From ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 29 Feb 2020 18:01:47 +0000 Subject: gentoo (leap year) resync : 29.02.2020 --- net-misc/Manifest.gz | Bin 55592 -> 55602 bytes net-misc/apt-cacher-ng/Manifest | 8 +- .../apt-cacher-ng/apt-cacher-ng-3.3.1_p1.ebuild | 2 +- .../apt-cacher-ng/apt-cacher-ng-3.3.1_p2.ebuild | 2 +- net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p2.ebuild | 2 +- .../apt-cacher-ng/apt-cacher-ng-9999999.ebuild | 2 +- net-misc/asterisk/Manifest | 2 + net-misc/asterisk/asterisk-13.31.0.ebuild | 325 ++++++++++++++ net-misc/axel/Manifest | 6 +- net-misc/axel/axel-2.17.7.ebuild | 48 ++ net-misc/axel/axel-9999.ebuild | 4 +- net-misc/axel/metadata.xml | 4 + net-misc/babeld/Manifest | 4 +- net-misc/babeld/babeld-1.8.2.ebuild | 4 +- net-misc/babeld/babeld-1.9.1.ebuild | 4 +- net-misc/bfgminer/Manifest | 4 +- net-misc/bfgminer/bfgminer-5.4.2.ebuild | 3 +- net-misc/bfgminer/bfgminer-5.5.0.ebuild | 3 +- net-misc/bridge-utils/Manifest | 4 +- net-misc/bridge-utils/bridge-utils-1.5.ebuild | 4 +- net-misc/bridge-utils/bridge-utils-1.6.ebuild | 4 +- net-misc/crossbar/Manifest | 16 - net-misc/crossbar/crossbar-17.12.1.ebuild | 172 -------- net-misc/crossbar/crossbar-17.6.1_p3-r1.ebuild | 163 ------- net-misc/crossbar/crossbar-17.8.1.ebuild | 172 -------- net-misc/crossbar/crossbar-17.9.1.ebuild | 172 -------- net-misc/crossbar/crossbar-18.3.1.ebuild | 169 -------- net-misc/crossbar/files/confd | 11 - net-misc/crossbar/files/config.json.sample | 60 --- .../files/crossbar-17.8.1-Revert-Torservices.patch | 246 ----------- .../files/crossbar-17.9.1-Revert-Torservices.patch | 270 ------------ net-misc/crossbar/files/initd | 35 -- net-misc/crossbar/metadata.xml | 22 - net-misc/dhcp/Manifest | 2 +- net-misc/dhcp/dhcp-4.4.2-r1.ebuild | 268 ------------ net-misc/dhcp/dhcp-4.4.2-r2.ebuild | 268 ++++++++++++ net-misc/dleyna-server/Manifest | 5 +- net-misc/dleyna-server/dleyna-server-0.5.0.ebuild | 4 +- net-misc/dleyna-server/dleyna-server-0.6.0.ebuild | 43 ++ net-misc/dleyna-server/files/0.6.0-gupnp-1.2.patch | 71 +++ net-misc/dropbox/Manifest | 6 + net-misc/dropbox/dropbox-91.4.548.ebuild | 109 +++++ net-misc/dropbox/dropbox-92.3.365.ebuild | 102 +++++ net-misc/efax/Manifest | 4 +- net-misc/efax/efax-0.9a-r4.ebuild | 4 +- net-misc/efax/efax-0.9a_p19_p1.ebuild | 4 +- net-misc/electron-cash/Manifest | 4 +- .../electron-cash/electron-cash-3.3.6-r1.ebuild | 151 ------- .../electron-cash/electron-cash-4.0.2-r1.ebuild | 152 ------- .../electron-cash/electron-cash-4.0.2-r2.ebuild | 151 +++++++ net-misc/electrum-ltc/Manifest | 2 +- .../electrum-ltc/electrum-ltc-3.3.4.1-r1.ebuild | 155 ------- .../electrum-ltc/electrum-ltc-3.3.4.1-r2.ebuild | 154 +++++++ net-misc/eventd/Manifest | 2 +- net-misc/eventd/eventd-0.27.0-r1.ebuild | 2 +- net-misc/geomyidae/Manifest | 4 +- net-misc/geomyidae/geomyidae-0.32.2.ebuild | 4 +- net-misc/geomyidae/geomyidae-0.34.ebuild | 4 +- net-misc/gofish/Manifest | 2 +- net-misc/gofish/gofish-1.2.ebuild | 4 +- net-misc/gupnp-tools/Manifest | 4 +- net-misc/gupnp-tools/gupnp-tools-0.10.0.ebuild | 36 ++ net-misc/gupnp-tools/gupnp-tools-0.8.14.ebuild | 6 +- net-misc/httpie/Manifest | 2 + net-misc/httpie/httpie-2.0.0.ebuild | 39 ++ net-misc/icecast/Manifest | 2 +- net-misc/icecast/icecast-2.4.4.ebuild | 4 +- net-misc/ipcalc/Manifest | 2 +- net-misc/ipcalc/ipcalc-0.41.ebuild | 2 +- net-misc/kafka-bin/Manifest | 2 + net-misc/kafka-bin/kafka-bin-2.4.0.ebuild | 59 +++ net-misc/kea/Manifest | 6 +- net-misc/kea/kea-1.7.3.ebuild | 76 ---- net-misc/kea/kea-1.7.5.ebuild | 73 ++++ net-misc/kea/kea-9999.ebuild | 13 +- net-misc/libteam/Manifest | 6 +- net-misc/libteam/libteam-1.29.ebuild | 4 +- net-misc/libteam/libteam-1.30.ebuild | 2 +- net-misc/libteam/libteam-9999.ebuild | 4 +- net-misc/lksctp-tools/Manifest | 2 +- .../lksctp-tools/lksctp-tools-1.0.18-r1.ebuild | 1 - net-misc/lldpd/Manifest | 4 +- net-misc/lldpd/lldpd-1.0.3.ebuild | 1 - net-misc/lldpd/lldpd-1.0.4.ebuild | 3 +- net-misc/memcached/Manifest | 6 +- net-misc/memcached/memcached-1.5.19.ebuild | 97 ----- net-misc/memcached/memcached-1.5.20.ebuild | 97 ----- net-misc/memcached/memcached-1.5.21-r1.ebuild | 2 +- net-misc/minissdpd/Manifest | 2 +- net-misc/minissdpd/minissdpd-1.5.20190824.ebuild | 4 +- net-misc/monmotha/Manifest | 2 +- net-misc/monmotha/monmotha-2.3.8-r1.ebuild | 4 +- net-misc/netevent/Manifest | 3 + net-misc/netevent/metadata.xml | 11 + net-misc/netevent/netevent-2.0_p20200217.ebuild | 32 ++ net-misc/netpipes/Manifest | 2 +- net-misc/netpipes/netpipes-4.2-r2.ebuild | 4 +- net-misc/nextcloud-client/Manifest | 6 +- .../nextcloud-client/nextcloud-client-2.6.0.ebuild | 87 ---- .../nextcloud-client/nextcloud-client-2.6.1.ebuild | 89 ---- .../nextcloud-client/nextcloud-client-2.6.3.ebuild | 89 ++++ net-misc/ntp/Manifest | 6 +- net-misc/ntp/ntp-4.2.8_p13-r1.ebuild | 4 +- net-misc/ntp/ntp-4.2.8_p13-r2.ebuild | 2 - net-misc/ntp/ntp-4.2.8_p13.ebuild | 2 - net-misc/oidentd/Manifest | 15 +- net-misc/oidentd/files/oidentd-2.0.7-confd | 4 - .../files/oidentd-2.0.8-bind-to-ipv6-too.patch | 17 - net-misc/oidentd/files/oidentd-2.0.8-gcc5.patch | 25 -- .../files/oidentd-2.0.8-log-conntrack-fails.patch | 52 --- .../oidentd/files/oidentd-2.0.8-masquerading.patch | 43 -- .../oidentd-2.0.8-no-conntrack-masquerading.patch | 41 -- net-misc/oidentd/files/oidentd.conf | 22 - net-misc/oidentd/files/oidentd.service | 9 - net-misc/oidentd/files/oidentd.socket | 10 - net-misc/oidentd/files/oidentd_at.service | 7 - net-misc/oidentd/files/oidentd_masq.conf | 10 - net-misc/oidentd/oidentd-2.0.8-r6.ebuild | 63 --- net-misc/oidentd/oidentd-2.4.0.ebuild | 2 +- net-misc/openssh/Manifest | 10 +- .../files/openssh-8.2_p1-X509-12.4-tests.patch | 11 - .../files/openssh-8.2_p1-X509-12.4.2-tests.patch | 11 + .../files/openssh-8.2_p1-X509-glue-12.4.2.patch | 129 ++++++ .../files/openssh-8.2_p1-X509-glue-12.4.patch | 150 ------- net-misc/openssh/openssh-8.1_p1-r2.ebuild | 2 +- net-misc/openssh/openssh-8.2_p1-r1.ebuild | 481 -------------------- net-misc/openssh/openssh-8.2_p1-r3.ebuild | 482 +++++++++++++++++++++ net-misc/rabbitmq-server/Manifest | 12 +- .../rabbitmq-server/rabbitmq-server-3.7.17.ebuild | 106 ----- .../rabbitmq-server/rabbitmq-server-3.7.21.ebuild | 105 ----- .../rabbitmq-server/rabbitmq-server-3.7.24.ebuild | 80 ++++ .../rabbitmq-server/rabbitmq-server-3.8.0.ebuild | 105 ----- .../rabbitmq-server/rabbitmq-server-3.8.1.ebuild | 105 ----- .../rabbitmq-server/rabbitmq-server-3.8.2.ebuild | 80 ++++ net-misc/radvd/Manifest | 8 +- net-misc/radvd/radvd-2.14.ebuild | 3 +- net-misc/radvd/radvd-2.17-r1.ebuild | 3 +- net-misc/radvd/radvd-2.17-r2.ebuild | 3 +- net-misc/radvd/radvd-2.18.ebuild | 3 +- net-misc/rclone/Manifest | 8 - net-misc/rclone/rclone-1.45.ebuild | 38 -- net-misc/rclone/rclone-1.47.0.ebuild | 38 -- net-misc/rclone/rclone-1.49.1.ebuild | 38 -- net-misc/rclone/rclone-1.50.2.ebuild | 39 -- net-misc/rdate/Manifest | 2 +- net-misc/rdate/rdate-1.4-r4.ebuild | 2 +- net-misc/remmina/Manifest | 2 + net-misc/remmina/remmina-1.4.1.ebuild | 97 +++++ net-misc/ris-linux/Manifest | 2 +- net-misc/ris-linux/ris-linux-0.4-r1.ebuild | 4 +- net-misc/rwhoisd/Manifest | 2 +- net-misc/rwhoisd/rwhoisd-1.5.9.6.ebuild | 6 +- net-misc/rygel/Manifest | 4 +- net-misc/rygel/rygel-0.36.2.ebuild | 8 +- net-misc/rygel/rygel-0.38.3.ebuild | 81 ++++ net-misc/scponly/Manifest | 4 +- .../files/scponly-4.8-sftp-server-path.patch | 42 ++ net-misc/scponly/metadata.xml | 10 +- net-misc/scponly/scponly-4.8-r7.ebuild | 245 +++++++++++ net-misc/ser2net/Manifest | 2 +- net-misc/ser2net/ser2net-2.10.0.ebuild | 4 +- net-misc/smb4k/Manifest | 2 +- net-misc/smb4k/smb4k-3.0.2.ebuild | 2 +- net-misc/sock/Manifest | 2 +- net-misc/sock/sock-1.1-r1.ebuild | 4 +- net-misc/sshpass/Manifest | 2 +- net-misc/sshpass/sshpass-1.06.ebuild | 4 +- net-misc/streamlink/Manifest | 2 + net-misc/streamlink/streamlink-1.3.1.ebuild | 82 ++++ net-misc/streamtuner/Manifest | 2 +- net-misc/streamtuner/streamtuner-0.99.99-r5.ebuild | 8 +- net-misc/tigervnc/Manifest | 2 +- net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild | 1 - net-misc/unison/Manifest | 6 +- net-misc/unison/unison-2.48.4-r1.ebuild | 4 +- net-misc/unison/unison-2.48.4.ebuild | 4 +- net-misc/unison/unison-2.51.2.ebuild | 4 +- net-misc/vino/Manifest | 4 +- net-misc/vino/vino-3.22.0-r2.ebuild | 4 +- net-misc/vino/vino-3.22.0-r3.ebuild | 2 + net-misc/whois/Manifest | 4 +- net-misc/whois/whois-5.5.3.ebuild | 74 ---- net-misc/whois/whois-5.5.6.ebuild | 74 ++++ net-misc/x2goclient/Manifest | 4 +- net-misc/x2goclient/x2goclient-4.1.2.1-r1.ebuild | 4 +- net-misc/x2goclient/x2goclient-4.1.2.2.ebuild | 62 +++ net-misc/zerotier/Manifest | 8 +- .../files/zerotier-1.4.6-add-armv7a-support.patch | 14 + .../zerotier-1.4.6-add-mk-ctlr-node-target.patch | 27 ++ .../files/zerotier-1.4.6-fixup-neon-support.patch | 96 ++++ .../files/zerotier-1.4.6-respect-ldflags.patch | 11 + net-misc/zerotier/metadata.xml | 13 +- net-misc/zerotier/zerotier-1.4.6.ebuild | 79 ++++ 193 files changed, 3528 insertions(+), 4502 deletions(-) create mode 100644 net-misc/asterisk/asterisk-13.31.0.ebuild create mode 100644 net-misc/axel/axel-2.17.7.ebuild delete mode 100644 net-misc/crossbar/Manifest delete mode 100644 net-misc/crossbar/crossbar-17.12.1.ebuild delete mode 100644 net-misc/crossbar/crossbar-17.6.1_p3-r1.ebuild delete mode 100644 net-misc/crossbar/crossbar-17.8.1.ebuild delete mode 100644 net-misc/crossbar/crossbar-17.9.1.ebuild delete mode 100644 net-misc/crossbar/crossbar-18.3.1.ebuild delete mode 100644 net-misc/crossbar/files/confd delete mode 100644 net-misc/crossbar/files/config.json.sample delete mode 100644 net-misc/crossbar/files/crossbar-17.8.1-Revert-Torservices.patch delete mode 100644 net-misc/crossbar/files/crossbar-17.9.1-Revert-Torservices.patch delete mode 100644 net-misc/crossbar/files/initd delete mode 100644 net-misc/crossbar/metadata.xml delete mode 100644 net-misc/dhcp/dhcp-4.4.2-r1.ebuild create mode 100644 net-misc/dhcp/dhcp-4.4.2-r2.ebuild create mode 100644 net-misc/dleyna-server/dleyna-server-0.6.0.ebuild create mode 100644 net-misc/dleyna-server/files/0.6.0-gupnp-1.2.patch create mode 100644 net-misc/dropbox/dropbox-91.4.548.ebuild create mode 100644 net-misc/dropbox/dropbox-92.3.365.ebuild delete mode 100644 net-misc/electron-cash/electron-cash-3.3.6-r1.ebuild delete mode 100644 net-misc/electron-cash/electron-cash-4.0.2-r1.ebuild create mode 100644 net-misc/electron-cash/electron-cash-4.0.2-r2.ebuild delete mode 100644 net-misc/electrum-ltc/electrum-ltc-3.3.4.1-r1.ebuild create mode 100644 net-misc/electrum-ltc/electrum-ltc-3.3.4.1-r2.ebuild create mode 100644 net-misc/gupnp-tools/gupnp-tools-0.10.0.ebuild create mode 100644 net-misc/httpie/httpie-2.0.0.ebuild create mode 100644 net-misc/kafka-bin/kafka-bin-2.4.0.ebuild delete mode 100644 net-misc/kea/kea-1.7.3.ebuild create mode 100644 net-misc/kea/kea-1.7.5.ebuild delete mode 100644 net-misc/memcached/memcached-1.5.19.ebuild delete mode 100644 net-misc/memcached/memcached-1.5.20.ebuild create mode 100644 net-misc/netevent/Manifest create mode 100644 net-misc/netevent/metadata.xml create mode 100644 net-misc/netevent/netevent-2.0_p20200217.ebuild delete mode 100644 net-misc/nextcloud-client/nextcloud-client-2.6.0.ebuild delete mode 100644 net-misc/nextcloud-client/nextcloud-client-2.6.1.ebuild create mode 100644 net-misc/nextcloud-client/nextcloud-client-2.6.3.ebuild delete mode 100644 net-misc/oidentd/files/oidentd-2.0.7-confd delete mode 100644 net-misc/oidentd/files/oidentd-2.0.8-bind-to-ipv6-too.patch delete mode 100644 net-misc/oidentd/files/oidentd-2.0.8-gcc5.patch delete mode 100644 net-misc/oidentd/files/oidentd-2.0.8-log-conntrack-fails.patch delete mode 100644 net-misc/oidentd/files/oidentd-2.0.8-masquerading.patch delete mode 100644 net-misc/oidentd/files/oidentd-2.0.8-no-conntrack-masquerading.patch delete mode 100644 net-misc/oidentd/files/oidentd.conf delete mode 100644 net-misc/oidentd/files/oidentd.service delete mode 100644 net-misc/oidentd/files/oidentd.socket delete mode 100644 net-misc/oidentd/files/oidentd_at.service delete mode 100644 net-misc/oidentd/files/oidentd_masq.conf delete mode 100644 net-misc/oidentd/oidentd-2.0.8-r6.ebuild delete mode 100644 net-misc/openssh/files/openssh-8.2_p1-X509-12.4-tests.patch create mode 100644 net-misc/openssh/files/openssh-8.2_p1-X509-12.4.2-tests.patch create mode 100644 net-misc/openssh/files/openssh-8.2_p1-X509-glue-12.4.2.patch delete mode 100644 net-misc/openssh/files/openssh-8.2_p1-X509-glue-12.4.patch delete mode 100644 net-misc/openssh/openssh-8.2_p1-r1.ebuild create mode 100644 net-misc/openssh/openssh-8.2_p1-r3.ebuild delete mode 100644 net-misc/rabbitmq-server/rabbitmq-server-3.7.17.ebuild delete mode 100644 net-misc/rabbitmq-server/rabbitmq-server-3.7.21.ebuild create mode 100644 net-misc/rabbitmq-server/rabbitmq-server-3.7.24.ebuild delete mode 100644 net-misc/rabbitmq-server/rabbitmq-server-3.8.0.ebuild delete mode 100644 net-misc/rabbitmq-server/rabbitmq-server-3.8.1.ebuild create mode 100644 net-misc/rabbitmq-server/rabbitmq-server-3.8.2.ebuild delete mode 100644 net-misc/rclone/rclone-1.45.ebuild delete mode 100644 net-misc/rclone/rclone-1.47.0.ebuild delete mode 100644 net-misc/rclone/rclone-1.49.1.ebuild delete mode 100644 net-misc/rclone/rclone-1.50.2.ebuild create mode 100644 net-misc/remmina/remmina-1.4.1.ebuild create mode 100644 net-misc/rygel/rygel-0.38.3.ebuild create mode 100644 net-misc/scponly/files/scponly-4.8-sftp-server-path.patch create mode 100644 net-misc/scponly/scponly-4.8-r7.ebuild create mode 100644 net-misc/streamlink/streamlink-1.3.1.ebuild delete mode 100644 net-misc/whois/whois-5.5.3.ebuild create mode 100644 net-misc/whois/whois-5.5.6.ebuild create mode 100644 net-misc/x2goclient/x2goclient-4.1.2.2.ebuild create mode 100644 net-misc/zerotier/files/zerotier-1.4.6-add-armv7a-support.patch create mode 100644 net-misc/zerotier/files/zerotier-1.4.6-add-mk-ctlr-node-target.patch create mode 100644 net-misc/zerotier/files/zerotier-1.4.6-fixup-neon-support.patch create mode 100644 net-misc/zerotier/files/zerotier-1.4.6-respect-ldflags.patch create mode 100644 net-misc/zerotier/zerotier-1.4.6.ebuild (limited to 'net-misc') diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz index b688ab169c7a..df7113bcc547 100644 Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest index 4448fcff04fd..356d9bea735d 100644 --- a/net-misc/apt-cacher-ng/Manifest +++ b/net-misc/apt-cacher-ng/Manifest @@ -10,8 +10,8 @@ DIST apt-cacher-ng_3.3.1-1.debian.tar.xz 50912 BLAKE2B a873c4e718765a7161d9f87b6 DIST apt-cacher-ng_3.3.1-2.debian.tar.xz 49772 BLAKE2B b864859e7f0ad5eba24b2f1ced74dbdb7a1878fbc2190863929f45534163c18ed2a67c4c75b5fe8011d93312ab9a67d899b09669e7aacb1ad3ae15a2bc1fba12 SHA512 653ca59c1d9c89a9586ccf963da480524ff8195222435e4a89f0c08ca64586e1993a92d00a05dbf738b0814869a5e6b539a05d1d59cb956e66b2dbe5ad95eeb8 DIST apt-cacher-ng_3.3.1.orig.tar.xz 321996 BLAKE2B b630a31414ee86256f2e2ebe950b56d182d61dffd1603ce8387b5cd677d18fcda3ed17864bb99c253b11e2d29163b172c2d0bc91a3f5b14fb9f0ef321d656b40 SHA512 0d412e4a488fa4c55f1292c1fc7346bdf88228528455ce1d2ad20137ddb84df211a3bc5911c12662428335d8f624979d166b0ed31f74e466228df3ab108e67f3 DIST apt-cacher-ng_3.3.orig.tar.xz 320884 BLAKE2B c4bda8de90f76e7cb8335fdb758571db030c1298881afceb865f84e506aeb82e4db69c5c091debfdcf6c85bc8d4e703b75725ae6b06f2e412ba4b4362d568a05 SHA512 01a09bc13d2a9d24ee3012a21ae954362715bc0b69ef021a3446ad7d78157209aaaf941fbb02b0e5323bfb0337a1e3d6450c07b680d42f7bf93855d7ac65c60f -EBUILD apt-cacher-ng-3.3.1_p1.ebuild 2879 BLAKE2B 4c9c3afcb14de20f728f9e30a6a1e589f93f030688c455eb8b3aebe4c2ba4d6216dcd4b201e20e4750947d03d7d96dca81482e6585a21f232b1a2aafa79151ce SHA512 707727031eacee8eed6ef40ff7a6bc096080ad63f4c6e9c50207154a39878211198be02eb1570b9f93318d8d47b21a96e0a4161409d23dca9987117e6e6166bc -EBUILD apt-cacher-ng-3.3.1_p2.ebuild 2986 BLAKE2B 67abb15845e25e8fd8369f457f095f1051015d230b550ec20446334053fe15caceac1e0da0ed7be97f2643f6f3b460d48803919d50e08c3e74a7f855c19932fd SHA512 86990db8ef1d294d222a3f7988d18384fd80f58fec1dbe6a05917baaed1e0e0bfe6609208d0edf4e6c3e6af589ebd7bbb9ae560a3ed2ae73506f377dd946b1c2 -EBUILD apt-cacher-ng-3.3_p2.ebuild 2835 BLAKE2B 493f5c0239468027e8b9ae9ab5a4c32a0c3112b0b405d8ade23414485c0ba63c91c47794e447ccd8ce9e06c7a2e16239c57e11cffe8996f7965db14e947002a9 SHA512 4964e404269bc52a1fc533430f8faf1d1d889384c08226bf853fdca5706a40f878d67137f0790556418661e6f7db7bc6de92f363e9c099be662fc25eb340b3a2 -EBUILD apt-cacher-ng-9999999.ebuild 2765 BLAKE2B 8df3e332732ccad11a6040820351e787bfa7f46eb6745d8bf6ec34fe7151a996248bea17bc91c2477fe50970b47f0427bd982ec59dcb88b36f49bfbd5bd114d7 SHA512 9843a2f6c6d91b1517b52a06085eb801589dcf46a019069400c7b2cde458d455b11e260a7fec621514d63b6c9a16f703c8427559f660a59384a60e54f3c5a63b +EBUILD apt-cacher-ng-3.3.1_p1.ebuild 2880 BLAKE2B 132ba8bc3e684efd3d907763bff442e17a561d12e7a679ab698d54a6f4b97f7a21399c372be8918759db3fad4905d4da2571d7cc0d8c74932c6338df4df3a565 SHA512 7ed99cd2482b820ae7bc44022a088ea21a4bbd123f075251d2cdd95a3c6ef7ebbecb7163de03218e1c1ad13383fe42b6e676a4799c4a2462ccd53e38c281ed6f +EBUILD apt-cacher-ng-3.3.1_p2.ebuild 2987 BLAKE2B b3a076b3b4e58020e8795279da7c28cfa9f496f285814f34e5bcfc37976de7496e1e89df002f31e89bff8311db3ac261c1609041fc115cf85216b7214e9e90a4 SHA512 847e7cd3b1eab44f0d883da8bc6642b191b96302a9082e3f4a1ea80c65b4e5fc8382274ffdfc0dd19f93c7d4fac4db6bd003bd02a0bce14ac9971dc018cb35c1 +EBUILD apt-cacher-ng-3.3_p2.ebuild 2836 BLAKE2B 6e5556ca639c5dbf75b08d56aaec16a49c019cc720f124cd852747265c5ca25954ab01f99a3255eaf9d3bbcd271c7a919c7539d6b9883a8034a8dc0e9344073f SHA512 c9fc9be4c3f8d67984e1ac865bd77d04161d4d088edc4a412495a3bae78486f4dba60c302ad8aec11fb3e3abb979a4ef89398e21136e1fd3ca77a2c48ef25f20 +EBUILD apt-cacher-ng-9999999.ebuild 2766 BLAKE2B 4f701f236badb3a89b585690aab07e0004a5ac09daa6afb8dab499e3ae083ff6cf70ebba41c72ed6eb185c0c668d499c94d1f458da2c1117c9140a1a7b998dc2 SHA512 664184bd5ebc58302e952848ab301b241173e2ddec5896a9f99c35f96622d915e47d9243d590473d65d488fd66c869accb31c0cc7bd22c97245a0784b369186e MISC metadata.xml 493 BLAKE2B 6c2fb1f7abaee7df8db9ccdd7b71774230ddf2dc860d59f65a1cb77560532eb363e550bef6df18a63a78858a0a2469b0eb011d8bf0d41bf36a4c1b11223f0b2d SHA512 58f1345b841c7d5105432d0dab345033b9cefcfd4dedfe05f52d25135716be336a2f4a5fee3288236239bae9bbb1381deff0917fff8c80d81caaf64e8706b5a6 diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p1.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p1.ebuild index 2af7ed01cfc5..b8e377221817 100644 --- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p1.ebuild +++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p1.ebuild @@ -60,7 +60,7 @@ pkg_setup() { enewuser ${PN} -1 -1 -1 ${PN} } -src_configure(){ +src_configure() { local mycmakeargs=() if use fuse; then mycmakeargs+=( "-DHAVE_FUSE_25=yes" ) diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p2.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p2.ebuild index f0991d2bc87a..0b5dc00272ba 100644 --- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p2.ebuild +++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p2.ebuild @@ -60,7 +60,7 @@ pkg_setup() { enewuser ${PN} -1 -1 -1 ${PN} } -src_configure(){ +src_configure() { local mycmakeargs=() if use fuse; then mycmakeargs+=( "-DHAVE_FUSE_25=yes" ) diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p2.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p2.ebuild index cca26b8bae3a..f92adf794bf4 100644 --- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p2.ebuild +++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p2.ebuild @@ -59,7 +59,7 @@ pkg_setup() { enewuser ${PN} -1 -1 -1 ${PN} } -src_configure(){ +src_configure() { local mycmakeargs=() if use fuse; then mycmakeargs+=( "-DHAVE_FUSE_25=yes" ) diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild index 75d78c14ed9f..25cdda30a1e1 100644 --- a/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild +++ b/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild @@ -57,7 +57,7 @@ pkg_setup() { enewuser ${PN} -1 -1 -1 ${PN} } -src_configure(){ +src_configure() { local mycmakeargs=( "-DCMAKE_SKIP_BUILD_RPATH=on" ) diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest index 1c5cc6099665..a24a44355cb4 100644 --- a/net-misc/asterisk/Manifest +++ b/net-misc/asterisk/Manifest @@ -15,10 +15,12 @@ AUX asterisk.tmpfiles.conf 88 BLAKE2B 3c32a8dd17b94d607407a7b201448be69c72f1cbe2 DIST asterisk-11.25.3.tar.gz 35134682 BLAKE2B 9da24d5d6a674ab660edb103e5fc56ddfbcc58cd86166cc08cceb0598a63b51eae36133565e09a30ad11ff6623ba8945437dfb561d2916f68341d398540dabce SHA512 9c0521d55e5b69663ea40066d52e397ba6c165a4b20cd0a1e5e375b9c0e5a6e4f37908e50b0b580e288dec9be252af9a8bce7bceb03ba029f902fb757e6311ed DIST asterisk-13.23.1.tar.gz 33064056 BLAKE2B 7f531766df5f2db29b562e7c7d4e265d5cf610f192188691279c0294195b835bb62beef19d7e9554862e6b44764064b21d50a3e307bbf85dd12b67a2df8be459 SHA512 227bfc80b2e6382019d608296c4e1c8e992ba867636fa2c8ee578d0aa406b8828bf7962b24035d9b581c433afd18be7cbe98eb954112661b9759b6296ee686dd DIST asterisk-13.29.1.tar.gz 33061969 BLAKE2B b581a3b706438fd0f685cab9c6148f9803d09f878d2ec824cd7b3edb299d5514e7c473622f135caa8a7905ab70dff915b83ff9dcbcf80cb04955ba8dea03c968 SHA512 3c32324f67413abdf73a3146b8e280fd23d65854df23b87b01e7f20c635c304606f6216c49c6dcd44c3a09b945d15124a5d70182c4b69e5ed8e542a13589d2df +DIST asterisk-13.31.0.tar.gz 33110710 BLAKE2B b4fd186697784d7755992f0ae0cd881c58878420a2a43e0d50e93b91ac1fb9e41d95d7419509a403112975a2b5968c9691ad04ebe04c28c9e80809ad06710ec5 SHA512 b95a982d132420b971cf6750b2124e8df9f7d1bdab788c972897dc1a5b9ac6dccc6414b9b4684fb2196782d12a8dddab4059c2bd3c19fd3de6ef4ff6a3656344 DIST gentoo-asterisk-patchset-3.17.tar.bz2 5074 BLAKE2B 3c945e77b54b2449253acb9fcea8d289a7a3184729190622c14aff5557d36c93556efa83320fe4e7ae84021960c09f35ae9f997e8015706eef933aae2948309e SHA512 37f86f3c699b2643afd8080391e817a282571694bb56e00efd0734918dbc33d6c12a2463dbc24667597420863b4f506870140fbb8ef3f1700124ef790ae7252d DIST gentoo-asterisk-patchset-4.07.tar.bz2 2471 BLAKE2B d9026e7e8c12431496c24f204d117ed715741623195af10c838ec3ac5ce6a26fbb2d76d4c45c538881b532084e2ce74d2de83a27a0abaa5f65791be91416ef6d SHA512 73a9f92e6a737687c311941100c45bbc573f54fa79d0284318996c0d70274a4d2218693406d71b371496d27123d4d99bbc159974388e6547a682c06084d3b4c5 DIST gentoo-asterisk-patchset-4.08.tar.bz2 2176 BLAKE2B 7f8c9b5fda855091e66b2534d2be23fb1616f565480459f71f766826e5deeeecb24899e2ee9eefe74323e892624d32ab954ec7e9be6a002431ff029fc13493ed SHA512 365c1b8628882c48c279e1fd77d982e6d0820ba7d7122e97bb4988f875d7010caa956798c833c3b01d389004fa08a63a9de2c1b452c9e5701c6106e29fd8e9e1 EBUILD asterisk-11.25.3.ebuild 9607 BLAKE2B dedc0fe6dc53dd63a674648fc309957416f6b0e1f6036803802831ec33754b0fada3af67264744274004c2d29b0b43c1d4ab430aec6c3d368aab024a02c92297 SHA512 90c7b637065abc7953bce1016eee9c3b9f94f3a30df593de81cd72e61afd217db62a505d059623f99f72be643ade955460dbd4138e5a98e979b924de5bbe2cc8 EBUILD asterisk-13.23.1.ebuild 9721 BLAKE2B bb24fad06bea49534ead1bb19917842eed3e04c24b0a2f60ae2035544ba250d420c995134cbe221a51aa05327c45cfe5e44710539891966fb0af7d6e379876c6 SHA512 42df62f3e23ceef24fe934b2565bcb44fadbce1c69d9c6c17c14afea457418f250ad99e9969a4197ab28b208a48d7fb86ab4a2872d27a1fa1f00c01dcd86f41e EBUILD asterisk-13.29.1.ebuild 9818 BLAKE2B 365c779b4cb8efc96eba5c03447b6e706bba2bcc7ba942bedb190fdcac646463fb7ddfbaa4924048729d30bd4daf858cee7f4400092ab2c41ec63c1d604714a8 SHA512 99c700cec1b101c3d85c452be848fd7e616906fe541f20c53fe2d8e342bdf6aa3377671340fe71ed5aa4720d10f629207718a1fbefca771a1e85eb5cac726121 +EBUILD asterisk-13.31.0.ebuild 9819 BLAKE2B 8c210d6b31d5beafbca4f5d8cb8280b6a922383230c70e83126d5f0cff7fa8f1a662960b3552cfd23dd9b3014d26801bb26bd67a574de1afcf8f1afa4a96837f SHA512 977940a0e5e39b8c38ebc97d5a0b35be603d738eb7eb15db86575de0243c1671dd600ad27d77ee7d8a12b8bbe91bc207aa2dde2d5e907afb99f80281cfc2f1a3 MISC metadata.xml 1302 BLAKE2B 813ef13f37f239e03c203a77d1b035d7177c24fc96c4da6cf333b1779ea7fc4be1bf44a288ea5f0f21cc284136ee67ef7a68178a048cb4890ac75001e4d4fbe8 SHA512 73dbe17abd814e6f1babbfb860badb42b64bec299cb1cd75db57fc05e9ea775a14b0f2c5c9ec9f4422a64036d90c2797057ec273150da17c91d6b957a71d6f73 diff --git a/net-misc/asterisk/asterisk-13.31.0.ebuild b/net-misc/asterisk/asterisk-13.31.0.ebuild new file mode 100644 index 000000000000..6678f7aec857 --- /dev/null +++ b/net-misc/asterisk/asterisk-13.31.0.ebuild @@ -0,0 +1,325 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools linux-info systemd + +MY_P="${PN}-${PV/_/-}" + +DESCRIPTION="Asterisk: A Modular Open Source PBX System" +HOMEPAGE="https://www.asterisk.org/" +SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz + https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +IUSE_VOICEMAIL_STORAGE=" + +voicemail_storage_file + voicemail_storage_odbc + voicemail_storage_imap +" +IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libedit libressl lua mysql newt +samples odbc osplookup oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog vorbis xmpp" +IUSE_EXPAND="VOICEMAIL_STORAGE" +REQUIRED_USE="gtalk? ( xmpp ) + ^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} ) + voicemail_storage_odbc? ( odbc ) +" + +PATCHES=( "${WORKDIR}/asterisk-patchset" ) + +DEPEND="acct-user/asterisk + acct-group/asterisk + dev-db/sqlite:3 + dev-libs/popt + dev-libs/jansson + dev-libs/libxml2:2 + dev-libs/libxslt + sys-libs/ncurses:0= + sys-libs/zlib + alsa? ( media-libs/alsa-lib ) + bluetooth? ( net-wireless/bluez:= ) + calendar? ( + net-libs/neon:= + dev-libs/libical:= + dev-libs/iksemel + ) + caps? ( sys-libs/libcap ) + cluster? ( sys-cluster/corosync ) + curl? ( net-misc/curl ) + dahdi? ( + net-libs/libpri + net-misc/dahdi-tools + ) + freetds? ( dev-db/freetds ) + gtalk? ( dev-libs/iksemel ) + http? ( dev-libs/gmime:2.6 ) + iconv? ( virtual/libiconv ) + ilbc? ( dev-libs/ilbc-rfc3951 ) + ldap? ( net-nds/openldap ) + libedit? ( dev-libs/libedit ) + lua? ( dev-lang/lua:* ) + mysql? ( dev-db/mysql-connector-c:= ) + newt? ( dev-libs/newt ) + odbc? ( dev-db/unixODBC ) + osplookup? ( net-libs/osptoolkit ) + pjproject? ( net-libs/pjproject ) + portaudio? ( media-libs/portaudio ) + postgres? ( dev-db/postgresql:* ) + radius? ( net-dialup/freeradius-client ) + snmp? ( net-analyzer/net-snmp:= ) + span? ( media-libs/spandsp ) + speex? ( + media-libs/speex + media-libs/speexdsp + ) + srtp? ( net-libs/libsrtp:0 ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + vorbis? ( media-libs/libvorbis ) + voicemail_storage_imap? ( virtual/imap-c-client ) + xmpp? ( dev-libs/iksemel ) +" + +RDEPEND="${DEPEND} + net-misc/asterisk-core-sounds + net-misc/asterisk-extra-sounds + net-misc/asterisk-moh-opsound + selinux? ( sec-policy/selinux-asterisk ) + syslog? ( virtual/logger )" + +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}/${MY_P}" + +QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" + +pkg_setup() { + CONFIG_CHECK="~!NF_CONNTRACK_SIP" + local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users + have reported that this module dropped critical SIP packets in their deployments. You + may want to disable it if you see such problems." + check_extra_config +} + +src_prepare() { + default + AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf +} + +function menuselect() { + menuselect/menuselect "$@" || die "menuselect $* failed." +} + +src_configure() { + local vmst + + econf \ + --libdir="/usr/$(get_libdir)" \ + --localstatedir="/var" \ + --with-crypto \ + --with-gsm=internal \ + --with-popt \ + --with-z \ + --without-libedit \ + $(use_with caps cap) \ + $(use_with http gmime) \ + $(use_with newt) \ + $(use_with pjproject) \ + $(use_with portaudio) \ + $(use_with ssl) + + # Blank out sounds/sounds.xml file to prevent + # asterisk from installing sounds files (we pull them in via + # asterisk-{core,extra}-sounds and asterisk-moh-opsound. + >"${S}"/sounds/sounds.xml + + # That NATIVE_ARCH chatter really is quite bothersome + sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system" + + # Compile menuselect binary for optional components + emake NOISE_BUILD=yes menuselect.makeopts + + # Disable BUILD_NATIVE (bug #667498) + menuselect --disable build_native menuselect.makeopts + + # Broken functionality is forcibly disabled (bug #360143) + menuselect --disable chan_misdn menuselect.makeopts + menuselect --disable chan_ooh323 menuselect.makeopts + + # Utility set is forcibly enabled (bug #358001) + menuselect --enable smsq menuselect.makeopts + menuselect --enable streamplayer menuselect.makeopts + menuselect --enable aelparse menuselect.makeopts + menuselect --enable astman menuselect.makeopts + + # this is connected, otherwise it would not find + # ast_pktccops_gate_alloc symbol + menuselect --enable chan_mgcp menuselect.makeopts + menuselect --enable res_pktccops menuselect.makeopts + + # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available + menuselect --enable pbx_dundi menuselect.makeopts + menuselect --enable func_aes menuselect.makeopts + menuselect --enable chan_iax2 menuselect.makeopts + + # SQlite3 is now the main database backend, enable related features + menuselect --enable cdr_sqlite3_custom menuselect.makeopts + menuselect --enable cel_sqlite3_custom menuselect.makeopts + + # The others are based on USE-flag settings + use_select() { + local state=$(use "$1" && echo enable || echo disable) + shift # remove use from parameters + + while [[ -n $1 ]]; do + menuselect --${state} "$1" menuselect.makeopts + shift + done + } + + use_select alsa chan_alsa + use_select bluetooth chan_mobile + use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar} + use_select cluster res_corosync + use_select curl func_curl res_config_curl res_curl + use_select dahdi app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi + use_select freetds {cdr,cel}_tds + use_select gtalk chan_motif + use_select http res_http_post + use_select iconv func_iconv + use_select ilbc codec_ilbc format_ilbc + use_select ldap res_config_ldap + use_select lua pbx_lua + use_select mysql app_mysql cdr_mysql res_config_mysql + use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc + use_select osplookup app_osplookup + use_select oss chan_oss + use_select postgres {cdr,cel}_pgsql res_config_pgsql + use_select radius {cdr,cel}_radius + use_select snmp res_snmp + use_select span res_fax_spandsp + use_select speex {codec,func}_speex + use_select srtp res_srtp + use_select statsd res_statsd res_{endpoint,chan}_stats + use_select syslog cdr_syslog + use_select vorbis format_ogg_vorbis + use_select xmpp res_xmpp + + # Voicemail storage ... + for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do + if use ${vmst}; then + menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts + fi + done + + if use debug; then + for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do + menuselect --enable $o menuselect.makeopts + done + fi +} + +src_compile() { + emake ASTCFLAGS="${CFLAGS}" ASTLDFLAGS="${LDFLAGS}" NOISY_BUILD=yes +} + +src_install() { + local d + + mkdir -p "${ED}/usr/$(get_libdir)/pkgconfig" || die + emake DESTDIR="${D}" NOISY_BUILD=yes installdirs + emake DESTDIR="${D}" NOISY_BUILD=yes install + + if use radius; then + insinto /etc/radiusclient/ + doins contrib/dictionary.digium + fi + diropts -m 0750 -o root -g asterisk + keepdir /etc/asterisk + if use samples; then + emake NOISY_BUILD=yes DESTDIR="${ED}" samples + for conffile in "${ED}/etc/asterisk/"* + do + fowners root:root "${conffile#${ED}}" + fperms 0644 "${conffile#${ED}}" + done + einfo "Sample files have been installed" + else + einfo "Skipping installation of sample files..." + rm "${ED}"/var/lib/asterisk/mohmp3/* || die + rm "${ED}"/var/lib/asterisk/sounds/demo-* || die + rm "${ED}"/var/lib/asterisk/agi-bin/* || die + rm "${ED}"/etc/asterisk/* || die + fi + rm -r "${ED}"/var/spool/asterisk/voicemail/default || die + + # keep directories + diropts -m 0770 -o asterisk asterisk + keepdir /var/lib/asterisk + keepdir /var/spool/asterisk + keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail} + diropts -m 0750 -o asterisk -g asterisk + keepdir /var/log/asterisk/{cdr-csv,cdr-custom} + + newinitd "${FILESDIR}"/1.8.0/asterisk.initd8 asterisk + newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk + + systemd_dounit "${FILESDIR}"/asterisk.service + systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf + systemd_install_serviced "${FILESDIR}"/asterisk.service.conf + + # Reset diropts else dodoc uses it for doc installations. + diropts -m0755 + + # install the upgrade documentation + dodoc UPGRADE* BUGS CREDITS + + # install extra documentation + if use doc; then + dodoc doc/*.txt + dodoc doc/*.pdf + fi + + # install SIP scripts; bug #300832 + # + dodoc "${FILESDIR}/1.6.2/sip_calc_auth" + dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh" + dodoc "${FILESDIR}/1.8.0/find_call_ids.sh" + dodoc "${FILESDIR}/1.6.2/call_data.txt" + + # install logrotate snippet; bug #329281 + # + insinto /etc/logrotate.d + newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk + + # Asterisk installs a few folders that's empty by design, + # but still required. This finds them, and marks them for + # portage. + for d in $(find "${ED}"/var -type d -empty || die "Find failed."); do + keepdir "${d#${ED}}" + done +} + +pkg_postinst() { + # + # Announcements, warnings, reminders... + # + einfo "Asterisk has been installed" + echo + elog "If you want to know more about asterisk, visit these sites:" + elog "http://www.asteriskdocs.org/" + elog "http://www.voip-info.org/wiki-Asterisk" + echo + elog "http://www.automated.it/guidetoasterisk.htm" + echo + elog "Gentoo VoIP IRC Channel:" + elog "#gentoo-voip @ irc.freenode.net" + echo + echo + elog "Please read the Asterisk 13 upgrade document:" + elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+13" +} diff --git a/net-misc/axel/Manifest b/net-misc/axel/Manifest index aee9514e02f4..b5193546f8e9 100644 --- a/net-misc/axel/Manifest +++ b/net-misc/axel/Manifest @@ -4,10 +4,12 @@ AUX axel-2.4-max-redir.patch 412 BLAKE2B 62146c6f0da6fdff0fe89aeeb487094020b04ee DIST axel-2.12.tar.gz 82995 BLAKE2B da6e00cb577ffd9ab55c3b5b4362f0bdbc08ae89572a7cc224c092710da7911d2c974f52240fd4d2e16ce1d7657a68b5917d866120fb092b85736f181887adac SHA512 5e163c319366f7efd16f8b35dbcf901300c884ab303696dabe87ad47511f56cc3f1e399af738dc79ca717ca70fd529b6dd1adf30f5162cfb530105ce34e2eaf2 DIST axel-2.14.1.tar.gz 89356 BLAKE2B 43e278f09304ed9f872c9348fb2113758a046819c6c8667bd6bff65824a8a55c3d0ac647027947f76b9c4f334495284f30066fa3bd60bc0eaab4f4b5b5059620 SHA512 72c37fc6def0c765ed8220c27efe22255073b1e3cf1c8f6bda5ee2ce9cd36ac46263ac602a185efd40ca8f197a268612f2dcda69bcb49891c2538b910d971e8b DIST axel-2.15.tar.gz 96474 BLAKE2B 73b35b0c234bf2c21b5c6038979061c908de7520d923ecf6d84d7d6cee348c3e17b8f8d3771909ed74cf20899e3d8ece2cba44764ce625755e0ff44563c0fc43 SHA512 b0a516850b56b74fe763df3320b98e47f9977dda208cff9a98a87bdc63e37f5e0fd31d30c240a375f9d992320674983ced8201ee631187149e62b42804c48eb6 +DIST axel-2.17.7.tar.xz 202632 BLAKE2B 2d799ad39c0742e2edfa09dd19f9d941c54c6136f4d5ec5a95f85d338bdebcc79545205cd1dde6ef25d28c89f494ae3cc278c73e375c9f4a96dabff73b139257 SHA512 ed1815199a7cc78897a820e1938a80dba72b83e1b40e6c1e81c6d3457aaa17faf20148a82383768524d61bbabda5b00cdcb2c15ff8ae5ed74e415da0b53be3aa DIST axel-2.4.tar.bz2 44995 BLAKE2B 03218c6243029695deae1a2d96b4e0cce719cf23602faf2d2fb4422f06ae313f5a1ed6759e7bc59a1ce756a732873ca5faed636742b608b6a66240b694b7189a SHA512 34d73cea19f2bf393aa8d3e4b6c24296f8b1d4e6177da6f4728763e013d5d9d073aa5dae31d0ff175126e8fcbd973daf94674a70f100afc9e7d00b92b78b8ec9 EBUILD axel-2.12.ebuild 1108 BLAKE2B a8b96a4e82b041e098990502c07a4cf1c60addbd80032527f0df3ed7aa6071eb32c922d91afb865ec9be21bed374d8a70a02f9c5bb91d9bfca134c0bc5a9609b SHA512 b7df6f7160734344d763fbca4c095dbbbfe5e4afe98a91bccce2da958ce8f21a67dc433164586ddaa02e61e2041898d64dc74ca1d699a35fd5c8affc9219488f EBUILD axel-2.14.1.ebuild 1306 BLAKE2B 85d9063a51d8c0e51e9bf74be671605c1e79b6e427ac48f09565b857f9da70f3955ad6d5ad3b3ce8cfa0f207f03a6a4be348a28be6a6e789e2620395844ccae0 SHA512 4327edc03fcea40ad2132700c284b4361abe8c4508bf250b5ad4bfa65acfea3f6c1ff893f65716b8b1687289229933a1761850378dc99aa314cb477d41d3c5eb EBUILD axel-2.15.ebuild 1306 BLAKE2B 85d9063a51d8c0e51e9bf74be671605c1e79b6e427ac48f09565b857f9da70f3955ad6d5ad3b3ce8cfa0f207f03a6a4be348a28be6a6e789e2620395844ccae0 SHA512 4327edc03fcea40ad2132700c284b4361abe8c4508bf250b5ad4bfa65acfea3f6c1ff893f65716b8b1687289229933a1761850378dc99aa314cb477d41d3c5eb +EBUILD axel-2.17.7.ebuild 1265 BLAKE2B 564377b6c9d3cb51c9d875a24f1d8d297a0486b277482948ad5bf28ec923344d0ee9a20cef14e34e083a3be00e7b685990f8c3d7002fcc1dcf2b535281d76d42 SHA512 fc37cbc285b8f993cfdeb0cf25a32fc1206d045020148c5fd102be977cc74de6736da8153a894c8b23906148e3c109fbef94c1aaeb6a2e740c09dd7cf9f8b58e EBUILD axel-2.4-r3.ebuild 1237 BLAKE2B d0d8ce79c27539a484d5fb95946dc899b795fb032983da603fe589915aaf0da3b23be582381ebbe721bc2d6dfab400765c57f7a6c2bac6857067d2894a8f547a SHA512 5df8d2b9540294029d86073950ae495a2ccea4f8a1f1b960963c3946fb0b5cf2c281b8264151e2104ebf0cec5dd1b27f55c9c636b132a9b44659024b8898fa02 -EBUILD axel-9999.ebuild 1187 BLAKE2B fa2b8d7b7ee68e682a54c4aa559d70ceb5ae9599aa4be96d3b1f9d72ef90a6b575472ad7fdd4c86a3fbede653b192b8eabbc661b5f66f2ec9e25b8d25549cf83 SHA512 490e1f2f403ae3dcfe9566daf27137a2ddd71bfb7646e8a80ec2ea842f9d4f5f37169330e2b9fcfc3a16047b2ac24efa02a72fe71ff24cb04671b28494171c3e -MISC metadata.xml 297 BLAKE2B 9f26dea03e49f186ad556d820c49e2cce7a033c0d6afb0097371ee89cb645c77e997a774787bf45f1a579ec17b1535cd3d5c23599f0d872c197385881a00bdb8 SHA512 8d005244ca7b5f8dd30f9a158e4a53880d8a395bf11c73f8a3c7a3c668153a4c126b0a88942d3bd895a0e5ddc1f672eb770858356d0e12af75a098d36a80d56d +EBUILD axel-9999.ebuild 1187 BLAKE2B 4c472cbd4c0ba71f7bda52eaaae06193b175978072d7d7d60094f158e76a6fb0b51060b9aebc66260bb28751f2b8d5f57598511a8b00ba5d346278fb8421143d SHA512 c11ab2d39ef19797a4b2e0ddae4d7bcb80fc6979527bdccfd4fd600bb366c14d7c0cbae7f2bf55062b34f286246c45e6d4498296466d5fe179cb19c5cb6cc3ee +MISC metadata.xml 410 BLAKE2B 89c374385d4e3a03953352d1d995029ca481386a0c522b1c4c2c18bc58c62f65e5eb287a656392093d72735174adc8e48dacd1771989d0bdd6ca2a0c77e3cd80 SHA512 f64c314f27882031b215373ded6b4a1e0a93b398ec96aff1a429ef6b01cc1d426c1692b8f2ecdea4f5503d853d753f292a7edac960a559bcb60ea491d5a1e7ce diff --git a/net-misc/axel/axel-2.17.7.ebuild b/net-misc/axel/axel-2.17.7.ebuild new file mode 100644 index 000000000000..5a684ef22ffd --- /dev/null +++ b/net-misc/axel/axel-2.17.7.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +DESCRIPTION="Light Unix download accelerator" +HOMEPAGE="https://github.com/axel-download-accelerator/axel" +SRC_URI="https://github.com/axel-download-accelerator/axel/releases/download/v${PV}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris" +IUSE="debug libressl nls ssl" + +CDEPEND=" + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) +" +DEPEND="${CDEPEND} + nls? ( sys-devel/gettext )" +RDEPEND="${CDEPEND} + nls? ( virtual/libintl virtual/libiconv )" + +DOCS=( doc/. ) + +src_configure() { + econf \ + $(use_enable nls) \ + $(use_with ssl) +} + +pkg_postinst() { + einfo 'To use axel with portage, create a script in' + einfo '/usr/local/bin/fetchwrapper.sh with the following content:' + einfo + einfo ' #!/bin/bash' + einfo ' set -e' + einfo ' /usr/bin/axel -o "$1.axel" "$2"' + einfo ' mv "$1.axel" "$1"' + einfo + einfo 'and then add the following to your make.conf:' + einfo ' FETCHCOMMAND='\''/usr/local/bin/fetchwrapper.sh "\${DISTDIR}/\${FILE}" "\${URI}"'\' + einfo ' RESUMECOMMAND="${FETCHCOMMAND}"' +} diff --git a/net-misc/axel/axel-9999.ebuild b/net-misc/axel/axel-9999.ebuild index 2788479a5801..aeeaf251d69f 100644 --- a/net-misc/axel/axel-9999.ebuild +++ b/net-misc/axel/axel-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools git-r3 diff --git a/net-misc/axel/metadata.xml b/net-misc/axel/metadata.xml index 2a0e2be810bd..0b08d51dbfed 100644 --- a/net-misc/axel/metadata.xml +++ b/net-misc/axel/metadata.xml @@ -1,6 +1,10 @@ + + slashbeast@gentoo.org + Piotr Karbowski + jlec@gentoo.org diff --git a/net-misc/babeld/Manifest b/net-misc/babeld/Manifest index 1245eb9c998d..821144220fd3 100644 --- a/net-misc/babeld/Manifest +++ b/net-misc/babeld/Manifest @@ -1,6 +1,6 @@ AUX babeld 314 BLAKE2B c0bf51460d6de136acf70533f9da0a59dc3e5cbdcc49ba05cdfbd134d37655fa12f929b1f5860390fe836e988b70e00d5b05bca0b7dcabfd0807126307b4e6e5 SHA512 bcde060f79bc37f3179d1ce2ca396f8200d0f4df24b2c51e2def44567071f8e38a9562ed72f48875ff195aadf6ab49c50616a828b4ed01d4963facde25a65897 DIST babeld-1.8.2.tar.gz 92852 BLAKE2B ddf64558ebe2c96812e0b68382cda118539a1221fa15df7ee5d6aa67cdb5e1da556e4518371580bfb9df61780f559892787057605a02b8870c0a8e1f2018fc5d SHA512 08ef0747a672e7a3f2e06d4082da0d021378cea94633fdddf7de38178552bc5a587852fdb5c8bfdeeb6897ba4fd61c78e6ee4d19523a6c3e60d0e3c150418319 DIST babeld-1.9.1.tar.gz 94668 BLAKE2B 169932e8d37d683bfa7e945e313d17c3ee633d11031d940ef3f5be3e0a9fbaffb28d47cf9f6d6ef6b25130af9a485ac4a629d0009485021d6f2fe19ec5382788 SHA512 433a9a2da02c56e93f5fc5f9399320f7f4dbac8d87eff9a539300d5740269eeda6be1302a2cf4a4b9c524780b286d9eb7898585fc530129a1f84341faf1e6fd0 -EBUILD babeld-1.8.2.ebuild 531 BLAKE2B a37429166703e6079428e7706d16239a99b2ce97f424aeeb92e81a88fe1284246531741016091b50e42a3c63b8884b566c2843c82547270805234e0bcc4c7fca SHA512 2ff633bd21110e73e47c90c19c0862d8a1af0d995890cd44a0a2cc94ca7ca7f3c524a8cdb68de7420d33d31a93c3ba753e6416841324dc99af7a134c9421ac37 -EBUILD babeld-1.9.1.ebuild 528 BLAKE2B 14c652c670452ac833e794aec03912c88b46919c781b9be1536c18c01c818880326ee8a3df63e12ced122c41027ad2aaa2d3fa1a13e86fbff108014d0de1ea61 SHA512 8e6786f568340bf6fc34fc08cb0a12fac4fdf1dcc695bdee46c05a4921c333233a8c8a0edf983c8aaf841dcb402bfd673775b5610c02718434f859547a089dc9 +EBUILD babeld-1.8.2.ebuild 529 BLAKE2B c5b9c2705ae547218d13c27f14089b0fbb0a3d28e80a61b503eb13e0a63e135b32b2b7b101e1c4a5ed11478453246066e68d45410868a69fa8ad599df5bdb2e5 SHA512 3cf5949df5005e96e2e952c75a6ad4029757de6fe76e51f1a79a016f5e7acae917e04a92b2ad02a733c89b23a1a7cb0d0141e52d97a9a277f929e1979bc6cfd9 +EBUILD babeld-1.9.1.ebuild 529 BLAKE2B c5b9c2705ae547218d13c27f14089b0fbb0a3d28e80a61b503eb13e0a63e135b32b2b7b101e1c4a5ed11478453246066e68d45410868a69fa8ad599df5bdb2e5 SHA512 3cf5949df5005e96e2e952c75a6ad4029757de6fe76e51f1a79a016f5e7acae917e04a92b2ad02a733c89b23a1a7cb0d0141e52d97a9a277f929e1979bc6cfd9 MISC metadata.xml 213 BLAKE2B 21f4d23acabbf3b15cd7161a8b3d63b042b273a0839be30ed713eb9cf4f0e36d2a579264fb35fc66b12168288ef24b5abd2418e85abdf4e1ea5f7de1a26ef28f SHA512 e8aad49b782740278a85d29c45a05a6545fb67fe68cd4b47ba72a759ea822eff4eb5ac8e620cfa0fa44840ecc134d89d2f7281e88434527c78cd6c9c92f704ed diff --git a/net-misc/babeld/babeld-1.8.2.ebuild b/net-misc/babeld/babeld-1.8.2.ebuild index a72348e3bd74..a0e8e1da80bc 100644 --- a/net-misc/babeld/babeld-1.8.2.ebuild +++ b/net-misc/babeld/babeld-1.8.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -16,7 +16,7 @@ src_compile() { emake CDEBUGFLAGS="${CFLAGS}" } -src_install(){ +src_install() { emake "TARGET=${D}" PREFIX="${EPREFIX}"/usr install dodoc CHANGES README doinitd "${FILESDIR}"/${PN} diff --git a/net-misc/babeld/babeld-1.9.1.ebuild b/net-misc/babeld/babeld-1.9.1.ebuild index e0354998c9ec..a0e8e1da80bc 100644 --- a/net-misc/babeld/babeld-1.9.1.ebuild +++ b/net-misc/babeld/babeld-1.9.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -16,7 +16,7 @@ src_compile() { emake CDEBUGFLAGS="${CFLAGS}" } -src_install(){ +src_install() { emake "TARGET=${D}" PREFIX="${EPREFIX}"/usr install dodoc CHANGES README doinitd "${FILESDIR}"/${PN} diff --git a/net-misc/bfgminer/Manifest b/net-misc/bfgminer/Manifest index 4cd10a6e1b21..5c64ec342aff 100644 --- a/net-misc/bfgminer/Manifest +++ b/net-misc/bfgminer/Manifest @@ -1,5 +1,5 @@ DIST bfgminer-5.4.2.tar.xz 1039200 BLAKE2B f63a7fa2c85d352a366794a39619599db6ccc3f98508ccd90387b315374227d74edfcfd2329db8b57c96539b194b0d2ee746cbea032c241dab1cf93e717b137d SHA512 b5ae8ae44df166d5576f89683ce9ee0832ca1f506b2522da7e3cd432abc5e218e9080e2a79f4da29e40db0d3179e63c9a8907d5d6b60d5d4895d6cac2b15d8ca DIST bfgminer-5.5.0.tar.xz 1054664 BLAKE2B db841a73bca10b19205744be531c13f2c4435bd69c9f2af7b8aba84381af640028cc4db33df399cf05dd0bbec7b79a5b65679bcb2a8bec7624f6fbc47e9ebd79 SHA512 d1adae473e01fcf1cd0efde74d3e8ce10609e520397d688bf4e226c1113c1606c782e3cfdba6847f1a3886cac30de6b5baa03b731aca86287d53bf01ef705cdb -EBUILD bfgminer-5.4.2.ebuild 5117 BLAKE2B f1e985c58d4ab5c626b6fa67234a07f84b5302eef4599bf22b57ed77918e821b03a8c8735fe83466433ef17f186936bef52214a91436a0e8b86b68437a03f144 SHA512 5b96f640bca3d18ad5c75da5be5250c4a90184b69698723875a9ad0647bb803a3f13402a822d63c020bc006827f86512a399c1fe4beb34a44f0b8e816c48a7f9 -EBUILD bfgminer-5.5.0.ebuild 5179 BLAKE2B 179869f66f6495d1bd831f0777c9caa5665dbf1445fabbae1f93d90b15c5687d0385e0b90245f614977a691ebf9b10ad03be2474015aa72c32055c9f275eb794 SHA512 df5c9ba8b76775eab85b0b69f4245e570d295ab62f8c56542c6af06a5eaa3d3e08b47bb273f21ba35fd06812f12d153a0c3d2c2f8c59fd74012b73e9eb1f02ad +EBUILD bfgminer-5.4.2.ebuild 5078 BLAKE2B bc2e800efc60f278ae2d87851c515cef62b51ba8bdb9ae11ca826e26de9b30044d34f132772f392b1bcea0c11e2c62e5ec92bf799272011c9feb064645b21ee7 SHA512 0dfdfb130462f501cf2b2134fcaf215e4ff9e6dc5ba3935d8b1773a34e3f1336c329426892f3b81a9380efcb50d10cdc839a764e160e8fbcd3219b4bbaef330b +EBUILD bfgminer-5.5.0.ebuild 5140 BLAKE2B 40d8ab029c46fb949f722a9db0036f45b64500e6a7cf5f8255e8b7dc188a1459033e43cd57b2c79ac6622314a9989031372855a6377dcdcc4ffda1bb99cb1a4f SHA512 bd78c293f402787a3952e88940ae68dcebe7b3760ca5ffe73c818eaa6dc38019a7fffa8c7c807903c228e360bddeb33438bc7c42c6c036917bf780b13cbdc6ef MISC metadata.xml 4029 BLAKE2B b9ed1a1c14386e3c4c3d11d40ae60988e2d7170c2363418b1dd9f33e0e32516bcf45ea08c96310d598173b43cd0fa23d7c1f6033656c3914ded0e685f39b6de6 SHA512 17f36d0d7f9055d1860acf7fe83f036184303cfa095d872f40877fd2f78cfb3433bdb01eba6c39058117dcbdbe5c7645e6b5eb0d24922288d34256c80624fa21 diff --git a/net-misc/bfgminer/bfgminer-5.4.2.ebuild b/net-misc/bfgminer/bfgminer-5.4.2.ebuild index 93d5146abac5..2ecd1c526ca9 100644 --- a/net-misc/bfgminer/bfgminer-5.4.2.ebuild +++ b/net-misc/bfgminer/bfgminer-5.4.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -138,7 +138,6 @@ src_configure() { CFLAGS="${CFLAGS}" \ econf \ - --docdir="/usr/share/doc/${PF}" \ $(use_enable adl) \ $(use_enable antminer) \ $(use_enable avalon) \ diff --git a/net-misc/bfgminer/bfgminer-5.5.0.ebuild b/net-misc/bfgminer/bfgminer-5.5.0.ebuild index 6d7f7cea5ea7..457913d67bbe 100644 --- a/net-misc/bfgminer/bfgminer-5.5.0.ebuild +++ b/net-misc/bfgminer/bfgminer-5.5.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -138,7 +138,6 @@ src_configure() { CFLAGS="${CFLAGS}" \ econf \ - --docdir="/usr/share/doc/${PF}" \ $(use_enable adl) \ $(use_enable alchemist)\ $(use_enable avalon) \ diff --git a/net-misc/bridge-utils/Manifest b/net-misc/bridge-utils/Manifest index 8161c1a73f40..0c1d522b754c 100644 --- a/net-misc/bridge-utils/Manifest +++ b/net-misc/bridge-utils/Manifest @@ -1,6 +1,6 @@ AUX bridge-utils-1.5-linux-3.8.patch 435 BLAKE2B 0e9adb67c1cf21f58d85933ee2d00a21c6192500ab2dfc71f61a3da4a6367afec2d217efcca52dc515ee75b099432ff5ec2b04ae91f4cef3d0c36fba193bc0c9 SHA512 dea1668cc0b76b1f88e7040262e3056db278000df2680e8d3a1596b6821e7f8213a0e67ae26ffc23950b848c2ccc5dabf61baf6c40159eecfb7c22118dec2635 DIST bridge-utils-1.5.tar.gz 33243 BLAKE2B 211ecb831f802c119f32c30621daa781056bd9ff2fb5880d328704bd76b5b5b964d0671f77489fb9c71f25a3e073e5e4070cfa759deeba014aa1136ff60b1fdd SHA512 4e525fbd3defb509664ef3b728d9e5edfb92beaebdb5d7733d8203fb38cb3f4bb54d02dc1e28813889a2ee19c78b9b47da6d99c8032481a7fd7f104658dea7c3 DIST bridge-utils-1.6.tar.xz 29904 BLAKE2B 4a816d2855a8f127dca3a19df326863848d36032c881a9093cd98b88f701d70486a9488e9761869629f29c6f5bc14305388eac3c22393a3e60dfdb3c9c4dda10 SHA512 b2ed39bc67349b7b91f2068cb505c0e3c89a8797d61e3d97ff957796cfe5fcef2c26dd788bd4215f628d69a4c8592377f4e632c3e181e87af3eaa238d8741e02 -EBUILD bridge-utils-1.5.ebuild 1281 BLAKE2B e6de8e0ad11732c63cf2d7ab327eedb2c64645ca17e716a334c31763283054df09b31fb4f25eb59ae3b168729ea6cdaede66d0f588ba023a7c38e755a92a5da6 SHA512 f2770626ffb714981d426b4d9f005922724389580d0dd3252c91123fdd94212b6aecaed5547c66a459dd1d1d6109d4f93453103c996e55a1659fa27e72c57636 -EBUILD bridge-utils-1.6.ebuild 1357 BLAKE2B 44bc210ffe56da0c1a79950084251c6e2bad2acf7a621a4c996572fb8f26f53b298f5bd2ec029de6b07441037ee39c18a61cc07d015c78346e1b5e02f2077c87 SHA512 7a5710b0f74043736326f9bb78329dd07dd16b34570f1fde9b89266ac8a70c5f0504ca63cd2ee732b48c0c7b3d5a00f69ee8566a33ae4268d4c29d4e72b3125a +EBUILD bridge-utils-1.5.ebuild 1277 BLAKE2B 53d99bff5e104da916a9badc58b4f454125aa5b72d0c075eeb6303f8c3205cccd6f60340c5ab71f16d7bcaedb971f6b301e6adeacc2c076b380824ae91eda215 SHA512 ea72b9e527becce6eecf88a96f61ec974c7b62928be7684a5653ef211feb566cd2d0a8b3d0a990f6588c43037901b252cacea1393d853721af9adf1b96d16a4c +EBUILD bridge-utils-1.6.ebuild 1353 BLAKE2B 1de8bfd74d84f0191b4b508cc004e3ac8a6db354c59db9b8886f27d69fe361636349ae2930e13dff71338ce8121246de1b5d4431c5f5ff7fb5b1fb001147144f SHA512 94fab337794fc88b33d9cf4a13aaa43f4aaf082235432b2ae2bec8f2d73351b6f81dce4c47feaeb81149e4760006f53804708c29ca47098bfe804021499d9d7f MISC metadata.xml 491 BLAKE2B bf2e6636e5cd672907c0fa7a57894aadd2a56c6a86243d6894567e5819684dba5ef73419b9796d3e8e30e5d9048e13f4a11f714400f4b71dc2a61b8fee81467f SHA512 ec5ffecc293290fa0931f16fc447b5f9537d86db112462f6f865b1e4714e95c10d22fef326692d4506958956c3148061beba187e19b8549608f02ef974302bee diff --git a/net-misc/bridge-utils/bridge-utils-1.5.ebuild b/net-misc/bridge-utils/bridge-utils-1.5.ebuild index 153aec032ceb..239e3a9622eb 100644 --- a/net-misc/bridge-utils/bridge-utils-1.5.ebuild +++ b/net-misc/bridge-utils/bridge-utils-1.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -41,7 +41,7 @@ src_configure() { --with-linux-headers="$(get_headers)" } -src_install () { +src_install() { emake install DESTDIR="${D}" dodoc AUTHORS ChangeLog README THANKS TODO \ doc/{FAQ,FIREWALL,HOWTO,PROJECTS,RPM-GPG-KEY,SMPNOTES,WISHLIST} diff --git a/net-misc/bridge-utils/bridge-utils-1.6.ebuild b/net-misc/bridge-utils/bridge-utils-1.6.ebuild index 9ccebc972046..1e911905bc21 100644 --- a/net-misc/bridge-utils/bridge-utils-1.6.ebuild +++ b/net-misc/bridge-utils/bridge-utils-1.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -44,7 +44,7 @@ src_configure() { econf "${myeconfargs[@]}" } -src_install () { +src_install() { emake install DESTDIR="${D}" dodoc AUTHORS ChangeLog README THANKS TODO \ doc/{FAQ,FIREWALL,HOWTO,PROJECTS,RPM-GPG-KEY,SMPNOTES,WISHLIST} diff --git a/net-misc/crossbar/Manifest b/net-misc/crossbar/Manifest deleted file mode 100644 index 0703692d98c9..000000000000 --- a/net-misc/crossbar/Manifest +++ /dev/null @@ -1,16 +0,0 @@ -AUX confd 310 BLAKE2B b98b5a4ac537190cf20a9aeed714dd1792037f09b791983f1685f311b7f407bd6fb4256a9e4dd9257b4e250c7db3d99df0605664ef1bf5a09b7b043a23847d93 SHA512 52d0b222101ea129588d8a4721011feeb935784ca2bbe462a808e3b1083405ef9fee852ed7f5f4461c6108b0b2e273c75f2546a9d5cbc32a46a17b8bcf19c5cf -AUX config.json.sample 1952 BLAKE2B cacdc1d03e28252f536d878e3c009310c29f8c321bb3a4d1da4152b87555bd93f605b56d0f1ddb963b3e803aa3b89fbb34f9b90e412cea3a51a613f39087441a SHA512 fa70eacdfb24842002c4318a12ad25cc413a0f217fb58560f5d9a3d06cc1b175872ae8fc68b0644c97c5fe15446ea847f333527d843022f18fc777b483362e20 -AUX crossbar-17.8.1-Revert-Torservices.patch 9679 BLAKE2B 6d00b84212a0ca5382cddccf1cae37ee94f4456e18e8a75591470612db1accf2a8aa8cd7a651d1f1cf8827ec9771a6648d5e0bd012cf6262e20dc898d9a1b363 SHA512 084c7a4f16ebc5e75fd1fca48f9df7edb78f65dd5e1402d993235e491c649f769eb5d26701ba651fb0f7e3b0d3c75fabdf649586bf0542ac890aa2671c6e99ae -AUX crossbar-17.9.1-Revert-Torservices.patch 10253 BLAKE2B 00306f3c2f769bf13a64c06e38823f5856c1b3f6e073ec3da83a9a2a132f5abee8bb2edde7b83a09845575ac2850bc3b7a1ba95b98a7297d6716456eff454b3f SHA512 a550382b89dc7aa673ee1f2d90eda9cbc5006fa6a112aae70dc82863ec248300189a90ce6195b5fea755ad723e8a4a448762813a8e4c9d7d50bac404f72633ed -AUX initd 788 BLAKE2B 7804bc7075c1994266cbf50c531c5627d3e62ae7b1e2c18f6ea2b5bae7f96dc568465f662fae4354a386be11eba0150b658eaaee8add4b74399770d23936e3d1 SHA512 1675727c294354ccc7e2582ea16be9d1f8b0f9c110a8f8e34aab03e052d54ed9134d801a123b5a82d6b40ec65c47cd925a1f7ef9dd91af75b1b12c4b7c19ad38 -DIST crossbar-17.12.1.tar.gz 736982 BLAKE2B bd2af652d376bf8ffe6cc23b0a798bb905ce835ba9282a276e1e5878d01a52370fd887f9e96339e4a2e45b89ca41918a936be7a010d9c1054a3c9f2a8361bd50 SHA512 082432f04fcf578012392d02ddafb4bcd6a61da4a1467a6ae767ca75293747cf84ee7bf27d1e2078e5c637c66b3fbd848b14cfc39eaefd1b98b5ad3b64c0a58d -DIST crossbar-17.6.1.post3.tar.gz 725054 BLAKE2B 1c60ae9a29f9d2831dd219c30751c65c07639810c24ea27f35c1fb27fd55c6b97f225e9fef9bbb00c79233a52a5e7ae6f4a61020c028f697e3fbdec1ada41980 SHA512 c3efac2c7f7a41e6544eb98057afb249908453d6ddfb81c514f0705ed967374d50f844fe1a80395652b81a7c23abc90a03a0d6c88287f10cbfe99e64cb70919d -DIST crossbar-17.8.1.tar.gz 1545668 BLAKE2B 812a4b423bf663386255332de2ab90afb4f0a44d205a193d71523e7fa0aba2bf1644b2136200c6ae4b1639de2764b7139ee6081a5167b21abc2bdec6400c5a60 SHA512 21ed2031ddebe93fcd4fcd01243b2aa8979444e833386db83b10d032cfc3c3f9d47cf638d4cf26eb2801e91892c85115fec91e0a6f071a619f014132663f6c32 -DIST crossbar-17.9.1.tar.gz 730753 BLAKE2B 8fb93b017b6af8264aa828a6353d1c6f5fd7f224797504f67f77b5cf2759ada5f9609eb6815da96afadfc2bae90acb2837be19ed0896e1a8ce37ff384fcea367 SHA512 fee96e1c900c756536dc9bf6088c512a50accbae0e8010b7e058de8ed2ebb2f366e5d5051ab2f07517dd642f4d65c65e9b701b00d7bca1b9352c58f38f892563 -DIST crossbar-18.3.1.tar.gz 736736 BLAKE2B 546a7d4ff173928179eeff86aef50e3517067e6aede145a5185e891fe749e0e2c507b577ea3be8f416c5894e8c43db42d8ceaabbdc64823b305219c2f6277ff4 SHA512 cb85ba44054c59eecb751896c5f0d793ccc8990c9d00733de546512b7e500a90ef4042d49ec6f648ec3677687950fbee62208c9bbb6692de65df4f238a2414dc -EBUILD crossbar-17.12.1.ebuild 6411 BLAKE2B cd8f50759df9ee32ef4ea6f87a87cc4e696756836e5ab41415d9661c6d48ef75737fdc839aa8048cf877656f112497b8abb29c7f40ee755cc75f86654b17a855 SHA512 d5da96f410dd9bba7f1e16f946c99f9589caa0af5da72c2a0894241ac81518fbc88bd8fc319b4c046b6e24db4235622d73939daf2e1db8ba80dafb301c494640 -EBUILD crossbar-17.6.1_p3-r1.ebuild 6057 BLAKE2B 8c21a15a98e477d0065d0d35817a552aaedb8e6013d6f17d2a759a4ace52db9b3755538e1f0b53bab3e6a2ac2278182031638050b7d97b0cfdd38e218408c415 SHA512 2b3592eca8bb2d29b0cf7e38d2052492fcea7f4f83daaaa07f2cb366cef1c8dada4cb7603bec5b5568ea9e916c7112cf7fd1bea8732ffe7ffc6f0ae8a1aa3c60 -EBUILD crossbar-17.8.1.ebuild 6458 BLAKE2B 90cd4aae6ed04c1a4002acc5116b77a3f20a66fcef516abaa42a73d2c19a5f3641b45bae4ac113feee644b4c9d51026c4a33d76a8dd4479168d544fef93adeb9 SHA512 ebbd8586f7897a098a6a70cb3466eab8a414ef0e7a7580c8f6ac6f7898156d5fd875af73a6d5cf762384cc5e691ca476fa969f5111e39143a0eacab2d44043f0 -EBUILD crossbar-17.9.1.ebuild 6408 BLAKE2B eaa6ddf22b89ea4fc054b8fa586e9d111990776a813324cb6583de1022cc01ac0a7cfbb1210582fc7fe70661024206333016a41daeb2b9d359e1340c7e49bccc SHA512 01ac1f4bbd526810fdb6f675ca9164c2d6fdc37e3cbfbc633cb37ca67a2d6866b9ac004e0119730c2e8181bd05581f25b58f685e6e14617dbffebdc5524c6868 -EBUILD crossbar-18.3.1.ebuild 6360 BLAKE2B 03b7639afaa35590f8fa62295b2b8a4bcd9f11729c193ed7638a20df425dc9c1d390a57ad93b77bcd185f5ddf97b9e66707e4593cf92a727f578a8b59d34d0bf SHA512 352acae32355f108b85147c521459db08f1fca16e56569dfdba9a1c89faa38186f4899ec7f8f994267ca2cd069817e46e902ebfb92fc58cf3d741d0c7ee3d7c6 -MISC metadata.xml 811 BLAKE2B 689aebe79e9e10ec110a4a5327245d727e3c6bb2e8e8dd3b0b07fefd8ab0032ec85a061309fc8fa8452e0c795c0a2fefed6ebd0091868c3815ab23d0e4a27c50 SHA512 f48554a367ca9b99176b6b3ed9b7322fd60ef4fe6ca78584263411a8e59fc9e89bccbca4c9484b1d267ed534ba6bab05750164f4802709795e1505e4ef276a41 diff --git a/net-misc/crossbar/crossbar-17.12.1.ebuild b/net-misc/crossbar/crossbar-17.12.1.ebuild deleted file mode 100644 index 713e12a96e9b..000000000000 --- a/net-misc/crossbar/crossbar-17.12.1.ebuild +++ /dev/null @@ -1,172 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 python3_6 ) - -inherit user systemd distutils-r1 - -MY_PV="${PV}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Crossbar.io - The Unified Application Router for the twisted framework" -HOMEPAGE="https://crossbar.io/ https://github.com/crossbario/crossbar https://pypi.org/project/crossbar/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test tor" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-python/attrs-17.2.0[${PYTHON_USEDEP}] - >=dev-python/autobahn-17.10.1[${PYTHON_USEDEP}] - >=dev-python/bitstring-3.1.5[${PYTHON_USEDEP}] - >=dev-python/cbor-1.0.0[${PYTHON_USEDEP}] - >=dev-python/click-6.7[${PYTHON_USEDEP}] - >=dev-python/constantly-15.1.0[${PYTHON_USEDEP}] - >=dev-python/cryptography-1.9.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep '>=dev-python/enum34-1.1.6[${PYTHON_USEDEP}]' python2_7) - >=dev-python/hyper-h2-3.0.1[${PYTHON_USEDEP}] - =dev-python/idna-2.5[${PYTHON_USEDEP}] - >=dev-python/incremental-17.5.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.18[${PYTHON_USEDEP}]' python2_7) - >=dev-python/jinja-2.9.6[${PYTHON_USEDEP}] - >=dev-python/lmdb-0.92[${PYTHON_USEDEP}] - >=dev-python/mistune-0.7.4[${PYTHON_USEDEP}] - >=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}] - >=dev-python/priority-1.3.0[${PYTHON_USEDEP}] - >=dev-python/psutil-5.2.2[${PYTHON_USEDEP}] - >=dev-python/pyasn1-0.2.3[${PYTHON_USEDEP}] - >=dev-python/pyasn1-modules-0.0.9[${PYTHON_USEDEP}] - >=dev-python/pygments-2.2.0[${PYTHON_USEDEP}] - >=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}] - >=dev-python/pytrie-0.3[${PYTHON_USEDEP}] - >=dev-python/py-ubjson-0.9.0[${PYTHON_USEDEP}] - >=dev-python/pynacl-1.1.2[${PYTHON_USEDEP}] - >=dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}] - >=dev-python/pyyaml-3.12[${PYTHON_USEDEP}] - >=dev-python/sdnotify-0.3.1[${PYTHON_USEDEP}] - >=dev-python/service_identity-17.0.0[${PYTHON_USEDEP}] - >=dev-python/setproctitle-1.1.10[${PYTHON_USEDEP}] - >=dev-python/setuptools-36.0.1[${PYTHON_USEDEP}] - >=dev-python/shutilwhich-1.1.0[${PYTHON_USEDEP}] - >=dev-python/treq-17.3.1[${PYTHON_USEDEP}] - >=dev-python/twisted-17.5.0[${PYTHON_USEDEP}] - >=dev-python/txaio-2.8.2[${PYTHON_USEDEP}] - >=dev-python/u-msgpack-2.4.1[${PYTHON_USEDEP}] - >=dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] - >=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}] - tor? ( >=dev-python/txtorcon-0.19.3[${PYTHON_USEDEP}] ) -" -DEPEND=" - !dev-python/crossbar - >=dev-python/setuptools-36.0.1[${PYTHON_USEDEP}] - >=dev-python/twisted-17.5.0[${PYTHON_USEDEP}] - test? ( - dev-python/mock[${PYTHON_USEDEP}] - ) -" -DOCS=( - README.rst LICENSE-FOR-API LICENSE COPYRIGHT -) - -S="${WORKDIR}"/${MY_P} - -python_prepare_all() { - # don't install the copyright, license... let dodoc do it - sed -e "s/^ data_files=.*//" -i setup.py || die - - if ! use tor; then - eapply "${FILESDIR}/${PN}-17.9.1-Revert-Torservices.patch" - sed -e "s/^txtorcon.*//" -i requirements-min.txt || die - fi - # remove these py2 deps from setuptools install_requires - # it is not filtered out for >=py3.4 and results in test fails - sed -e "s/^ipaddress.*//" -i requirements-min.txt || die - sed -e "s/^enum34.*//" -i requirements-min.txt || die - - distutils-r1_python_prepare_all -} - -pkg_setup() { - enewuser crossbar -} - -python_test() { - pushd "${TEST_DIR}" > /dev/null || die - /usr/bin/trial crossbar || die "Tests failed with ${EPYTHON}" - popd > /dev/null || die -} - -python_install_all() { - distutils-r1_python_install_all - - keepdir /var/lib/crossbar - insinto /var/lib/crossbar - doins "${FILESDIR}/config.json.sample" - - newconfd "${FILESDIR}/confd" crossbar - newinitd "${FILESDIR}/initd" crossbar -} - -pkg_posinst() { - einfo "For exapmle configurations and scripts" - einfo "See: https://github.com/crossbario/crossbar-examples" - - if [[ -n ${REPLACING_VERSIONS} ]]; then - ewarn - ewarn "Starting with net-misc/crossbar-17.6.1_p3-r1, more than one instance of crossbar" - ewarn "can be run simultaneously. Note that \"BASEDIR\" in the crossbar conf.d/crossbar file" - ewarn "is the common base directory for all instances. If you are migrating from an older" - ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory." - ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance." - ewarn "In order to start the service running OpenRC-based systems need to link to the init file:" - ewarn " ln --symbolic --relative /etc/init.d/crossbar /etc/init.d/crossbar.myinstance" - ewarn " rc-update add crossbar.myinstance default" - ewarn " /etc/init.d/crossbar.myinstance start" - ewarn "Systems using systemd can do the following:" - ewarn " systemctl enable crossbar@myinstance.service" - ewarn " systemctl enable crossbar.target" - ewarn " systemctl start crossbar.target" - fi -} - -pkg_config() { - local crossbar_path="/var/lib/crossbar" - local log_path="/var/log/crossbar" - einfo "This will prepare a new crossbar instance in ${crossbar_path}." - einfo "Press Control-C to abort." - - einfo "Enter the name for the new instance: " - read instance_name - [[ -z "${instance_name}" ]] && die "Invalid instance name" - - local instance_path="${crossbar_path}/${instance_name}" - local instance_log_path="${log_path}/${instance_name}" - - if [[ -e "${instance_path}" ]]; then - eerror "The instance with the specified name already exists:" - eerror "${instance_path}" - die "Instance already exists" - fi - - if [[ ! -d "${instance_path}" ]]; then - mkdir --parents "${instance_path}" || die "Unable to create directory ${crossbar_path}" - fi - chown --recursive crossbar "${instance_path}" || die "Setting permissions for instance failed" - cp "${crossbar_path}/config.json.sample" "${instance_path}/config.json" \ - || die "Moving sample configuration failed" - ln --symbolic --relative "/etc/init.d/crossbar" "/etc/init.d/crossbar.${instance_name}" \ - || die "Unable to create link to init file" - - if [[ ! -d "${instance_log_path}" ]]; then - mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}" - fi - ln --symbolic --relative "${instance_log_path}/node.log" "${instance_path}/node.log" \ - || die "Unable to create link to log file" - - einfo "Successfully created a crossbar instance at ${instance_path}." - einfo "To change the default settings edit the config.json file in this directory." -} diff --git a/net-misc/crossbar/crossbar-17.6.1_p3-r1.ebuild b/net-misc/crossbar/crossbar-17.6.1_p3-r1.ebuild deleted file mode 100644 index 29ce90de46a4..000000000000 --- a/net-misc/crossbar/crossbar-17.6.1_p3-r1.ebuild +++ /dev/null @@ -1,163 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -# Not quite ready for py3, unconditionally deps on too many backported -# pkgs installed in newer pythons that shouldn't need them. -PYTHON_COMPAT=( python2_7 ) - -inherit user systemd distutils-r1 - -MY_PV="17.6.1.post3" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Crossbar.io - The Unified Application Router for the twisted framework" -HOMEPAGE="https://crossbar.io/ https://github.com/crossbario/crossbar https://pypi.org/project/crossbar/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-python/setuptools-36.0.1[${PYTHON_USEDEP}] - >=dev-python/twisted-17.1.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep '>=dev-python/enum34-1.1.6[${PYTHON_USEDEP}]' python2_7) - >=dev-python/txaio-2.8.0[${PYTHON_USEDEP}] - >=dev-python/pyasn1-0.2.3[${PYTHON_USEDEP}] - >=dev-python/pyasn1-modules-0.0.9[${PYTHON_USEDEP}] - >=dev-python/incremental-17.5.0[${PYTHON_USEDEP}] - >=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}] - =dev-python/priority-1.3.0[${PYTHON_USEDEP}] - >=dev-python/service_identity-17.0.0[${PYTHON_USEDEP}] - >=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}] - >=dev-python/cryptography-1.9.0[${PYTHON_USEDEP}] - >=dev-python/autobahn-17.6.2[${PYTHON_USEDEP}] - >=dev-python/jinja-2.9.6[${PYTHON_USEDEP}] - >=dev-python/treq-17.3.1[${PYTHON_USEDEP}] - >=dev-python/pyyaml-3.12[${PYTHON_USEDEP}] - >=dev-python/click-6.7[${PYTHON_USEDEP}] - >=dev-python/attrs-17.2.0[${PYTHON_USEDEP}] - >=dev-python/constantly-15.1.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.18[${PYTHON_USEDEP}]' python2_7) - >=dev-python/cbor-1.0.0[${PYTHON_USEDEP}] - >=dev-python/bitstring-3.1.5[${PYTHON_USEDEP}] - >=dev-python/pygments-2.2.0[${PYTHON_USEDEP}] - >=dev-python/pytrie-0.3[${PYTHON_USEDEP}] - >=dev-python/psutil-5.2.2[${PYTHON_USEDEP}] - >=dev-python/py-ubjson-0.9.0[${PYTHON_USEDEP}] - >=dev-python/pynacl-1.1.2[${PYTHON_USEDEP}] - >=dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}] - >=dev-python/lmdb-0.92[${PYTHON_USEDEP}] - >=dev-python/mistune-0.7.4[${PYTHON_USEDEP}] - >=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}] - >=dev-python/setproctitle-1.1.10[${PYTHON_USEDEP}] - >=dev-python/sdnotify-0.3.1[${PYTHON_USEDEP}] - >=dev-python/shutilwhich-1.1.0[${PYTHON_USEDEP}] - >=dev-python/u-msgpack-2.4.1[${PYTHON_USEDEP}] - >=dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] -" -DEPEND=" - !dev-python/crossbar - >=dev-python/setuptools-36.0.1[${PYTHON_USEDEP}] - >=dev-python/twisted-17.1.0[${PYTHON_USEDEP}] - test? ( - dev-python/mock[${PYTHON_USEDEP}] - ) -" -DOCS=( - README.rst LICENSE-FOR-API LICENSE COPYRIGHT -) - -S="${WORKDIR}"/${MY_P} - -python_prepare_all() { - # don't install the copyright, license... let dodoc do it - sed -e "s/^ data_files=.*//" -i setup.py || die - - distutils-r1_python_prepare_all -} - -pkg_setup() { - enewuser crossbar -} - -python_test() { - pushd "${TEST_DIR}" > /dev/null || die - /usr/bin/trial crossbar || die "Tests failed with ${EPYTHON}" - popd > /dev/null || die -} - -python_install_all() { - distutils-r1_python_install_all - - keepdir /var/lib/crossbar - insinto /var/lib/crossbar - doins "${FILESDIR}/config.json.sample" - - newconfd "${FILESDIR}/confd" crossbar - newinitd "${FILESDIR}/initd" crossbar -} - -pkg_posinst() { - einfo "For exapmle configurations and scripts" - einfo "See: https://github.com/crossbario/crossbar-examples" - - if [[ -n ${REPLACING_VERSIONS} ]]; then - ewarn - ewarn "Starting with net-misc/crossbar-17.6.1_p3-r1, more than one instance of crossbar" - ewarn "can be run simultaneously. Note that \"BASEDIR\" in the crossbar conf.d/crossbar file" - ewarn "is the common base directory for all instances. If you are migrating from an older" - ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory." - ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance." - ewarn "In order to start the service running OpenRC-based systems need to link to the init file:" - ewarn " ln --symbolic --relative /etc/init.d/crossbar /etc/init.d/crossbar.myinstance" - ewarn " rc-update add crossbar.myinstance default" - ewarn " /etc/init.d/crossbar.myinstance start" - ewarn "Systems using systemd can do the following:" - ewarn " systemctl enable crossbar@myinstance.service" - ewarn " systemctl enable crossbar.target" - ewarn " systemctl start crossbar.target" - fi -} - -pkg_config() { - local crossbar_path="/var/lib/crossbar" - local log_path="/var/log/crossbar" - einfo "This will prepare a new crossbar instance in ${crossbar_path}." - einfo "Press Control-C to abort." - - einfo "Enter the name for the new instance: " - read instance_name - [[ -z "${instance_name}" ]] && die "Invalid instance name" - - local instance_path="${crossbar_path}/${instance_name}" - local instance_log_path="${log_path}/${instance_name}" - - if [[ -e "${instance_path}" ]]; then - eerror "The instance with the specified name already exists:" - eerror "${instance_path}" - die "Instance already exists" - fi - - if [[ ! -d "${instance_path}" ]]; then - mkdir --parents "${instance_path}" || die "Unable to create directory ${crossbar_path}" - fi - chown --recursive crossbar "${instance_path}" || die "Setting permissions for instance failed" - cp "${crossbar_path}/config.json.sample" "${instance_path}/config.json" \ - || die "Moving sample configuration failed" - ln --symbolic --relative "/etc/init.d/crossbar" "/etc/init.d/crossbar.${instance_name}" \ - || die "Unable to create link to init file" - - if [[ ! -d "${instance_log_path}" ]]; then - mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}" - fi - ln --symbolic --relative "${instance_log_path}/node.log" "${instance_path}/node.log" \ - || die "Unable to create link to log file" - - einfo "Successfully created a crossbar instance at ${instance_path}." - einfo "To change the default settings edit the config.json file in this directory." -} diff --git a/net-misc/crossbar/crossbar-17.8.1.ebuild b/net-misc/crossbar/crossbar-17.8.1.ebuild deleted file mode 100644 index 1dac2d540405..000000000000 --- a/net-misc/crossbar/crossbar-17.8.1.ebuild +++ /dev/null @@ -1,172 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 python3_6 ) - -inherit user systemd distutils-r1 - -MY_PV="${PV}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Crossbar.io - The Unified Application Router for the twisted framework" -HOMEPAGE="https://crossbar.io/ https://github.com/crossbario/crossbar https://pypi.org/project/crossbar/" -#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" -SRC_URI="https://github.com/crossbario/crossbar/archive/v17.8.1.tar.gz -> ${P}.tar.gz" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test tor" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-python/attrs-17.2.0[${PYTHON_USEDEP}] - >=dev-python/autobahn-17.7.1[${PYTHON_USEDEP}] - >=dev-python/bitstring-3.1.5[${PYTHON_USEDEP}] - >=dev-python/cbor-1.0.0[${PYTHON_USEDEP}] - >=dev-python/click-6.7[${PYTHON_USEDEP}] - >=dev-python/constantly-15.1.0[${PYTHON_USEDEP}] - >=dev-python/cryptography-1.9.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep '>=dev-python/enum34-1.1.6[${PYTHON_USEDEP}]' python2_7) - >=dev-python/hyper-h2-3.0.1[${PYTHON_USEDEP}] - >=dev-python/incremental-17.5.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.18[${PYTHON_USEDEP}]' python2_7) - >=dev-python/jinja-2.9.6[${PYTHON_USEDEP}] - >=dev-python/lmdb-0.92[${PYTHON_USEDEP}] - >=dev-python/mistune-0.7.4[${PYTHON_USEDEP}] - >=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}] - >=dev-python/priority-1.3.0[${PYTHON_USEDEP}] - >=dev-python/psutil-5.2.2[${PYTHON_USEDEP}] - >=dev-python/pyasn1-0.2.3[${PYTHON_USEDEP}] - >=dev-python/pyasn1-modules-0.0.9[${PYTHON_USEDEP}] - >=dev-python/pygments-2.2.0[${PYTHON_USEDEP}] - >=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}] - >=dev-python/pytrie-0.3[${PYTHON_USEDEP}] - >=dev-python/py-ubjson-0.9.0[${PYTHON_USEDEP}] - >=dev-python/pynacl-1.1.2[${PYTHON_USEDEP}] - >=dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}] - >=dev-python/pyyaml-3.12[${PYTHON_USEDEP}] - >=dev-python/sdnotify-0.3.1[${PYTHON_USEDEP}] - >=dev-python/service_identity-17.0.0[${PYTHON_USEDEP}] - >=dev-python/setproctitle-1.1.10[${PYTHON_USEDEP}] - >=dev-python/setuptools-36.0.1[${PYTHON_USEDEP}] - >=dev-python/shutilwhich-1.1.0[${PYTHON_USEDEP}] - >=dev-python/treq-17.3.1[${PYTHON_USEDEP}] - >=dev-python/twisted-17.5.0[${PYTHON_USEDEP}] - >=dev-python/txaio-2.8.1[${PYTHON_USEDEP}] - >=dev-python/u-msgpack-2.4.1[${PYTHON_USEDEP}] - >=dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] - >=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}] - tor? ( >=dev-python/txtorcon-0.19.3[${PYTHON_USEDEP}] ) -" -DEPEND=" - !dev-python/crossbar - >=dev-python/setuptools-36.0.1[${PYTHON_USEDEP}] - >=dev-python/twisted-17.5.0[${PYTHON_USEDEP}] - test? ( - dev-python/mock[${PYTHON_USEDEP}] - ) -" -DOCS=( - README.rst LICENSE-FOR-API LICENSE COPYRIGHT -) - -S="${WORKDIR}"/${MY_P} - -python_prepare_all() { - # don't install the copyright, license... let dodoc do it - sed -e "s/^ data_files=.*//" -i setup.py || die - - if ! use tor; then - eapply "${FILESDIR}/${PN}-17.8.1-Revert-Torservices.patch" - sed -e "s/^txtorcon.*//" -i requirements-min.txt || die - fi - # remove these py2 deps from setuptools install_requires - # it is not filtered out for >=py3.4 and results in test fails - sed -e "s/^ipaddress.*//" -i requirements-min.txt || die - sed -e "s/^enum34.*//" -i requirements-min.txt || die - - distutils-r1_python_prepare_all -} - -pkg_setup() { - enewuser crossbar -} - -python_test() { - pushd "${TEST_DIR}" > /dev/null || die - /usr/bin/trial crossbar || die "Tests failed with ${EPYTHON}" - popd > /dev/null || die -} - -python_install_all() { - distutils-r1_python_install_all - - keepdir /var/lib/crossbar - insinto /var/lib/crossbar - doins "${FILESDIR}/config.json.sample" - - newconfd "${FILESDIR}/confd" crossbar - newinitd "${FILESDIR}/initd" crossbar -} - -pkg_posinst() { - einfo "For exapmle configurations and scripts" - einfo "See: https://github.com/crossbario/crossbar-examples" - - if [[ -n ${REPLACING_VERSIONS} ]]; then - ewarn - ewarn "Starting with net-misc/crossbar-17.6.1_p3-r1, more than one instance of crossbar" - ewarn "can be run simultaneously. Note that \"BASEDIR\" in the crossbar conf.d/crossbar file" - ewarn "is the common base directory for all instances. If you are migrating from an older" - ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory." - ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance." - ewarn "In order to start the service running OpenRC-based systems need to link to the init file:" - ewarn " ln --symbolic --relative /etc/init.d/crossbar /etc/init.d/crossbar.myinstance" - ewarn " rc-update add crossbar.myinstance default" - ewarn " /etc/init.d/crossbar.myinstance start" - ewarn "Systems using systemd can do the following:" - ewarn " systemctl enable crossbar@myinstance.service" - ewarn " systemctl enable crossbar.target" - ewarn " systemctl start crossbar.target" - fi -} - -pkg_config() { - local crossbar_path="/var/lib/crossbar" - local log_path="/var/log/crossbar" - einfo "This will prepare a new crossbar instance in ${crossbar_path}." - einfo "Press Control-C to abort." - - einfo "Enter the name for the new instance: " - read instance_name - [[ -z "${instance_name}" ]] && die "Invalid instance name" - - local instance_path="${crossbar_path}/${instance_name}" - local instance_log_path="${log_path}/${instance_name}" - - if [[ -e "${instance_path}" ]]; then - eerror "The instance with the specified name already exists:" - eerror "${instance_path}" - die "Instance already exists" - fi - - if [[ ! -d "${instance_path}" ]]; then - mkdir --parents "${instance_path}" || die "Unable to create directory ${crossbar_path}" - fi - chown --recursive crossbar "${instance_path}" || die "Setting permissions for instance failed" - cp "${crossbar_path}/config.json.sample" "${instance_path}/config.json" \ - || die "Moving sample configuration failed" - ln --symbolic --relative "/etc/init.d/crossbar" "/etc/init.d/crossbar.${instance_name}" \ - || die "Unable to create link to init file" - - if [[ ! -d "${instance_log_path}" ]]; then - mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}" - fi - ln --symbolic --relative "${instance_log_path}/node.log" "${instance_path}/node.log" \ - || die "Unable to create link to log file" - - einfo "Successfully created a crossbar instance at ${instance_path}." - einfo "To change the default settings edit the config.json file in this directory." -} diff --git a/net-misc/crossbar/crossbar-17.9.1.ebuild b/net-misc/crossbar/crossbar-17.9.1.ebuild deleted file mode 100644 index 3ce1782e9f49..000000000000 --- a/net-misc/crossbar/crossbar-17.9.1.ebuild +++ /dev/null @@ -1,172 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 python3_6 ) - -inherit user systemd distutils-r1 - -MY_PV="${PV}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Crossbar.io - The Unified Application Router for the twisted framework" -HOMEPAGE="https://crossbar.io/ https://github.com/crossbario/crossbar https://pypi.org/project/crossbar/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test tor" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-python/attrs-17.2.0[${PYTHON_USEDEP}] - ~dev-python/autobahn-${PV}[${PYTHON_USEDEP}] - >=dev-python/bitstring-3.1.5[${PYTHON_USEDEP}] - >=dev-python/cbor-1.0.0[${PYTHON_USEDEP}] - >=dev-python/click-6.7[${PYTHON_USEDEP}] - >=dev-python/constantly-15.1.0[${PYTHON_USEDEP}] - >=dev-python/cryptography-1.9.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep '>=dev-python/enum34-1.1.6[${PYTHON_USEDEP}]' python2_7) - >=dev-python/hyper-h2-3.0.1[${PYTHON_USEDEP}] - =dev-python/idna-2.5[${PYTHON_USEDEP}] - >=dev-python/incremental-17.5.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.18[${PYTHON_USEDEP}]' python2_7) - >=dev-python/jinja-2.9.6[${PYTHON_USEDEP}] - >=dev-python/lmdb-0.92[${PYTHON_USEDEP}] - >=dev-python/mistune-0.7.4[${PYTHON_USEDEP}] - >=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}] - >=dev-python/priority-1.3.0[${PYTHON_USEDEP}] - >=dev-python/psutil-5.2.2[${PYTHON_USEDEP}] - >=dev-python/pyasn1-0.2.3[${PYTHON_USEDEP}] - >=dev-python/pyasn1-modules-0.0.9[${PYTHON_USEDEP}] - >=dev-python/pygments-2.2.0[${PYTHON_USEDEP}] - >=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}] - >=dev-python/pytrie-0.3[${PYTHON_USEDEP}] - >=dev-python/py-ubjson-0.9.0[${PYTHON_USEDEP}] - >=dev-python/pynacl-1.1.2[${PYTHON_USEDEP}] - >=dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}] - >=dev-python/pyyaml-3.12[${PYTHON_USEDEP}] - >=dev-python/sdnotify-0.3.1[${PYTHON_USEDEP}] - >=dev-python/service_identity-17.0.0[${PYTHON_USEDEP}] - >=dev-python/setproctitle-1.1.10[${PYTHON_USEDEP}] - >=dev-python/setuptools-36.0.1[${PYTHON_USEDEP}] - >=dev-python/shutilwhich-1.1.0[${PYTHON_USEDEP}] - >=dev-python/treq-17.3.1[${PYTHON_USEDEP}] - >=dev-python/twisted-17.5.0[${PYTHON_USEDEP}] - >=dev-python/txaio-2.8.2[${PYTHON_USEDEP}] - >=dev-python/u-msgpack-2.4.1[${PYTHON_USEDEP}] - >=dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] - >=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}] - tor? ( >=dev-python/txtorcon-0.19.3[${PYTHON_USEDEP}] ) -" -DEPEND=" - !dev-python/crossbar - >=dev-python/setuptools-36.0.1[${PYTHON_USEDEP}] - >=dev-python/twisted-17.5.0[${PYTHON_USEDEP}] - test? ( - dev-python/mock[${PYTHON_USEDEP}] - ) -" -DOCS=( - README.rst LICENSE-FOR-API LICENSE COPYRIGHT -) - -S="${WORKDIR}"/${MY_P} - -python_prepare_all() { - # don't install the copyright, license... let dodoc do it - sed -e "s/^ data_files=.*//" -i setup.py || die - - if ! use tor; then - eapply "${FILESDIR}/${PN}-17.9.1-Revert-Torservices.patch" - sed -e "s/^txtorcon.*//" -i requirements-min.txt || die - fi - # remove these py2 deps from setuptools install_requires - # it is not filtered out for >=py3.4 and results in test fails - sed -e "s/^ipaddress.*//" -i requirements-min.txt || die - sed -e "s/^enum34.*//" -i requirements-min.txt || die - - distutils-r1_python_prepare_all -} - -pkg_setup() { - enewuser crossbar -} - -python_test() { - pushd "${TEST_DIR}" > /dev/null || die - /usr/bin/trial crossbar || die "Tests failed with ${EPYTHON}" - popd > /dev/null || die -} - -python_install_all() { - distutils-r1_python_install_all - - keepdir /var/lib/crossbar - insinto /var/lib/crossbar - doins "${FILESDIR}/config.json.sample" - - newconfd "${FILESDIR}/confd" crossbar - newinitd "${FILESDIR}/initd" crossbar -} - -pkg_posinst() { - einfo "For exapmle configurations and scripts" - einfo "See: https://github.com/crossbario/crossbar-examples" - - if [[ -n ${REPLACING_VERSIONS} ]]; then - ewarn - ewarn "Starting with net-misc/crossbar-17.6.1_p3-r1, more than one instance of crossbar" - ewarn "can be run simultaneously. Note that \"BASEDIR\" in the crossbar conf.d/crossbar file" - ewarn "is the common base directory for all instances. If you are migrating from an older" - ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory." - ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance." - ewarn "In order to start the service running OpenRC-based systems need to link to the init file:" - ewarn " ln --symbolic --relative /etc/init.d/crossbar /etc/init.d/crossbar.myinstance" - ewarn " rc-update add crossbar.myinstance default" - ewarn " /etc/init.d/crossbar.myinstance start" - ewarn "Systems using systemd can do the following:" - ewarn " systemctl enable crossbar@myinstance.service" - ewarn " systemctl enable crossbar.target" - ewarn " systemctl start crossbar.target" - fi -} - -pkg_config() { - local crossbar_path="/var/lib/crossbar" - local log_path="/var/log/crossbar" - einfo "This will prepare a new crossbar instance in ${crossbar_path}." - einfo "Press Control-C to abort." - - einfo "Enter the name for the new instance: " - read instance_name - [[ -z "${instance_name}" ]] && die "Invalid instance name" - - local instance_path="${crossbar_path}/${instance_name}" - local instance_log_path="${log_path}/${instance_name}" - - if [[ -e "${instance_path}" ]]; then - eerror "The instance with the specified name already exists:" - eerror "${instance_path}" - die "Instance already exists" - fi - - if [[ ! -d "${instance_path}" ]]; then - mkdir --parents "${instance_path}" || die "Unable to create directory ${crossbar_path}" - fi - chown --recursive crossbar "${instance_path}" || die "Setting permissions for instance failed" - cp "${crossbar_path}/config.json.sample" "${instance_path}/config.json" \ - || die "Moving sample configuration failed" - ln --symbolic --relative "/etc/init.d/crossbar" "/etc/init.d/crossbar.${instance_name}" \ - || die "Unable to create link to init file" - - if [[ ! -d "${instance_log_path}" ]]; then - mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}" - fi - ln --symbolic --relative "${instance_log_path}/node.log" "${instance_path}/node.log" \ - || die "Unable to create link to log file" - - einfo "Successfully created a crossbar instance at ${instance_path}." - einfo "To change the default settings edit the config.json file in this directory." -} diff --git a/net-misc/crossbar/crossbar-18.3.1.ebuild b/net-misc/crossbar/crossbar-18.3.1.ebuild deleted file mode 100644 index 9f47d7ef9b48..000000000000 --- a/net-misc/crossbar/crossbar-18.3.1.ebuild +++ /dev/null @@ -1,169 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 python3_6 ) - -inherit user systemd distutils-r1 - -MY_PV="${PV}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Crossbar.io - The Unified Application Router for the twisted framework" -HOMEPAGE="https://crossbar.io/ https://github.com/crossbario/crossbar https://pypi.org/project/crossbar/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm64" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-python/attrs-17.2.0[${PYTHON_USEDEP}] - >=dev-python/autobahn-18.3.1[${PYTHON_USEDEP}] - >=dev-python/bitstring-3.1.5[${PYTHON_USEDEP}] - >=dev-python/cbor-1.0.0[${PYTHON_USEDEP}] - >=dev-python/click-6.7[${PYTHON_USEDEP}] - >=dev-python/constantly-15.1.0[${PYTHON_USEDEP}] - >=dev-python/cryptography-1.9.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep '>=dev-python/enum34-1.1.6[${PYTHON_USEDEP}]' python2_7) - >=dev-python/hyper-h2-3.0.1[${PYTHON_USEDEP}] - =dev-python/idna-2.5[${PYTHON_USEDEP}] - >=dev-python/incremental-17.5.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.18[${PYTHON_USEDEP}]' python2_7) - >=dev-python/jinja-2.9.6[${PYTHON_USEDEP}] - >=dev-python/lmdb-0.92[${PYTHON_USEDEP}] - >=dev-python/mistune-0.7.4[${PYTHON_USEDEP}] - >=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}] - >=dev-python/priority-1.3.0[${PYTHON_USEDEP}] - >=dev-python/psutil-5.2.2[${PYTHON_USEDEP}] - >=dev-python/pyasn1-0.2.3[${PYTHON_USEDEP}] - >=dev-python/pyasn1-modules-0.0.9[${PYTHON_USEDEP}] - >=dev-python/pygments-2.2.0[${PYTHON_USEDEP}] - >=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}] - >=dev-python/pytrie-0.3[${PYTHON_USEDEP}] - >=dev-python/py-ubjson-0.9.0[${PYTHON_USEDEP}] - >=dev-python/pynacl-1.1.2[${PYTHON_USEDEP}] - >=dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}] - >=dev-python/pyyaml-3.12[${PYTHON_USEDEP}] - >=dev-python/sdnotify-0.3.1[${PYTHON_USEDEP}] - >=dev-python/service_identity-17.0.0[${PYTHON_USEDEP}] - >=dev-python/setproctitle-1.1.10[${PYTHON_USEDEP}] - >=dev-python/setuptools-36.0.1[${PYTHON_USEDEP}] - >=dev-python/shutilwhich-1.1.0[${PYTHON_USEDEP}] - >=dev-python/treq-17.3.1[${PYTHON_USEDEP}] - >=dev-python/twisted-17.5.0[${PYTHON_USEDEP}] - >=dev-python/txaio-2.9.0[${PYTHON_USEDEP}] - >=dev-python/u-msgpack-2.4.1[${PYTHON_USEDEP}] - >=dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] - >=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}] - >=dev-python/txtorcon-0.19.3[${PYTHON_USEDEP}] -" -DEPEND=" - !dev-python/crossbar - >=dev-python/setuptools-36.0.1[${PYTHON_USEDEP}] - >=dev-python/twisted-17.5.0[${PYTHON_USEDEP}] - test? ( - dev-python/mock[${PYTHON_USEDEP}] - ) -" -DOCS=( - README.rst LICENSE-FOR-API LICENSE COPYRIGHT -) - -S="${WORKDIR}"/${MY_P} - -python_prepare_all() { - # don't install the copyright, license... let dodoc do it - sed -e "s/^ data_files=.*//" -i setup.py || die - - # remove these py2 deps from setuptools install_requires - # it is not filtered out for >=py3.4 and results in test fails - sed -e "s/^ipaddress.*//" -i requirements-min.txt || die - sed -e "s/^enum34.*//" -i requirements-min.txt || die - - distutils-r1_python_prepare_all -} - -pkg_setup() { - enewuser crossbar -} - -python_test() { - pushd "${TEST_DIR}" > /dev/null || die - /usr/bin/trial crossbar || die "Tests failed with ${EPYTHON}" - popd > /dev/null || die -} - -python_install_all() { - distutils-r1_python_install_all - - keepdir /var/lib/crossbar - insinto /var/lib/crossbar - doins "${FILESDIR}/config.json.sample" - - newconfd "${FILESDIR}/confd" crossbar - newinitd "${FILESDIR}/initd" crossbar -} - -pkg_posinst() { - einfo "For exapmle configurations and scripts" - einfo "See: https://github.com/crossbario/crossbar-examples" - - if [[ -n ${REPLACING_VERSIONS} ]]; then - ewarn - ewarn "Starting with crossbar-18.3.1 the tor service capability and dependency are now built-in" - ewarn "Starting with net-misc/crossbar-17.6.1_p3-r1, more than one instance of crossbar" - ewarn "can be run simultaneously. Note that \"BASEDIR\" in the crossbar conf.d/crossbar file" - ewarn "is the common base directory for all instances. If you are migrating from an older" - ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory." - ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance." - ewarn "In order to start the service running OpenRC-based systems need to link to the init file:" - ewarn " ln --symbolic --relative /etc/init.d/crossbar /etc/init.d/crossbar.myinstance" - ewarn " rc-update add crossbar.myinstance default" - ewarn " /etc/init.d/crossbar.myinstance start" - ewarn "Systems using systemd can do the following:" - ewarn " systemctl enable crossbar@myinstance.service" - ewarn " systemctl enable crossbar.target" - ewarn " systemctl start crossbar.target" - fi -} - -pkg_config() { - local crossbar_path="/var/lib/crossbar" - local log_path="/var/log/crossbar" - einfo "This will prepare a new crossbar instance in ${crossbar_path}." - einfo "Press Control-C to abort." - - einfo "Enter the name for the new instance: " - read instance_name - [[ -z "${instance_name}" ]] && die "Invalid instance name" - - local instance_path="${crossbar_path}/${instance_name}" - local instance_log_path="${log_path}/${instance_name}" - - if [[ -e "${instance_path}" ]]; then - eerror "The instance with the specified name already exists:" - eerror "${instance_path}" - die "Instance already exists" - fi - - if [[ ! -d "${instance_path}" ]]; then - mkdir --parents "${instance_path}" || die "Unable to create directory ${crossbar_path}" - fi - chown --recursive crossbar "${instance_path}" || die "Setting permissions for instance failed" - cp "${crossbar_path}/config.json.sample" "${instance_path}/config.json" \ - || die "Moving sample configuration failed" - ln --symbolic --relative "/etc/init.d/crossbar" "/etc/init.d/crossbar.${instance_name}" \ - || die "Unable to create link to init file" - - if [[ ! -d "${instance_log_path}" ]]; then - mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}" - fi - ln --symbolic --relative "${instance_log_path}/node.log" "${instance_path}/node.log" \ - || die "Unable to create link to log file" - - einfo "Successfully created a crossbar instance at ${instance_path}." - einfo "To change the default settings edit the config.json file in this directory." -} diff --git a/net-misc/crossbar/files/confd b/net-misc/crossbar/files/confd deleted file mode 100644 index e4a914f640fd..000000000000 --- a/net-misc/crossbar/files/confd +++ /dev/null @@ -1,11 +0,0 @@ -# Path to the wamp router basedir. -BASEDIR="/var/lib/crossbar" - -# User account for the crossbar router. -# The basedir should be owned by this user. -USERNAME="crossbar" - -# loglevel {none,error,warn,info,debug,trace} -# How much Crossbar.io should log to the terminal, in -# order of verbosity. -LOGLEVEL="info" diff --git a/net-misc/crossbar/files/config.json.sample b/net-misc/crossbar/files/config.json.sample deleted file mode 100644 index d7b7d6af7300..000000000000 --- a/net-misc/crossbar/files/config.json.sample +++ /dev/null @@ -1,60 +0,0 @@ -{ - "version": 2, - "controller": {}, - "workers": [ - { - "type": "router", - "realms": [ - { - "name": "realm1", - "roles": [ - { - "name": "anonymous", - "permissions": [ - { - "uri": "", - "match": "prefix", - "allow": { - "call": true, - "register": true, - "publish": true, - "subscribe": true - }, - "disclose": { - "caller": false, - "publisher": false - }, - "cache": true - } - ] - } - ] - } - ], - "transports": [ - { - "type": "universal", - "endpoint": { - "type": "tcp", - "port": 8080 - }, - "rawsocket": { - }, - "websocket": { - "ws": { - "type": "websocket" - } - }, - "web": { - "paths": { - "/": { - "type": "static", - "directory": "../web" - } - } - } - } - ] - } - ] -} diff --git a/net-misc/crossbar/files/crossbar-17.8.1-Revert-Torservices.patch b/net-misc/crossbar/files/crossbar-17.8.1-Revert-Torservices.patch deleted file mode 100644 index 3a83bdf8fc69..000000000000 --- a/net-misc/crossbar/files/crossbar-17.8.1-Revert-Torservices.patch +++ /dev/null @@ -1,246 +0,0 @@ -From 97a2d923dff32397c9df5adb95ecb84bcd95d83d Mon Sep 17 00:00:00 2001 -From: Brian Dolbec -Date: Tue, 19 Sep 2017 17:44:08 -0700 -Subject: [PATCH] Revert "Add built-in Tor services and connection support" - -This reverts commit f75db17642845f46bebd2f6f1d6a092974b9b390. ---- - crossbar/common/checkconfig.py | 60 +-------------- - crossbar/twisted/endpoint.py | 83 +-------------------- - .../router/transport/Transport-Endpoints.md | 85 +--------------------- - requirements-dev.txt | 1 - - requirements-min.txt | 1 - - 5 files changed, 4 insertions(+), 226 deletions(-) - -diff --git a/crossbar/common/checkconfig.py b/crossbar/common/checkconfig.py -index a8e84d45..1f5d9c91 100644 ---- a/crossbar/common/checkconfig.py -+++ b/crossbar/common/checkconfig.py -@@ -867,31 +867,6 @@ def check_listening_endpoint_twisted(endpoint): - # should/can we ask Twisted to parse it easily? - - --def check_listening_endpoint_onion(endpoint): -- """ -- :param endpoint: The onion endpoint -- :type endpoint: dict -- """ -- for k in endpoint: -- if k not in ['type', 'port', 'private_key_file', 'tor_control_endpoint']: -- raise InvalidConfigException( -- "encountered unknown attribute '{}' in onion endpoint".format(k) -- ) -- -- check_dict_args( -- { -- u"type": (True, [six.text_type]), -- u"port": (True, [int, long]), -- u"private_key_file": (True, [six.text_type]), -- u"tor_control_endpoint": (True, [Mapping]) -- }, -- endpoint, -- "onion endpoint config", -- ) -- -- check_connecting_endpoint(endpoint[u"tor_control_endpoint"]) -- -- - def check_connecting_endpoint_tcp(endpoint): - """ - Check a TCP connecting endpoint configuration. -@@ -978,33 +953,6 @@ def check_connecting_endpoint_twisted(endpoint): - check_endpoint_timeout(endpoint['timeout']) - - --def check_connecting_endpoint_tor(endpoint): -- """ -- :param endpoint: The Tor connecting endpoint to check. -- :type endpoint: dict -- """ -- for k in endpoint: -- if k not in ['type', 'host', 'port', 'tor_socks_port', 'tls']: -- raise InvalidConfigException( -- "encountered unknown attribute '{}' in connecting endpoint".format(k) -- ) -- -- if 'host' not in endpoint: -- raise InvalidConfigException("missing mandatory attribute 'host' in connecting endpoint item\n\n{}".format(pformat(endpoint))) -- -- if 'port' not in endpoint: -- raise InvalidConfigException("missing mandatory attribute 'port' in connecting endpoint item\n\n{}".format(pformat(endpoint))) -- -- if 'tor_socks_port' not in endpoint: -- raise InvalidConfigException("missing mandatory attribute 'tor_socks_port' in connecting endpoint item\n\n{}".format(pformat(endpoint))) -- -- check_endpoint_port(endpoint['port']) -- check_endpoint_port(endpoint['tor_socks_port']) -- -- if 'tls' in endpoint: -- check_connecting_endpoint_tls(endpoint['tls']) -- -- - def check_listening_endpoint(endpoint): - """ - Check a listening endpoint configuration. -@@ -1022,7 +970,7 @@ def check_listening_endpoint(endpoint): - raise InvalidConfigException("missing mandatory attribute 'type' in endpoint item\n\n{}".format(pformat(endpoint))) - - etype = endpoint['type'] -- if etype not in ['tcp', 'unix', 'twisted', 'onion']: -+ if etype not in ['tcp', 'unix', 'twisted']: - raise InvalidConfigException("invalid attribute value '{}' for attribute 'type' in endpoint item\n\n{}".format(etype, pformat(endpoint))) - - if etype == 'tcp': -@@ -1031,8 +979,6 @@ def check_listening_endpoint(endpoint): - check_listening_endpoint_unix(endpoint) - elif etype == 'twisted': - check_listening_endpoint_twisted(endpoint) -- elif etype == 'onion': -- check_listening_endpoint_onion(endpoint) - else: - raise InvalidConfigException('logic error') - -@@ -1054,7 +1000,7 @@ def check_connecting_endpoint(endpoint): - raise InvalidConfigException("missing mandatory attribute 'type' in endpoint item\n\n{}".format(pformat(endpoint))) - - etype = endpoint['type'] -- if etype not in ['tcp', 'unix', 'twisted', 'tor']: -+ if etype not in ['tcp', 'unix', 'twisted']: - raise InvalidConfigException("invalid attribute value '{}' for attribute 'type' in endpoint item\n\n{}".format(etype, pformat(endpoint))) - - if etype == 'tcp': -@@ -1063,8 +1009,6 @@ def check_connecting_endpoint(endpoint): - check_connecting_endpoint_unix(endpoint) - elif etype == 'twisted': - check_connecting_endpoint_twisted(endpoint) -- elif etype == 'tor': -- check_connecting_endpoint_tor(endpoint) - else: - raise InvalidConfigException('logic error') - -diff --git a/crossbar/twisted/endpoint.py b/crossbar/twisted/endpoint.py -index 483e5a39..251bfa5c 100644 ---- a/crossbar/twisted/endpoint.py -+++ b/crossbar/twisted/endpoint.py -@@ -33,7 +33,7 @@ from __future__ import absolute_import, division - import six - import os - from os import environ --from os.path import join, abspath, isabs, exists -+from os.path import join, abspath - - from twisted.internet import defer - from twisted.internet._sslverify import OpenSSLCertificateAuthorities -@@ -48,11 +48,7 @@ from twisted.internet.endpoints import TCP4ServerEndpoint, \ - UNIXClientEndpoint, \ - serverFromString, \ - clientFromString --from twisted.internet.interfaces import IStreamServerEndpoint - from twisted.python.filepath import FilePath --from zope.interface import implementer -- --import txtorcon - - from crossbar.twisted.sharedport import SharedPort, SharedTLSPort - -@@ -318,12 +314,6 @@ def _create_tls_client_context(config, cbdir, log): - return ctx - - --def _ensure_absolute(fname, cbdir): -- if isabs(fname): -- return fname -- return abspath(join(cbdir, fname)) -- -- - def create_listening_endpoint_from_config(config, cbdir, reactor, log): - """ - Create a Twisted stream server endpoint from a Crossbar.io transport configuration. -@@ -431,59 +421,6 @@ def create_listening_endpoint_from_config(config, cbdir, reactor, log): - elif config['type'] == 'twisted': - endpoint = serverFromString(reactor, config['server_string']) - -- # tor endpoint -- elif config['type'] == 'onion': # or "tor"? r "tor_onion"? -- port = config['port'] -- private_key_fname = _ensure_absolute(config[u'private_key_file'], cbdir) -- tor_control_ep = create_connecting_endpoint_from_config( -- config[u'tor_control_endpoint'], cbdir, reactor, log -- ) -- -- try: -- with open(private_key_fname, 'r') as f: -- private_key = f.read().strip() -- except (IOError, OSError): -- private_key = None -- -- @implementer(IStreamServerEndpoint) -- class _EphemeralOnion(object): -- -- @defer.inlineCallbacks -- def listen(self, proto_factory): -- # we don't care which local TCP port we listen on, but -- # we do need to know it -- local_ep = TCP4ServerEndpoint(reactor, 0, interface=u"127.0.0.1") -- target_port = yield local_ep.listen(proto_factory) -- tor = yield txtorcon.connect( -- reactor, -- tor_control_ep, -- ) -- -- # create and add the service -- hs = txtorcon.EphemeralHiddenService( -- ports=["{} 127.0.0.1:{}".format(port, target_port.getHost().port)], -- key_blob_or_type=private_key if private_key else "NEW:BEST", -- ) -- log.info("Uploading descriptors can take more than 30s") -- yield hs.add_to_tor(tor.protocol) -- -- # if it's new, store our private key -- # XXX better "if private_key is None"? -- if not exists(private_key_fname): -- with open(private_key_fname, 'w') as f: -- f.write(hs.private_key) -- log.info("Wrote private key to '{fname}'", fname=private_key_fname) -- -- addr = txtorcon.TorOnionAddress(hs.hostname, port) -- log.info( -- "Listening on Tor onion service {addr.onion_uri}:{addr.onion_port}" -- " with local port {local_port}", -- addr=addr, -- local_port=target_port.getHost().port, -- ) -- defer.returnValue(addr) -- endpoint = _EphemeralOnion() -- - else: - raise Exception("invalid endpoint type '{}'".format(config['type'])) - -@@ -656,24 +593,6 @@ def create_connecting_endpoint_from_config(config, cbdir, reactor, log): - elif config['type'] == 'twisted': - endpoint = clientFromString(reactor, config['client_string']) - -- elif config['type'] == 'tor': -- host = config['host'] -- port = config['port'] -- socks_port = config['tor_socks_port'] -- tls = config.get('tls', False) -- if not tls and not host.endswith(u'.onion'): -- log.warn("Non-TLS connection traversing Tor network; end-to-end encryption advised") -- -- socks_endpoint = TCP4ClientEndpoint( -- reactor, "127.0.0.1", socks_port, -- ) -- endpoint = txtorcon.TorClientEndpoint( -- host, port, -- socks_endpoint=socks_endpoint, -- reactor=reactor, -- use_tls=tls, -- ) -- - else: - raise Exception("invalid endpoint type '{}'".format(config['type'])) - --- -2.14.1 - diff --git a/net-misc/crossbar/files/crossbar-17.9.1-Revert-Torservices.patch b/net-misc/crossbar/files/crossbar-17.9.1-Revert-Torservices.patch deleted file mode 100644 index dd4b2b58e455..000000000000 --- a/net-misc/crossbar/files/crossbar-17.9.1-Revert-Torservices.patch +++ /dev/null @@ -1,270 +0,0 @@ -From 97a2d923dff32397c9df5adb95ecb84bcd95d83d Mon Sep 17 00:00:00 2001 -From: Brian Dolbec -Date: Tue, 19 Sep 2017 17:44:08 -0700 -Subject: [PATCH] Revert "Add built-in Tor services and connection support" - -This reverts commit f75db17642845f46bebd2f6f1d6a092974b9b390. ---- - crossbar/common/checkconfig.py | 60 +-------------- - crossbar/twisted/endpoint.py | 83 +-------------------- - .../router/transport/Transport-Endpoints.md | 85 +--------------------- - requirements-dev.txt | 1 - - requirements-min.txt | 1 - - 5 files changed, 4 insertions(+), 226 deletions(-) - -diff --git a/crossbar/common/checkconfig.py b/crossbar/common/checkconfig.py -index a8e84d45..1f5d9c91 100644 ---- a/crossbar/common/checkconfig.py -+++ b/crossbar/common/checkconfig.py -@@ -867,31 +867,6 @@ def check_listening_endpoint_twisted(endpoint): - # should/can we ask Twisted to parse it easily? - - --def check_listening_endpoint_onion(endpoint): -- """ -- :param endpoint: The onion endpoint -- :type endpoint: dict -- """ -- for k in endpoint: -- if k not in ['type', 'port', 'private_key_file', 'tor_control_endpoint']: -- raise InvalidConfigException( -- "encountered unknown attribute '{}' in onion endpoint".format(k) -- ) -- -- check_dict_args( -- { -- u"type": (True, [six.text_type]), -- u"port": (True, six.integer_types), -- u"private_key_file": (True, [six.text_type]), -- u"tor_control_endpoint": (True, [Mapping]) -- }, -- endpoint, -- "onion endpoint config", -- ) -- check_endpoint_port(u"port") -- check_connecting_endpoint(endpoint[u"tor_control_endpoint"]) -- -- - def check_connecting_endpoint_tcp(endpoint): - """ - Check a TCP connecting endpoint configuration. -@@ -978,33 +953,6 @@ def check_connecting_endpoint_twisted(endpoint): - check_endpoint_timeout(endpoint['timeout']) - - --def check_connecting_endpoint_tor(endpoint): -- """ -- :param endpoint: The Tor connecting endpoint to check. -- :type endpoint: dict -- """ -- for k in endpoint: -- if k not in ['type', 'host', 'port', 'tor_socks_port', 'tls']: -- raise InvalidConfigException( -- "encountered unknown attribute '{}' in connecting endpoint".format(k) -- ) -- -- if 'host' not in endpoint: -- raise InvalidConfigException("missing mandatory attribute 'host' in connecting endpoint item\n\n{}".format(pformat(endpoint))) -- -- if 'port' not in endpoint: -- raise InvalidConfigException("missing mandatory attribute 'port' in connecting endpoint item\n\n{}".format(pformat(endpoint))) -- -- if 'tor_socks_port' not in endpoint: -- raise InvalidConfigException("missing mandatory attribute 'tor_socks_port' in connecting endpoint item\n\n{}".format(pformat(endpoint))) -- -- check_endpoint_port(endpoint['port']) -- check_endpoint_port(endpoint['tor_socks_port']) -- -- if 'tls' in endpoint: -- check_connecting_endpoint_tls(endpoint['tls']) -- -- - def check_listening_endpoint(endpoint): - """ - Check a listening endpoint configuration. -@@ -1022,7 +970,7 @@ def check_listening_endpoint(endpoint): - raise InvalidConfigException("missing mandatory attribute 'type' in endpoint item\n\n{}".format(pformat(endpoint))) - - etype = endpoint['type'] -- if etype not in ['tcp', 'unix', 'twisted', 'onion']: -+ if etype not in ['tcp', 'unix', 'twisted']: - raise InvalidConfigException("invalid attribute value '{}' for attribute 'type' in endpoint item\n\n{}".format(etype, pformat(endpoint))) - - if etype == 'tcp': -@@ -1031,8 +979,6 @@ def check_listening_endpoint(endpoint): - check_listening_endpoint_unix(endpoint) - elif etype == 'twisted': - check_listening_endpoint_twisted(endpoint) -- elif etype == 'onion': -- check_listening_endpoint_onion(endpoint) - else: - raise InvalidConfigException('logic error') - -@@ -1054,7 +1000,7 @@ def check_connecting_endpoint(endpoint): - raise InvalidConfigException("missing mandatory attribute 'type' in endpoint item\n\n{}".format(pformat(endpoint))) - - etype = endpoint['type'] -- if etype not in ['tcp', 'unix', 'twisted', 'tor']: -+ if etype not in ['tcp', 'unix', 'twisted']: - raise InvalidConfigException("invalid attribute value '{}' for attribute 'type' in endpoint item\n\n{}".format(etype, pformat(endpoint))) - - if etype == 'tcp': -@@ -1063,8 +1009,6 @@ def check_connecting_endpoint(endpoint): - check_connecting_endpoint_unix(endpoint) - elif etype == 'twisted': - check_connecting_endpoint_twisted(endpoint) -- elif etype == 'tor': -- check_connecting_endpoint_tor(endpoint) - else: - raise InvalidConfigException('logic error') - -diff --git a/crossbar/twisted/endpoint.py b/crossbar/twisted/endpoint.py -index 483e5a39..251bfa5c 100644 ---- a/crossbar/twisted/endpoint.py -+++ b/crossbar/twisted/endpoint.py -@@ -33,7 +33,7 @@ from __future__ import absolute_import, division - import six - import os - from os import environ --from os.path import join, abspath, isabs, exists -+from os.path import join, abspath - - from twisted.internet import defer - from twisted.internet._sslverify import OpenSSLCertificateAuthorities -@@ -48,11 +48,7 @@ from twisted.internet.endpoints import TCP4ServerEndpoint, \ - UNIXClientEndpoint, \ - serverFromString, \ - clientFromString --from twisted.internet.interfaces import IStreamServerEndpoint - from twisted.python.filepath import FilePath --from zope.interface import implementer -- --import txtorcon - - from crossbar.twisted.sharedport import SharedPort, SharedTLSPort - -@@ -318,12 +314,6 @@ def _create_tls_client_context(config, cbdir, log): - return ctx - - --def _ensure_absolute(fname, cbdir): -- if isabs(fname): -- return fname -- return abspath(join(cbdir, fname)) -- -- - def create_listening_endpoint_from_config(config, cbdir, reactor, log): - """ - Create a Twisted stream server endpoint from a Crossbar.io transport configuration. -@@ -431,59 +421,6 @@ def create_listening_endpoint_from_config(config, cbdir, reactor, log): - elif config['type'] == 'twisted': - endpoint = serverFromString(reactor, config['server_string']) - -- # tor endpoint -- elif config['type'] == 'onion': # or "tor"? r "tor_onion"? -- port = config['port'] -- private_key_fname = _ensure_absolute(config[u'private_key_file'], cbdir) -- tor_control_ep = create_connecting_endpoint_from_config( -- config[u'tor_control_endpoint'], cbdir, reactor, log -- ) -- -- try: -- with open(private_key_fname, 'r') as f: -- private_key = f.read().strip() -- except (IOError, OSError): -- private_key = None -- -- @implementer(IStreamServerEndpoint) -- class _EphemeralOnion(object): -- -- @defer.inlineCallbacks -- def listen(self, proto_factory): -- # we don't care which local TCP port we listen on, but -- # we do need to know it -- local_ep = TCP4ServerEndpoint(reactor, 0, interface=u"127.0.0.1") -- target_port = yield local_ep.listen(proto_factory) -- tor = yield txtorcon.connect( -- reactor, -- tor_control_ep, -- ) -- -- # create and add the service -- hs = txtorcon.EphemeralHiddenService( -- ports=["{} 127.0.0.1:{}".format(port, target_port.getHost().port)], -- key_blob_or_type=private_key if private_key else "NEW:BEST", -- ) -- log.info("Uploading descriptors can take more than 30s") -- yield hs.add_to_tor(tor.protocol) -- -- # if it's new, store our private key -- # XXX better "if private_key is None"? -- if not exists(private_key_fname): -- with open(private_key_fname, 'w') as f: -- f.write(hs.private_key) -- log.info("Wrote private key to '{fname}'", fname=private_key_fname) -- -- addr = txtorcon.TorOnionAddress(hs.hostname, port) -- log.info( -- "Listening on Tor onion service {addr.onion_uri}:{addr.onion_port}" -- " with local port {local_port}", -- addr=addr, -- local_port=target_port.getHost().port, -- ) -- defer.returnValue(addr) -- endpoint = _EphemeralOnion() -- - else: - raise Exception("invalid endpoint type '{}'".format(config['type'])) - -@@ -656,24 +593,6 @@ def create_connecting_endpoint_from_config(config, cbdir, reactor, log): - elif config['type'] == 'twisted': - endpoint = clientFromString(reactor, config['client_string']) - -- elif config['type'] == 'tor': -- host = config['host'] -- port = config['port'] -- socks_port = config['tor_socks_port'] -- tls = config.get('tls', False) -- if not tls and not host.endswith(u'.onion'): -- log.warn("Non-TLS connection traversing Tor network; end-to-end encryption advised") -- -- socks_endpoint = TCP4ClientEndpoint( -- reactor, "127.0.0.1", socks_port, -- ) -- endpoint = txtorcon.TorClientEndpoint( -- host, port, -- socks_endpoint=socks_endpoint, -- reactor=reactor, -- use_tls=tls, -- ) -- - else: - raise Exception("invalid endpoint type '{}'".format(config['type'])) - -diff --git a/requirements-dev.txt b/requirements-dev.txt -index fa75074a..d68d1e89 100644 ---- a/requirements-dev.txt -+++ b/requirements-dev.txt -@@ -4,7 +4,6 @@ colorama>=0.3.3 - mock>=1.3.0 - wheel>=0.26.0 - hashin>=0.4.1 --txtorcon>=0.19.3 - - # docs - flask -diff --git a/requirements-min.txt b/requirements-min.txt -index 38ee5a71..83c8d802 100644 ---- a/requirements-min.txt -+++ b/requirements-min.txt -@@ -6,7 +6,6 @@ Twisted>=17.5.0 - h2>=3.0.1 - priority>=1.3.0 - txaio>=2.8.2 --txtorcon>=0.19.3 - autobahn>=17.9.1 - netaddr>=0.7.19 - PyTrie>=0.3 --- -2.14.1 - diff --git a/net-misc/crossbar/files/initd b/net-misc/crossbar/files/initd deleted file mode 100644 index 565dfb304aea..000000000000 --- a/net-misc/crossbar/files/initd +++ /dev/null @@ -1,35 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -NODE=${RC_SVCNAME:9} - -command=/usr/bin/crossbar -command_args="start --cbdir=${BASEDIR}/${NODE} --logtofile --colour=false --loglevel=${LOGLEVEL}" -command_background=true -description="start crossbar wamp router for ${NODE}" -pidfile="${BASEDIR}/${NODE}/crossbar.pid" - - -depend() { - need net -} - -checkconfig() { - if [ -z "${BASEDIR}" ]; then - eerror "BASEDIR not set" - return 1 - fi - if [ -z "${USERNAME}" ]; then - eerror "USERNAME not set" - return 1 - fi - if [ ! -d "${BASEDIR}" ]; then - eerror "${BASEDIR} is not a directory" - return 1 - fi - if [ ! -e "${BASEDIR}/${NODE}" ]; then - eerror "${BASEDIR} does not contain a ${NODE} sub directory" - return 1 - fi -} diff --git a/net-misc/crossbar/metadata.xml b/net-misc/crossbar/metadata.xml deleted file mode 100644 index d9d6f959b0b7..000000000000 --- a/net-misc/crossbar/metadata.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - Crossbar.io Technologies GmbH - - crossbar - crossbariocrossbar - - - Crossbar.io is an open source networking platform - for distributed and microservice applications. It implements the - open Web Application Messaging Protocol (WAMP), is feature rich, - scalable, robust and secure. Let Crossbar.io take care of the - hard parts of messaging so you can focus on your app's features. - - - include tor services connections support - - diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest index fd1b7eba04ea..175f357456f3 100644 --- a/net-misc/dhcp/Manifest +++ b/net-misc/dhcp/Manifest @@ -24,6 +24,6 @@ AUX dhcrelay6.service.conf 220 BLAKE2B 936c3f0b4e6cfb4e8160dbf01c12d8ceafe62d6c9 DIST dhcp-4.4.1.tar.gz 11164378 BLAKE2B fd3c65d8802c42cb936ff75ee19784e4f533c9b36aa08a61280aa8acae5cf581c67cd70222b46eb24b1f9a571e1c028cc853952feac4b6a12f9b7d7d3dbc2fc9 SHA512 684ae349f224918c9f8cec7bd6c55cd0b83ad2b5827375b2876ca088eb05b7ff1364e50f6dc24f2485c610d9be94d4ba3020f60a0fa0ef63962349d191b887e7 DIST dhcp-4.4.2.tar.gz 9906235 BLAKE2B b2233aafdefebc2d907dc83acbefc8df8aeb35791261343e2880168a59056d4b92ef030745fac16dd9a0c2f088d90cf8d420b1c2a7b0fc53d5ed11cffd4b8f18 SHA512 c3dee2cf6e4b43d519d4bc89e9b8b12a6e3747d8c4edc0f83d4a88355a483b91a5f7d2353a3c0a2f37f88704fd2f64478ac5161ca72b10c42cebcb92907afa40 EBUILD dhcp-4.4.1.ebuild 7905 BLAKE2B a6d29d223d131f97c96534d9d13511789582e43aee9cff7fed74d7c74c1bea95838ee21bb88029816daf6f82501289051a8ea193279ec0f97aef22a282405621 SHA512 e4a2e123ecbabe9b26a614a2f8037854f94cf69e328f2da85f9fa8b7897452bf19468e14dc56e8bbb86770d913ec2b55d459fedbf05c79a49b3c6a8f13fb2fbf -EBUILD dhcp-4.4.2-r1.ebuild 7962 BLAKE2B 721bf195a630d35779744f9081e0e104b60d563284c4b092ba308100182fb1f7dc8e165a141fdb23504688015cd9f040cc1cecdd075bb521b3466b251582612e SHA512 55bf16cd4359588ad73c845b757cc04c9dac01d7e7960a23acf344d50341b4c860e815ec56ef41f0434e6c569e3c11f67cbd3683814459ea6dce38c4e0a4fd15 +EBUILD dhcp-4.4.2-r2.ebuild 7961 BLAKE2B fc3e02637b6734000b8120783ed71dede090d258ff70fd189e591ef0558b5659ab24fc12bc97cdcd6ee396422d7532b1e16c1914d97e4a8814617a67c02dac4a SHA512 fdd448b6b2f214f479e0e848e6fdca61d9bec0ba15817cb354e73c910e5b952cc48bd0828cb88df9aa45ff891736e0295d3df1d77e8c4133de2a32a98beee568 EBUILD dhcp-4.4.2.ebuild 7934 BLAKE2B 43944b83a3cf71d6461076d586e40c81853ca62af026f6890911d42803cc981278bfdd68bdb1b667351765c02c6b7005c01d6f9935436a1fda17f5358da975e4 SHA512 e9bfb118e7d6fc4258eed4a9ee2d0f18be76d4aa5241ab874a3cc6eec631bb675f7e83e2bde08d1898dbc0b3cef306bcdd2c8276bfd982d837dc825651b292ee MISC metadata.xml 669 BLAKE2B 27f8b039b9fdca5cb487c31d12bdfe550efff35a3705ba3fd20e6a783c70e48d4d6ca26fdb966230517bb0f3182da2df3d565396e2ced70f6fd94b15a1d4f601 SHA512 854b5b781642506f45df585d2072a79164620ec16e2b59abe2ef55e474f229d676f69f4820b4db1f6dce04df55bc5e3a20bcff959a34b3cc41bf61cce31f1efd diff --git a/net-misc/dhcp/dhcp-4.4.2-r1.ebuild b/net-misc/dhcp/dhcp-4.4.2-r1.ebuild deleted file mode 100644 index 26c97d7eafa4..000000000000 --- a/net-misc/dhcp/dhcp-4.4.2-r1.ebuild +++ /dev/null @@ -1,268 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd toolchain-funcs - -MY_PV="${PV//_alpha/a}" -MY_PV="${MY_PV//_beta/b}" -MY_PV="${MY_PV//_rc/rc}" -MY_PV="${MY_PV//_p/-P}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server" -HOMEPAGE="https://www.isc.org/dhcp" -SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz - ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz" - -LICENSE="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax" - -DEPEND=" - acct-group/dhcp - acct-user/dhcp - client? ( - kernel_linux? ( - ipv6? ( sys-apps/iproute2 ) - sys-apps/net-tools - ) - ) - ldap? ( - net-nds/openldap - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl ) - ) - )" -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-dhcp ) - vim-syntax? ( app-vim/dhcpd-syntax )" - -S="${WORKDIR}/${MY_P}" - -src_unpack() { - unpack ${A} - # handle local bind hell - cd "${S}"/bind - unpack ./bind.tar.gz -} - -PATCHES=( - # Gentoo patches - these will probably never be accepted upstream - # Fix some permission issues - "${FILESDIR}/${PN}-3.0-fix-perms.patch" - - # Enable dhclient to equery NTP servers - "${FILESDIR}/${PN}-4.3.6-dhclient-ntp.patch" - "${FILESDIR}/${PN}-4.3.6-dhclient-resolvconf.patch" - - # Enable dhclient to get extra configuration from stdin - "${FILESDIR}/${PN}-4.2.2-dhclient-stdin-conf.patch" - "${FILESDIR}/${PN}-4.3.6-nogateway.patch" #265531 - "${FILESDIR}/${PN}-4.3.6-quieter-ping.patch" #296921 - "${FILESDIR}/${PN}-4.4.0-always-accept-4.patch" #437108 - "${FILESDIR}/${PN}-4.3.6-iproute2-path.patch" #480636 - "${FILESDIR}/${PN}-4.2.5-bindtodevice-inet6.patch" #471142 - "${FILESDIR}/${PN}-4.3.3-ldap-ipv6-client-id.patch" #559832 -) - -src_prepare() { - default - - # Brand the version with Gentoo - sed -i \ - -e "/VERSION=/s:'$: Gentoo-${PR}':" \ - configure || die - - # Change the hook script locations of the scripts - sed -i \ - -e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \ - -e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \ - client/scripts/* || die - - # No need for the linux script to force bash #158540 - sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die - - # Quiet the freebsd logger a little - sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die - - # Remove these options from the sample config - sed -i -r \ - -e "/(script|host-name|domain-name) /d" \ - client/dhclient.conf.example || die - - if use client && ! use server ; then - sed -i -r \ - -e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \ - Makefile.in || die - elif ! use client && use server ; then - sed -i -r \ - -e '/^SUBDIRS/s:\::' \ - Makefile.in || die - fi - - # Only install different man pages if we don't have en - if [[ " ${LINGUAS} " != *" en "* ]]; then - # Install Japanese man pages - if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then - einfo "Installing Japanese documention" - cp doc/ja_JP.eucJP/dhclient* client || die - cp doc/ja_JP.eucJP/dhcp* common || die - fi - fi - # Now remove the non-english docs so there are no errors later - rm -r doc/ja_JP.eucJP || die - - # make the bind build work - do NOT make "binddir" local! - binddir="${S}/bind" - cd "${binddir}" || die - cat <<-EOF > bindvar.tmp - binddir=${binddir} - GMAKE=${MAKE:-gmake} - EOF - eapply -p2 "${FILESDIR}"/${PN}-4.4.0-bind-disable.patch - # Only use the relevant subdirs now that ISC - #removed the lib/export structure in bind. - sed '/^SUBDIRS/s@=.*$@= isc dns isccfg irs samples@' \ - -i bind-*/lib/Makefile.in || die -} - -src_configure() { - # bind defaults to stupid `/usr/bin/ar` - tc-export AR BUILD_CC - export ac_cv_path_AR=${AR} - - # this is tested for by the bind build system, and can cause trouble - # when cross-building; since dhcp itself doesn't make use of libcap, - # simply disable it. - export ac_cv_lib_cap_cap_set_proc=no - - # Use FHS sane paths ... some of these have configure options, - # but not all, so just do it all here. - local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp" - cat <<-EOF >> includes/site.h - #define _PATH_DHCPD_CONF "${e}/dhcpd.conf" - #define _PATH_DHCLIENT_CONF "${e}/dhclient.conf" - #define _PATH_DHCPD_DB "${l}/dhcpd.leases" - #define _PATH_DHCPD6_DB "${l}/dhcpd6.leases" - #define _PATH_DHCLIENT_DB "${l}/dhclient.leases" - #define _PATH_DHCLIENT6_DB "${l}/dhclient6.leases" - #define _PATH_DHCPD_PID "${r}/dhcpd.pid" - #define _PATH_DHCPD6_PID "${r}/dhcpd6.pid" - #define _PATH_DHCLIENT_PID "${r}/dhcpclient.pid" - #define _PATH_DHCLIENT6_PID "${r}/dhcpclient6.pid" - #define _PATH_DHCRELAY_PID "${r}/dhcrelay.pid" - #define _PATH_DHCRELAY6_PID "${r}/dhcrelay6.pid" - EOF - - local myeconfargs=( - --enable-paranoia - --enable-early-chroot - --sysconfdir=${e} - $(use_enable ipv6 dhcpv6) - $(use_with ldap) - $(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto) - ) - econf "${myeconfargs[@]}" - - # configure local bind cruft. symtable option requires - # perl and we don't want to require that #383837. - cd bind/bind-*/ || die - local el - eval econf \ - $(for el in $(awk '/^bindconfig/,/^$/ {print}' ../Makefile.in) ; do if [[ ${el} =~ ^-- ]] ; then printf ' %s' ${el//\\} ; fi ; done | sed 's,@\([[:alpha:]]\+\)dir@,${binddir}/\1,g') \ - --disable-symtable \ - --without-make-clean -} - -src_compile() { - # build local bind cruft first - emake -C bind/bind-*/lib install - # then build standard dhcp code - emake AR="$(tc-getAR)" -} - -src_install() { - default - - dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters} - docinto html - dodoc doc/References.html - - if [[ -e client/dhclient ]] ; then - # move the client to / - dodir /sbin - mv "${ED}"/usr/sbin/dhclient "${ED}"/sbin/ || die - - exeinto /sbin - if use kernel_linux ; then - newexe "${S}"/client/scripts/linux dhclient-script - else - newexe "${S}"/client/scripts/freebsd dhclient-script - fi - fi - - if [[ -e server/dhcpd ]] ; then - if use ldap ; then - insinto /etc/openldap/schema - doins contrib/ldap/dhcp.* - dosbin contrib/ldap/dhcpd-conf-to-ldap - fi - - newinitd "${FILESDIR}"/dhcpd.init5 dhcpd - newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd - newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay - newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay - newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6 - newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6 - - systemd_newtmpfilesd "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf - systemd_dounit "${FILESDIR}"/dhcpd4.service - systemd_dounit "${FILESDIR}"/dhcpd6.service - systemd_dounit "${FILESDIR}"/dhcrelay4.service - systemd_dounit "${FILESDIR}"/dhcrelay6.service - systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf - systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf - - sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560 - fi - - # the default config files aren't terribly useful #384087 - local f - for f in "${ED}"/etc/dhcp/*.conf.example ; do - mv "${f}" "${f%.example}" || die - done - sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die -} - -pkg_preinst() { - enewgroup dhcp - enewuser dhcp -1 -1 /var/lib/dhcp dhcp - - # Keep the user files over the sample ones. The - # hashing is to ignore the crappy defaults #384087. - local f h - for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do - h=${f#*:} - f="/etc/dhcp/${f%:*}.conf" - if [ -e "${EROOT}"${f} ] ; then - case $(md5sum "${EROOT}"${f}) in - ${h}*) ;; - *) cp -p "${EROOT}"${f} "${ED}"${f};; - esac - fi - done -} - -pkg_postinst() { - if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then - ewarn - ewarn "WARNING: The dhcp init script has been renamed to dhcpd" - ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and" - ewarn "and dhcp should be removed from the default runlevel" - ewarn - fi -} diff --git a/net-misc/dhcp/dhcp-4.4.2-r2.ebuild b/net-misc/dhcp/dhcp-4.4.2-r2.ebuild new file mode 100644 index 000000000000..87b562df6029 --- /dev/null +++ b/net-misc/dhcp/dhcp-4.4.2-r2.ebuild @@ -0,0 +1,268 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit systemd toolchain-funcs + +MY_PV="${PV//_alpha/a}" +MY_PV="${MY_PV//_beta/b}" +MY_PV="${MY_PV//_rc/rc}" +MY_PV="${MY_PV//_p/-P}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server" +HOMEPAGE="https://www.isc.org/dhcp" +SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz + ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz" + +LICENSE="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax" + +DEPEND=" + acct-group/dhcp + acct-user/dhcp + client? ( + kernel_linux? ( + ipv6? ( sys-apps/iproute2 ) + sys-apps/net-tools + ) + ) + ldap? ( + net-nds/openldap + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl ) + ) + )" +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-dhcp ) + vim-syntax? ( app-vim/dhcpd-syntax )" + +S="${WORKDIR}/${MY_P}" + +src_unpack() { + unpack ${A} + # handle local bind hell + cd "${S}"/bind + unpack ./bind.tar.gz +} + +PATCHES=( + # Gentoo patches - these will probably never be accepted upstream + # Fix some permission issues + "${FILESDIR}/${PN}-3.0-fix-perms.patch" + + # Enable dhclient to equery NTP servers + "${FILESDIR}/${PN}-4.3.6-dhclient-ntp.patch" + "${FILESDIR}/${PN}-4.3.6-dhclient-resolvconf.patch" + + # Enable dhclient to get extra configuration from stdin + "${FILESDIR}/${PN}-4.2.2-dhclient-stdin-conf.patch" + "${FILESDIR}/${PN}-4.3.6-nogateway.patch" #265531 + "${FILESDIR}/${PN}-4.3.6-quieter-ping.patch" #296921 + "${FILESDIR}/${PN}-4.4.0-always-accept-4.patch" #437108 + "${FILESDIR}/${PN}-4.3.6-iproute2-path.patch" #480636 + "${FILESDIR}/${PN}-4.2.5-bindtodevice-inet6.patch" #471142 + "${FILESDIR}/${PN}-4.3.3-ldap-ipv6-client-id.patch" #559832 +) + +src_prepare() { + default + + # Brand the version with Gentoo + sed -i \ + -e "/VERSION=/s:'$: Gentoo-${PR}':" \ + configure || die + + # Change the hook script locations of the scripts + sed -i \ + -e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \ + -e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \ + client/scripts/* || die + + # No need for the linux script to force bash #158540 + sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die + + # Quiet the freebsd logger a little + sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die + + # Remove these options from the sample config + sed -i -r \ + -e "/(script|host-name|domain-name) /d" \ + client/dhclient.conf.example || die + + if use client && ! use server ; then + sed -i -r \ + -e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \ + Makefile.in || die + elif ! use client && use server ; then + sed -i -r \ + -e '/^SUBDIRS/s:\::' \ + Makefile.in || die + fi + + # Only install different man pages if we don't have en + if [[ " ${LINGUAS} " != *" en "* ]]; then + # Install Japanese man pages + if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then + einfo "Installing Japanese documention" + cp doc/ja_JP.eucJP/dhclient* client || die + cp doc/ja_JP.eucJP/dhcp* common || die + fi + fi + # Now remove the non-english docs so there are no errors later + rm -r doc/ja_JP.eucJP || die + + # make the bind build work - do NOT make "binddir" local! + binddir="${S}/bind" + cd "${binddir}" || die + cat <<-EOF > bindvar.tmp + binddir=${binddir} + GMAKE=${MAKE:-gmake} + EOF + eapply -p2 "${FILESDIR}"/${PN}-4.4.0-bind-disable.patch + # Only use the relevant subdirs now that ISC + #removed the lib/export structure in bind. + sed '/^SUBDIRS/s@=.*$@= isc dns isccfg irs samples@' \ + -i bind-*/lib/Makefile.in || die +} + +src_configure() { + # bind defaults to stupid `/usr/bin/ar` + tc-export AR BUILD_CC + export ac_cv_path_AR=${AR} + + # this is tested for by the bind build system, and can cause trouble + # when cross-building; since dhcp itself doesn't make use of libcap, + # simply disable it. + export ac_cv_lib_cap_cap_set_proc=no + + # Use FHS sane paths ... some of these have configure options, + # but not all, so just do it all here. + local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp" + cat <<-EOF >> includes/site.h + #define _PATH_DHCPD_CONF "${e}/dhcpd.conf" + #define _PATH_DHCLIENT_CONF "${e}/dhclient.conf" + #define _PATH_DHCPD_DB "${l}/dhcpd.leases" + #define _PATH_DHCPD6_DB "${l}/dhcpd6.leases" + #define _PATH_DHCLIENT_DB "${l}/dhclient.leases" + #define _PATH_DHCLIENT6_DB "${l}/dhclient6.leases" + #define _PATH_DHCPD_PID "${r}/dhcpd.pid" + #define _PATH_DHCPD6_PID "${r}/dhcpd6.pid" + #define _PATH_DHCLIENT_PID "${r}/dhcpclient.pid" + #define _PATH_DHCLIENT6_PID "${r}/dhcpclient6.pid" + #define _PATH_DHCRELAY_PID "${r}/dhcrelay.pid" + #define _PATH_DHCRELAY6_PID "${r}/dhcrelay6.pid" + EOF + + local myeconfargs=( + --enable-paranoia + --enable-early-chroot + --sysconfdir=${e} + $(use_enable ipv6 dhcpv6) + $(use_with ldap) + $(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto) + ) + econf "${myeconfargs[@]}" + + # configure local bind cruft. symtable option requires + # perl and we don't want to require that #383837. + cd bind/bind-*/ || die + local el + eval econf \ + $(for el in $(awk '/^bindconfig/,/^$/ {print}' ../Makefile.in) ; do if [[ ${el} =~ ^-- ]] ; then printf ' %s' ${el//\\} ; fi ; done | sed 's,@\([[:alpha:]]\+\)dir@,${binddir}/\1,g') \ + --disable-symtable \ + --without-make-clean +} + +src_compile() { + # build local bind cruft first + emake -C bind/bind-*/lib install + # then build standard dhcp code + emake AR="$(tc-getAR)" +} + +src_install() { + default + + dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters} + docinto html + dodoc doc/References.html + + if [[ -e client/dhclient ]] ; then + # move the client to / + dodir /sbin + mv "${ED}"/usr/sbin/dhclient "${ED}"/sbin/ || die + + exeinto /sbin + if use kernel_linux ; then + newexe "${S}"/client/scripts/linux dhclient-script + else + newexe "${S}"/client/scripts/freebsd dhclient-script + fi + fi + + if [[ -e server/dhcpd ]] ; then + if use ldap ; then + insinto /etc/openldap/schema + doins contrib/ldap/dhcp.* + dosbin contrib/ldap/dhcpd-conf-to-ldap + fi + + newinitd "${FILESDIR}"/dhcpd.init5 dhcpd + newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd + newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay + newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay + newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6 + newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6 + + systemd_newtmpfilesd "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf + systemd_dounit "${FILESDIR}"/dhcpd4.service + systemd_dounit "${FILESDIR}"/dhcpd6.service + systemd_dounit "${FILESDIR}"/dhcrelay4.service + systemd_dounit "${FILESDIR}"/dhcrelay6.service + systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf + systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf + + sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560 + fi + + # the default config files aren't terribly useful #384087 + local f + for f in "${ED}"/etc/dhcp/*.conf.example ; do + mv "${f}" "${f%.example}" || die + done + sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die + + diropts -m0750 -o dhcp -g dhcp + keepdir /var/lib/dhcp +} + +pkg_preinst() { + # Keep the user files over the sample ones. The + # hashing is to ignore the crappy defaults #384087. + local f h + for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do + h=${f#*:} + f="/etc/dhcp/${f%:*}.conf" + if [ -e "${EROOT}"${f} ] ; then + case $(md5sum "${EROOT}"${f}) in + ${h}*) ;; + *) cp -p "${EROOT}"${f} "${ED}"${f};; + esac + fi + done +} + +pkg_postinst() { + if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then + ewarn + ewarn "WARNING: The dhcp init script has been renamed to dhcpd" + ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and" + ewarn "and dhcp should be removed from the default runlevel" + ewarn + fi +} diff --git a/net-misc/dleyna-server/Manifest b/net-misc/dleyna-server/Manifest index 3b1be210bd75..e621becc7c5d 100644 --- a/net-misc/dleyna-server/Manifest +++ b/net-misc/dleyna-server/Manifest @@ -1,4 +1,7 @@ +AUX 0.6.0-gupnp-1.2.patch 2449 BLAKE2B 25aba7b48ef6dfef1d1dbe1c229fefc8c395c8ab1b393a49b6382662437137f628a7e4565aff701331375aae89fbdc3d6b8408d606694ca540036eb87743415b SHA512 9f0ba14980cb9238b576f40802c11e718a42576fd5f33fabf0ff4a2be186533bc6113ae88f1d554894d2205b7824a3a83f7fb99b43559a1c0add8ee07c8adf48 AUX dleyna-server-0.5.0-fix-references-to-GUPnPContextManager.patch 285 BLAKE2B 5425885163b4df90ec99ff0756d1d1da0b0336a73790f1f1c3e7c2ed40b51c78752705a229313d4e35503f62acd3d521026cc7553c154f35c464de5fe53dcf48 SHA512 76df25eac5b3b0d726089e98c38d8280bf3a72dfa830381f3b6a9a31df10abe31cc53c64e75f2fb12901130f243377392c607129821ca7645929ec2696bd88e4 DIST dleyna-server-0.5.0.tar.gz 412938 BLAKE2B 532e1a418708d84dabd98670d84c865b6f69252cbd851504bd2d75bbbf683b699a47513a6ae994f809f3993a67815d5a3ee53683a016448c76d604fed040aceb SHA512 30bafd14c9b85406efc21dd078bce80ed10927ef2728c4535990654b6c279549c5a89099d9266cd1e22a2f574006d2c9cfec8e3e79109c2e760d8ab4609cf398 -EBUILD dleyna-server-0.5.0.ebuild 877 BLAKE2B 78cc1ef9d19ed88df304ad41faf6fd4de87d14358b516d66ee32a77d6bfc9438970e934c1c2f5a6ba13b2156db9316416077bdc0fe823a3bb90a1e6b70f991c1 SHA512 219e65f5e4de35e016920cfbd12078310fd569cb7bed952ea1623508190a86a1baca3a5917a9f70c255a212d23228118ff7e057f606b2780343e0522184eea2f +DIST dleyna-server-0.6.0.tar.gz 107573 BLAKE2B c2460d20ac12d377170fc1292efa48ccec218b7c8e6f2d463a159bda801a7e9a5cfd239e51bcf9d997124a0a9ff305f3a4047228d54a55b26407fb1e37b2e238 SHA512 5fecc48f72afdac46da04d1785cf49384ed84b078802e4703cd86dc8e2c5db64df0232f66b73c73b3f358f7248117cd00fa4652397619d87f8f4a305e047306c +EBUILD dleyna-server-0.5.0.ebuild 885 BLAKE2B 9ae97dc70d8a4925a1f388ce79e001d946333bd8d0f0b96e8a9e9029ef5ac59bedef3c6a28088edc29cf265f6f75d49622d410df46b5160350769f2a60ab0a14 SHA512 c3c68d394a3ff2640d7cdf3c86b5a90756c92a7df5368fdc737682a417ab43f6b547d6801642520fb4654c5d8f94ec3031a3a8bbc6649160c5a6b6e19bca452d +EBUILD dleyna-server-0.6.0.ebuild 843 BLAKE2B 284fa7d88caef61d192ceddbaffdd4a9937d55afff94eb4a3d94374110d0af8438da97deee61ce521fee0d8be4ca324499a2824da0186fc5f98a5696efa6a0bf SHA512 9e5d5d7997df003e47f6db7b42f7a47e111478d4a5bd445c4a0493bf2e4805b94a6906147d342624e3a537ad53af02ae0070434ac99c152f6c00ef2ccb8409f2 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442 diff --git a/net-misc/dleyna-server/dleyna-server-0.5.0.ebuild b/net-misc/dleyna-server/dleyna-server-0.5.0.ebuild index 72f80642cf90..658b58777b19 100644 --- a/net-misc/dleyna-server/dleyna-server-0.5.0.ebuild +++ b/net-misc/dleyna-server/dleyna-server-0.5.0.ebuild @@ -19,8 +19,8 @@ RDEPEND=" dev-libs/libxml2 >=media-libs/gupnp-dlna-0.9.4:2.0 >=net-libs/dleyna-core-0.5 - >=net-libs/gssdp-0.13.2 - >=net-libs/gupnp-0.20.3 + >=net-libs/gssdp-0.13.2:0/3 + >=net-libs/gupnp-0.20.3:0/4 >=net-libs/gupnp-av-0.11.5 >=net-libs/libsoup-2.28.2:2.4 " diff --git a/net-misc/dleyna-server/dleyna-server-0.6.0.ebuild b/net-misc/dleyna-server/dleyna-server-0.6.0.ebuild new file mode 100644 index 000000000000..d0e3df56827f --- /dev/null +++ b/net-misc/dleyna-server/dleyna-server-0.6.0.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +DESCRIPTION="Service that allows to discover and manipulate DLNA Digital Media servers (DMS)" +HOMEPAGE="https://01.org/dleyna/" +SRC_URI="https://01.org/sites/default/files/downloads/dleyna/${P}.tar_2.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + >=dev-libs/glib-2.36:2 + dev-libs/libxml2:2 + >=media-libs/gupnp-dlna-0.9.4:2.0 + >=net-libs/dleyna-core-0.6.0 + >=net-libs/gssdp-1.2:0= + >=net-libs/gupnp-1.2:0= + >=net-libs/gupnp-av-0.11.5 + >=net-libs/libsoup-2.28.2:2.4 +" +DEPEND="${RDEPEND} + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PV}-gupnp-1.2.patch +) + +src_prepare() { + default + eautoreconf +} + +src_install() { + default + find "${ED}" -name "*.la" -delete || die +} diff --git a/net-misc/dleyna-server/files/0.6.0-gupnp-1.2.patch b/net-misc/dleyna-server/files/0.6.0-gupnp-1.2.patch new file mode 100644 index 000000000000..ff9725e0f58c --- /dev/null +++ b/net-misc/dleyna-server/files/0.6.0-gupnp-1.2.patch @@ -0,0 +1,71 @@ +From 96c01c88363d6e5e9b7519bc4e8b5d86cf783e1f Mon Sep 17 00:00:00 2001 +From: Jan Tojnar +Date: Sat, 16 Mar 2019 05:46:20 +0100 +Subject: [PATCH] Port to gupnp-1.2 + +gupnp_context_get_host_ip has been deprecated for a long time, as +the host-ip property moved to gssdp. + +There is also a ton of new deprecations but I will address that separately. +--- + configure.ac | 8 ++++---- + libdleyna/server/upnp.c | 4 ++-- + test/dbus/dms-info.c | 2 -- + 3 files changed, 6 insertions(+), 8 deletions(-) + mode change 100755 => 100644 libdleyna/server/upnp.c + mode change 100755 => 100644 test/dbus/dms-info.c + +diff --git a/configure.ac b/configure.ac +index 11879e7..61f4fca 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -36,10 +36,10 @@ LT_LANG([C]) + + # Checks for libraries. + PKG_PROG_PKG_CONFIG(0.16) +-PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.28]) +-PKG_CHECK_MODULES([GIO], [gio-2.0 >= 2.28]) +-PKG_CHECK_MODULES([GSSDP], [gssdp-1.0 >= 0.13.2]) +-PKG_CHECK_MODULES([GUPNP], [gupnp-1.0 >= 0.20.3]) ++PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.36]) ++PKG_CHECK_MODULES([GIO], [gio-2.0 >= 2.36]) ++PKG_CHECK_MODULES([GSSDP], [gssdp-1.2 >= 0.13.2]) ++PKG_CHECK_MODULES([GUPNP], [gupnp-1.2 >= 0.20.3]) + PKG_CHECK_MODULES([GUPNPAV], [gupnp-av-1.0 >= 0.11.5]) + PKG_CHECK_MODULES([GUPNPDLNA], [gupnp-dlna-2.0 >= 0.9.4]) + PKG_CHECK_MODULES([SOUP], [libsoup-2.4 >= 2.28.2]) +diff --git a/libdleyna/server/upnp.c b/libdleyna/server/upnp.c +old mode 100755 +new mode 100644 +index 9913a76..d04efb8 +--- a/libdleyna/server/upnp.c ++++ b/libdleyna/server/upnp.c +@@ -351,8 +351,8 @@ static void prv_device_unavailable_cb(GUPnPControlPoint *cp, + + udn = gupnp_device_info_get_udn((GUPnPDeviceInfo *)proxy); + +- ip_address = gupnp_context_get_host_ip( +- gupnp_control_point_get_context(cp)); ++ ip_address = gssdp_client_get_host_ip( ++ GSSDP_CLIENT(gupnp_control_point_get_context(cp))); + + if (!udn || !ip_address) + goto on_error; +diff --git a/test/dbus/dms-info.c b/test/dbus/dms-info.c +old mode 100755 +new mode 100644 +index a189b9f..4530e58 +--- a/test/dbus/dms-info.c ++++ b/test/dbus/dms-info.c +@@ -360,8 +360,6 @@ int main(int argc, char *argv[]) + if (sigprocmask(SIG_BLOCK, &mask, NULL) == -1) + goto on_error; + +- g_type_init(); +- + /* Create proxy for com.intel.dLeynaServer.Manager. The Manager + object has no properties. We will create the proxy asynchronously + and use G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES to ensure that +-- +2.20.1 + diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest index 382dfda950b3..b11f18aa7b67 100644 --- a/net-misc/dropbox/Manifest +++ b/net-misc/dropbox/Manifest @@ -4,10 +4,16 @@ AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a521 DIST dropbox-lnx.x86-89.3.268.tar.gz 92308961 BLAKE2B 4b1a229eca8e96b49360404fc3a03277343f1dcea9b2065b637d8531b266233215e3f3c21163d20ed104db90b4d37dcd873bc1353036a14f89ac50b78180a518 SHA512 25195ef1f44641ca3aee00c4b5cb52006d9610b9d067ea1ade4717dd47729db98e5b0556b5c61ea881ee84e8f8aafec868555591d8d3f4c1ecc81974159e3321 DIST dropbox-lnx.x86-89.4.278.tar.gz 92309633 BLAKE2B 47f886ab9f81335b8cb0a9133ad0b47e55d53aab6d6d99b89f2b266bd0345e4a788b950dd3fce7b24ff91ffc45c2ba5e8e5154d28a1c3690ed1d200d4d06e9ee SHA512 7f3731f32ef7869c31b18ca7b167ed5695deb8c8130aff3bb7783799dddd1ae3472bd49ef4069dd5ccda76a02b518f7eaba0209fbaf94b974e7caed4c0f8b9ee DIST dropbox-lnx.x86-90.4.307.tar.gz 92672302 BLAKE2B 4323a379cbfe4428db63bb36c78b9eb83dc6026242eeb6f6f68687f0868c2d03edcf40ff2c9312e5a432458814c96a4df749640f0a256ecc675f3a5e860a8772 SHA512 b3248397d8b83436ccaf671528a2dd333c8bcb3073b3248f1826a63c5b1f542a7bebfd8ee184e3eb5feb74070116c681a3c71816c4a8ae817ed992cc9b07aa00 +DIST dropbox-lnx.x86-91.4.548.tar.gz 93309539 BLAKE2B 8e0349ad072c6aabfd0b0b8c6b75acede9bb0765945a49186362f2f511ee73a989ef408d1634110cabc9116002d5f046d7fb723db7d4748ca192e652ccdb7535 SHA512 f4c6c2883da728ab9ad811183680ffdb34600af8da48e3c54dc65d6ca533e92d1f44a878e5f2f9379e26049e184a0d6943a886d7af194969c92ec83289a0d9d5 +DIST dropbox-lnx.x86-92.3.365.tar.gz 93818688 BLAKE2B 670b1ae458f7ba76290478860f06cf58379f94a639887dfb738715a3cdcb1191635adc26b10363575cd0d131b096bdfd9191a09ed2cbe228b6ba9e3eb807ea29 SHA512 25ed1f1f257694fa1f249f97ec2e0da66bef10cee94dae8e5bc3e1643c7c561689c6ff8a9699d1140ef5400771c08706f44295fb8c7f7f09be2f7042b24d11a5 DIST dropbox-lnx.x86_64-89.3.268.tar.gz 96723713 BLAKE2B 5bfb7721303b466f9015709f1a235045263fa0db46ff4f0ad7e772c4dc1261b8c7549d63c0ac4a9d98e35581c630ad5ed851d0c63334267b196bec7dc93c0ddf SHA512 627bf49df5a6da76bf04484912c7be686f4e9adc51be619fd613b56fdd514088c173c39cab5fb5a6757074130efc54edf192c7df43090965ba9066de5d0f1755 DIST dropbox-lnx.x86_64-89.4.278.tar.gz 96726025 BLAKE2B 152be18f9b15e9e2a4c188ea6f4649da09b6d50571bacf42068db1abe16a375612e5db9c86369cc4d3e582b660d79df1f35af03504abfed64e728a8515630eed SHA512 5bfc29ff40a3b423eb03ad44e0212ebf015b877bd128432f76ff3103aa43ea6f87575247a5b0b815951c203dfd4b54345e6ab880ab47deb21e29d659e5819755 DIST dropbox-lnx.x86_64-90.4.307.tar.gz 97077393 BLAKE2B 2271b740d381ad5748ec0b5986991b1b3e5ef9d9553e101eca787ff0db5eb03dd91934b7024cdb2eb545dff7ecb5dd64bb95d3b0b8b5f709fb27f90081a1a0e4 SHA512 464ba52e6fe3376c1bd8cb0806a65918e2fd3ff0e5b8379c6c19f9b302cc64b64cdc80f9b8ee2a072fa6564d8c9de0502a9474c72ef5560d7a0b62faf9c5633a +DIST dropbox-lnx.x86_64-91.4.548.tar.gz 97671093 BLAKE2B 589d92f99809b59b84075c827de697c15ad566eaa6269b5c017f781115db391c09738b2032a0e0215b304d58bf324686cb1db9a41d822f99259fa205daa5c38a SHA512 b6868fa07258423c22f6d800a33e220b3b8d19b06f5a99ec16890e4a1f7e2c9112d3e16cfa64f145cb9287ee149c20c4ce91bf434ebe5b4393bad91ba76edb8b +DIST dropbox-lnx.x86_64-92.3.365.tar.gz 98181418 BLAKE2B f9ac16e13fc52b0e875617ef161beb902fd75956af9fd3194d2bab5be2d2454d5e0dc510b8b62ca4c892c57f76c9598aca770dc2608f691faa53ae9d45b1721a SHA512 64f26097838fd8d49ce7a25cf303422e9c742fa867a58c145f30cacf85e559a9d0f124715057c0149cb576fb09706372d5518188df7ccb3ec56cd9f7e0de14ae EBUILD dropbox-89.3.268-r1.ebuild 2749 BLAKE2B 3c7d18fefef5596d9dd6c7e140a4fce617f897090a64ed36fc07695a9bc4006b0d0137353e83dd7aba32d6aa4d7464eaf88b411671e7aefa92b9345fb3d0215c SHA512 6955781d8b1fdbf8d5e9e04f262f8f50bf6e4fc69f9061e9ff1a09e47c79ba32dcff0d2feb80da4edc4aba9c7b0d1b2b4bf0f4d66f0d69de27cd3ad193abc513 EBUILD dropbox-89.4.278.ebuild 2751 BLAKE2B a9fb44c7a6588eac19a8d25c6be0f53868ed0fa7ba75bcc1ea8948b4c237563de05c6a0fe8e0dfb42f2e0250f042bd8f5f72d0d474341a17212d9167097fb0a3 SHA512 adadd488e7749135212fcc6c4c4f8b68b62d22b95e0242a33407a54cde4dfd448b08ae380c92414b44f3147a3f41642abb1d5e2b7f061748dab961071c510d64 EBUILD dropbox-90.4.307.ebuild 2751 BLAKE2B a9fb44c7a6588eac19a8d25c6be0f53868ed0fa7ba75bcc1ea8948b4c237563de05c6a0fe8e0dfb42f2e0250f042bd8f5f72d0d474341a17212d9167097fb0a3 SHA512 adadd488e7749135212fcc6c4c4f8b68b62d22b95e0242a33407a54cde4dfd448b08ae380c92414b44f3147a3f41642abb1d5e2b7f061748dab961071c510d64 +EBUILD dropbox-91.4.548.ebuild 2751 BLAKE2B a9fb44c7a6588eac19a8d25c6be0f53868ed0fa7ba75bcc1ea8948b4c237563de05c6a0fe8e0dfb42f2e0250f042bd8f5f72d0d474341a17212d9167097fb0a3 SHA512 adadd488e7749135212fcc6c4c4f8b68b62d22b95e0242a33407a54cde4dfd448b08ae380c92414b44f3147a3f41642abb1d5e2b7f061748dab961071c510d64 +EBUILD dropbox-92.3.365.ebuild 2563 BLAKE2B 4bfdeb547c2f0ac9e3d98d647c8d8178567780460463e029205309a946c1f46a6f89badf6916fff113ff6317cd5bafc7b311a8017d6f0203087f55baff939ef7 SHA512 eedc17753481143c2b258f8a8b1527394667120be4f88e6969c927207009ec14ffcdbd5b7e928924c009ddf19e2e76a8d7a613fa849897aec3a567719e8102a4 MISC metadata.xml 422 BLAKE2B aa4c408abfc15620a5a8aa6f65891c152315200622b4cf65214757244394a7234e01093d4c0d899d93897182061b02631cce9a3f9409e530d9d9d9a7662771a8 SHA512 987f29ecd23a68ee9037749c20640279f1e232e1d09fb0c4279940643ed50cfd2f0ee8c3e5d3f582b6ca227c757bd3306ca7b3bc59cc7a4f86e9586421d4c839 diff --git a/net-misc/dropbox/dropbox-91.4.548.ebuild b/net-misc/dropbox/dropbox-91.4.548.ebuild new file mode 100644 index 000000000000..21752c395069 --- /dev/null +++ b/net-misc/dropbox/dropbox-91.4.548.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop pax-utils systemd xdg + +DESCRIPTION="Dropbox daemon (pretends to be GUI-less)" +HOMEPAGE="https://www.dropbox.com/" +SRC_URI=" + amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz ) + x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )" + +LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~x86-linux" +IUSE="+librsync-bundled selinux X" + +RESTRICT="mirror strip" + +QA_PREBUILT="opt/.*" +QA_EXECSTACK="opt/dropbox/dropbox" + +DEPEND="librsync-bundled? ( dev-util/patchelf )" + +# Be sure to have GLIBCXX_3.4.9, #393125 +RDEPEND=" + X? ( + dev-libs/glib:2 + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtdeclarative:5 + || ( + dev-qt/qtgui:5[-gles2,X(-)] + dev-qt/qtgui:5[-gles2,xcb(-)] + ) + dev-qt/qtopengl:5[-gles2] + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5[-gles2] + dev-qt/qtwebkit:5 + dev-qt/qtwidgets:5[-gles2] + media-libs/fontconfig + media-libs/freetype + virtual/jpeg + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXinerama + x11-libs/libXxf86vm + x11-libs/pango[X] + x11-misc/wmctrl + x11-themes/hicolor-icon-theme + ) + !librsync-bundled? ( =sys-devel/gcc-4.2.0 + sys-libs/zlib + sys-libs/ncurses-compat:5" + +src_unpack() { + unpack ${A} + mkdir -p "${S}" || die + mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die + mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die + rmdir "${S}"/dropbox-lnx.*-${PV}/ || die + rmdir .dropbox-dist || die +} + +src_prepare() { + default + + rm -vf libGL.so.1 libX11* libdrm.so.2 libffi.so.6 libpopt.so.0 wmctrl || die + # tray icon doesnt load when removing libQt5* (bug 641416) + #rm -vrf libQt5* libicu* qt.conf plugins/ || die + if use X ; then + mv images/hicolor/16x16/status "${T}" || die + else + rm -vrf PyQt5* *pyqt5* images || die + fi + if use librsync-bundled ; then + patchelf --set-rpath '$ORIGIN' librsyncffi_native.*.so || die + else + rm -vf librsync.so.1 || die + fi + pax-mark cm dropbox + mv README ACKNOWLEDGEMENTS "${T}" || die +} + +src_install() { + local targetdir="/opt/dropbox" + + insinto "${targetdir}" + doins -r * + fperms a+x "${targetdir}"/{dropbox,dropboxd} + dosym "${targetdir}/dropboxd" "/opt/bin/dropbox" + + use X && doicon -s 16 -c status "${T}"/status + + make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo" + + newinitd "${FILESDIR}"/dropbox.initd dropbox + newconfd "${FILESDIR}"/dropbox.conf dropbox + systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service" + + dodoc "${T}"/{README,ACKNOWLEDGEMENTS} +} diff --git a/net-misc/dropbox/dropbox-92.3.365.ebuild b/net-misc/dropbox/dropbox-92.3.365.ebuild new file mode 100644 index 000000000000..ff5503155916 --- /dev/null +++ b/net-misc/dropbox/dropbox-92.3.365.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop pax-utils systemd xdg + +DESCRIPTION="Dropbox daemon (pretends to be GUI-less)" +HOMEPAGE="https://www.dropbox.com/" +SRC_URI=" + amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz ) + x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )" + +LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~x86-linux" +IUSE="+librsync-bundled selinux X" + +RESTRICT="mirror strip" + +QA_PREBUILT="opt/.*" +QA_EXECSTACK="opt/dropbox/dropbox" + +BDEPEND="dev-util/patchelf" + +# Be sure to have GLIBCXX_3.4.9, #393125 +RDEPEND=" + X? ( + dev-libs/glib:2 + media-libs/fontconfig + media-libs/freetype + virtual/jpeg + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXinerama + x11-libs/libXxf86vm + x11-libs/pango[X] + x11-misc/wmctrl + x11-themes/hicolor-icon-theme + ) + !librsync-bundled? ( =sys-devel/gcc-4.2.0 + sys-libs/zlib + sys-libs/ncurses-compat:5" + +src_unpack() { + unpack ${A} + mkdir -p "${S}" || die + mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die + mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die + rmdir "${S}"/dropbox-lnx.*-${PV}/ || die + rmdir .dropbox-dist || die +} + +src_prepare() { + default + + rm -vf libGL.so.1 libX11* libdrm.so.2 libffi.so.6 libpopt.so.0 wmctrl || die + # tray icon doesnt load when removing libQt5* (bug 641416) + #rm -vrf libQt5* libicu* qt.conf plugins/ || die + if use X ; then + mv images/hicolor/16x16/status "${T}" || die + else + rm -vrf PyQt5* *pyqt5* images || die + fi + if use librsync-bundled ; then + patchelf --set-rpath '$ORIGIN' librsyncffi_native.*.so || die + else + rm -vf librsync.so.1 || die + fi + patchelf --set-rpath '$ORIGIN' \ + apex._apex.*.so \ + nucleus_python.*.so \ + tprt.*.so \ + || die + pax-mark cm dropbox + mv README ACKNOWLEDGEMENTS "${T}" || die +} + +src_install() { + local targetdir="/opt/dropbox" + + insinto "${targetdir}" + doins -r * + fperms a+x "${targetdir}"/{dropbox,dropboxd} + dosym "${targetdir}/dropboxd" "/opt/bin/dropbox" + + use X && doicon -s 16 -c status "${T}"/status + + make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo" + + newinitd "${FILESDIR}"/dropbox.initd dropbox + newconfd "${FILESDIR}"/dropbox.conf dropbox + systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service" + + dodoc "${T}"/{README,ACKNOWLEDGEMENTS} +} diff --git a/net-misc/efax/Manifest b/net-misc/efax/Manifest index e150c4bf4323..5ce240ea8f48 100644 --- a/net-misc/efax/Manifest +++ b/net-misc/efax/Manifest @@ -5,6 +5,6 @@ DIST efax-0.9a-001114.tar.gz 97402 BLAKE2B 4c8365814dda4cc8c53da9cf6f71ae95c9a5b DIST efax_0.9a-19.1.diff.gz 18698 BLAKE2B 4b0a97e39f65009ff0f295cd4f573a919580ef442a3f0d3d838f79a7a7e31d70beb7b849a2a8bae839a244b1a43ecddedf90fe1bc59f8794906cb3d354557456 SHA512 dd656dd9f737aea598fc0ba241048e695018bce7eb439e009bc751fba1690dc28a99bee53db0c87d0638c9e4ac02b37e6de543355f06e1d8c87ed3d20e354cfc DIST efax_0.9a-19.diff.gz 18178 BLAKE2B d3dca49db55a52839c88c52c8934976fd56e32fb9501c27fe211b4bd4ed4b85014915f2e0785f7668cfc9743262ee6232af92c477386cc32f2b57e336aa4354e SHA512 8b1a2d007ebba73b772400eb1e0ccc61d832775590ac4fd6e171008c9741409118db099b444dc8da04dd87f1cb7025a9af62f60b2c3ccba21cc89863a2909735 DIST efax_0.9a.orig.tar.gz 97402 BLAKE2B 4c8365814dda4cc8c53da9cf6f71ae95c9a5b64a4677f0f717d03ea53710df1944db07514d01c18f9bf0d2c64642a2b7ca0416a7571a6f4b880ad8098a919c5e SHA512 b6361f84a8239e515cf29dbcbfde3d38648b73e7acfc72a0e2ced4ff2dd801c73bbccf5d34fb8aa065ec8b8bfc694a58f6d8dc00bb9e9a63e580be618a45228b -EBUILD efax-0.9a-r4.ebuild 998 BLAKE2B 256b878233ac8e986a5d0c7b4ac25e02278edb762a7dd020a3a4be7a039d64365b830820af9626a1e9f44714f227b195bc3170f94f1eb425003972af37ce6943 SHA512 cbf87b250909606c4952b39f4dc3dfd0e4ea9be64a264be1f6308bd13da4037d824ac9079ff7bce8e2f6ec2b915e6807669112d9c422ff824af5a7b3270bbe5d -EBUILD efax-0.9a_p19_p1.ebuild 1245 BLAKE2B aacc00ddab996e2d1384be6cf80b673ea54f6ff305d36fc40a86636fc4d68748f318c8c4680bf8d8180e9c8f9b9782f75e1a4285ecea1783d43c653fb5b9e8df SHA512 e07987dfb00812c5a081677905af709422f2194385d7d21eb3e2de6f7f42e021f55c768c3bee9bed42e4624b32ba813406d33dd765c2ef6f5c093a118ff09970 +EBUILD efax-0.9a-r4.ebuild 996 BLAKE2B 5bd0f32c0096a9b35dbb553feae83062ab678cc86ed1b0c6b8c3847f4dc4b337aef076d9ae3cae7e96cd066f2f2d6c4cfe4448f5a76d4f2ab27796b3e487fbff SHA512 94cf53bdd74571ee69ff2486cf180a4e1fee46cef3dbd281ffc02b69c5f2787f84bd8cbf398864253d831d6b9fd34d0a8ec8cabe536265ca7ccad05f74f93e19 +EBUILD efax-0.9a_p19_p1.ebuild 1243 BLAKE2B e658e3f5a592f53796ae3279a5e35ece6825cbff80c51cbc6260db68c71e7258c8963cd65aac266134f4e89a6338ed45b87f6ffa4e7a548125c041fc0e1a3500 SHA512 789732760a0c6fed1b09391f6afbd0bd45c4f1691386897daac8a35c6283ee86eb6b443c9486d1bf28eb26917d6dd82844d2f802cd56d06c351f15036a338f64 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/net-misc/efax/efax-0.9a-r4.ebuild b/net-misc/efax/efax-0.9a-r4.ebuild index e206513ab3ab..ef730ef1ec3e 100644 --- a/net-misc/efax/efax-0.9a-r4.ebuild +++ b/net-misc/efax/efax-0.9a-r4.ebuild @@ -17,7 +17,7 @@ IUSE="" SLOT="0" LICENSE="GPL-2" -src_prepare () { +src_prepare() { epatch "${WORKDIR}/${PN}_${PV}-19.diff" rm -f "${S}"/${P}/debian/patches/series "${S}"/${P}/debian/patches/00list EPATCH_FORCE="yes" epatch "${S}"/${P}/debian/patches/* @@ -32,7 +32,7 @@ src_compile() { emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" } -src_install () { +src_install() { dobin efax efix fax doman efax.1 efix.1 newman fax.1 efax-fax.1 # Don't collide with net-dialup/mgetty, bug #429808 diff --git a/net-misc/efax/efax-0.9a_p19_p1.ebuild b/net-misc/efax/efax-0.9a_p19_p1.ebuild index 8b89d9a44565..2bcfd9441501 100644 --- a/net-misc/efax/efax-0.9a_p19_p1.ebuild +++ b/net-misc/efax/efax-0.9a_p19_p1.ebuild @@ -21,7 +21,7 @@ PATCHES=( ) S="${WORKDIR}/${P/_p*}-001114" -src_prepare () { +src_prepare() { eapply "${WORKDIR}"/${PN}_${PV/_p*}-$(ver_cut 5).$(ver_cut 7).diff local patch for patch in $(< debian/patches/00list); do @@ -41,7 +41,7 @@ src_compile() { emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" } -src_install () { +src_install() { dobin efax efix fax doman efax.1 efix.1 newman fax.1 efax-fax.1 # Don't collide with net-dialup/mgetty, bug #429808 diff --git a/net-misc/electron-cash/Manifest b/net-misc/electron-cash/Manifest index 2fe1343dfd5c..c34a68ac9b14 100644 --- a/net-misc/electron-cash/Manifest +++ b/net-misc/electron-cash/Manifest @@ -1,6 +1,4 @@ AUX 3.3.6-no-user-root.patch 1261 BLAKE2B 6035a47b73ce13a92ef66177d6131f5744a498bb4360aa289aca6a09c6ef3e7b663914590f4c9be635078fed0bc82ae706f0cb4c7280acab88bbb1f5211d6473 SHA512 bed6b2108b3a8c8960b43eff854b8292d5e6fbd0fdd8383e43e020cac51767cbd70a1c371a3dffe1bc51145f97f930cb966fd4eee1ecc3ca021cbcfac0ea1a81 -DIST electron-cash-3.3.6.tar.gz 8506610 BLAKE2B 85f61ec0c95e41c5fc170c3419317e077c3e871ee90db7f4e7ebbf6e931950746798efe9b4b6e7c6e0992a52165772a699d8220e1a21ff597f024084929afddc SHA512 993829ce29013e26f219bbd41d13c8d399920ee4c1e5fcae3c4fb298c766228766e93b559db1de3c14bd5add6f651c83655afb32bf173bacdaddf83a8a941f18 DIST electron-cash-4.0.2.tar.gz 8967992 BLAKE2B 081546d148dbc7da5e192154818831e125437c00093e1fe434ef0a67f8c06ceb1d2b1f44de9e71aac5786f995aeffd8fb6b74c64f6aa249f5cc9c06c9a276845 SHA512 dad17906f1dc2e53d4c6bff15a38d3276d16377f71b4d4e260b7b667f2b045da49f504483606d4515cdf71300b67108301b6cce971d1cca16c3856023b3e3f3a -EBUILD electron-cash-3.3.6-r1.ebuild 3565 BLAKE2B f184518ef278c85be726caf3d4c06d72446a36a8d7c57a1412144f78a7b830a57ed3b9f5cfc968b8aa45e2c745f22bdc45270b8892b7ae3fee346e6fac6061ae SHA512 5a09705dc6e0b395d59aa0d03c470164f355ffaf0044b707259975811366dd267d2d2f9e957cc8a40a71bea6931f1a502a2592d57d9282ed268e103cb4ba7a80 -EBUILD electron-cash-4.0.2-r1.ebuild 3588 BLAKE2B e3538f2539fa46816825ad8791916cfbd6a068f2386e3df8db095980e62a9b3e6bc257249626b0890b5e01d1c1c272506a17e689d20dcb723d352fcedf9ae123 SHA512 01bb90258132ab8ae9eefe6f8f2fe85b0a3c3c5b342073425f85506d9b42b9e15417bed2a68b3ff730779ca942689e3273be75a74e61c94e6c56fb1650270d01 +EBUILD electron-cash-4.0.2-r2.ebuild 3560 BLAKE2B 733d818311c88760706e995c616b0a9ecf756cfee6a7830001d3710b3dad0624a40975d78959851e0fdf897a313a8f0bebe973cb29a7eab4ecd42096d9d3d7da SHA512 96c3e23caf8de041b17d17264adda93197b24750acf71c10958baf40fb7fbee2a4ec4898aa789ebbbb04b4975f145d90878c8943a49d206d18d157c3bf936399 MISC metadata.xml 976 BLAKE2B 991083b0233c11e6e5bbb3d7d560b20587332344fca7d3fad40cde8bc4bce1f3455172b7131451e034d0ab9722913667eb9739fe1bbd214354bf7cde974cecf6 SHA512 38383f6b7809ee97e33a777b5eab2593b22ce99d78442c40e9ff4654f350b6ad17da0c2e309b43fed517e2b384ab5f806a5ef60a71f887d72a4dcf06c9bbdede diff --git a/net-misc/electron-cash/electron-cash-3.3.6-r1.ebuild b/net-misc/electron-cash/electron-cash-3.3.6-r1.ebuild deleted file mode 100644 index ce2b8f67d146..000000000000 --- a/net-misc/electron-cash/electron-cash-3.3.6-r1.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -PYTHON_COMPAT=( python3_6 ) -PYTHON_REQ_USE="ncurses?" - -inherit distutils-r1 gnome2-utils xdg-utils - -MY_P="Electron-Cash-${PV}" -DESCRIPTION="Lightweight Bitcoin Cash client (BCH fork of Electrum)" -HOMEPAGE="https://github.com/fyookball/electrum/" -SRC_URI="https://github.com/fyookball/electrum/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="audio_modem cli cosign digitalbitbox email ncurses qrcode +qt5 sync vkb - l10n_es l10n_ja l10n_pt l10n_zh-CN" - -REQUIRED_USE=" - || ( cli ncurses qt5 ) - audio_modem? ( qt5 ) - cosign? ( qt5 ) - digitalbitbox? ( qt5 ) - email? ( qt5 ) - qrcode? ( qt5 ) - sync? ( qt5 ) - vkb? ( qt5 ) -" - -RDEPEND=" - dev-python/dnspython[${PYTHON_USEDEP}] - dev-python/ecdsa[${PYTHON_USEDEP}] - dev-python/jsonrpclib[${PYTHON_USEDEP}] - dev-python/pbkdf2[${PYTHON_USEDEP}] - dev-python/pyaes[${PYTHON_USEDEP}] - dev-python/PySocks[${PYTHON_USEDEP}] - dev-python/qrcode[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/tlslite[${PYTHON_USEDEP}] - dev-python/protobuf-python[${PYTHON_USEDEP}] - qrcode? ( media-gfx/zbar[v4l] ) - qt5? ( - dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] - ) - ncurses? ( dev-lang/python ) -" - -S="${WORKDIR}/${MY_P}" - -DOCS="RELEASE-NOTES" - -src_prepare() { - eapply "${FILESDIR}/3.3.6-no-user-root.patch" - - # Prevent icon from being installed in the wrong location - sed -i '/icons/d' setup.py || die - - if use qt5; then - pyrcc5 icons.qrc -o gui/qt/icons_rc.py || die - else - sed "s|'electroncash_gui.qt',||" -i setup.py || die - fi - - local wordlist= - for wordlist in \ - $(usex l10n_ja '' japanese) \ - $(usex l10n_pt '' portuguese) \ - $(usex l10n_es '' spanish) \ - $(usex l10n_zh-CN '' chinese_simplified) \ - ; do - rm -f "lib/wordlist/${wordlist}.txt" || die - sed -i "/${wordlist}\\.txt/d" lib/mnemonic.py || die - done - - # Remove unrequested GUI implementations: - local gui setup_py_gui - for gui in \ - $(usex cli '' stdio) \ - kivy \ - $(usex qt5 '' qt ) \ - $(usex ncurses '' text ) \ - ; do - rm gui/"${gui}"* -r || die - done - - # And install requested ones... - for gui in \ - $(usex qt5 qt '') \ - ; do - setup_py_gui="${setup_py_gui}'electrum_gui.${gui}'," - done - - sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die - - local bestgui - if use qt5; then - bestgui=qt - elif use ncurses; then - bestgui=text - else - bestgui=stdio - fi - sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' "${PN}" || die - - local plugin - # trezor requires python trezorlib module - # keepkey requires trezor - for plugin in \ - $(usex audio_modem '' audio_modem ) \ - $(usex cosign '' cosigner_pool ) \ - $(usex digitalbitbox '' digitalbitbox ) \ - $(usex email '' email_requests ) \ - hw_wallet \ - ledger \ - keepkey \ - $(usex sync '' labels ) \ - trezor \ - $(usex vkb '' virtualkeyboard ) \ - ; do - rm -r plugins/"${plugin}"* || die - sed -i "/${plugin}/d" setup.py || die - done - - eapply_user - - distutils-r1_src_prepare -} - -src_install() { - doicon -s 128 icons/${PN}.png - distutils-r1_src_install -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update -} diff --git a/net-misc/electron-cash/electron-cash-4.0.2-r1.ebuild b/net-misc/electron-cash/electron-cash-4.0.2-r1.ebuild deleted file mode 100644 index 39e50d7d405e..000000000000 --- a/net-misc/electron-cash/electron-cash-4.0.2-r1.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -PYTHON_COMPAT=( python3_6 ) -PYTHON_REQ_USE="ncurses?" - -inherit distutils-r1 gnome2-utils xdg-utils - -MY_P="Electron-Cash-${PV}" -DESCRIPTION="Lightweight Bitcoin Cash client (BCH fork of Electrum)" -HOMEPAGE="https://github.com/fyookball/electrum/" -SRC_URI="https://github.com/fyookball/electrum/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="audio_modem cli cosign digitalbitbox email ncurses qrcode +qt5 sync vkb - l10n_es l10n_ja l10n_pt l10n_zh-CN" - -REQUIRED_USE=" - || ( cli ncurses qt5 ) - audio_modem? ( qt5 ) - cosign? ( qt5 ) - digitalbitbox? ( qt5 ) - email? ( qt5 ) - qrcode? ( qt5 ) - sync? ( qt5 ) - vkb? ( qt5 ) -" - -RDEPEND=" - dev-python/dnspython[${PYTHON_USEDEP}] - dev-python/ecdsa[${PYTHON_USEDEP}] - dev-python/jsonrpclib[${PYTHON_USEDEP}] - dev-python/pbkdf2[${PYTHON_USEDEP}] - dev-python/pyaes[${PYTHON_USEDEP}] - dev-python/PySocks[${PYTHON_USEDEP}] - dev-python/qrcode[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/tlslite[${PYTHON_USEDEP}] - dev-python/protobuf-python[${PYTHON_USEDEP}] - qrcode? ( media-gfx/zbar[v4l] ) - qt5? ( - dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] - ) - ncurses? ( dev-lang/python ) - dev-libs/libsecp256k1 -" - -S="${WORKDIR}/${MY_P}" - -DOCS="RELEASE-NOTES" - -src_prepare() { - eapply "${FILESDIR}/3.3.6-no-user-root.patch" - - # Prevent icon from being installed in the wrong location - sed -i '/icons/d' setup.py || die - - if use qt5; then - pyrcc5 icons.qrc -o gui/qt/icons_rc.py || die - else - sed "s|'electroncash_gui.qt',||" -i setup.py || die - fi - - local wordlist= - for wordlist in \ - $(usex l10n_ja '' japanese) \ - $(usex l10n_pt '' portuguese) \ - $(usex l10n_es '' spanish) \ - $(usex l10n_zh-CN '' chinese_simplified) \ - ; do - rm -f "lib/wordlist/${wordlist}.txt" || die - sed -i "/${wordlist}\\.txt/d" lib/mnemonic.py || die - done - - # Remove unrequested GUI implementations: - local gui setup_py_gui - for gui in \ - $(usex cli '' stdio) \ - kivy \ - $(usex qt5 '' qt ) \ - $(usex ncurses '' text ) \ - ; do - rm gui/"${gui}"* -r || die - done - - # And install requested ones... - for gui in \ - $(usex qt5 qt '') \ - ; do - setup_py_gui="${setup_py_gui}'electrum_gui.${gui}'," - done - - sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die - - local bestgui - if use qt5; then - bestgui=qt - elif use ncurses; then - bestgui=text - else - bestgui=stdio - fi - sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' "${PN}" || die - - local plugin - # trezor requires python trezorlib module - # keepkey requires trezor - for plugin in \ - $(usex audio_modem '' audio_modem ) \ - $(usex cosign '' cosigner_pool ) \ - $(usex digitalbitbox '' digitalbitbox ) \ - $(usex email '' email_requests ) \ - hw_wallet \ - ledger \ - keepkey \ - $(usex sync '' labels ) \ - trezor \ - $(usex vkb '' virtualkeyboard ) \ - ; do - rm -r plugins/"${plugin}"* || die - sed -i "/${plugin}/d" setup.py || die - done - - eapply_user - - distutils-r1_src_prepare -} - -src_install() { - doicon -s 128 icons/${PN}.png - distutils-r1_src_install -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update -} diff --git a/net-misc/electron-cash/electron-cash-4.0.2-r2.ebuild b/net-misc/electron-cash/electron-cash-4.0.2-r2.ebuild new file mode 100644 index 000000000000..87c2b57dd7c3 --- /dev/null +++ b/net-misc/electron-cash/electron-cash-4.0.2-r2.ebuild @@ -0,0 +1,151 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_6 python3_7 ) +PYTHON_REQ_USE="ncurses?" + +inherit distutils-r1 gnome2-utils xdg-utils + +MY_P="Electron-Cash-${PV}" +DESCRIPTION="Lightweight Bitcoin Cash client (BCH fork of Electrum)" +HOMEPAGE="https://github.com/fyookball/electrum/" +SRC_URI="https://github.com/fyookball/electrum/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="audio_modem cli cosign digitalbitbox email ncurses qrcode +qt5 sync vkb + l10n_es l10n_ja l10n_pt l10n_zh-CN" + +REQUIRED_USE=" + || ( cli ncurses qt5 ) + audio_modem? ( qt5 ) + cosign? ( qt5 ) + digitalbitbox? ( qt5 ) + email? ( qt5 ) + qrcode? ( qt5 ) + sync? ( qt5 ) + vkb? ( qt5 ) +" + +RDEPEND=" + dev-python/dnspython[${PYTHON_USEDEP}] + dev-python/ecdsa[${PYTHON_USEDEP}] + dev-python/jsonrpclib[${PYTHON_USEDEP}] + dev-python/pbkdf2[${PYTHON_USEDEP}] + dev-python/pyaes[${PYTHON_USEDEP}] + dev-python/PySocks[${PYTHON_USEDEP}] + dev-python/qrcode[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + dev-python/protobuf-python[${PYTHON_USEDEP}] + qrcode? ( media-gfx/zbar[v4l] ) + qt5? ( + dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] + ) + ncurses? ( dev-lang/python ) + dev-libs/libsecp256k1 +" + +S="${WORKDIR}/${MY_P}" + +DOCS="RELEASE-NOTES" + +src_prepare() { + eapply "${FILESDIR}/3.3.6-no-user-root.patch" + + # Prevent icon from being installed in the wrong location + sed -i '/icons/d' setup.py || die + + if use qt5; then + pyrcc5 icons.qrc -o gui/qt/icons_rc.py || die + else + sed "s|'electroncash_gui.qt',||" -i setup.py || die + fi + + local wordlist= + for wordlist in \ + $(usex l10n_ja '' japanese) \ + $(usex l10n_pt '' portuguese) \ + $(usex l10n_es '' spanish) \ + $(usex l10n_zh-CN '' chinese_simplified) \ + ; do + rm -f "lib/wordlist/${wordlist}.txt" || die + sed -i "/${wordlist}\\.txt/d" lib/mnemonic.py || die + done + + # Remove unrequested GUI implementations: + local gui setup_py_gui + for gui in \ + $(usex cli '' stdio) \ + kivy \ + $(usex qt5 '' qt ) \ + $(usex ncurses '' text ) \ + ; do + rm gui/"${gui}"* -r || die + done + + # And install requested ones... + for gui in \ + $(usex qt5 qt '') \ + ; do + setup_py_gui="${setup_py_gui}'electrum_gui.${gui}'," + done + + sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die + + local bestgui + if use qt5; then + bestgui=qt + elif use ncurses; then + bestgui=text + else + bestgui=stdio + fi + sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' "${PN}" || die + + local plugin + # trezor requires python trezorlib module + # keepkey requires trezor + for plugin in \ + $(usex audio_modem '' audio_modem ) \ + $(usex cosign '' cosigner_pool ) \ + $(usex digitalbitbox '' digitalbitbox ) \ + $(usex email '' email_requests ) \ + hw_wallet \ + ledger \ + keepkey \ + $(usex sync '' labels ) \ + trezor \ + $(usex vkb '' virtualkeyboard ) \ + ; do + rm -r plugins/"${plugin}"* || die + sed -i "/${plugin}/d" setup.py || die + done + + eapply_user + + distutils-r1_src_prepare +} + +src_install() { + doicon -s 128 icons/${PN}.png + distutils-r1_src_install +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update + xdg_desktop_database_update +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_desktop_database_update +} diff --git a/net-misc/electrum-ltc/Manifest b/net-misc/electrum-ltc/Manifest index e04474eb319b..990364d8836f 100644 --- a/net-misc/electrum-ltc/Manifest +++ b/net-misc/electrum-ltc/Manifest @@ -2,5 +2,5 @@ AUX 3.1.2-no-user-root.patch 847 BLAKE2B 7c682268f4f76884b364fad9dfef63931ffb694 AUX 3.2.3-pip-optional-pkgs.patch 348 BLAKE2B e49855ff70c50b73c67190ef085454cc23ec7d3e0a8dd419b5837ebb85b56b280518c4b8f260288bed7286578ceb9b4683b30db617c99d965bba653c6fa0ed54 SHA512 24dad9328e867e1d65150a35391aef0df8af1f4859516b24b5c725ff57c2c6e7d1e8ca6e78efbca60a53a1bd2b98744ed8c2cec0e4396b9e2664ea125675e6dd AUX 3.3.2-desktop.patch 530 BLAKE2B fbf901cfc9133ed45afc1a7859c02926fbb8ad52db9429c10b29a4a5dd75d9e4b1387077ea21f075d6cf176e7b167127a9f344b24b126bde5d9445257ffe5780 SHA512 981f57845811ff3d528fe4ab69d75f547dc0189ebb842260d448407645e19fb16be6ceeb6d4a76e3d491fc98a8773588fbddf9b96b270365da48ed2eb82f8e36 DIST electrum-ltc-3.3.4.1.tar.gz 3897254 BLAKE2B 113e4175adad0d404f9677913bd24cbda569f20183de75d341d60b954f0423ff13042e0b05f66f7953729368412fc181d2c8da7caee15899f6810cb77c4be241 SHA512 cab85edbe9189fffd2a4b8d57dd89dc55f68cf3f02cd4a7427c53de852ab2001b82b1484126699c8eee36d765a8ca58936eba82e3c153f654bf5629b9cd50745 -EBUILD electrum-ltc-3.3.4.1-r1.ebuild 3806 BLAKE2B 9c27e7a9eedac873b5ec8f974d41f28ad13ec8bb0b83c8d55ed3ee285ed4417f0227ec126c0d36badbed799e1cb775686a2ee7d6f5e240d409a11176419051b5 SHA512 2a2751773dc33cce75c76c2065ae26d2860d8aca3e2c9adbc7eb6bd82896a908343c1034fa28c5ff691e7373fc81dd8f9ef5f38c33a54ea2967df0461791e7a2 +EBUILD electrum-ltc-3.3.4.1-r2.ebuild 3778 BLAKE2B f563602446e71642b0f7271956284b859b92539a329b5b2f9a89d9b9d540ee4749958987f96379a3e6483185129a9fd5acb19e455083bc888ad8db567660e205 SHA512 986d3175aed062e4569727b6f4526e3fb0c1dc0b4e40d0cc565b1b6d04e58b943631dd9be7dbfa0d7efbbe2cbbbef6d76ca1b18f19901ad730a4d5b8d8dbc044 MISC metadata.xml 893 BLAKE2B 285448da111f6431d8fb440fcf040ee2e22a5fb1fdc8b4b93c75ea2165f6d53a7a7b746add11300c06bc43a3243e423ea57aaa4186dc0dbb91ff8d734216c6c5 SHA512 7881df99b246a3f323270790c2d3c789aa402810418662ef35590d03ea5d82f3877ab465b66e2fe52c4be268ea5965735f5de513ea8d41f260a63a40f3dd3dd9 diff --git a/net-misc/electrum-ltc/electrum-ltc-3.3.4.1-r1.ebuild b/net-misc/electrum-ltc/electrum-ltc-3.3.4.1-r1.ebuild deleted file mode 100644 index 8ca11888da6d..000000000000 --- a/net-misc/electrum-ltc/electrum-ltc-3.3.4.1-r1.ebuild +++ /dev/null @@ -1,155 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -PYTHON_COMPAT=( python3_6 ) -PYTHON_REQ_USE="ncurses?" - -inherit desktop distutils-r1 gnome2-utils xdg-utils - -EGIT_COMMIT="${PV}" -DESCRIPTION="Litecoin thin client" -HOMEPAGE="https://electrum-ltc.org/" -SRC_URI="https://github.com/pooler/electrum-ltc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="audio_modem cli cosign digitalbitbox email ncurses qrcode +qt5 sync vkb - l10n_es l10n_ja l10n_pt-BR l10n_pt-PT l10n_zh-CN" - -REQUIRED_USE=" - || ( cli ncurses qt5 ) - audio_modem? ( qt5 ) - cosign? ( qt5 ) - digitalbitbox? ( qt5 ) - email? ( qt5 ) - qrcode? ( qt5 ) - sync? ( qt5 ) - vkb? ( qt5 ) -" - -RDEPEND="${PYTHON_DEPS} - dev-python/aiohttp-socks[${PYTHON_USEDEP}] - dev-python/aiorpcX[${PYTHON_USEDEP}] - dev-python/dnspython[${PYTHON_USEDEP}] - dev-python/ecdsa[${PYTHON_USEDEP}] - dev-python/jsonrpclib[${PYTHON_USEDEP}] - dev-python/pbkdf2[${PYTHON_USEDEP}] - dev-python/pyaes[${PYTHON_USEDEP}] - dev-python/PySocks[${PYTHON_USEDEP}] - dev-python/qrcode[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/tlslite[${PYTHON_USEDEP}] - dev-python/protobuf-python[${PYTHON_USEDEP}] - qrcode? ( media-gfx/zbar[v4l] ) - qt5? ( - dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] - ) - ncurses? ( dev-lang/python ) -" - -S="${WORKDIR}/${PN}-${EGIT_COMMIT}" - -DOCS="RELEASE-NOTES" - -src_prepare() { - eapply "${FILESDIR}/3.1.2-no-user-root.patch" - eapply "${FILESDIR}/3.2.3-pip-optional-pkgs.patch" - eapply "${FILESDIR}/3.3.2-desktop.patch" - - # Prevent icon from being installed in the wrong location - sed -i '/icons_dirname/d' setup.py || die - - if ! use qt5; then - sed "/'electrum_ltc.gui.qt',/d" -i setup.py || die - fi - - local wordlist= - for wordlist in \ - $(usex l10n_ja '' japanese) \ - $(usex l10n_pt-BR '' $(usex l10n_pt-PT '' portuguese)) \ - $(usex l10n_es '' spanish) \ - $(usex l10n_zh-CN '' chinese_simplified) \ - ; do - rm -f "${PN}/wordlist/${wordlist}.txt" || die - sed -i "/${wordlist}\\.txt/d" ${PN/-/_}/mnemonic.py || die - done - - # Remove unrequested GUI implementations: - local gui setup_py_gui - for gui in \ - $(usex cli '' stdio) \ - kivy \ - $(usex qt5 '' qt ) \ - $(usex ncurses '' text ) \ - ; do - rm ${PN/-/_}/gui/"${gui}"* -r || die - done - - # And install requested ones... - for gui in \ - $(usex qt5 qt '') \ - ; do - setup_py_gui="${setup_py_gui}'electrum_gui.${gui}'," - done - - sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die - - local bestgui - if use qt5; then - bestgui=qt - elif use ncurses; then - bestgui=text - else - bestgui=stdio - fi - sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN/-/_}/${PN} || die - - local plugin - # trezor requires python trezorlib module - # keepkey requires trezor - for plugin in \ - $(usex audio_modem '' audio_modem ) \ - $(usex cosign '' cosigner_pool ) \ - $(usex digitalbitbox '' digitalbitbox ) \ - $(usex email '' email_requests ) \ - hw_wallet \ - ledger \ - keepkey \ - $(usex sync '' labels ) \ - trezor \ - $(usex vkb '' virtualkeyboard ) \ - ; do - rm -r ${PN/-/_}/plugins/"${plugin}"* || die - sed -i "/${plugin}/d" setup.py || die - done - - eapply_user - - xdg_environment_reset - distutils-r1_src_prepare -} - -src_install() { - doicon -s 128 ${PN/-/_}/gui/icons/${PN}.png - distutils-r1_src_install -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update -} diff --git a/net-misc/electrum-ltc/electrum-ltc-3.3.4.1-r2.ebuild b/net-misc/electrum-ltc/electrum-ltc-3.3.4.1-r2.ebuild new file mode 100644 index 000000000000..bc888ddb453c --- /dev/null +++ b/net-misc/electrum-ltc/electrum-ltc-3.3.4.1-r2.ebuild @@ -0,0 +1,154 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_6 python3_7 ) +PYTHON_REQ_USE="ncurses?" + +inherit desktop distutils-r1 gnome2-utils xdg-utils + +EGIT_COMMIT="${PV}" +DESCRIPTION="Litecoin thin client" +HOMEPAGE="https://electrum-ltc.org/" +SRC_URI="https://github.com/pooler/electrum-ltc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="audio_modem cli cosign digitalbitbox email ncurses qrcode +qt5 sync vkb + l10n_es l10n_ja l10n_pt-BR l10n_pt-PT l10n_zh-CN" + +REQUIRED_USE=" + || ( cli ncurses qt5 ) + audio_modem? ( qt5 ) + cosign? ( qt5 ) + digitalbitbox? ( qt5 ) + email? ( qt5 ) + qrcode? ( qt5 ) + sync? ( qt5 ) + vkb? ( qt5 ) +" + +RDEPEND="${PYTHON_DEPS} + dev-python/aiohttp-socks[${PYTHON_USEDEP}] + dev-python/aiorpcX[${PYTHON_USEDEP}] + dev-python/dnspython[${PYTHON_USEDEP}] + dev-python/ecdsa[${PYTHON_USEDEP}] + dev-python/jsonrpclib[${PYTHON_USEDEP}] + dev-python/pbkdf2[${PYTHON_USEDEP}] + dev-python/pyaes[${PYTHON_USEDEP}] + dev-python/PySocks[${PYTHON_USEDEP}] + dev-python/qrcode[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + dev-python/protobuf-python[${PYTHON_USEDEP}] + qrcode? ( media-gfx/zbar[v4l] ) + qt5? ( + dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] + ) + ncurses? ( dev-lang/python ) +" + +S="${WORKDIR}/${PN}-${EGIT_COMMIT}" + +DOCS="RELEASE-NOTES" + +src_prepare() { + eapply "${FILESDIR}/3.1.2-no-user-root.patch" + eapply "${FILESDIR}/3.2.3-pip-optional-pkgs.patch" + eapply "${FILESDIR}/3.3.2-desktop.patch" + + # Prevent icon from being installed in the wrong location + sed -i '/icons_dirname/d' setup.py || die + + if ! use qt5; then + sed "/'electrum_ltc.gui.qt',/d" -i setup.py || die + fi + + local wordlist= + for wordlist in \ + $(usex l10n_ja '' japanese) \ + $(usex l10n_pt-BR '' $(usex l10n_pt-PT '' portuguese)) \ + $(usex l10n_es '' spanish) \ + $(usex l10n_zh-CN '' chinese_simplified) \ + ; do + rm -f "${PN}/wordlist/${wordlist}.txt" || die + sed -i "/${wordlist}\\.txt/d" ${PN/-/_}/mnemonic.py || die + done + + # Remove unrequested GUI implementations: + local gui setup_py_gui + for gui in \ + $(usex cli '' stdio) \ + kivy \ + $(usex qt5 '' qt ) \ + $(usex ncurses '' text ) \ + ; do + rm ${PN/-/_}/gui/"${gui}"* -r || die + done + + # And install requested ones... + for gui in \ + $(usex qt5 qt '') \ + ; do + setup_py_gui="${setup_py_gui}'electrum_gui.${gui}'," + done + + sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die + + local bestgui + if use qt5; then + bestgui=qt + elif use ncurses; then + bestgui=text + else + bestgui=stdio + fi + sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN/-/_}/${PN} || die + + local plugin + # trezor requires python trezorlib module + # keepkey requires trezor + for plugin in \ + $(usex audio_modem '' audio_modem ) \ + $(usex cosign '' cosigner_pool ) \ + $(usex digitalbitbox '' digitalbitbox ) \ + $(usex email '' email_requests ) \ + hw_wallet \ + ledger \ + keepkey \ + $(usex sync '' labels ) \ + trezor \ + $(usex vkb '' virtualkeyboard ) \ + ; do + rm -r ${PN/-/_}/plugins/"${plugin}"* || die + sed -i "/${plugin}/d" setup.py || die + done + + eapply_user + + xdg_environment_reset + distutils-r1_src_prepare +} + +src_install() { + doicon -s 128 ${PN/-/_}/gui/icons/${PN}.png + distutils-r1_src_install +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update + xdg_desktop_database_update +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_desktop_database_update +} diff --git a/net-misc/eventd/Manifest b/net-misc/eventd/Manifest index f7d381f3124c..1588a6370849 100644 --- a/net-misc/eventd/Manifest +++ b/net-misc/eventd/Manifest @@ -1,3 +1,3 @@ DIST eventd-0.27.0.tar.xz 188000 BLAKE2B 06779168e9049714aabc051f8a85a5e5764509c3deceddd300c103f4831b6679f082748858bebb9629dcd47fa0b570158c6cf2b665167ab8e20a7dc0f12cc00f SHA512 586fdf36742cfda5a3c5e4cf4600307b8d699701fdf32eec25a7b294c815ded6e7e41210e65c706c34c5f2d911cadec89b677f082dad183f486fb7d1a55a2302 -EBUILD eventd-0.27.0-r1.ebuild 2583 BLAKE2B 0923b6cf889ec63bd7e199033892e1e18b3c99422d576574d363c4617123a286493351ca07ce789fc7f99a0f4568d44110f11eeceb838500a4ef4efe46925902 SHA512 b88cadb2c5a2610943d7766056445f23bb7c79a33ca0e1d9d0ca894db9dca5e091f1e38248978f2f183d85fd3be71c01cf97ff44d442f3fc7f041492dca76489 +EBUILD eventd-0.27.0-r1.ebuild 2590 BLAKE2B 17919f8f3343bb00c4fed7a87315427290806d457c3d4243bf00ad98a0df71e3eddbc3e240852ae83e892d95166419755b7c101dbd1a9d4131449ec5acad9dab SHA512 09de971721608429bb3da6dbf596516986aa4f24b71bd683de1d610cb25914061f93d13786822257c555e7f512262cda46710d449bf93f70d1067c320f4cf1b0 MISC metadata.xml 907 BLAKE2B f615133974e8aa1afefed00bf6d5e856b18feac63189f8c338de145145c10870de3bf45a764c53c9003fbac6215961ba9e4ca8898c0e2089545a20bc3b147342 SHA512 9132a923a1c3b140374a480473665aa85ab0a9d8f7aa74298a78b4905c5d2bbb97a0fa9d8564c600a9023f64e67151ac47b9443c55e6e7642bbebaf22da061aa diff --git a/net-misc/eventd/eventd-0.27.0-r1.ebuild b/net-misc/eventd/eventd-0.27.0-r1.ebuild index d0083975d4fc..b0d6a59a9665 100644 --- a/net-misc/eventd/eventd-0.27.0-r1.ebuild +++ b/net-misc/eventd/eventd-0.27.0-r1.ebuild @@ -50,7 +50,7 @@ COMMON_DEPEND=" purple? ( net-im/pidgin ) speech? ( app-accessibility/speech-dispatcher ) systemd? ( sys-apps/systemd:= ) - upnp? ( net-libs/gssdp:= ) + upnp? ( >=net-libs/gssdp-1.2:0= ) wayland? ( dev-libs/wayland ) webhook? ( net-libs/libsoup:2.4 ) websocket? ( net-libs/libsoup:2.4 ) diff --git a/net-misc/geomyidae/Manifest b/net-misc/geomyidae/Manifest index 84829e716051..fcbbb4b796c3 100644 --- a/net-misc/geomyidae/Manifest +++ b/net-misc/geomyidae/Manifest @@ -1,5 +1,5 @@ DIST geomyidae-v0.32.2.tgz 20897 BLAKE2B 117a4e89a379a8e84355661d910fcb227ef6105cdf6c5860a89c94caa7ed71d278b53c325a59bf200acdd589b515559995b27536c9fab3fe30fe87cb82f10130 SHA512 3b0927a16082df862b9efacc2f29fd1b1ca76f7d465426e179d5995a416bc27b518daba422512091304ed5479ff133e3d40f7bf66aedfbd8d99d13710809d519 DIST geomyidae-v0.34.tgz 22242 BLAKE2B bc25f50c49c10e5a04b83a12cdcd7546b33f6a7d93eab504122bcfb2fdacfbcb82205890d5fd999d1b8b681c65dc0ef0dc5f95ea2d56a795fa371031c4af43b8 SHA512 55b7845c8b9fbee70b2e2bd71d2e3bb8e34c3029a1ea410cb39750763c81d5c31af8c703f7b673aa28fbfd61dd7915300ed4ff22f94c8430ac754681bc30ce41 -EBUILD geomyidae-0.32.2.ebuild 1031 BLAKE2B 04a3cccb671609ed69f0c715edc73f6f5ae9522d225f375d5cb58827fe864b1e3a66aacd467ecd32ee85503748237a2410477bb100f6963838f8b393748fa8e4 SHA512 e3ff159000ca3068d6a2583071944af7f87d530ef5482d79ff7c7037a5efa460f3902cb88abcd9e9b79b238c628df3553783973456b05ad5aa519e6126c1aa7b -EBUILD geomyidae-0.34.ebuild 1028 BLAKE2B 3ecd610bdd02391345b49857dc8569dd2874fce30a739c601689e62e9513ad545a35597a3e2737fc8bddee712695dd265c93249affece0a2385b5e1eb6914535 SHA512 d8f0a0e9507384c3616b0bf806f3389da5c089ab16ca7887c7e398b4d07973633ad5e7f39971b7aaee951dad4917b77dd7ac4a79064efa1d177e0722b8b84fd8 +EBUILD geomyidae-0.32.2.ebuild 1029 BLAKE2B c242ef54e3a92f257149a373d276d3ef496c757c27cfdf8197b8285d56ddaf790a2feea8a2c7e032ea8e0a84beea69c03d7dcd1a70445b6ecabd105511f55a19 SHA512 875352e3b65ec186ec6fc3489c32173db9a214fdf235ad58dcf8bfba0f9c5283265c8aa413d2a65f1061add4f219feca76c35c11e57b0f77982228da314e5d29 +EBUILD geomyidae-0.34.ebuild 1029 BLAKE2B c242ef54e3a92f257149a373d276d3ef496c757c27cfdf8197b8285d56ddaf790a2feea8a2c7e032ea8e0a84beea69c03d7dcd1a70445b6ecabd105511f55a19 SHA512 875352e3b65ec186ec6fc3489c32173db9a214fdf235ad58dcf8bfba0f9c5283265c8aa413d2a65f1061add4f219feca76c35c11e57b0f77982228da314e5d29 MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a diff --git a/net-misc/geomyidae/geomyidae-0.32.2.ebuild b/net-misc/geomyidae/geomyidae-0.32.2.ebuild index 44ee5a8e613f..18d502998aa1 100644 --- a/net-misc/geomyidae/geomyidae-0.32.2.ebuild +++ b/net-misc/geomyidae/geomyidae-0.32.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~arm ~x86" S="${WORKDIR}/${PN}-v${PV}" -pkg_setup(){ +pkg_setup() { enewgroup gopherd enewuser gopherd -1 -1 /var/gopher gopherd } diff --git a/net-misc/geomyidae/geomyidae-0.34.ebuild b/net-misc/geomyidae/geomyidae-0.34.ebuild index 86affea4be21..18d502998aa1 100644 --- a/net-misc/geomyidae/geomyidae-0.34.ebuild +++ b/net-misc/geomyidae/geomyidae-0.34.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~arm ~x86" S="${WORKDIR}/${PN}-v${PV}" -pkg_setup(){ +pkg_setup() { enewgroup gopherd enewuser gopherd -1 -1 /var/gopher gopherd } diff --git a/net-misc/gofish/Manifest b/net-misc/gofish/Manifest index b28edde6faf6..414b55d492ae 100644 --- a/net-misc/gofish/Manifest +++ b/net-misc/gofish/Manifest @@ -1,5 +1,5 @@ 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 643 BLAKE2B d31502744e2cfdb665cb36dffad42faa2d2dbc461d7de715efaf926c495e9ebd67c7fe35f17b3b9e8a0fbad6559fc21b518cd1703b381ab77bc9fddc85ba0091 SHA512 02da3d0c5e09d17ef17f41c0fd94c9827d0063bd1a23377d49a179f904bb53a9d900a2fcb2d30349e2eda634c0a062eef56204e001d4e265ba4ec73e7c0031c5 +EBUILD gofish-1.2.ebuild 639 BLAKE2B 84057e4158b72cf573c684aa61eea6c60961922ac457ce1a261340b333dad8624330e8334caca52865c2ca543beba75f12bf591a521a58d273466dd94e3fee9a SHA512 4788c07ebd7a8b82a04cea280b80e149ba559d3703b376428478bc3cebc0101ad4627cc829678eb30b087c2ae64b4e9f9b7300582f0787b8b760489f6471ecf9 MISC metadata.xml 243 BLAKE2B abe6d8663d75c0714d442564a532697432403497680faea1e7aaac85ead3e43040f41b87aeff96392efe92cbeb4e8795d5fa89975098673d89b6b116e24e8b98 SHA512 20e0e5969c25ae20a3e0fd1a48aab24ea25d41f80ea16d1b5075a097ce1de9f1652c571a9b2673d6ff009e03eeb9bf5a11f61ed305486784df5ae0924ef9ef24 diff --git a/net-misc/gofish/gofish-1.2.ebuild b/net-misc/gofish/gofish-1.2.ebuild index afbc6b28d2c0..6f64429d30ae 100644 --- a/net-misc/gofish/gofish-1.2.ebuild +++ b/net-misc/gofish/gofish-1.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -30,7 +30,7 @@ src_configure() { --disable-mmap-cache } -src_install () { +src_install() { default dodoc Configure_GoFish newinitd "${FILESDIR}"/gofish.rc gofish diff --git a/net-misc/gupnp-tools/Manifest b/net-misc/gupnp-tools/Manifest index 479418dc35c7..5a8f176c3f78 100644 --- a/net-misc/gupnp-tools/Manifest +++ b/net-misc/gupnp-tools/Manifest @@ -1,3 +1,5 @@ +DIST gupnp-tools-0.10.0.tar.xz 154792 BLAKE2B 47ef726fd931006ca8f63277269a729cda2d91fca7acb7f99c7c20020a3b75452b176dd7ad0c54aaf667da24db7f777d3fe6e8a2496127fe15e4d12912ddea6a SHA512 7fe9231a1ce9e1dea3d5d87df69dfb4014824ad286777cb7b5c93154df02c42e60e6aa239e34c4e0404d9a4a31c0172059110f7d004d7527b191bfa02ec552d7 DIST gupnp-tools-0.8.14.tar.xz 558552 BLAKE2B a0f132722d14a1a0d35258ba2656e07e292c9ae1def256ff48e08d0526f3d665fe328464d5d836c5fb59936d592ed3cfc43c70870fbb88bfcdee74c3abe6f9e8 SHA512 746f12728c7d06d6fb2cab3f015c5d145ba8df45fb0ca8462a0d1c53db081f62ae7c39001604e73c2596f1584318680bf387a6f7751af7146b2b9c5c28651739 -EBUILD gupnp-tools-0.8.14.ebuild 614 BLAKE2B bab077eebb55de945499f52731269301af35250e5c4dea9501e76f2251796aa49552cf01fcaac223e00c8f8ba77d824237ac209efb797dbb285234bb1019f758 SHA512 8a4e2c83c8b6daed9bb3ea32e77411b9648f0fc9dbf07e032e9c0d2fd92e8da27301712b793f94e052750a6e53e96aaafe24f7ccbd3e4cfe7ad07fac68d7868d +EBUILD gupnp-tools-0.10.0.ebuild 706 BLAKE2B c8b3e5b616e1178735caa9f6f532a5fb2aba48434ac86307c0971b957c46c3a7812c8be4a90975c46e0dfedbc1da3f842265f8f866095751237eacf45979518b SHA512 30e83097662c4b94b63edf823afffbaef29c40996016841f55f59bc3fbb0089a5fcf89adcd3b2e3b3df8164ae88c9da8227d0ba0d51c1385101f85d537321374 +EBUILD gupnp-tools-0.8.14.ebuild 613 BLAKE2B 211dc9e0137a927737d12b120351ac79e2f76e7f7460337e2de025190b3894dd6e15a54bc1b9f36ee05925d95417f3e40db58c3e756f56df9b08ef9cae965c61 SHA512 d08cbc016f31c3a1da6fa246cd2608c0f4090a233ec72826cd7832fa1f9768d69e4977f08f958ed1a4a3a694643f02619eae463188c8f6b563242d00a69f8537 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/net-misc/gupnp-tools/gupnp-tools-0.10.0.ebuild b/net-misc/gupnp-tools/gupnp-tools-0.10.0.ebuild new file mode 100644 index 000000000000..32a19be6085b --- /dev/null +++ b/net-misc/gupnp-tools/gupnp-tools-0.10.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +inherit gnome.org meson xdg + +DESCRIPTION="Collection of developer-oriented UPnP tools" +HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP" + +LICENSE="GPL-2+ LGPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="" + +RDEPEND=" + >=net-libs/gssdp-1.2.0:= + >=net-libs/gupnp-1.2.0:= + >=net-libs/libsoup-2.42:2.4 + >=net-libs/gupnp-av-0.5.5:0= + >=x11-libs/gtk+-3.10:3 + >=dev-libs/glib-2.24:2 + >=dev-libs/libxml2-2.4:2 + x11-libs/gtksourceview:4 +" +DEPEND="${RDEPEND}" +BDEPED=" + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +src_configure() { + local emesonargs=( + -Dav-tools=true + ) + meson_src_configure +} diff --git a/net-misc/gupnp-tools/gupnp-tools-0.8.14.ebuild b/net-misc/gupnp-tools/gupnp-tools-0.8.14.ebuild index 36f012ae841b..a5798803860a 100644 --- a/net-misc/gupnp-tools/gupnp-tools-0.8.14.ebuild +++ b/net-misc/gupnp-tools/gupnp-tools-0.8.14.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -15,8 +15,8 @@ IUSE="" RDEPEND=" >=dev-libs/glib-2.24:2 >=dev-libs/libxml2-2.4:2 - >=net-libs/gssdp-0.13.3:0= - >=net-libs/gupnp-0.20.14:0= + >=net-libs/gssdp-0.13.3:0/3 + >=net-libs/gupnp-0.20.14:0/4 >=net-libs/gupnp-av-0.5.5:0= >=net-libs/libsoup-2.42:2.4 >=x11-libs/gtk+-3.10:3 diff --git a/net-misc/httpie/Manifest b/net-misc/httpie/Manifest index 426a7b731f1a..149e77635a08 100644 --- a/net-misc/httpie/Manifest +++ b/net-misc/httpie/Manifest @@ -2,5 +2,7 @@ AUX httpie-1.0.2-fix-test_ssl.patch 446 BLAKE2B ae51dfcbddd35796d7283d2eff398dfe AUX httpie-1.0.3-test_binary.patch 782 BLAKE2B 1e7e63fe889e2b5ebcc814d681652b718d49c2bdf09d90e70c10cf2f7f6cb88ea70509a98a7e56d6b84ecfb84b6b8e5158e73c8d322aa161c8de79e6ac0332fe SHA512 ed917989c3f04aa213739563a6ccd34da413798787cff6a9af07ea058013c6a96c06dbf1e36daefef45faf571983286d3faab869b7918b29239278b54e5570b8 AUX httpie-1.0.3-test_stream.patch 722 BLAKE2B 8ae3ff08311178f40d6e4156fc0fdab443e1f2b76a73f8f47bdffc2b3f62e506b9a60e856ddd358da36e9f45ccfe056ea18906f627c40e20313bd75949711f04 SHA512 1a5b9a010cba066b7fb33e7222c343271e7660f460e2cf23bfcfbb1ad3e6d1472e4dc9ee4679d9c893c40ab1e8dc7a652e2209167cd51f6f5489eac70be03d99 DIST httpie-1.0.3.tar.gz 1745537 BLAKE2B 82279804bf10c1882a163f7b361917c9013a5d4ec9ace934f4d89a8c42d18575863cec57768bb4ccfed3b9913a7f2cba593f398a36f87d045a68f21c7237e381 SHA512 80e540dcb92a55fb8b3c5dd56f380cb1795e4296827591853070a5b775c1f87cd881758d9dd0bdfeff383d06ce8ffafe68ec0269e3d269473e528952a769ecb7 +DIST httpie-2.0.0.tar.gz 1752529 BLAKE2B 212e7a142f3efdf1bf238d6eb7e472579a8a8248950caf19ec584eba4f903de09b08433805105a61714046857d32b662f54cde927d20db2a2a1ab81bc99bc753 SHA512 ddac5206107241c9fdc2d2697a31fc7a123c3a01c2ccbd0aad8d52e1472f093b201e422522972cce992bfb2fc7d32ffc6380d457112c83ab643008086f9a7f2d EBUILD httpie-1.0.3.ebuild 1280 BLAKE2B 8dc29d0ac813e1a560329dcaa81a7d09a9943ab7da68cdfd8fe51d78e5770b488cfaba540d37ba846a28a4dea2637f6f120e139ca77781ddf8b797024ca74c86 SHA512 7fcd9f49ed92db12b57ad9bb684113260f941ac764f329616f7cb0c0d758c1c0ece6611ac0d7551243890b6a6991af3fa45b8e2a1ab594da97eb5dffa9ce9cf8 +EBUILD httpie-2.0.0.ebuild 1055 BLAKE2B 81e139ebc0bf0c666ea991a8e2afef1d2927304244012a955145c16b2f73a4e04716ad5d5580d9ecf92a1ec276a4e46e5d43c0af24d660a96bed88120c39e597 SHA512 e4ee9b4188bf81da301a3f306ac19f2fa3ab9fa751fc6ff36183e2d065ff91c4ea3ae998f6ffb8737277fc9aca373190536a1b5f50b077e7a338b00379661c31 MISC metadata.xml 947 BLAKE2B 09a29d45dec43196bd3f7e10ee318f35272f73fa4a6de170ad6287630ad6b36842e06992fa79d681746784292a95d5b0c6c750ddecaecf5da0246b4c0b9610e6 SHA512 6060535898a5d8ea8d0f6e95b170dbd18c7701e8722d55e57f07bbd7b9ab77559ea5b79c3e7df34b4cf07018eae0f3d8ac76e7a5352fd3f6289cc6723de7f7cb diff --git a/net-misc/httpie/httpie-2.0.0.ebuild b/net-misc/httpie/httpie-2.0.0.ebuild new file mode 100644 index 000000000000..12211f339e9b --- /dev/null +++ b/net-misc/httpie/httpie-2.0.0.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_USE_SETUPTOOLS=rdepend +PYTHON_COMPAT=( python3_6 python3_7 ) +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}]" +DEPEND="test? ( + ${RDEPEND} + dev-python/mock[${PYTHON_USEDEP}] + dev-python/pyopenssl[${PYTHON_USEDEP}] + dev-python/pytest-httpbin[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + )" + +distutils_enable_tests pytest + +python_install_all() { + newbashcomp extras/httpie-completion.bash http + insinto /usr/share/fish/vendor_completions.d + newins extras/httpie-completion.fish http.fish + distutils-r1_python_install_all +} diff --git a/net-misc/icecast/Manifest b/net-misc/icecast/Manifest index dacb83813a7c..a6eb84f0983c 100644 --- a/net-misc/icecast/Manifest +++ b/net-misc/icecast/Manifest @@ -5,5 +5,5 @@ AUX icecast.logrotate 140 BLAKE2B e42003ef1902b876df9c90fbbe15ebfd41fe6b38d989d2 AUX icecast.service 185 BLAKE2B 342bfd8bb1c906ae6184ae56469c7fd484b09d55da9d552cd1e8ec32865bc8756608f2962fc63810fe3fbd1936819d36207926c80e5eb1796ec7dc742f56d075 SHA512 a1e662f9b39ecbd35f28e849c5ae9db314d12e8fcefb152660180e9b51fe538197522c5ddda4908a4012ebe73ac4f9a6c12543a01548e9c41f17b5a17b942f51 AUX icecast.xml 6775 BLAKE2B 2e63a21250cc0e3e580ee1bda7a188d295e3ce81de9ebb442bcd17c4ca5ed6edc0384bf03128e9b680b399feabb4272b7d56940f8732f3ca8da9a5fd68c6c11e SHA512 72620980b9213aa3570b9e4e803cb901f0a3770b081721f0f4e01ad9a0af0cc8a7f6242940b1ac9941f51320ab8c3e97245cf8e0249c5bf504b8f3a01c250a96 DIST icecast-2.4.4.tar.gz 2360592 BLAKE2B fd4034749feb4bf38c684ac6d8de572fdebce875843dc1be286264c8fe8d38feb24ea889b07ec79aada34cf16dae46eb21a8c5470f67c08f2dd56dc04c12130f SHA512 e9ffb478cac2570891787455591d881a59185e067bb36f51706a7070cd9d82d80425ec8cf151f5ebb17d1b75654449fc760f8b82a1bb05f020b47ec09e46b4d0 -EBUILD icecast-2.4.4.ebuild 2212 BLAKE2B a87031b13fb2dbc6ae934bb725df09091bb8cdba3649d3e9aae7022d0cb60164645894fee09a3267d21b5134998ac504511e7e96fbdfb355a5950d98ce039ef3 SHA512 753a56b7c2d576c6084a1319a9042df02effe06c459126f4e22538efde21cb32e1286deaf2539f9b23567aee5c367ecf2ef5ab5814850c772184a1c2c4c134c0 +EBUILD icecast-2.4.4.ebuild 2148 BLAKE2B fe7bd8190da285f64640d1523a43627bddf596bf1877159bc9ba1d3a6c8a1510f74a3a5d0d146fffdad7909c7d29ce4829a3a4507db21db3143f07c3b6fe63b3 SHA512 0dd5daa2b48d309740092d72a8387cc4aa58b6c2899ccd566e13357d834dcb9774d24a457890b4be3e369e2b29c101e1787828cb7a3b88ff4ed58dceee0adcf3 MISC metadata.xml 512 BLAKE2B d4478aee58c5ea15615899722848ee4e84025febf3fdff1203cdc68cea5b7f9021df8995bec3d25bf8f06953dfb3b4b6f2621fae904be59cc88c78732a0ac79a SHA512 73beb97a44390ef3aa35ef29f473397886d8af1f02e8b76924697d8e86df99238010ae63b392e9eb8cd5e6d7c634e380a51c5e298074cd7ed8256649ef6bfc62 diff --git a/net-misc/icecast/icecast-2.4.4.ebuild b/net-misc/icecast/icecast-2.4.4.ebuild index 0047b2cccc17..9b56924bcfdc 100644 --- a/net-misc/icecast/icecast-2.4.4.ebuild +++ b/net-misc/icecast/icecast-2.4.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -51,8 +51,6 @@ src_prepare() { src_configure() { local myeconfargs=( - --disable-dependency-tracking - --docdir=/usr/share/doc/${PF} --sysconfdir=/etc/icecast2 $(use_enable kate) $(use_enable yp) diff --git a/net-misc/ipcalc/Manifest b/net-misc/ipcalc/Manifest index 231771bb85d0..9e6dec56ddc4 100644 --- a/net-misc/ipcalc/Manifest +++ b/net-misc/ipcalc/Manifest @@ -1,3 +1,3 @@ DIST ipcalc-0.41.tar.gz 21599 BLAKE2B 3b54df9bb38fa42c9b11d1192a8e23e6cd7c9cdadc07716f8ec2322f8ff60f6098b89727b6c08d8d0c810974a8f046c0487910073db3390b803802820453d9b7 SHA512 089eb2b9a38b07caa182ff11547a93d86aed570311fc8cd9e636c7546ab4d15acc854b9d79bbba9c797dcfbbedd1d6f4d521aec97bf613905fe5198a29c9889d -EBUILD ipcalc-0.41.ebuild 530 BLAKE2B c4956f9b80af75a31afb5f53eee5ef49bcc0687ba5eee6217a44ee5411e49bc35541f1d06e8bf94b705e854b409f2490d57e93df60dc5ba53dddace71f491410 SHA512 4b815fd302eb8e6cc42efc9adf8034cf8adf966f12e4497f8ef2af3b585e2df2f080c4d52a102c13a28f6fd0095b8a97395d1b0e1c76568cfafb3a0a2cbbe449 +EBUILD ipcalc-0.41.ebuild 529 BLAKE2B 1d09930c6218e28360cea902da539e9ab9a7b39abb48405d73c5b82844b9e1a9d9a4fe6f331e6e8070e350fae2bc5885d58d7f9bce0c71384a16ff0f226c7621 SHA512 56476c42915fb2177ccca26da748cf7af2e04f4fe0531a8b3959b83ee333f65b55af1c0dd97adc47f6097e45d10260c59fcf6ec941eacd559dc3604130b8e8e7 MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef diff --git a/net-misc/ipcalc/ipcalc-0.41.ebuild b/net-misc/ipcalc/ipcalc-0.41.ebuild index 98494fb1f505..18d8276b4331 100644 --- a/net-misc/ipcalc/ipcalc-0.41.ebuild +++ b/net-misc/ipcalc/ipcalc-0.41.ebuild @@ -13,7 +13,7 @@ KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-li RDEPEND=">=dev-lang/perl-5.6.0" -src_install () { +src_install() { dobin ${PN} dodoc changelog contributors } diff --git a/net-misc/kafka-bin/Manifest b/net-misc/kafka-bin/Manifest index 14e8340ff418..e6d5c1b55a02 100644 --- a/net-misc/kafka-bin/Manifest +++ b/net-misc/kafka-bin/Manifest @@ -7,6 +7,7 @@ DIST kafka_2.12-2.1.1.tgz 55351618 BLAKE2B a102fa24883ab5d3110aec1367e40c0ed0a43 DIST kafka_2.12-2.2.0.tgz 57028557 BLAKE2B d71a84a308961fc78ad51c9831ef3a45f95380f143df2c961ea79603ba7c2471d0b0ae15853df86904d90dfc82cd2d2a52c03371391f534a4bf10bcd05d314ba SHA512 63fdcd05b857a096d2e72804253590bd086e4f3046fbfa546f186602e48f54712ed6de2a346a5b05d5335870bf5268fcb2bfd3ef9c4f4bbea379091a79604556 DIST kafka_2.12-2.2.1.tgz 57054917 BLAKE2B fb69ef12f7480b8b47e511cc9325b622dc1fcc6a265bacfdf1ac03d34ad8f5a3b3242c41386214519423bce1e18d8a90f2e7034e26681fe637c823d0a73f69bb SHA512 b8d828f06dfe59e34c4cfa20c57c8c8b43374f1e7c09f12dfa5433534a380bfe09a6de90fb86a4403939a87ab9c665e2369143c138c71391b01bbb9b384e7ac5 DIST kafka_2.12-2.3.0.tgz 57215197 BLAKE2B 91400bed0860633523d60f4b00e47eb18b27f67abca24547d680d08213c10e0de126bf39f790ae16e704446811e9d25d78ed940cf3ae07fff8e2045cd05a89f1 SHA512 a5ed591ab304a1f16f7fd64183871e38aabf814a2c1ca86bb3d064c83e85a6463d3c55f4d707a29fc3d7994dd7ba1f790b5a6219c6dffdf472afd99cee37892e +DIST kafka_2.12-2.4.0.tgz 62283588 BLAKE2B 3492f7a5be9941a75aa5896be0e25974b46887a66e391395a813844bae2f5f57062b636852cdb7aa3650fb4017f9d462a3b95b2166b8a0be62f403c44826b675 SHA512 53b52f86ea56c9fac62046524f03f75665a089ea2dae554aefe3a3d2694f2da88b5ba8725d8be55f198ba80695443559ed9de7c0b2a2817f7a6141008ff79f49 EBUILD kafka-bin-1.1.1.ebuild 1447 BLAKE2B 3aac5189f8f62444b55204f42759f6aa9f131f5c9ddedbd0c67fd0e907182bad3ead1a11410cde18b2097d5ed79db894dd1cd72e6a7140175295ec5e84445b5e SHA512 6fb6d16f1a574c38c9e5027169826bcafc6ec5d8462e57001e000b0d5a3965f9ff496f0190b325781cfefea74d277569eb9b72cbda98c915c8c60e5894f8d917 EBUILD kafka-bin-2.0.1.ebuild 1457 BLAKE2B c7fc8d065c41c06321baa29e04851d7d29354ebcba4f0ed5a778d011602aec9561c04483b3bdb2c4f9fc3817e1f8db57c341eb8628b9ea355cb29e99867f454a SHA512 b0354a1f117f2c436d49dfd41ddc143189f4982ebe4b9f9c70c7887cd3d5ad8aea561332331a9c7c516201e8dea12597cf4ec067899b8a936eb0e8807944eec0 EBUILD kafka-bin-2.1.0.ebuild 1457 BLAKE2B c7fc8d065c41c06321baa29e04851d7d29354ebcba4f0ed5a778d011602aec9561c04483b3bdb2c4f9fc3817e1f8db57c341eb8628b9ea355cb29e99867f454a SHA512 b0354a1f117f2c436d49dfd41ddc143189f4982ebe4b9f9c70c7887cd3d5ad8aea561332331a9c7c516201e8dea12597cf4ec067899b8a936eb0e8807944eec0 @@ -14,4 +15,5 @@ EBUILD kafka-bin-2.1.1.ebuild 1457 BLAKE2B c7fc8d065c41c06321baa29e04851d7d29354 EBUILD kafka-bin-2.2.0.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 MISC metadata.xml 311 BLAKE2B 9fa7db32894e010ccdfb89bae2807b359d0e82ee6937427b6bdbce2554a02367b6e66b689fd7f74ba05e3a701bf4cfd7bdc20b15a96b645b03d6ecc34826fbd0 SHA512 9221b0e14820c3217378e26fe5bb82d03fca4ff3c98cb3fe5a95d688df8b7c792f8a97bfdb0f47874dc36b13dce3bae1a14db073586bde3a46e2fda434859af6 diff --git a/net-misc/kafka-bin/kafka-bin-2.4.0.ebuild b/net-misc/kafka-bin/kafka-bin-2.4.0.ebuild new file mode 100644 index 000000000000..7df42fcc92f1 --- /dev/null +++ b/net-misc/kafka-bin/kafka-bin-2.4.0.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2019 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/" + +# pick recommended scala version +SCALA_VERSION=2.12 +MY_PN="kafka" +MY_P="${MY_PN}_${SCALA_VERSION}-${PV}" +SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz" + +RESTRICT="mirror" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="internal-zookeeper" + +COMMON_DEPEND="acct-group/kafka + acct-user/kafka + virtual/jre:1.8" +DEPEND="${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND}" + +S="${WORKDIR}/${MY_P}" +INSTALL_DIR="/opt/${MY_PN}" + +src_prepare() { + sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die + sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die + eapply_user +} + +src_install() { + insinto /etc/kafka + doins config/zookeeper.properties config/server.properties + if use "internal-zookeeper"; then + keepdir /var/lib/kafka/zookeeper + newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper" + fi + + keepdir /var/lib/kafka + fowners -R kafka:kafka /var/lib/kafka + + keepdir /var/log/kafka + fowners -R kafka:kafka /var/log/kafka + + newinitd "${FILESDIR}/${MY_PN}.init.d.4" "${MY_PN}" + + dodir "${INSTALL_DIR}" + cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die + keepdir "${INSTALL_DIR}/logs" + fowners -R kafka:kafka "${INSTALL_DIR}" +} diff --git a/net-misc/kea/Manifest b/net-misc/kea/Manifest index afc01b446954..dbb944ea57bc 100644 --- a/net-misc/kea/Manifest +++ b/net-misc/kea/Manifest @@ -1,8 +1,8 @@ AUX kea-confd 87 BLAKE2B 564c4c3b7e4d3b16ad03a7971b842e83f1d332a3fd9d5c63d3905b95d57368f9f769e792e39b03ad4345c5870d6d221e904f1f11998c7165874de1c05606e7b7 SHA512 14a95add77a5190475ca698d5981fbf2e07a15c998004af518c2d51c3327c8b059b574a7e8485af61359a814c1b57f8f406902999515c975d81d6ff3e2e00fab AUX kea-initd 1814 BLAKE2B bf6383f4b8b7f2ef4c8603e3ae1783026753ab39cfa6fec61ae1095dcf08dc5438570fefbc35a087e5285ee6b9f424c1fd62153ef8355246c4cc9fb30bf61acb SHA512 7247df003b2083728f57dac0669b72de41c3c2838ccf601198eca84c2e605efe088d091b6a78fa8cf2705514b7307178914225d209ab8fcc450d63a1951abd31 -DIST kea-1.7.3.tar.gz 7284882 BLAKE2B 9023d3f2df7a81d817b83cec9ea52d75e268d95e5337befa973cf8630b620f0454e8cf6fdfa40f02c6cc3fabf0671e2f18e974ff2412b757fad2081015fa1e21 SHA512 17720bd5f119e5fe1cea9ab3642630757fe645c662ab8efb1af0bd301786ccb950c7a7c5b147ad54a7a5aff6471fa84c6a11bf031030180e3080be02894d4812 DIST kea-1.7.4.tar.gz 7322221 BLAKE2B 8042f0d0ecce90635d41aa07599c475adfd17ab8145d14fdd92b3c4442ddf44e4495c63d67c9e5bc30d81cf42eb4393a111762c6f308fcf597cd364360d05bd5 SHA512 ae2117b5add65abed1603be2393cc300fea181376c598c2facdd76cc868d53fabb5714d41f7a5647b0ae508d05e98b50fa101a7917503835928f274a157ed6ca -EBUILD kea-1.7.3.ebuild 1751 BLAKE2B b7583dec6559db10ca04aa42e0403d5e13aea1378eb173df28ac0b9a7fc4ea55d21466bce11b7176398422d9e947facb65621766eea9cdeed79df61a4304e355 SHA512 c33b772170d0eb59e33fb0fb68cdb75cb75c4df0199de2769aea5ffb0c62f75ad5c0d870580d8ab4359f254c50910889d3aa0fb7d6d3e6badbdd8ee13ab3c9a2 +DIST kea-1.7.5.tar.gz 7337326 BLAKE2B 9fa3b16cdbe90503715987d72d5560da13ff619be85040c49572cc24ed83fe0e155c9c7be9785d6f918b1c5a5777ac3d59153fc313d6622d68025d6af4a34956 SHA512 1e31a9b2031d5dfdef18178abcdc30c1fe20ac4013c070cf01e2a2af56d4594fc8ae1edcc9e98483cd8feb8d9d916b893e42cfdd41e195c2d79d0c8800040034 EBUILD kea-1.7.4.ebuild 1751 BLAKE2B e4a91eaa51eca00d5bab01cb9b73c352ab977993ceb4e55aa3b83d878315fcbccb431a69918f2e706967083548ca3e373cd1607f37f160a27db419b8e0c37660 SHA512 d5f21137b0058fd900db1e50f4c8cac895366e110189ebcc5b9a0ad0dee6f33457b4da20c2983e621a29626b0b208c3d83f6e40c63537aa2b38d16d931caebf8 -EBUILD kea-9999.ebuild 1751 BLAKE2B b7583dec6559db10ca04aa42e0403d5e13aea1378eb173df28ac0b9a7fc4ea55d21466bce11b7176398422d9e947facb65621766eea9cdeed79df61a4304e355 SHA512 c33b772170d0eb59e33fb0fb68cdb75cb75c4df0199de2769aea5ffb0c62f75ad5c0d870580d8ab4359f254c50910889d3aa0fb7d6d3e6badbdd8ee13ab3c9a2 +EBUILD kea-1.7.5.ebuild 1704 BLAKE2B f479319090a275bc18f010f230d7d44ce87715cba8a72aa87c97a44226c7998f9729558a0384e3166e119381462cf9a21ec8034790f8f4c9226929e31700d904 SHA512 371cbaf28455c69bcde417f25b318dee1425ee238058125d1a15ebcc57cfdab52735a8ba663b51abc0efb1b3874032a726546d9af756cc7a0c08ff9331006bfb +EBUILD kea-9999.ebuild 1704 BLAKE2B f479319090a275bc18f010f230d7d44ce87715cba8a72aa87c97a44226c7998f9729558a0384e3166e119381462cf9a21ec8034790f8f4c9226929e31700d904 SHA512 371cbaf28455c69bcde417f25b318dee1425ee238058125d1a15ebcc57cfdab52735a8ba663b51abc0efb1b3874032a726546d9af756cc7a0c08ff9331006bfb MISC metadata.xml 522 BLAKE2B bef1cd45abb947d0273e3ff4898930f9301af1a002e2f041eda4af09c7d8fab0f226498071fe8c8db6732d16427990cd580cc49f119d0258dad29e875299d7da SHA512 f879683f8d58f4367e72d623b95915257218926405e83baae3ef1610dba2c14c347f23157c2d99835663409b14ff909e586eba53b4455de763afc36a38fb8975 diff --git a/net-misc/kea/kea-1.7.3.ebuild b/net-misc/kea/kea-1.7.3.ebuild deleted file mode 100644 index c915fee4402e..000000000000 --- a/net-misc/kea/kea-1.7.3.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs user - -MY_PV="${PV//_p/-P}" -MY_PV="${MY_PV/_/-}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server" -HOMEPAGE="http://www.isc.org/kea/" -if [[ ${PV} = 9999* ]] ; then - inherit autotools git-r3 - EGIT_REPO_URI="https://github.com/isc-projects/kea.git" -else - SRC_URI="ftp://ftp.isc.org/isc/kea/${MY_P}.tar.gz - ftp://ftp.isc.org/isc/kea/${MY_PV}/${MY_P}.tar.gz" - [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script -SLOT="0" -IUSE="mysql +openssl postgres samples" - -DEPEND=" - dev-libs/boost:= - dev-cpp/gtest - dev-libs/log4cplus - mysql? ( dev-db/mysql-connector-c ) - !openssl? ( dev-libs/botan:2= ) - openssl? ( dev-libs/openssl:0= ) - postgres? ( dev-db/postgresql:* ) -" -RDEPEND="${DEPEND}" -BDEPEND="virtual/pkgconfig" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - [[ ${PV} = *9999 ]] && eautoreconf - # Brand the version with Gentoo - sed -i \ - -e "/VERSION=/s:'$: Gentoo-${PR}':" \ - configure || die -} - -src_configure() { - local myeconfargs=( - --disable-static - --enable-perfdhcp - --localstatedir="${EPREFIX}/var" - --without-werror - $(use_with mysql) - $(use_with openssl) - $(use_with postgres pgsql) - $(use_enable samples install-configurations) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - newconfd "${FILESDIR}"/${PN}-confd ${PN} - newinitd "${FILESDIR}"/${PN}-initd ${PN} - keepdir /var/{lib,run}/${PN} /var/log - find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die -} - -pkg_preinst() { - enewgroup dhcp - enewuser dhcp -1 -1 /var/lib/dhcp dhcp -} diff --git a/net-misc/kea/kea-1.7.5.ebuild b/net-misc/kea/kea-1.7.5.ebuild new file mode 100644 index 000000000000..2f6a4dc21e8a --- /dev/null +++ b/net-misc/kea/kea-1.7.5.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +MY_PV="${PV//_p/-P}" +MY_PV="${MY_PV/_/-}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server" +HOMEPAGE="http://www.isc.org/kea/" +if [[ ${PV} = 9999* ]] ; then + inherit autotools git-r3 + EGIT_REPO_URI="https://github.com/isc-projects/kea.git" +else + SRC_URI="ftp://ftp.isc.org/isc/kea/${MY_P}.tar.gz + ftp://ftp.isc.org/isc/kea/${MY_PV}/${MY_P}.tar.gz" + [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script +SLOT="0" +IUSE="mysql +openssl postgres samples" + +DEPEND=" + dev-libs/boost:= + dev-cpp/gtest + dev-libs/log4cplus + mysql? ( dev-db/mysql-connector-c ) + !openssl? ( dev-libs/botan:2= ) + openssl? ( dev-libs/openssl:0= ) + postgres? ( dev-db/postgresql:* ) +" +RDEPEND="${DEPEND} + acct-group/dhcp + acct-user/dhcp" +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + default + [[ ${PV} = *9999 ]] && eautoreconf + # Brand the version with Gentoo + sed -i \ + -e "/VERSION=/s:'$: Gentoo-${PR}':" \ + configure || die +} + +src_configure() { + local myeconfargs=( + --disable-static + --enable-perfdhcp + --localstatedir="${EPREFIX}/var" + --without-werror + $(use_with mysql) + $(use_with openssl) + $(use_with postgres pgsql) + $(use_enable samples install-configurations) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + newconfd "${FILESDIR}"/${PN}-confd ${PN} + newinitd "${FILESDIR}"/${PN}-initd ${PN} + keepdir /var/{lib,run}/${PN} /var/log + find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die +} diff --git a/net-misc/kea/kea-9999.ebuild b/net-misc/kea/kea-9999.ebuild index c915fee4402e..2f6a4dc21e8a 100644 --- a/net-misc/kea/kea-9999.ebuild +++ b/net-misc/kea/kea-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit toolchain-funcs user +inherit toolchain-funcs MY_PV="${PV//_p/-P}" MY_PV="${MY_PV/_/-}" @@ -34,7 +34,9 @@ DEPEND=" openssl? ( dev-libs/openssl:0= ) postgres? ( dev-db/postgresql:* ) " -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + acct-group/dhcp + acct-user/dhcp" BDEPEND="virtual/pkgconfig" S="${WORKDIR}/${MY_P}" @@ -69,8 +71,3 @@ src_install() { keepdir /var/{lib,run}/${PN} /var/log find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die } - -pkg_preinst() { - enewgroup dhcp - enewuser dhcp -1 -1 /var/lib/dhcp dhcp -} diff --git a/net-misc/libteam/Manifest b/net-misc/libteam/Manifest index 68212e1f692c..949a191fa015 100644 --- a/net-misc/libteam/Manifest +++ b/net-misc/libteam/Manifest @@ -2,7 +2,7 @@ DIST libteam-1.22.tar.gz 544302 BLAKE2B 8c20471506546de6f45989513ed22fe79f694feb DIST libteam-1.29.tar.gz 175970 BLAKE2B 8fa4192fc90b3a7ebe7ba9330191ad81e9c27dbec8e6cb657cf287cc66e4d3cc072ff032ea48311368401d7ba89b31015a9ca0c285a262336d6babfcb6457833 SHA512 adcf3706abd7fd2641388606dc2f39584607ec1f455bc52409c3905961cea446baecc5af80b6605ebb7167aef6f539b99f641cb39d97d396f32cea2aeb676561 DIST libteam-1.30.tar.gz 175985 BLAKE2B 10ad03167c627ab7a51c5a8bcaa7fa95233c10a8df72c602e6a053bf48560653e053a5c161d61cba5e2c8860c80e17e04e953ae0fb483d00fc70d8b56630e93c SHA512 c037fb20b31fe018f508ccd733037267bb628b569f5689f5748e3daa467239d4d5ffe00ca389022d4dddaefed11828204b2887fdccf1a76327b56ec7fa0a0be5 EBUILD libteam-1.22.ebuild 1278 BLAKE2B 760afca7072e722f981b8a492accd81ca33907389f601a6baa8b74c025c8011c69d5f2ad67d7db1682a6cc9f52edc6158d79743df2090bdd972c2563198e3420 SHA512 b041b9a44a39c69947febd1747d238cc38ebddd4ca55e2032523875d388edbf0d41744d9dab2b6c3a78d76e6c3d286e28ed98fcc325889f770f147224e0f676a -EBUILD libteam-1.29.ebuild 1373 BLAKE2B 4b4ef0e895ef437b1a4ec01e6bff9964f9f3ec96d98345cd9b5b2a9c9f389c793d2005c2932be7fce0414f9cc0418a03cbb1b4660d3e37834496a2e26fb664f5 SHA512 060d16f4e5120b6325aee0eafda90d5b48d2af6bb3d1ec9887f570e4b748eea1d074750646fe6785850466318df0bffcfc9df83a9ac7395128606c1dac2d2da9 -EBUILD libteam-1.30.ebuild 1373 BLAKE2B c083daa904b401950a8fff15670e08be65ffe08acf2cdd60c0a8c8e7f4873e3dd18ea8b5eb6dd8475c3cac7a4fa4b56de03d7a2cd27b9b3cbb871335cf49a2b4 SHA512 8b90a7e6631e8e0e098086658087af55eb17aa941c6b2d0290f08948056f75e2c57f8db15833c7a98a324f40e41c6409fd84c6966b18798f08a3d0635bf6f191 -EBUILD libteam-9999.ebuild 1358 BLAKE2B 82baa62b2b443b492034359f4fa469d0fc7ed7f6cfa75d45c13281d6ec6be0222c4119a3f6c23024a4f52dbb6bea1b8b8342c4edf545592bb7406d8e23c03714 SHA512 beb5dafa39a3671e3bb91d45f524e4a25c1fe0e0a0c4999701f5fc23dbb7c8c51fcaabc49f4bf172b309d7e23ecbefe084113d73c04eba11e58813de3529e5aa +EBUILD libteam-1.29.ebuild 1374 BLAKE2B cb8c50775142338159d2c2082c749b850d4774b9ed7d6f4f6369ef07e9f82b5290720f1a8aafd8228ff5f13b0abfd76371f724f207583a032237c97258c21948 SHA512 334bc0f0733dba9b08967426aa8f1d6c3509d3a0dd27195290258a3db5a23c2225f3d8719d5b8f4ebf74429c616ce9daedda804d4c35bbc844425e14d9067653 +EBUILD libteam-1.30.ebuild 1374 BLAKE2B cb8c50775142338159d2c2082c749b850d4774b9ed7d6f4f6369ef07e9f82b5290720f1a8aafd8228ff5f13b0abfd76371f724f207583a032237c97258c21948 SHA512 334bc0f0733dba9b08967426aa8f1d6c3509d3a0dd27195290258a3db5a23c2225f3d8719d5b8f4ebf74429c616ce9daedda804d4c35bbc844425e14d9067653 +EBUILD libteam-9999.ebuild 1359 BLAKE2B 245cb586cedf580935c7a55198f8c907fdefaad07b452a63066484f3ebbc01552d67310b55022407d9ad272b456bd27e9152e835416ed467df5a26c5b6a6dce6 SHA512 0c08712c4a2e6ec840308df9975a7a618cca15843b8d3602260af06acf075a9074d171d179bc037cb0c41801a3b58f3b810f95b2ca0b7841aec388b766f3b167 MISC metadata.xml 334 BLAKE2B c4d7a143b2617bc5896b42db67b45115231eef0177c1bd6d4878fcce85b1db00085153aff0a51b7e4b877b2bc68aeeb7769f8360042a6e6e21d5c9371bcc2e03 SHA512 0cdfae73365dfd53d676ae7ab8e9a0689f0a117542d5fb99e1c5987ae41388f8f8c54b37829915035f417b7e9ac30b6f2abccf95b8a3202c7a6731530201d2d4 diff --git a/net-misc/libteam/libteam-1.29.ebuild b/net-misc/libteam/libteam-1.29.ebuild index d02ffcdc084e..d4c4a38f6d61 100644 --- a/net-misc/libteam/libteam-1.29.ebuild +++ b/net-misc/libteam/libteam-1.29.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -36,7 +36,7 @@ Only >=3.3.0 kernel version support in team mode" DOCS=( README ) -src_prepare(){ +src_prepare() { default eautoreconf } diff --git a/net-misc/libteam/libteam-1.30.ebuild b/net-misc/libteam/libteam-1.30.ebuild index cf1260d2fc5b..d4c4a38f6d61 100644 --- a/net-misc/libteam/libteam-1.30.ebuild +++ b/net-misc/libteam/libteam-1.30.ebuild @@ -36,7 +36,7 @@ Only >=3.3.0 kernel version support in team mode" DOCS=( README ) -src_prepare(){ +src_prepare() { default eautoreconf } diff --git a/net-misc/libteam/libteam-9999.ebuild b/net-misc/libteam/libteam-9999.ebuild index 44894e0e9a66..f28587593458 100644 --- a/net-misc/libteam/libteam-9999.ebuild +++ b/net-misc/libteam/libteam-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -36,7 +36,7 @@ Only >=3.3.0 kernel version support in team mode" DOCS=( README ) -src_prepare(){ +src_prepare() { default eautoreconf } diff --git a/net-misc/lksctp-tools/Manifest b/net-misc/lksctp-tools/Manifest index cce2f3cae4d6..41386e5cd80f 100644 --- a/net-misc/lksctp-tools/Manifest +++ b/net-misc/lksctp-tools/Manifest @@ -3,5 +3,5 @@ AUX lksctp-tools-1.0.8-prefix.patch 332 BLAKE2B a83cc8172bb96f7cade25b049608ef46 DIST lksctp-tools-1.0.17.tar.gz 795762 BLAKE2B a37b653b1f9effd039c5241669c767d8b0918bf4790d9f017c70eefd4ce1efdbe5d76f6e88e15ddf214308267ee62a6004d2af781ad720ef847e8d99ae5a55f6 SHA512 055719130b7dda4da9cf002dcd5f1fb3d8cf75300a99365976e087b2b6971b4ccd357f95b515a44e37874af161f7b7f9b42c60191aff938d18fada5a49aa44c4 DIST lksctp-tools-1.0.18.tar.gz 560302 BLAKE2B 6151109a0f43044048ff64a6ca021710f28e695017b79513412a44999ec67bdbe7cb0bbba7d5e0deb28b8fdd097379100046ef77508678f726f18944b9799f22 SHA512 1d7275fadc0f2270865307cff2645810e9bab6c1a97e70be6115cace737334dbdd87a072fae25b89dd9cac2e05974556542de70ea8ef70b9e4f14873c82a5055 EBUILD lksctp-tools-1.0.17.ebuild 1259 BLAKE2B de38f2f5fa016f758c50ab838b79512505f0331ee75d1e56db4269ac49f3d8a07cd1994159f39d108b761f4ef6bc74da7d5cfc264215dfce7d3d5e78d031c02d SHA512 19a60c2c213b4810907d504243c7b479957fa2be4ca2748773ebdae738d847918ea4185070605b7c5d2a7cd4e422483326c684f0116d5cfd52ea4791f8334130 -EBUILD lksctp-tools-1.0.18-r1.ebuild 1390 BLAKE2B d2bb828a8c5448fef14bec8074fed95f224baa12bba57f407305c739b6c45e9cd239c1a15c6f545e6a1998dc922ea48230899625d2c555db68334a98e85846d1 SHA512 f19396b0994a99ffccd96f155bbf8e9e74ba0b0e2b9e95d65a214327d7edd094f6830a058e2cdb5c637a8e6001f84f176d38c3f076160fda32a5d96f58ef674c +EBUILD lksctp-tools-1.0.18-r1.ebuild 1346 BLAKE2B d1b98efb451a2101122c304a8f2bfd2d03a94eba700f40f084ddb3cbf09b01290a0f576122f3693931eed9ba3525902d134381ca3471b3d01ee78ad799a9be5a SHA512 9d3fdd04ab31a89d98c5f34b40bf9b4df45dab3413443c5b3c1eceb10e02f0444a53aab6a6fb3bc4c8eeafc15e29c2a0608f9524c1f47386df71ca438797678e 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 b8c39e9d66a8..7b8e8421b759 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 @@ -39,7 +39,6 @@ multilib_src_configure() { append-flags -fno-strict-aliasing local myeconfargs=( - --docdir="${EPREFIX}"/usr/share/doc/${PF} --enable-shared $(use_enable static-libs static) ) diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest index 85e54b11cbf9..92edf8cb767f 100644 --- a/net-misc/lldpd/Manifest +++ b/net-misc/lldpd/Manifest @@ -9,6 +9,6 @@ AUX lldpd.service 205 BLAKE2B 787e9d19def1d4d3cfe207e928b994d46b4fda5d2431ab147d AUX tmpfilesd 32 BLAKE2B ad674d771fa90bde09e231ef21358928de2f3eccdbe0e9b3e2a0c0438a55899e858c98dc3d49714ee07cec4c921d15d955fd0c34f6dfaa4f3667bc4c0e9dfcde SHA512 58b11cc9241c4da25bf53da31b1ed64a489a7bd0998bc8a395659d77975607fd6ab035ffc830ddbfe2e5be244ff7c308900358452aee728fd56a4a7d4e80ffde DIST lldpd-1.0.3.tar.gz 1605563 BLAKE2B 968d1c2e046049fd9ba9e9af7b8cb4f531fbd99f41a9157679f3694f800b0da1a4dd3b21feac583fa5cde3f57b022e2d6ee543ea349e1136037ba10419e3c855 SHA512 bae121a707d06726830dbb6b45210c1ed23aa2a99349a68d088b3ae3109504a6b462c7b0abf8543297083294519be2878779edf1a41bb73fe002bb6c9f966ef1 DIST lldpd-1.0.4.tar.gz 1607806 BLAKE2B 28fc45b0f2fe958e5d0aac370b54fda286aa4f04c228eeb12a2f60ea6643f63a7de3831ee3f0a060cd4de3849e75b58fdb6a868dc1aa0f8dc4b516fdd4f4ead0 SHA512 a5537acf2ca3be22a70124101c1c70713e655aee8d6344d25901aa5eff1efd5afb221364b9c92388bf3edf74c4cd5841fb7c9ba77745ac3cd80051bc0bad1ac9 -EBUILD lldpd-1.0.3.ebuild 2575 BLAKE2B cd1daa54be890c1b259525ea1ed7bbb1e23b54e08a2ff98c1f43a7f17ab9d4df3e064148cd8cb48c90c87571cd841a94ec15321797e9522af58095afaef16b95 SHA512 564899e0e270b9f3ca37f3b4df5e45efca7776b32871babbf8428dbb063978839114d7362a76feda7e7995ab0e6ce42c94a8ec518d60acbe4de98d7bdf791bfd -EBUILD lldpd-1.0.4.ebuild 2549 BLAKE2B 0e63a4b563b35ee90072bb756036300bf5ae2a53ee0fd7f9386e9a3c85ac4b0beec271e98adc8631eee38b3c86c11101e9ffa826afa738a8a787e5c941664689 SHA512 1d33c741feb750d164449cbf61978fd520a229e1180939a68b64233d76adbd605024520eb2d093bfc9836195ab62a8751c5ad95f9d48b9ba3819751ebfe83d30 +EBUILD lldpd-1.0.3.ebuild 2541 BLAKE2B 91a6ce4d2e1503f2bbff6f29c5819202e069a9fa06b033438ff4d98525fe389f8d11104ff4a058a83301e7ddea473599e277d6e2c8ba01db2bc0d0605761bcff SHA512 c828991bae9872304317d2436445df7d0db20f97a8902ba2a4effd12d6730bd66ec7b9130766baee6b7b31b076efed529afb811ca2f96b10298eadb4400a15ff +EBUILD lldpd-1.0.4.ebuild 2515 BLAKE2B 4a9c52827401c9cd32d6e914fe8e963498b57bc7bffbb0f58336385499f442c2df114d9e085aeda257016779b25a207131089228294f8382e6be00efae42f1f1 SHA512 2b78ff27eda0ba7ce765f03f222ee790d62bcf7d1df780d4f09a32edca424d32a245eecd8e0575898603e8fe0292602f0e0c82fa6bcbca317d4edf5a0313a663 MISC metadata.xml 2768 BLAKE2B 61820f8fee8d710e94de066011fddc103a3ee606ab7a587e44ba1b4c414fa20599036be8e9a3d31b94b4e55a3396423f9da7ba3b5c08e6d9966024fcf552121f SHA512 c99072e81bdbebe79208b85dc13511d25ce8116faed76d5b8ec8485775801761b23dd857edbd7025b01572ceaab9f32ccf77e95a348426ab6b6835ffcc99f511 diff --git a/net-misc/lldpd/lldpd-1.0.3.ebuild b/net-misc/lldpd/lldpd-1.0.3.ebuild index 48ccb73bd035..2ecf7a755691 100644 --- a/net-misc/lldpd/lldpd-1.0.3.ebuild +++ b/net-misc/lldpd/lldpd-1.0.3.ebuild @@ -62,7 +62,6 @@ src_configure() { --with-privsep-chroot=/run/${PN} \ --with-lldpd-ctl-socket=/run/${PN}.socket \ --with-lldpd-pid-file=/run/${PN}.pid \ - --docdir=/usr/share/doc/${PF} \ $(use_enable cdp) \ $(use_enable doc doxygen-man) \ $(use_enable doc doxygen-pdf) \ diff --git a/net-misc/lldpd/lldpd-1.0.4.ebuild b/net-misc/lldpd/lldpd-1.0.4.ebuild index b3e6c9c49fbb..92e05bbf1444 100644 --- a/net-misc/lldpd/lldpd-1.0.4.ebuild +++ b/net-misc/lldpd/lldpd-1.0.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -61,7 +61,6 @@ src_configure() { --with-privsep-chroot=/run/${PN} \ --with-lldpd-ctl-socket=/run/${PN}.socket \ --with-lldpd-pid-file=/run/${PN}.pid \ - --docdir=/usr/share/doc/${PF} \ $(use_enable cdp) \ $(use_enable doc doxygen-man) \ $(use_enable doc doxygen-pdf) \ diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest index e5b00a0f04a1..5cc5d269d357 100644 --- a/net-misc/memcached/Manifest +++ b/net-misc/memcached/Manifest @@ -7,13 +7,9 @@ AUX memcached.confd 872 BLAKE2B d57dfb6da370f5e980b9e7143323a6cf51fecea802e5d034 AUX memcached.init2 2205 BLAKE2B d27dbf6fb4d72ec49ff89cb3957770a25afe467c96c05648e75dddea47cdacee09d073e138e72d3b8671c3538e2005049dcd05440083b03e25136b3fd206c4d9 SHA512 b7b68362a4e4b24e9db893b85c3959184d17ea0bf8346a38561235461cfc8c94cf6d546f1c31bbe34bb7ca3409db2209171dd08214d5f057d00c65885663992a AUX memcached.service 273 BLAKE2B bfe217d2ec7fd9aead468f4f5b100843287a49bef163dd106349f3275acbffaca60e09c8b723a566a96065d8208eb52f44f7c3ad24a8aaf3980471e8d0478b77 SHA512 647f06160142c5e38e4009203609bf2152dd1bdd4b94be9e2bf3c5741e631419fc9cf300575a65a905956eec916d736c4e3b3d3e3c80438f1b33cd10fe4dcd95 DIST memcached-1.5.14.tar.gz 485076 BLAKE2B 729b4b708e921184bfedadbb02b0304eb09dcebbbd1420605deb608dcd7dea25a8982ca0f387f237a1a6412b4682372018c593396ef9bff5aa0fa901c0fdafd6 SHA512 d06083d971d0a40195b4dfb252a3bf7c3a0d20b2dcad56726ff9e0b87ba84024309300516dad40181f1b7af4d9c4f35924383977c5e1ff9b5f13d2ef05f684ed -DIST memcached-1.5.19.tar.gz 517380 BLAKE2B 8c6e7c87e786d88c783da87396daec9deb0c9f8c4112fa7cec6d79e8e96505576c2b7f3dff91317a3f45582322cfdb435535a41bb537b0a0bfec9df6f8d5986f SHA512 4445f383e18ffc53071c13b495c3864978658f4f6f439ab4579dd831fc12ad4850e04e9526954608ae627b0b23a9d6cb327560f02d15abff23e12f5d7c1723b4 -DIST memcached-1.5.20.tar.gz 531035 BLAKE2B fcabbb8deac585f20100855bbdd27616077e0f129a8537c39869ceb251fae8d598c64998846120f63f29a690afdc2a3603f87bb21ecc473e13f5ef9e9c48bbb9 SHA512 07b125971fcec2cd06797fe16e9825e18b9d3446f6b91583f82f1b50920cd0e55c65506ebdf5fcef7b08d92f9641a20859ba67b3dd3986ba5624d0d6f494293d DIST memcached-1.5.21.tar.gz 532631 BLAKE2B eaed8eae81c7874c48dfc6df5611d83d21a69a19c9b79bddbf909d15f1c84b3c03416002bf0beff07a8e6502741ad6f776e1cc86cf4b16840ea83c727db3c80b SHA512 4ade3e15e6821b76f086b4933f5599248f8de7e7b2ae106dc8ecbc8a5073a1966e4c3956413fd57387bb88fca2c0e95b9a3ce7bfce19c42bec584a3268f06998 DIST memcached-1.5.22.tar.gz 532713 BLAKE2B 90787522f36d9d4389438334572725df18050ae67bda2d97cde67b01492ca81772ddf7e83e02f71031ca909402a68f3db085ef6bece6e032ce580676a8a722f3 SHA512 19804c2847679eb018a0221b0717ebbcd2cd33b7f03176cc0d77b7405152dc944d3f5c39d0d81fcb6c08a2fa9317959e25587e7cb50718fdb6675288b2b078aa EBUILD memcached-1.5.14.ebuild 2931 BLAKE2B 7e7051a674ed35ed33e0b1b4ded10a9191c408ee49d504c9fd8b5a039428b3a8db13402702591ec66ad642681416902386084b85702093864700c8e154b7c4cb SHA512 be0362596b9d6054de0423d6b450fb883889e2f548d4c2a105e3b26a97fea4194100b18ab64fa52926e5f5b4dce663435200e12857d2967e9e2ecd4e0fc5f8ae -EBUILD memcached-1.5.19.ebuild 2938 BLAKE2B b67de575ce5c41510d4d0f8c19999e8f6b327460eff5b61192532e682981d27a69142f781e1b6f889b37bb69705fe375e6347d27dedca2c186ea9687dd55b71c SHA512 3989cbe5a174f963dc4daef97add3183f05dc45c2b1a5f1b937ac7d4c700f4ea633ed84697d61a08dfa147568ccde35b77b44cb05cfd95c18ad712ed641999a8 -EBUILD memcached-1.5.20.ebuild 2938 BLAKE2B b67de575ce5c41510d4d0f8c19999e8f6b327460eff5b61192532e682981d27a69142f781e1b6f889b37bb69705fe375e6347d27dedca2c186ea9687dd55b71c SHA512 3989cbe5a174f963dc4daef97add3183f05dc45c2b1a5f1b937ac7d4c700f4ea633ed84697d61a08dfa147568ccde35b77b44cb05cfd95c18ad712ed641999a8 -EBUILD memcached-1.5.21-r1.ebuild 2968 BLAKE2B 18bd2d8ae49c0c0ad850e316b388ae752d782ee548a85924c0ef6163d4ad6a13d52f208596dbbb2ed23a31164a69f8ecd7efa091119de26c588dfac044b30099 SHA512 160923ef6bb1ed42c839ba16473188af5c86ce9db62c4780bae33ba882128a58f395d6b598fcf7bf10d9c1187983789706dc4f75922590e0956acc3bace4c921 +EBUILD memcached-1.5.21-r1.ebuild 2966 BLAKE2B 21167f473b440b4a392dab1f34fa5db31365ffc0374d575a7f2159229edbfc10bc7e00cd2f0b63608ec69156c9f7cd28c51effba799635f4467efce2f39ba198 SHA512 bd16b38322d1aa577c85563aac5c115536b97102d97e655af5b84d69cacadf8bcb714143e695d2afd668eea62e01fcb1064bce948d6862d88ea2ca006fe4f4f8 EBUILD memcached-1.5.22.ebuild 2968 BLAKE2B 18bd2d8ae49c0c0ad850e316b388ae752d782ee548a85924c0ef6163d4ad6a13d52f208596dbbb2ed23a31164a69f8ecd7efa091119de26c588dfac044b30099 SHA512 160923ef6bb1ed42c839ba16473188af5c86ce9db62c4780bae33ba882128a58f395d6b598fcf7bf10d9c1187983789706dc4f75922590e0956acc3bace4c921 MISC metadata.xml 1134 BLAKE2B 3313deb6a6fda71074f08e202dcd43b53fcd4ab9af50b78b84aac67309f3c2a4a966f874c9d8f5c4688542e6fe03d4e2f7b3f854842638210ab64fc35bcdab30 SHA512 c3ce23016f9ea9067f6628f246866e3fcee6624f1a21360e448c7eebc3babd8fa3717966e58eeb0b6fd9885730609fa732a3e10b0a4dfaa57b0f0acc85c20bb4 diff --git a/net-misc/memcached/memcached-1.5.19.ebuild b/net-misc/memcached/memcached-1.5.19.ebuild deleted file mode 100644 index 77a0b3f38a8a..000000000000 --- a/net-misc/memcached/memcached-1.5.19.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools eutils flag-o-matic systemd user - -MY_PV="${PV/_rc/-rc}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="High-performance, distributed memory object caching system" -HOMEPAGE="http://memcached.org/" -SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz - https://www.memcached.org/files/old/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later - -RDEPEND=">=dev-libs/libevent-1.4:= - dev-lang/perl - sasl? ( dev-libs/cyrus-sasl ) - seccomp? ( sys-libs/libseccomp ) - selinux? ( sec-policy/selinux-memcached )" -DEPEND="${RDEPEND} - test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )" - -S="${WORKDIR}/${MY_P}" - -RESTRICT="!test? ( test )" - -src_prepare() { - epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch" - epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch" - epatch "${FILESDIR}/${PN}-1.4.4-as-needed.patch" - epatch "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch" - sed -i -e 's,-Werror,,g' configure.ac || die - sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die - eautoreconf - use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN - - # Tweak upstream systemd unit to use Gentoo variables/envfile. - # As noted by bug #587440 - sed -i -e '/^ExecStart/{ - s,{USER},{MEMCACHED_RUNAS},g; - s,{CACHESIZE},{MEMUSAGE},g; - s,OPTIONS,MISC_OPTS,g; - }; - /Environment=/{s,OPTIONS,MISC_OPTS,g;}; - /EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;}; - ' \ - "${S}"/scripts/memcached.service - default -} - -src_configure() { - econf \ - --disable-docs \ - $(use_enable sasl) - # The xml2rfc tool to build the additional docs requires TCL :-( - # `use_enable doc docs` -} - -src_compile() { - # There is a heavy degree of per-object compile flags - # Users do NOT know better than upstream. Trying to compile the testapp and - # the -debug version with -DNDEBUG _WILL_ fail. - append-flags -UNDEBUG -pthread - emake testapp memcached-debug CFLAGS="${CFLAGS}" - filter-flags -UNDEBUG - emake -} - -src_install() { - emake DESTDIR="${D}" install - dobin scripts/memcached-tool - use debug && dobin memcached-debug - - dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt} - - newconfd "${FILESDIR}/memcached.confd" memcached - newinitd "${FILESDIR}/memcached.init2" memcached - systemd_dounit "${S}/scripts/memcached.service" -} - -pkg_postinst() { - enewuser memcached -1 -1 /dev/null daemon - - elog "With this version of Memcached Gentoo now supports multiple instances." - elog "To enable this you should create a symlink in /etc/init.d/ for each instance" - elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/" - elog "Please see Gentoo bug #122246 for more info" -} - -src_test() { - emake -j1 test -} diff --git a/net-misc/memcached/memcached-1.5.20.ebuild b/net-misc/memcached/memcached-1.5.20.ebuild deleted file mode 100644 index 77a0b3f38a8a..000000000000 --- a/net-misc/memcached/memcached-1.5.20.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools eutils flag-o-matic systemd user - -MY_PV="${PV/_rc/-rc}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="High-performance, distributed memory object caching system" -HOMEPAGE="http://memcached.org/" -SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz - https://www.memcached.org/files/old/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later - -RDEPEND=">=dev-libs/libevent-1.4:= - dev-lang/perl - sasl? ( dev-libs/cyrus-sasl ) - seccomp? ( sys-libs/libseccomp ) - selinux? ( sec-policy/selinux-memcached )" -DEPEND="${RDEPEND} - test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )" - -S="${WORKDIR}/${MY_P}" - -RESTRICT="!test? ( test )" - -src_prepare() { - epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch" - epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch" - epatch "${FILESDIR}/${PN}-1.4.4-as-needed.patch" - epatch "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch" - sed -i -e 's,-Werror,,g' configure.ac || die - sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die - eautoreconf - use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN - - # Tweak upstream systemd unit to use Gentoo variables/envfile. - # As noted by bug #587440 - sed -i -e '/^ExecStart/{ - s,{USER},{MEMCACHED_RUNAS},g; - s,{CACHESIZE},{MEMUSAGE},g; - s,OPTIONS,MISC_OPTS,g; - }; - /Environment=/{s,OPTIONS,MISC_OPTS,g;}; - /EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;}; - ' \ - "${S}"/scripts/memcached.service - default -} - -src_configure() { - econf \ - --disable-docs \ - $(use_enable sasl) - # The xml2rfc tool to build the additional docs requires TCL :-( - # `use_enable doc docs` -} - -src_compile() { - # There is a heavy degree of per-object compile flags - # Users do NOT know better than upstream. Trying to compile the testapp and - # the -debug version with -DNDEBUG _WILL_ fail. - append-flags -UNDEBUG -pthread - emake testapp memcached-debug CFLAGS="${CFLAGS}" - filter-flags -UNDEBUG - emake -} - -src_install() { - emake DESTDIR="${D}" install - dobin scripts/memcached-tool - use debug && dobin memcached-debug - - dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt} - - newconfd "${FILESDIR}/memcached.confd" memcached - newinitd "${FILESDIR}/memcached.init2" memcached - systemd_dounit "${S}/scripts/memcached.service" -} - -pkg_postinst() { - enewuser memcached -1 -1 /dev/null daemon - - elog "With this version of Memcached Gentoo now supports multiple instances." - elog "To enable this you should create a symlink in /etc/init.d/ for each instance" - elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/" - elog "Please see Gentoo bug #122246 for more info" -} - -src_test() { - emake -j1 test -} diff --git a/net-misc/memcached/memcached-1.5.21-r1.ebuild b/net-misc/memcached/memcached-1.5.21-r1.ebuild index 4bd4eefadece..98253142de8a 100644 --- a/net-misc/memcached/memcached-1.5.21-r1.ebuild +++ b/net-misc/memcached/memcached-1.5.21-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later RDEPEND=">=dev-libs/libevent-1.4:= diff --git a/net-misc/minissdpd/Manifest b/net-misc/minissdpd/Manifest index c4f11e04970c..51ba387b70c1 100644 --- a/net-misc/minissdpd/Manifest +++ b/net-misc/minissdpd/Manifest @@ -1,5 +1,5 @@ AUX minissdpd.confd 487 BLAKE2B aeb624644debe2e9ba438f9839f526fc9411e6f4d355bf46764c5b7b59a62776c16c93d4112821159835e9d9f174f2af443c0d07a10823b41182910d12899947 SHA512 5ac723cb5b3d3f8bb97989cffb174f22566fcebff304e40f12ca5144cfa94b00614fdf6925e2c5a1dd0f8fa533aac12e991bad0d0909cbdd90a9b7ed73e0c296 AUX minissdpd.initd-r2 1522 BLAKE2B 35bde96e182529f0dd10ec4081c495ba1f52706dc191e29fa99ebb7d37b302578e492f705d4f724744ec3a9ca455730f01294e2a781529c3750193fd8e84cf50 SHA512 6d14fa0730b4c1f0e6a6765c80250ebd01d69c6fd3341049fae276a3d0ae2ec806cdfeb3b7897be0b62e426c7c9d7fb59514a0d67bb751a2e41f9b9616cc9ade DIST minissdpd-1.5.20190824.tar.gz 37300 BLAKE2B 3a04f6af0af8ce5d26e4860ceafe2c52f1ee562f179094fbcba3485c85ae75b7374fd7fa8f89ec6d9ce2a10bb94120618de40e0191fc7ecdd1e813a2b9c5d6af SHA512 79a14482b69a88b778e484a3b3e98964c420ff7576ac818ba60fd5e07f5b31754cdef3ee00d9189ba0a33f0268f11acd1f7c4222d8d0958920d1f568ec7755e2 -EBUILD minissdpd-1.5.20190824.ebuild 676 BLAKE2B 1d2e443df9406d31e7942c150b430eee7c68e3550f434b8fc4732db1c593335266864408ae93bb669d769dcfc83a9a1524d234a5bafca2446fc06fab63cb410d SHA512 f3429b14b6e2e7d019c582e7354f073159526299c3638e20622a5030cc49a2756d098356facd4974be82f14260e84775fd598e23ad05a0b2ce49c4728a94550e +EBUILD minissdpd-1.5.20190824.ebuild 675 BLAKE2B e45aa1fc469be382e2b90c22d1af62522ebcc4059e89bc6a902fb7c25c0f07b3c8a2655b7237b3ac77f4aeca36681dba6d94cbb09f26c0a7dad2b4919def5342 SHA512 ca94ce5f8c01f040587ae4772cf80d3fc2977216d9d9e897c9cc0e62019e23c52619c77eba8b5ecb4faa2f5ba2d731ce0d16fbc84207e1f678cec9dcda2c58c6 MISC metadata.xml 360 BLAKE2B 7e083fa0362b52310ab298a0684308dbe220a6f6acb7b99c99cf6bf22cb9406da9d34e021a367d50eaefa67f133c5b57f01d4b63aa46887ea15bf4c66ad5e5e4 SHA512 fbf209d07841a834e1d216090879be7a1e739f7ddd1e649d40d24aabe8782d2ed55a37fe8525453cb96137f1c76044087a6b435c786877349bbe939485d7b855 diff --git a/net-misc/minissdpd/minissdpd-1.5.20190824.ebuild b/net-misc/minissdpd/minissdpd-1.5.20190824.ebuild index 35c0a1f9b2be..b1855af3f03f 100644 --- a/net-misc/minissdpd/minissdpd-1.5.20190824.ebuild +++ b/net-misc/minissdpd/minissdpd-1.5.20190824.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -22,7 +22,7 @@ src_compile() { emake CC="$(tc-getCC)" } -src_install () { +src_install() { emake PREFIX="${ED}" install # note: we overwrite upstream's init.d newinitd "${FILESDIR}/${PN}.initd-r2" ${PN} diff --git a/net-misc/monmotha/Manifest b/net-misc/monmotha/Manifest index 9313bfa1e12d..2e390555a6d4 100644 --- a/net-misc/monmotha/Manifest +++ b/net-misc/monmotha/Manifest @@ -1,4 +1,4 @@ AUX monmotha.rc6 825 BLAKE2B 0dd41a71c1f22291f83baeafabe4be4ec627b17e8c2a6df12033718055d737544d55fe30f9e97c775e5243a1b148133472b861f5954b5519302f6cdf4191ff8b SHA512 4d11a2c00d1829664a39ac1338b8dc803d4e32c8703a929b9ce93fdeed42e1ccdb11fa5ab7e837d883dae0a7534b1fe40cba281f4d88a3d291ebd2911e34bd10 DIST rc.firewall-2.3.8 56204 BLAKE2B d699d5eb2c7efdfe258a2f38e2ffc1bb1e568c260c90a77a0fd1d27fbbe5b08ecefcc99d798fd210133ff8f7943fddacfc06a754044434e7525cd6449a92dc46 SHA512 ccdd3427a274204c697a64a8936d4311cb34fbb66738c6afc4c242baad01407d1a36adac7a73b24b432943cd7cec05c9c1d9b2d4845b8b132bd61378c0c2e098 -EBUILD monmotha-2.3.8-r1.ebuild 1228 BLAKE2B 48a264b3d0633e9f41865f491ff824ef5fa548d675d1c97b11f873d71cf1c5d0bc81e6e6c2caca4fab4198b853cb91c28696d8e61d462bf8be9e9e381b23c6e3 SHA512 80e2ea648ea4e4d32809ee69466db988a7f71a68e44e355aa9d1444bcc46fa0015d6c53e1219b2d387b4e81e8e8b7dc0ece240d70ce6269a7de099b9400256ea +EBUILD monmotha-2.3.8-r1.ebuild 1227 BLAKE2B f2330cc73216517c94bea2ef894dce7924e68bc011d5ca599e8c846cc90ec27326cd16e66553ca35c03b47822bfdc8d3f214a51f94cc47444ac3ed025a2d95e2 SHA512 e207dcead1a072dd0f4be2ba38aab32dd545732290ba0ff985fca4db76e49378d8a54f3e6a1d1fbdb5e5847457102411bb8ad30eac4956919cf7ed8d566e69a5 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/net-misc/monmotha/monmotha-2.3.8-r1.ebuild b/net-misc/monmotha/monmotha-2.3.8-r1.ebuild index 1fca00fb467e..00c63fadd917 100644 --- a/net-misc/monmotha/monmotha-2.3.8-r1.ebuild +++ b/net-misc/monmotha/monmotha-2.3.8-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -28,7 +28,7 @@ src_install() { newexe "${S}/rc.firewall-${PV}" monmotha } -pkg_postinst () { +pkg_postinst() { einfo "Don't forget to add the 'monmotha' startup script to your default" einfo "runlevel by typing the following command:" einfo "" diff --git a/net-misc/netevent/Manifest b/net-misc/netevent/Manifest new file mode 100644 index 000000000000..4852bdbc2ba0 --- /dev/null +++ b/net-misc/netevent/Manifest @@ -0,0 +1,3 @@ +DIST netevent-2.0_p20200217.tar.gz 39237 BLAKE2B 543456de89c6c57c7fe086d6697ca687ce0a04fce67efda7162e516eb1dca3f31b6ce31e1f5d7481fe538364f9f597103e3b77f3864c41456c6fe9080bfb424a SHA512 921982c8d9153e627c7931059e6163213ba2ac907f4ae98bcde62645e774cc41077ee728b698f3fad6a639fda19f99f9e43103006abe645f1a4ac4d68cf393c7 +EBUILD netevent-2.0_p20200217.ebuild 670 BLAKE2B ec4534fac8e8bf584485a90f7ba6d1c0af8a88700b961afabf41e1aecd16d921120415ced33bdc48788e5702f1d41a11797f5ec682470f159366dcb97e2cfb2e SHA512 6136d97214a2fb8d5b76d986624fc8768a63f83f770cde890a7fa1830b8d6626e48d42e6bb8f1e54bc3151e4825ce2fff02a8163dba675b31628d80dd19041d1 +MISC metadata.xml 325 BLAKE2B ea7c4382cb7e4e91b04a2b75f7af1924126d4a4592929dd19cc1f8d52b2cb81688c378f75dc12f08edaa12900c2577eec1fcb7f429e351e57bfe40ce525485b0 SHA512 22059c02dc58321f5d7d8dc7ea53ca486c4ff8949ace93f86da6d7d8d173988785590f3983bde637a4f6d511a28b301abb3c76254a113645314cf2f46843517d diff --git a/net-misc/netevent/metadata.xml b/net-misc/netevent/metadata.xml new file mode 100644 index 000000000000..bb16b0e7ff9b --- /dev/null +++ b/net-misc/netevent/metadata.xml @@ -0,0 +1,11 @@ + + + + + chewi@gentoo.org + James Le Cuirot + + + Blub/netevent + + diff --git a/net-misc/netevent/netevent-2.0_p20200217.ebuild b/net-misc/netevent/netevent-2.0_p20200217.ebuild new file mode 100644 index 000000000000..f9936ce3b145 --- /dev/null +++ b/net-misc/netevent/netevent-2.0_p20200217.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +COMMIT="c2066fa55db6f51090e00a240889d2f0cbd0ab4d" +DESCRIPTION="Tool to share Linux event devices with other machines" +HOMEPAGE="https://github.com/Blub/netevent" +SRC_URI="https://github.com/Blub/netevent/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm" +IUSE="doc" + +BDEPEND=" + doc? ( dev-python/docutils ) +" + +S="${WORKDIR}/${PN}-${COMMIT}" + +src_configure() { + tc-export CXX + + # Not Autoconf. + RST2MAN=rst2man.py \ + ./configure \ + --prefix="${EPREFIX}"/usr \ + $(use_enable doc) \ + || die +} diff --git a/net-misc/netpipes/Manifest b/net-misc/netpipes/Manifest index 014b298fe937..0a05042e4bb4 100644 --- a/net-misc/netpipes/Manifest +++ b/net-misc/netpipes/Manifest @@ -1,4 +1,4 @@ AUX netpipes-4.2-string.patch 179 BLAKE2B 12ab1a0d819bd8df023ef873f303304a22ff043651a3a7c7f659caf036320896f76804a26490148872e7203ad9985ea1eef8d20c02e577367562d779622bb117 SHA512 5eedd31bf184dd28b85dbfac07ba008e36d12419339181ad04f427d062f99d6be886720d212fe9f4f612988647be8c4f35e977bb0023f6c20e718da01bdbf9de DIST netpipes-4.2-export.tar.gz 75276 BLAKE2B 95c4b5a587760538522624d8908bab7748cd5ee09af681f90df6edf9c3d04b7c3b5cad39716be41ad416fb7b559ac994eeb412f89ed190f75ee2505ed5732beb SHA512 a875922d179b98d5d663825cb83dc92b515ca3fa77e44ce05941a0de58951840626836b597ea244a660be637d61be3428de7dab413a1c439e4673c82dae02531 -EBUILD netpipes-4.2-r2.ebuild 729 BLAKE2B 99782fa3c34acc3456e8745c8e78d959dba23d5fb8465e13006c1d70870d4abb2d9f8d200f8f94393b158338166924b292beda7099c70d25680d85f24cb49791 SHA512 4848eb2a845a2ec7ca7d103838a0a7552d83e5a5c2bf4f96fd53994822c56d59e19ceb435fdbe619903631b802b4077ac60fff87efee6fad220390ec7e02e3fe +EBUILD netpipes-4.2-r2.ebuild 725 BLAKE2B 7d107119dac37d004257861f41ae57a55ba3c0bca70bc695e2e62004563b6d331c18ca3616b8a6c6b3591dd792570a761f0def91bba4ebae3a9db92b5e5b2833 SHA512 26644912a34914a2d901fbd77c45b3d7ecbf1f98db7c89128d03e03a677aa8f81fd2fe3d504d8c5b878308b9ddbe17369f9ea3c6fa1c920183f490b6ac46869e MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-misc/netpipes/netpipes-4.2-r2.ebuild b/net-misc/netpipes/netpipes-4.2-r2.ebuild index 36be1f20476a..9fbe3848ce4c 100644 --- a/net-misc/netpipes/netpipes-4.2-r2.ebuild +++ b/net-misc/netpipes/netpipes-4.2-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -23,7 +23,7 @@ src_prepare() { epatch "${FILESDIR}/${P}"-string.patch } -src_compile () { +src_compile() { emake CC=$(tc-getCC) } diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest index c07e8e7512df..5101bce42900 100644 --- a/net-misc/nextcloud-client/Manifest +++ b/net-misc/nextcloud-client/Manifest @@ -1,10 +1,8 @@ AUX nextcloud-client-2.6.1-include_tests.patch 679 BLAKE2B 654c729a191643d4a37c301b4be62c495f059c81fcd1f3d8a5a85c579400fd97b86bb057c82bfb790588c9faa6f302a239b1c043ab53530713cb75a88179654c SHA512 c14054e6dc228ca77a659371b3c151e0551477fce3a2678a54da4ba73adbcf972a78114c5649adc3dc813fb01b55bbb812620caac0bc0460519424c2caa6c81f DIST nextcloud-client-2.5.2.tar.gz 18995992 BLAKE2B 6ad23962d327c1feeec34f59092021f7f82f4baeaf973fac0572db55cb03bc8ba2ed0c5037bcbfa80ca057d3976aaf6e402e129f2ec963b3a9c432330ef6aaf3 SHA512 1000b420355d7a4104ca5b41e813d467dcb345b60c79c78ce532de9c58ea89cad10d5565a433409bd512f0f7771c18c7c27974b968c74f84ccfda1ed3510d3ae -DIST nextcloud-client-2.6.0.tar.gz 18789917 BLAKE2B db5c703ecf630a96c141c9c8a7b15894c5a679e1b36217f38a02cd55307fadb5ea19c13ab44371fbbcf0610ddafdd2fb0c1ef6119db04808b94a72dbfb27da9a SHA512 161733540de85c436e204b150fb91b527737fee213e569335248ce7c6e1446497aad5e3fa814b3f98a1ec0cdb94fad64ccc0807eb953a94170f9d40abb478545 -DIST nextcloud-client-2.6.1.tar.gz 18947504 BLAKE2B 940145f9f633ad35e740a92d44d0d7172f7c0883bf29951694dd540213dcfc64f9d480a1cd38b586842dad8c96d3c2948d6e8af6042005f0cd23d9b6d3eab7c6 SHA512 dbda59f5ef6f5f85d8344732be4a0b51e51fa9d0180d5b589f79ab6fe1bacf3a63879aee2f297bc76d6257dd830b38c695cf88f98b9e3f788acf9d6b2f11f619 DIST nextcloud-client-2.6.2.tar.gz 18982053 BLAKE2B 53f4d13b42f50a272012909ed5c937b0a37543f11b8ef0119db670107ed10629d79cb2fcfbbe9148ff847f7ef9e38183f613ae3162206bf9e8f7424ae8280b72 SHA512 b56a7d6751381ffb546b0c8a4b9dbb7991f523ac2ff06dbc87ee36927a4326f57f520ea96a2116ead5d36db6b9900f552834ec9dff8ad5adf80e896829428199 +DIST nextcloud-client-2.6.3.tar.gz 18983292 BLAKE2B 89fdb35c12f4d126c19f31d09d54e027f9edf684fa4904bfba0e7c49a628295aabe00f2b6bc79496876a252dbc9d82772a95bcc59ae4220f8c91dd09bd2661d9 SHA512 ddeb8a32e0208bc415bf421cb3ce05713adb617fa78c0b5cb4d894c9e8d3499dcc495c115de3ea7abb0c402eef4bc64ede8c59a7f056acda47779096fedc8025 EBUILD nextcloud-client-2.5.2.ebuild 2032 BLAKE2B 7d8868094ef1a9c9204165ae2e716f09e1964c2eaad5e74a100492a11b3d180ec6ac66f6fc3374515c01dcf8430f1cf00ee845d1ea27ab6026b98dbc24b78eb0 SHA512 18b8ff5a30c85e4cfeb487e8f1cdd70b088e729b27a3031ec5bcdc1378bcbc9fd8f17d4b225067e2c9c024373cb76c42a32674bcad5f7069fd50c578442b5f17 -EBUILD nextcloud-client-2.6.0.ebuild 1973 BLAKE2B ebe8613b3bae1c5f073404b358e70bc69552eeae1640c06f885af276d36a59b3cfbc182176672dd475e6bd927be12267029be04d791bd137e3bb483f3d2bdb02 SHA512 c10355ffa0c739f8db536b61fa22083af25c3499650ec6a60b42bc5410ec4d85bc1c12c224b8b443a2cc2b17174107fe5b8fb38d508a452f96fd0fd4622e81d3 -EBUILD nextcloud-client-2.6.1.ebuild 2025 BLAKE2B 99b22e5e6ef99827c0846c2a1eaecae496376837d72c216358c530a8c03d3a8bdd607d26753d7c978018d01b285092a42bb77f1681f3fe31715d8acf92916f8b SHA512 d682fdc9c325c314b709d7de19499b3dda98bf3e75f519750e6269018b68e15c81fb7e26959effb9559a9d8a2530c386348cf03f97a58c77e159b816da23a751 EBUILD nextcloud-client-2.6.2.ebuild 2032 BLAKE2B 021d61158a3c0a0516690db20246e5fd55b3f95f1728250f776bc3f4564a8a18879c45c0aa76c14c37f1494bbe1b187a93915aee06f2511e411bff8ad533db46 SHA512 ab6ea6a2c29560330b75e538c387f6e393e53ff935f4a07b9772c0f2f7ef26a4bbad2ec573a826cef64ac1f3787aaefeb74e454d26543067cd8729480572e53d +EBUILD nextcloud-client-2.6.3.ebuild 2032 BLAKE2B 021d61158a3c0a0516690db20246e5fd55b3f95f1728250f776bc3f4564a8a18879c45c0aa76c14c37f1494bbe1b187a93915aee06f2511e411bff8ad533db46 SHA512 ab6ea6a2c29560330b75e538c387f6e393e53ff935f4a07b9772c0f2f7ef26a4bbad2ec573a826cef64ac1f3787aaefeb74e454d26543067cd8729480572e53d MISC metadata.xml 590 BLAKE2B 6ddde648f1b75a5ac3b83ff6b24cdef05b016052257dc99d152db249b029c88854a2b44a2d5a5e7a2b87b9148dbb677fa5bf12066c7f59a9ef5812bdbd57964b SHA512 27f8098bbdec79e03007513d2f4bd6799a399fc5930871542eedf3d018a13cacc1c4dfa23f9c78275c8e5a61830b1b6d4ebe667e3a4ff42541581d5287e940b4 diff --git a/net-misc/nextcloud-client/nextcloud-client-2.6.0.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.6.0.ebuild deleted file mode 100644 index 9b0d12160a76..000000000000 --- a/net-misc/nextcloud-client/nextcloud-client-2.6.0.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils xdg - -DESCRIPTION="Desktop Syncing Client for Nextcloud" -HOMEPAGE="https://github.com/nextcloud/desktop" -SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz" - -LICENSE="CC-BY-3.0 GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="doc dolphin nautilus shibboleth test" - -COMMON_DEPEND=">=dev-db/sqlite-3.4:3 - >=dev-libs/openssl-1.1.0:0= - dev-libs/qtkeychain[qt5(+)] - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtsql:5 - dev-qt/qtwebengine:5[widgets] - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - sys-fs/inotify-tools - dolphin? ( - kde-frameworks/kcoreaddons:5 - kde-frameworks/kio:5 - ) - nautilus? ( dev-python/nautilus-python ) - shibboleth? ( dev-qt/qtwebkit:5 )" - -RDEPEND="${COMMON_DEPEND}" -DEPEND="${COMMON_DEPEND} - dev-qt/linguist-tools:5 - doc? ( - dev-python/sphinx - dev-tex/latexmk - dev-texlive/texlive-latexextra - virtual/latex-base - ) - dolphin? ( kde-frameworks/extra-cmake-modules ) - test? ( - dev-util/cmocka - dev-qt/qttest:5 - )" - -RESTRICT="!test? ( test )" - -S=${WORKDIR}/desktop-${PV/_/-} - -src_prepare() { - # Keep tests in ${T} - sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die - - if ! use nautilus; then - pushd shell_integration > /dev/null || die - cmake_comment_add_subdirectory nautilus - popd > /dev/null || die - fi - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc - -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} - -DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc) - -DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin) - -DNO_SHIBBOLETH=$(usex !shibboleth) - -DUNIT_TESTING=$(usex test) - ) - - cmake-utils_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - if ! use doc ; then - elog "Documentation and man pages not installed" - elog "Enable doc USE-flag to generate them" - fi -} diff --git a/net-misc/nextcloud-client/nextcloud-client-2.6.1.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.6.1.ebuild deleted file mode 100644 index ba40a56dc34c..000000000000 --- a/net-misc/nextcloud-client/nextcloud-client-2.6.1.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils xdg - -DESCRIPTION="Desktop Syncing Client for Nextcloud" -HOMEPAGE="https://github.com/nextcloud/desktop" -SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz" - -LICENSE="CC-BY-3.0 GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="doc dolphin nautilus shibboleth test" - -COMMON_DEPEND=">=dev-db/sqlite-3.4:3 - >=dev-libs/openssl-1.1.0:0= - dev-libs/qtkeychain[qt5(+)] - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtsql:5 - dev-qt/qtwebengine:5[widgets] - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - sys-fs/inotify-tools - dolphin? ( - kde-frameworks/kcoreaddons:5 - kde-frameworks/kio:5 - ) - nautilus? ( dev-python/nautilus-python ) - shibboleth? ( dev-qt/qtwebkit:5 )" - -RDEPEND="${COMMON_DEPEND}" -DEPEND="${COMMON_DEPEND} - dev-qt/linguist-tools:5 - doc? ( - dev-python/sphinx - dev-tex/latexmk - dev-texlive/texlive-latexextra - virtual/latex-base - ) - dolphin? ( kde-frameworks/extra-cmake-modules ) - test? ( - dev-util/cmocka - dev-qt/qttest:5 - )" - -RESTRICT="!test? ( test )" - -PATCHES=( "${FILESDIR}"/${P}-include_tests.patch ) - -S=${WORKDIR}/desktop-${PV/_/-} - -src_prepare() { - # Keep tests in ${T} - sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die - - if ! use nautilus; then - pushd shell_integration > /dev/null || die - cmake_comment_add_subdirectory nautilus - popd > /dev/null || die - fi - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc - -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} - -DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc) - -DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin) - -DNO_SHIBBOLETH=$(usex !shibboleth) - -DUNIT_TESTING=$(usex test) - ) - - cmake-utils_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - if ! use doc ; then - elog "Documentation and man pages not installed" - elog "Enable doc USE-flag to generate them" - fi -} diff --git a/net-misc/nextcloud-client/nextcloud-client-2.6.3.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.6.3.ebuild new file mode 100644 index 000000000000..0efd5f09b271 --- /dev/null +++ b/net-misc/nextcloud-client/nextcloud-client-2.6.3.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-utils xdg + +DESCRIPTION="Desktop Syncing Client for Nextcloud" +HOMEPAGE="https://github.com/nextcloud/desktop" +SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz" + +LICENSE="CC-BY-3.0 GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="doc dolphin nautilus shibboleth test" + +COMMON_DEPEND=">=dev-db/sqlite-3.4:3 + >=dev-libs/openssl-1.1.0:0= + dev-libs/qtkeychain[qt5(+)] + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtsql:5 + dev-qt/qtwebengine:5[widgets] + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + sys-fs/inotify-tools + dolphin? ( + kde-frameworks/kcoreaddons:5 + kde-frameworks/kio:5 + ) + nautilus? ( dev-python/nautilus-python ) + shibboleth? ( dev-qt/qtwebkit:5 )" + +RDEPEND="${COMMON_DEPEND}" +DEPEND="${COMMON_DEPEND} + dev-qt/linguist-tools:5 + doc? ( + dev-python/sphinx + dev-tex/latexmk + dev-texlive/texlive-latexextra + virtual/latex-base + ) + dolphin? ( kde-frameworks/extra-cmake-modules ) + test? ( + dev-util/cmocka + dev-qt/qttest:5 + )" + +RESTRICT="!test? ( test )" + +PATCHES=( "${FILESDIR}"/${PN}-2.6.1-include_tests.patch ) + +S=${WORKDIR}/desktop-${PV/_/-} + +src_prepare() { + # Keep tests in ${T} + sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die + + if ! use nautilus; then + pushd shell_integration > /dev/null || die + cmake_comment_add_subdirectory nautilus + popd > /dev/null || die + fi + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc + -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} + -DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc) + -DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin) + -DNO_SHIBBOLETH=$(usex !shibboleth) + -DUNIT_TESTING=$(usex test) + ) + + cmake-utils_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + if ! use doc ; then + elog "Documentation and man pages not installed" + elog "Enable doc USE-flag to generate them" + fi +} diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest index ca4eb3c84c8a..eab5db1b4a36 100644 --- a/net-misc/ntp/Manifest +++ b/net-misc/ntp/Manifest @@ -22,7 +22,7 @@ AUX sntp.service-r3 320 BLAKE2B b47a7a4dab78c0ea9f85b861d7f5f2926e5302839db34b92 AUX sntp.service.conf 119 BLAKE2B ee94067e5aef213a15d211e36362f2b4e8e66dfc739be686966e6ee738375a5b8df68a4216c0d8e14c11223945be82a5f221d46d94e15349753a358542b7c9ae SHA512 7c5c397bb51f0192e927079044c7ffb91ae158c55f725be50d09bd618e6a4d37dd93c0f8e4bad726d1d9ada276bf73ad9567e00e0c30f4bf47344e4214f4b4b8 DIST ntp-4.2.8p13-manpages.tar.xz 25700 BLAKE2B 47076474529146f6fd375e20c52188f1ba04959ce3752c952e60e9b48c8ac129346fdf5c315e012556422d16b7d6c223722812a56a11a98463044d2b16fcf0f0 SHA512 824832c1a8685fcd196db679cf4b87c89d577cea5251fda7c3dfee00e888d64de76df99e8cf4b0d20056e3d539b3f46a260c6ce22339aa79b915427741030da2 DIST ntp-4.2.8p13.tar.gz 6949363 BLAKE2B b503153d8413e6ba174970bbddca59d237442e8ec29e082cedfea6523b0b7aaf2919dc219d816e02c8d3aa486beeaf5ca08b314a8b4c587333034447e1391ea0 SHA512 afbdbb8a37b8f4040a8a6939a3a85ad0350d359c153c297b32b8a013c7b7061fd925fa3e6e103671c5901e169156e22497813c654195ba50f890a7170b2f2075 -EBUILD ntp-4.2.8_p13-r1.ebuild 4562 BLAKE2B 0c2ea0e5db7ed0beafd8f16c68148fcbcfffac71d842ced27ef4b605bc59411b3a4327aa449635e4cbc91a63b021018c8d1ccc98d39fab705b91c6e4996d2c5f SHA512 ffa1e54d5cb412cbd484cf911e44c50be9a3f649a4c78995344bf40095ad8fecab35c8efac2df6377d4522399f96f38f4d5a566d7eceacbb34e97f04d4b3995c -EBUILD ntp-4.2.8_p13-r2.ebuild 4613 BLAKE2B d1071b3242fc3e2fd9726d875129088021e2d2e1a495a55439ab0b2c457a882a22da8b5b291cb0ec30d1f270465911a3795d167f8b7389308e0fce1cdeb29f0e SHA512 8bb87841e8390da267ff66f927cb18b3f76a04195becd2d22b6351ef808e3fce815c087f67282035b96082e6e21ec1155390baf699994f2dc8189186c520d94c -EBUILD ntp-4.2.8_p13.ebuild 4550 BLAKE2B 4ab389fd4c778896b631ba7ddf472456c315dfb7787a09a38d22c5a09df4df2e510c905557cf9119df82852bbe9c78c57256902b3e0a2624090b3da36c7bf0fc SHA512 ab7e785e61aa60a253947ce73050e124bcb9fbb05a64d50115f7ffbbd4c8b4eb3283caca9d49b5a6e3ff2a4a69062966e689e30c2c6924d4d23bfe87f0a45103 +EBUILD ntp-4.2.8_p13-r1.ebuild 4495 BLAKE2B 2fb958de52ac85e7af5cbe20b1fac82b8a33415239ac96bfbf94b73efa042b49fcb3c55e8c122470cbcc499147050a7906dba6452cffa35d21c7ea3363e183ea SHA512 16db38e303bcfa94d79e838b84bd332036384e69c8a2f1c806fbe9acabc067ecec5077a701fa227b88639f79d6fc02962d9f30487f0aa3b5cf8ef88f955a5e84 +EBUILD ntp-4.2.8_p13-r2.ebuild 4546 BLAKE2B 028b33ad5444fee81b17541344646840f0e706201abdea75275571d93a437a00f638da5c02da57041ef10e71c43f4e5d29033ea471f95230370dd07363febdec SHA512 90c66fcc4fab35213e2c48874a1a90f0fa1ac5bceea1ea6bdcd447a98fb750a988d41c27d6a6e61866dc9ee81eb8ba83e26ae7d97b501b2d308fbd47bb28ca80 +EBUILD ntp-4.2.8_p13.ebuild 4483 BLAKE2B c7f84b00bc604050d58f17a3ed8856d51cb3763509232d0f3221f7c062e938a0aeaae723a4dac8251a907bd4580b6f4e47c1b7109be899c6ae04c62ebec0122b SHA512 5b2c40c77e8c6ff15804a14a5c43035a3b2d8ca7c16e5f81d16fe716da169130dacb03d6a80493a705e87b3c80421cf6b51883e500db3ebc37402a5b473e7ee5 MISC metadata.xml 1014 BLAKE2B 133457965d766f0db56bbca2755a7e4c37319237843dbb92e7b2563194cc2282500010e76877d9cd5d6c9a56f8b815ffab1bdc84d76446310f3cee5476ff7f52 SHA512 37f6b14a86b13c20ecc83967332599b26e958015798e341ca3e1c1d79a666a3b69904c4aeb5ff298477d2b5fd709a2fe09271dbe41910e3f439bef47efa6b650 diff --git a/net-misc/ntp/ntp-4.2.8_p13-r1.ebuild b/net-misc/ntp/ntp-4.2.8_p13-r1.ebuild index 0f2889cf8bae..d3cc13c50464 100644 --- a/net-misc/ntp/ntp-4.2.8_p13-r1.ebuild +++ b/net-misc/ntp/ntp-4.2.8_p13-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -72,8 +72,6 @@ src_configure() { --with-lineeditlibs=readline,edit,editline --with-yielding-select --disable-local-libevent - --docdir='$(datarootdir)'/doc/${PF} - --htmldir='$(docdir)/html' --with-memlock=256 $(use_enable caps linuxcaps) $(use_enable parse-clocks) diff --git a/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild b/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild index f08b75b54091..2150ef08bd90 100644 --- a/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild +++ b/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild @@ -72,8 +72,6 @@ src_configure() { --with-lineeditlibs=readline,edit,editline --with-yielding-select --disable-local-libevent - --docdir='$(datarootdir)'/doc/${PF} - --htmldir='$(docdir)/html' --with-memlock=256 $(use_enable caps linuxcaps) $(use_enable parse-clocks) diff --git a/net-misc/ntp/ntp-4.2.8_p13.ebuild b/net-misc/ntp/ntp-4.2.8_p13.ebuild index a78a3be42762..1a92b7b4bcec 100644 --- a/net-misc/ntp/ntp-4.2.8_p13.ebuild +++ b/net-misc/ntp/ntp-4.2.8_p13.ebuild @@ -72,8 +72,6 @@ src_configure() { --with-lineeditlibs=readline,edit,editline --with-yielding-select --disable-local-libevent - --docdir='$(datarootdir)'/doc/${PF} - --htmldir='$(docdir)/html' --with-memlock=256 $(use_enable caps linuxcaps) $(use_enable parse-clocks) diff --git a/net-misc/oidentd/Manifest b/net-misc/oidentd/Manifest index d8b6ecec0cbe..92a05e22a754 100644 --- a/net-misc/oidentd/Manifest +++ b/net-misc/oidentd/Manifest @@ -1,18 +1,5 @@ -AUX oidentd-2.0.7-confd 67 BLAKE2B de8bbe7dd911860575b84578f4d691710fe38c7182be9fad80079eec6937c6f4581b0b6cdbd78918dea51a3994466b2f14fe5a22c9ff3d08bbd62008a67518f2 SHA512 d3aba90970df7cf9869934380267b3f5c687a86ad532fa854728e2f7506551254ae4bda0a1edece24d26c4da6c29d7e9c44923a29fd67016b88a7766c6e6a050 AUX oidentd-2.0.7-init 837 BLAKE2B ab01ed3d6675f6196edcf7712c9f2e77369edc2481433788e63a3a82e591831869623723002f49a4498ed10ba7657f51dbc795895384213e473eba950e7ba7be SHA512 ebd072d86fa879017bb43f8f9cdd0ea563f337b558552ebdc27c980376889dfd22f2d6bdeb424ca3e2dbe62a78ceb80208ee26398aed0c38c4f973646d6d80d3 -AUX oidentd-2.0.8-bind-to-ipv6-too.patch 557 BLAKE2B dc6427c5424d79955c74e38750cf202bfef8927caa74d8d84717597278cff30a97f3ad02126219a1097281445477b1435f8a61633c433048652460b91d5604e1 SHA512 a643d487efd819219dfd85c27d710a8dd41a1583260b662690c7ffb411e44a96eeeefb1a513f892dfba7fd82bea8be1013a8ef41a18651ee2a137789d6c108e5 -AUX oidentd-2.0.8-gcc5.patch 855 BLAKE2B 38e814ef3ac03bcfaa99227dbf124a0c786868745168727fabda032c767f31ed65b521163379855e17c2fc765c789efed7a5f3b0662dbce08207d80c08ee32dc SHA512 3bb470bc8096096d6cebcdeef142cf9f05076f33371c8a8ce4f2aa192758441392ccce090494979345e590d159422b7ab5e435a453081fffd27cf9a887549acf -AUX oidentd-2.0.8-log-conntrack-fails.patch 1686 BLAKE2B a1e7dd40d5b6ccf4f7a03f6178101e096eed86e0504e479335b4b4e36a8962d91a64e33e697502d3aaafbf336617261402b00b6a91573ac9e01c7d2206256dbc SHA512 210dcf4ee04d61ee07f7a38cb5b943343526677242d2e284929a7ae83e6940ad2806eef6271f2eb8fc13ee5ad2f2366aff4d4ad3ba9c244277f41bcf8daca9a0 -AUX oidentd-2.0.8-masquerading.patch 1288 BLAKE2B c653cfd9f43ea4b007a98d857c1bf2d6dd044b16187f5e0809dfab9e9f38e4df3583841f9486fcbc4b149e337878116b83cc62107ccd5ac65834376446613d62 SHA512 453787b4ef00a7578b65e04cc4fa36bc233d737294171e807b6d9711cbd2be9cd4fc461863ea8ddbd39901433a007d32403252e701604d13ddbb442a363439fc -AUX oidentd-2.0.8-no-conntrack-masquerading.patch 1141 BLAKE2B cda18949cdc768592b91de50ebdec992553611584d7ab0368f90b28ddde3a184526aeb5d05dd50dd4a92b9499f1e6335b9cab19a94bc6047bdfa1cbdaa148936 SHA512 8d0c44f16cab0331c52362671790360f47de7568b81622971a33865464a85342c956447164b516ed0fd90bbef72eab2bdec5fff0b0b7e23d554abaf109329b3b AUX oidentd-2.2.2-confd 69 BLAKE2B 37fac35c28304f92942844ee7652f52496cdc4c66da67d449127c3e9b61c715afb25cae7379137d8b9e2863d44e72535734c595c8edcc18f94b8c3841cd216ab SHA512 639f062b61b3aac829d6d16497d548290d8de3e161a1d8037b689593374b89028243b9369109b1b4b55d125ec665f1433bb971ea873a2e6e1b6b15eabfad8e6a -AUX oidentd.conf 298 BLAKE2B cc234d09546ac12fc51440ad4a24234a348c947f15bdd750b88bb0e87b0276a3b27ac2d7ef10d1e30911e851b64894953d7ac53eeb2e873d7a9a15fe83ca44ad SHA512 a05de9b08f87a200309c39d3bc3aba0aa2c6461c3c43a9d851299e6083f0ca9a362409b0db93ca069c7a50d3a14169a308aea51b3d42ebf0180a4b4c99bf5126 -AUX oidentd.service 186 BLAKE2B 2c5e3d68b2cc71ce369d063b27de0ba698f899003967d2eaf4e5746bd0637774070d951b23f040b6536ddda14ab8ba69a24d3f9c5ca1d98f86b785a0629127fd SHA512 dd89471b232c0cce1113ea8550a3cb0ad55bd0791b7c916ea13b533051fe10271cd8e41aff13bf4071b507251ab6b14de20c8b63a525074a728f007fe0d647e8 -AUX oidentd.socket 142 BLAKE2B d085224442446c55f6850f15537ab9c4f51a4093e12de58a8765851131c41b3df1e5961115bfbed616b02862dd7a0bc6f1f9bae1abb9d189b3d05cd2aed8224d SHA512 151f846a889968084f4b6900e42806ea2c16f184fe65fe67b77bd9176318faeb3db3f7a43d6eec8d70bca7c2919952ad9059301ba396ec56a9da1ab0371b44d4 -AUX oidentd_at.service 179 BLAKE2B 54ab7d09f950927a2dac5bc473d0533c6bc9d437e6f5c80d481795b46b67ce779682480084a02234c2a9f6b4b052eaed7a6ab8d9e31df34e4b1c81e5201e7a4c SHA512 513e49d74c25ea0392a4b9541df0b275fa497bf2cb1d55a3c1c31a9cfe207ec2de69e76d7813531c90b5b378d1dd55b3ee21371ad281ff5f2a89ab70f59a25b4 -AUX oidentd_masq.conf 429 BLAKE2B 08612753eb38386b0a20cf4432856d935697684680894a9303df3315d3708042cedb77ea60f913c448c311741fc19de757f7e3c55b148dd95b821457b839f27c SHA512 72e48e1923adf594d53ae325b0ba5a6ab406ac934985a699f6f3b2a88010f312ddac279a752bba6b237aa87451348a0933ee4166aa267a0b08919c37eaaac40a -DIST oidentd-2.0.8.tar.gz 212354 BLAKE2B 46f4c4478822e832885f5f38a2ab5b2132ff5c1e5071fd1dc6050e55992d50bd96be096064996853af69d16316e6aff648c5320714b53b60c038cc9aaedfedda SHA512 86229a4ef9892121c25a7140616e180f862ca34b73ea3ad9f0fbb008f657abb17e9f14c2c25ae14c14bfc14bf1ea10b50fd68318631a9c52227bbfd6e6d43288 DIST oidentd-2.4.0.tar.xz 188280 BLAKE2B e7a6cdcc78ae61b103b81335d6a4802bbc301adad256dbe9461245e7a2839e1f4786cf3bf7206df2f8fc6414351c4bb8f92c87d16d69f678e0793b9a760ee966 SHA512 3dc6f8ba1c374c21bbc721516f83c5b825d5bc75dbda390d5e5e0e72ceac31495380a6025c626edcec4f8685a009f5be9571606c50e28fc28dc9f73a20f1b2d0 -EBUILD oidentd-2.0.8-r6.ebuild 1442 BLAKE2B 57dde60a50d3320a552cd307238497cd585e6cc19fccf2efccde819d0d0420e1c6a0f617dc7e8498941ba6e96f7f2bde3e598924c7d216695edbac12f647fb75 SHA512 facbf9a25e0ccdcc402190183b1a1bfb79b4c797e66733d5cde3b57c19db69b1f43a20733ca8cbe3613815725e88be02ef9acc880222388396de086915260852 -EBUILD oidentd-2.4.0.ebuild 1189 BLAKE2B b5a532907a2fe31f6e7d8d9f351d3206cde48c5fd25ac585f73c226abf77e8faae4a3279842afe67ebc82b57119408d5ad5d0d0dbc54b73fc213588f539b8c0a SHA512 cb764653e10fa23491f0472182958d7814ad8e67d16c29082b90c776adaa570fdb52801b4cc3173215527a2a036167a38cad5d370458f2d43dc5fb566b90ac7d +EBUILD oidentd-2.4.0.ebuild 1184 BLAKE2B c6b8651c9717c645d4a6d4b9b5aaccc5e40a7774614b1129d4123f7686ee9aa5a563f04bee60e07070d25ce92e83f429f2a905f36822a40dffd45101f98eb0a0 SHA512 edc0fe5a171966fbe5ea2c3a28aaa0d77ff98f7c1ea3f59063ee1fa16ffef01c8b9f9f91354bc839ec5332ebba60e274f375034d0ead3a367bf439ee04ee8c0c MISC metadata.xml 539 BLAKE2B 10058ed518667411899809727711217f873c5ea4f65819a7f70315f1baf9a856f2b017197e1bd5b02e7b1a9c38b9a189df27e572c1eb6b04b08d29429f8f6d03 SHA512 0e2ad57b9a3032c73a0206ff665dbf8d258fdd91e595eaf7b06a309488321809e0f8bd567e37452cf83c89c734c4d57857b95df0472bda0b8c29f4e14b23af84 diff --git a/net-misc/oidentd/files/oidentd-2.0.7-confd b/net-misc/oidentd/files/oidentd-2.0.7-confd deleted file mode 100644 index 3116889e67e2..000000000000 --- a/net-misc/oidentd/files/oidentd-2.0.7-confd +++ /dev/null @@ -1,4 +0,0 @@ -# oidentd start-up options -USER="nobody" -GROUP="nobody" -OPTIONS="" diff --git a/net-misc/oidentd/files/oidentd-2.0.8-bind-to-ipv6-too.patch b/net-misc/oidentd/files/oidentd-2.0.8-bind-to-ipv6-too.patch deleted file mode 100644 index 2652622cdd4f..000000000000 --- a/net-misc/oidentd/files/oidentd-2.0.8-bind-to-ipv6-too.patch +++ /dev/null @@ -1,17 +0,0 @@ -Patch to bind to ipv6 socket as well -Patch supplied by Fabian Knittel ---- oidentd-2.0.8/src/oidentd_inet_util.c 2006-05-22 02:31:19.000000000 +0200 -+++ oidentd-2.0.8.new/src/oidentd_inet_util.c 2010-03-01 20:26:11.000000000 +0100 -@@ -60,6 +60,12 @@ - #ifdef WANT_IPV6 - case AF_INET6: - SIN6(ai->ai_addr)->sin6_port = listen_port; -+ -+ if (setsockopt(listenfd, IPPROTO_IPV6, IPV6_V6ONLY, &one, -+ sizeof(one)) != 0) { -+ debug("setsockopt IPV6_V6ONLY: %s", strerror(errno)); -+ return (-1); -+ } - break; - #endif - diff --git a/net-misc/oidentd/files/oidentd-2.0.8-gcc5.patch b/net-misc/oidentd/files/oidentd-2.0.8-gcc5.patch deleted file mode 100644 index a401a65d9bc6..000000000000 --- a/net-misc/oidentd/files/oidentd-2.0.8-gcc5.patch +++ /dev/null @@ -1,25 +0,0 @@ -Description: Fix a failure to build with gcc5. -Bug: http://bugs.debian.org/778035 - ---- a/src/oidentd_util.c 2015-07-03 05:56:24.000000000 -0400 -+++ b/src/oidentd_util.c 2015-07-03 05:56:47.671378000 -0400 -@@ -75,7 +75,7 @@ - ** PRNG functions on systems whose libraries provide them.) - */ - --inline int randval(int i) { -+extern __attribute__ ((gnu_inline)) int randval(int i) { - /* Per _Numerical Recipes in C_: */ - return ((double) i * rand() / (RAND_MAX+1.0)); - } ---- a/src/oidentd_util.h 2015-07-03 05:56:32.000000000 -0400 -+++ b/src/oidentd_util.h 2015-07-03 05:56:53.835378000 -0400 -@@ -58,7 +58,7 @@ - int find_group(const char *temp_group, gid_t *gid); - - int random_seed(void); --inline int randval(int i); -+extern __attribute__ ((gnu_inline)) int randval(int i); - - #ifndef HAVE_SNPRINTF - int snprintf(char *str, size_t n, char const *fmt, ...); diff --git a/net-misc/oidentd/files/oidentd-2.0.8-log-conntrack-fails.patch b/net-misc/oidentd/files/oidentd-2.0.8-log-conntrack-fails.patch deleted file mode 100644 index d29479ec0284..000000000000 --- a/net-misc/oidentd/files/oidentd-2.0.8-log-conntrack-fails.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 612f1d85dd59fc39b124392df38586769ebc8add Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Fri, 11 Mar 2016 10:00:59 +0100 -Subject: [PATCH] Log Linux core_init failures as normal error -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Opening Linux conntracking table file failure for different reason than -missing the file is fatal for deamon initizalization. But the failure -was logged inly in debugging build. - -This patch makes the fatal error visible in normal log. - -https://bugzilla.redhat.com/show_bug.cgi?id=1316308 -Signed-off-by: Petr Písař ---- - src/kernel/linux.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/kernel/linux.c b/src/kernel/linux.c -index 8bf265f..9103dbf 100644 ---- a/src/kernel/linux.c -+++ b/src/kernel/linux.c -@@ -73,21 +73,21 @@ bool core_init(void) { - masq_fp = fopen(MASQFILE, "r"); - if (masq_fp == NULL) { - if (errno != ENOENT) { -- debug("fopen: %s: %s", MASQFILE, strerror(errno)); -+ o_log(NORMAL, "fopen: %s: %s", MASQFILE, strerror(errno)); - return false; - } - - masq_fp = fopen(CONNTRACK, "r"); - if (masq_fp == NULL) { - if (errno != ENOENT) { -- debug("fopen: %s: %s", CONNTRACK, strerror(errno)); -+ o_log(NORMAL, "fopen: %s: %s", CONNTRACK, strerror(errno)); - return false; - } - - masq_fp = fopen(NFCONNTRACK, "r"); - if (masq_fp == NULL) { - if (errno != ENOENT) { -- debug("fopen: %s: %s", NFCONNTRACK, strerror(errno)); -+ o_log(NORMAL, "fopen: %s: %s", NFCONNTRACK, strerror(errno)); - return false; - } - masq_fp = fopen("/dev/null", "r"); --- -2.5.0 - diff --git a/net-misc/oidentd/files/oidentd-2.0.8-masquerading.patch b/net-misc/oidentd/files/oidentd-2.0.8-masquerading.patch deleted file mode 100644 index 191e9b95e64d..000000000000 --- a/net-misc/oidentd/files/oidentd-2.0.8-masquerading.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- oidentd.orig/src/kernel/linux.c 2006-05-22 06:58:53.000000000 +0300 -+++ oidentd-2.0.8/src/kernel/linux.c 2007-07-11 21:28:56.000000000 +0300 -@@ -48,6 +48,7 @@ - #define CFILE6 "/proc/net/tcp6" - #define MASQFILE "/proc/net/ip_masquerade" - #define CONNTRACK "/proc/net/ip_conntrack" -+#define NFCONNTRACK "/proc/net/nf_conntrack" - - static int netlink_sock; - extern struct sockaddr_storage proxy; -@@ -82,7 +83,15 @@ - debug("fopen: %s: %s", CONNTRACK, strerror(errno)); - return false; - } -- masq_fp = fopen("/dev/null", "r"); -+ -+ masq_fp = fopen(NFCONNTRACK, "r"); -+ if (masq_fp == NULL) { -+ if (errno != ENOENT) { -+ debug("fopen: %s: %s", NFCONNTRACK, strerror(errno)); -+ return false; -+ } -+ masq_fp = fopen("/dev/null", "r"); -+ } - } - - netfilter = true; -@@ -367,6 +376,15 @@ - &nport_temp, &mport_temp); - } - -+ if (ret != 21) { -+ ret = sscanf(buf, -+ "%*15s %*d %15s %*d %*d ESTABLISHED src=%d.%d.%d.%d dst=%d.%d.%d.%d sport=%d dport=%d packets=%*d bytes=%*d src=%d.%d.%d.%d dst=%d.%d.%d.%d sport=%d dport=%d", -+ proto, &l1, &l2, &l3, &l4, &r1, &r2, &r3, &r4, -+ &masq_lport_temp, &masq_fport_temp, -+ &nl1, &nl2, &nl3, &nl4, &nr1, &nr2, &nr3, &nr4, -+ &nport_temp, &mport_temp); -+ } -+ - if (ret != 21) - continue; - diff --git a/net-misc/oidentd/files/oidentd-2.0.8-no-conntrack-masquerading.patch b/net-misc/oidentd/files/oidentd-2.0.8-no-conntrack-masquerading.patch deleted file mode 100644 index 92ef02523160..000000000000 --- a/net-misc/oidentd/files/oidentd-2.0.8-no-conntrack-masquerading.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 20a63ad8a90c36397cceedd34887298890dbafa3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Fri, 11 Mar 2016 10:38:10 +0100 -Subject: [PATCH] Linux: Do not open conntracking table if masquerading is not - enabled -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The contracking table was always opened. This is unnecessary because -the table is used only when masquerading feature is requested on run -time. - -This patch skips opening the conntracking table on Linux if -masquerading is not requested. - -https://bugzilla.redhat.com/show_bug.cgi?id=1316308 -Signed-off-by: Petr Písař ---- - src/kernel/linux.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/kernel/linux.c b/src/kernel/linux.c -index 9103dbf..859f554 100644 ---- a/src/kernel/linux.c -+++ b/src/kernel/linux.c -@@ -70,6 +70,11 @@ bool netfilter; - */ - bool core_init(void) { - #ifdef MASQ_SUPPORT -+ if (!opt_enabled(MASQ)) { -+ masq_fp = NULL; -+ return true; -+ } -+ - masq_fp = fopen(MASQFILE, "r"); - if (masq_fp == NULL) { - if (errno != ENOENT) { --- -2.5.0 - diff --git a/net-misc/oidentd/files/oidentd.conf b/net-misc/oidentd/files/oidentd.conf deleted file mode 100644 index 03b28d827802..000000000000 --- a/net-misc/oidentd/files/oidentd.conf +++ /dev/null @@ -1,22 +0,0 @@ -# Configuration for oidentd -# see oidentd.conf(5) -# -default { - default { - deny spoof - deny spoof_all - deny spoof_privport - allow random - allow random_numeric - allow numeric - deny hide - } -} - -# you may want to hide root connections -#user "root" { -# default { -# force reply "UNKNOWN" -# } -#} - diff --git a/net-misc/oidentd/files/oidentd.service b/net-misc/oidentd/files/oidentd.service deleted file mode 100644 index bf159d855b8d..000000000000 --- a/net-misc/oidentd/files/oidentd.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=TCP/IP IDENT protocol server - -[Service] -ExecStart=/usr/sbin/oidentd -i -S -u nobody -g nobody -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target diff --git a/net-misc/oidentd/files/oidentd.socket b/net-misc/oidentd/files/oidentd.socket deleted file mode 100644 index 63df7036e543..000000000000 --- a/net-misc/oidentd/files/oidentd.socket +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Ident (RFC 1413) socket -Conflicts=oidentd.service - -[Socket] -ListenStream=113 -Accept=yes - -[Install] -WantedBy=sockets.target diff --git a/net-misc/oidentd/files/oidentd_at.service b/net-misc/oidentd/files/oidentd_at.service deleted file mode 100644 index ac03a94d6c8a..000000000000 --- a/net-misc/oidentd/files/oidentd_at.service +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=Ident (RFC 1413) per-connection server - -[Service] -ExecStart=/usr/sbin/oidentd -I -S -u nobody -g nobody -ExecReload=/bin/kill -HUP $MAINPID -StandardInput=socket diff --git a/net-misc/oidentd/files/oidentd_masq.conf b/net-misc/oidentd/files/oidentd_masq.conf deleted file mode 100644 index 6811288ff4cf..000000000000 --- a/net-misc/oidentd/files/oidentd_masq.conf +++ /dev/null @@ -1,10 +0,0 @@ -# oident masquarded connections configuration - -# use this file if your host is masquarading connections for several -# hosts and you want to return a reply based on the hostname of -# the originating machine -# add "-f" to OIDENT_OPTIONS in /etc/conf.d/oidentd if you want -# to forward ident requests to the real host - -# add hosts in the following format, see oidentd_masq.conf(5) for details: -# [/mask] diff --git a/net-misc/oidentd/oidentd-2.0.8-r6.ebuild b/net-misc/oidentd/oidentd-2.0.8-r6.ebuild deleted file mode 100644 index aa6c386da6e5..000000000000 --- a/net-misc/oidentd/oidentd-2.0.8-r6.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit linux-info systemd - -DESCRIPTION="Another (RFC1413 compliant) ident daemon" -HOMEPAGE="https://oidentd.janikrabe.com/" -SRC_URI="mirror://sourceforge/ojnk/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86" -IUSE="debug ipv6 masquerade selinux" - -DEPEND="" - -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-oident )" - -DOCS=( AUTHORS ChangeLog README TODO NEWS "${FILESDIR}"/${PN}_masq.conf "${FILESDIR}"/${PN}.conf ) - -PATCHES=( - "${FILESDIR}/${P}-masquerading.patch" - "${FILESDIR}/${P}-bind-to-ipv6-too.patch" - "${FILESDIR}/${P}-gcc5.patch" - "${FILESDIR}/${P}-log-conntrack-fails.patch" - "${FILESDIR}/${P}-no-conntrack-masquerading.patch" -) - -pkg_setup() { - local CONFIG_CHECK="~INET_TCP_DIAG" - - if use kernel_linux; then - linux-info_pkg_setup - fi -} - -src_configure() { - econf \ - $(use_enable debug) \ - $(use_enable ipv6) \ - $(use_enable masquerade masq) \ - $(use_enable masquerade nat) -} - -src_install() { - default - - newinitd "${FILESDIR}"/${PN}-2.0.7-init ${PN} - newconfd "${FILESDIR}"/${PN}-2.0.7-confd ${PN} - - systemd_newunit "${FILESDIR}"/${PN}_at.service ${PN}@.service - systemd_dounit "${FILESDIR}"/${PN}.socket - systemd_dounit "${FILESDIR}"/${PN}.service -} - -pkg_postinst() { - echo - elog "Example configuration files are in /usr/share/doc/${PF}" - echo -} diff --git a/net-misc/oidentd/oidentd-2.4.0.ebuild b/net-misc/oidentd/oidentd-2.4.0.ebuild index 3b85fa13389e..f47f07b80bf0 100644 --- a/net-misc/oidentd/oidentd-2.4.0.ebuild +++ b/net-misc/oidentd/oidentd-2.4.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://files.janikrabe.com/pub/${PN}/releases/${PV}/${P}.tar.xz" LICENSE="BSD-2 GPL-2 LGPL-2+ MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86" IUSE="debug ipv6 masquerade selinux" DEPEND="masquerade? ( net-libs/libnetfilter_conntrack )" diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest index a3a7ef91fedd..f3816a61d6ba 100644 --- a/net-misc/openssh/Manifest +++ b/net-misc/openssh/Manifest @@ -38,8 +38,8 @@ AUX openssh-8.1_p1-hpn-14.20-sctp-glue.patch 737 BLAKE2B b8f93cb197206eb4315c663 AUX openssh-8.1_p1-hpn-glue.patch 7830 BLAKE2B 81c239f57d252b3a9bb1c7aed56ac67196ad11a316163db0cf6d4c75d73db1cbae038707ec788c5101f40ebf455257fa2cd1b9d7facab1081b5b856317543dd7 SHA512 2cf4e5da60e30932619c6915295b1659f53db3e784e87fcbbd25b8d167df8e29a1712235413bb2d485956494111aa682d086f9b5a36c3f55a286d40599df8b8c AUX openssh-8.1_p1-tests-2020.patch 1332 BLAKE2B a400f6859a5d096729c9cb6047dce8612da7fe5f8d06cc891cfb6a4c88b568be3dfc7872d5be78ef349798f501828e1505bbd5ebd49d548dbbdc6bbf987dc843 SHA512 8f4c535d3ab15e4c761f6f5d4efe762ec2bc9b5de49ee369ce9186fe40095d2065418249c89161a8ef53e893079264fd9c95b73cd74937b08fa9f563a4f00290 AUX openssh-8.2_p1-GSSAPI-dns.patch 11647 BLAKE2B b904922f809a6616f488509a962c778837bc6003138efe79fb1ce9edf9611f14c209c11559a922497c50c3dff450286e40dfcb929414cb7f705357d2c4e3603d SHA512 f9256a80c75ae0db11df0e562ace026614f2f6d0f6c91eaed7786b2a3c37608e18ca45242385813fa34487e50f21e5d3a13bfb66adc854b7c34d278a164c3dc4 -AUX openssh-8.2_p1-X509-12.4-tests.patch 405 BLAKE2B cfdd9b557d69b9230dd24fce00504f96ec3349712b1ca8667bb60fc9619d7fbfe44d2de847fc8b06c31de434fcab6e53ec4cd373a20a701372fdb0516ca14839 SHA512 788f6e1a522773bb322d70be6edd32734034c35073eea417d3895ecd176b3cc3ebd228285441ec12e75c991121e40eaa6b75b8be76a05167a0419773ae13018a -AUX openssh-8.2_p1-X509-glue-12.4.patch 5824 BLAKE2B 2476520076f9e7ca6c0ff53ee9efa3121f3c229d429eda243aa4a9b17e7492b5748c95414ea46b789fac0453ca272ba54d440f2ccf2baf9af08891469b18af19 SHA512 fed53756e81113d1f155dcf26ecf3beb2a4ccedf06511520ae0ad8978d1dfd144fb5412458d50726dd292980e3e201b6462786d0fd12be9ebec57c7b012b4b6c +AUX openssh-8.2_p1-X509-12.4.2-tests.patch 405 BLAKE2B cfdd9b557d69b9230dd24fce00504f96ec3349712b1ca8667bb60fc9619d7fbfe44d2de847fc8b06c31de434fcab6e53ec4cd373a20a701372fdb0516ca14839 SHA512 788f6e1a522773bb322d70be6edd32734034c35073eea417d3895ecd176b3cc3ebd228285441ec12e75c991121e40eaa6b75b8be76a05167a0419773ae13018a +AUX openssh-8.2_p1-X509-glue-12.4.2.patch 5118 BLAKE2B 6adb167f27a926ac591c023e0bec87d3d5df9fd331338eea16240133bb1f637c5b2b8c44358ace9d390c2e8ed5f627360b8928ab47415fc89dcc44c1c8f1de5a SHA512 e4121c9b454445613a38d68a6dcb7be27ede1878fba811678d8a8b4cd185db609b4ffe7efb6cab0121e00af84aa86c798ebcedfe43a1b1ba4c200fe8600ba7b5 AUX openssh-8.2_p1-hpn-14.20-X509-glue.patch 4881 BLAKE2B 899065ef3b781e7e67ea630ff26ac8c3975073e9ef5b0cc345c6cee9fb2e45d2ff549b716a76211c88efb1e540ed7d79c4467e0342cfbea64fef8e6cafddac85 SHA512 d37d4fd8614bed8b1592697b911a04e2ca7d14d24e9c315a6695b4c88cdb5b4ae980e8cb68040fe54b4587675ebb3ac5694ea0d09093f8451aa65e427b6a5d95 AUX openssh-8.2_p1-hpn-14.20-glue.patch 5294 BLAKE2B 6a778eab95e05d371fd92a02f96b926cec5c6ff90dea36065b4857ddf243b5f95bb25aa339fddb1c662b628f26d0c11858d1ca0badece0a7268d6a51e99a09be SHA512 50289c60df01a59f134a0b283ec21d6a06beccdb68de67a46b4e0e9a9bc47855b0e4dbed47300c2f042f2eb9f63e4d6d0683f3092ee358a82e9d6337a3b173fe AUX openssh-8.2_p1-hpn-14.20-sctp-glue.patch 755 BLAKE2B 091a7cf60907c142d28b7f20a9fe4e1db8f2ce7f268ea4e0f206de89ea4ce560e82c2e91a9281a664868628426ad8c262667b7e6ad4e35247422937b98034855 SHA512 cff282e6a35a109794fca25b724b8e5024e7ded07b5dd3646489f384bdd5a42726d7cf9f814b8ebc20caed02a1a70d80e0396626bdfc13302096e15c11433dde @@ -74,7 +74,7 @@ DIST openssh-8.1_p1-glibc-2.31-patches.tar.xz 1752 BLAKE2B ccab53069c0058be7ba78 DIST openssh-8.1p1+x509-12.3.diff.gz 689934 BLAKE2B 57a302a25bec1d630b9c36f74ab490e11c97f9bcbaf8f527e46ae7fd5bade19feb3d8853079870b5c08b70a55e289cf4bf7981c11983973fa588841aeb21e650 SHA512 8d7c321423940f5a78a51a25ad5373f5db17a4a8ca7e85041e503998e0823ad22068bc652e907e9f5787858d45ce438a4bba18240fa72e088eb10b903e96b192 DIST openssh-8.1p1-sctp-1.2.patch.xz 7672 BLAKE2B f1aa0713fcb114d8774bd8d524d106401a9d7c2c73a05fbde200ccbdd2562b3636ddd2d0bc3eae9f04b4d7c729c3dafd814ae8c530a76c4a0190fae71d1edcd2 SHA512 2bffab0bbae5a4c1875e0cc229bfd83d8565bd831309158cd489d8b877556c69b936243888a181bd9ff302e19f2c174156781574294d260b6384c464d003d566 DIST openssh-8.1p1.tar.gz 1625894 BLAKE2B d525be921a6f49420a58df5ac434d43a0c85e0f6bf8428ecebf04117c50f473185933e6e4485e506ac614f71887a513b9962d7b47969ba785da8e3a38f767322 SHA512 b987ea4ffd4ab0c94110723860273b06ed8ffb4d21cbd99ca144a4722dc55f4bf86f6253d500386b6bee7af50f066e2aa2dd095d50746509a10e11221d39d925 -DIST openssh-8.2p1+x509-12.4.diff.gz 802630 BLAKE2B 1d4c30aa6fb2b90c3213a04adef8fc99b28796e72b067d308d5947a6f697ca2abead2a4658356e01347efaf9eb5100aeb054b56b04d55dd716d3793fad69010e SHA512 0314496ed7466efb90f18143b70d676fbb7990fd9ec6685992f36a031b47c638597ed3773ec3c121d416cbbf8ba2d3d2e8cb9c703bfc77a82ba5aa5c3bdde0de +DIST openssh-8.2p1+x509-12.4.2.diff.gz 805574 BLAKE2B 4df31b634308ce074d820df24984d44fdde48e115f8c2ac62afb09f28602acf9e4b080a13e5ba2e6033fe92bc4289ef00ed7adbb4af334462fbc9c82c4e7b64f SHA512 770b269929df0b7c9709fa2d07693a3ae9ebaca12fe463f7eabdaab66ee115fc02afa46dc847493d5050bff105740f2c1453fc456271d723c6e5b98d5bf7fd43 DIST openssh-8.2p1-sctp-1.2.patch.xz 7668 BLAKE2B 717487cffd235a5dfa2d9d3f2c1983f410d400b0d23f71a9b74406ac3d2f448d76381a3b7a3244942bff4e6bdc3bc78d148b9949c78dc297d99c7330179f8176 SHA512 a5fbd827e62e91b762062a29c7bc3bf569a202bdc8c91da7d77566ff8bb958b5b9fb6f8d45df586e0d7ac07a83de6e82996e9c5cdd6b3bf43336c420d3099305 DIST openssh-8.2p1.tar.gz 1701197 BLAKE2B 8b95cdebc87e8d14f655ed13c12b91b122adf47161071aa81d0763f81b12fe4bc3d409c260783d995307d4e4ed2d16080fd74b15e4dc6dcc5648d7e66720c3ed SHA512 c4db64e52a3a4c410de9de49f9cb104dd493b10250af3599b92457dd986277b3fd99a6f51cec94892fd1be5bd0369c5757262ea7805f0de464b245c3d34c120a DIST openssh-8_1_P1-hpn-AES-CTR-14.20.diff 29935 BLAKE2B 79101c43601e41306c957481c0680a63357d93bededdf12a32229d50acd9c1f46a386cbb91282e9e7d7bb26a9f276f5a675fd2de7662b7cbd073322b172d3bca SHA512 94f011b7e654630e968a378375aa54fa1fde087b4426d0f2225813262e6667a1073814d6a83e9005f97b371c536e462e614bfe726b092ffed8229791592ca221 @@ -85,6 +85,6 @@ EBUILD openssh-7.5_p1-r4.ebuild 11181 BLAKE2B 05ab7ab14082824bc936d189cd72087e79 EBUILD openssh-7.7_p1-r9.ebuild 15924 BLAKE2B b4c978f231feeadbd3ed5bde9424bc4ad0533ca6ac0cafe1a33417dbd1d04182e92444f4553c1762a0aa97c45cc20dc2f869638a788b1a2df9e89cfdfeba9f8d SHA512 6104ca756ad931f08b27e9f3b3ed6519ee5f89e30ece3607a4cee81081c9d15d7c39776dd3629671cc44074d79a96e923f5d08c8dc5920f77be03c174567d6c6 EBUILD openssh-7.9_p1-r4.ebuild 16296 BLAKE2B 836063b7f82a97e473f042ef2f2fe87521f4c72f9a4d4289205f5530bce5cb7e14ac5fac889634f82cc01a6e5bf5b9907aad57ff5040a2b5587682f44580d092 SHA512 41c100d9918aac6fae825aee354329dc8eaf63361c3125636369441eed98e1e96831f5e7dc623958d56d62ec09e5f2f74c9f93da6af9e00f220c36b7cd3f2e49 EBUILD openssh-8.0_p1-r4.ebuild 16679 BLAKE2B cc2c63682376443a11036e10182b7bef0c61bbb0a33fb3bf8e806a79d13f1bf9208f7c47519ddc35a95b3025b91026144e60480c92954eefff62791281d6c006 SHA512 674208389a7b7b28495a5145a948f1083a25b7697b6620677b3035111e8b73d9fcfeb091b516026c0edcd6dd4c37b939a1dc21738b372029acb68e0bbcdfaa5a -EBUILD openssh-8.1_p1-r2.ebuild 16429 BLAKE2B 3ddc0fa26dab49ef9b08dd0de5bf8257b3fd5918af145a9806b65317fba8e431d69177dcad5d4aec4965d5f6f5463e1239edffdce182c560fee36a36e9248089 SHA512 6dfda0e0c7bdc87025878ecd0ad967221888a5d0466aad9458f127c55d2dee5efa4330b0cd6f409e50f7ab77054f405a2d67d05519997b42bb79fb791c920fe9 -EBUILD openssh-8.2_p1-r1.ebuild 16764 BLAKE2B 621f9920b17281cdd137649e6a005e3cfad2a03fd312ea0db751a883880be83a10261b70ee428efdad6d5e50c5bbda197a7bc5a38d15321025b7948ae447d51d SHA512 5cd26fa5164a659936f4ebca9570317f4a4421bc7e27ade5a0db3baf993cee60a3537c5ed8a1d08eee3d09beaaca210c86ef118032a1718d8323a4cefbee9916 +EBUILD openssh-8.1_p1-r2.ebuild 16426 BLAKE2B 42562396d6bc711b5489375dc76ecc4b3307a366e9a8500f483973a7b401f1e2b4e5dd1aba79cd4d307fee80429efa3d1d90c2acc76bd71a8f7687e3a5fddc9e SHA512 73d077862441a26a20c41acbc59bd047854bfaa77fe3ad64125ec7011bb6941147bff005310deacd0550c2156e6632732543835bb128856b83a55a553987f5da +EBUILD openssh-8.2_p1-r3.ebuild 16788 BLAKE2B f5b7d8c76dd487da270c3f4370fb69389855a2b816ecff6bda726cf6b58676f187766f521ded13c0fda33dab89acdd45d2d05a5595b0bec437e079a741a7250e SHA512 5d8bdc782ae8bc26cf534d6871dda1aef53d9bb2bde4b3ecf8999407c5b2b33c193b9be10b9076dad99bef00c5cadfb3d56d9101b03c1b49af4dd5c9735c3390 MISC metadata.xml 2361 BLAKE2B 695d283e9b32826edf5d86ed1a26f3182d09ddf5ec40a35ac8273cf99ba042f4b6aeec563946e8c2b2ab5de798258c95810c8b23b9b725d1633b8ea7b0a105e7 SHA512 a532edee5daadb1390a02c124cf4dd0c80b956676bfe833bb5ffccc1cdc0d2aa9c5f9d10f61cb24af74aa7b731c2cc2f4b4418d94a2a75cc8f0c57ea98d57707 diff --git a/net-misc/openssh/files/openssh-8.2_p1-X509-12.4-tests.patch b/net-misc/openssh/files/openssh-8.2_p1-X509-12.4-tests.patch deleted file mode 100644 index 1c58d0d5d823..000000000000 --- a/net-misc/openssh/files/openssh-8.2_p1-X509-12.4-tests.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/openbsd-compat/regress/Makefile.in 2020-02-15 10:59:01.210601434 -0700 -+++ b/openbsd-compat/regress/Makefile.in 2020-02-15 10:59:18.753485852 -0700 -@@ -7,7 +7,7 @@ - CC=@CC@ - LD=@LD@ - CFLAGS=@CFLAGS@ --CPPFLAGS=-I. -I.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ -+CPPFLAGS=-I. -I.. -I../.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ - EXEEXT=@EXEEXT@ - LIBCOMPAT=../libopenbsd-compat.a - LIBS=@LIBS@ diff --git a/net-misc/openssh/files/openssh-8.2_p1-X509-12.4.2-tests.patch b/net-misc/openssh/files/openssh-8.2_p1-X509-12.4.2-tests.patch new file mode 100644 index 000000000000..1c58d0d5d823 --- /dev/null +++ b/net-misc/openssh/files/openssh-8.2_p1-X509-12.4.2-tests.patch @@ -0,0 +1,11 @@ +--- a/openbsd-compat/regress/Makefile.in 2020-02-15 10:59:01.210601434 -0700 ++++ b/openbsd-compat/regress/Makefile.in 2020-02-15 10:59:18.753485852 -0700 +@@ -7,7 +7,7 @@ + CC=@CC@ + LD=@LD@ + CFLAGS=@CFLAGS@ +-CPPFLAGS=-I. -I.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ ++CPPFLAGS=-I. -I.. -I../.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ + EXEEXT=@EXEEXT@ + LIBCOMPAT=../libopenbsd-compat.a + LIBS=@LIBS@ diff --git a/net-misc/openssh/files/openssh-8.2_p1-X509-glue-12.4.2.patch b/net-misc/openssh/files/openssh-8.2_p1-X509-glue-12.4.2.patch new file mode 100644 index 000000000000..90a5d5a660f2 --- /dev/null +++ b/net-misc/openssh/files/openssh-8.2_p1-X509-glue-12.4.2.patch @@ -0,0 +1,129 @@ +diff --exclude '*.un~' -ubr a/openssh-8.2p1+x509-12.4.2.diff b/openssh-8.2p1+x509-12.4.2.diff +--- a/openssh-8.2p1+x509-12.4.2.diff 2020-02-23 12:25:17.296737805 -0800 ++++ b/openssh-8.2p1+x509-12.4.2.diff 2020-02-23 12:26:25.347779673 -0800 +@@ -39236,16 +39236,15 @@ + + install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config + install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf +-@@ -378,6 +379,8 @@ ++@@ -378,6 +379,7 @@ + $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5 + $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8 + $(MKDIR_P) $(DESTDIR)$(libexecdir) + + $(MKDIR_P) $(DESTDIR)$(sshcadir) +-+ $(MKDIR_P) $(DESTDIR)$(piddir) + $(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH) + $(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT) + $(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT) +-@@ -386,11 +389,14 @@ ++@@ -386,11 +388,14 @@ + $(INSTALL) -m 0755 $(STRIP_OPT) ssh-keygen$(EXEEXT) $(DESTDIR)$(bindir)/ssh-keygen$(EXEEXT) + $(INSTALL) -m 0755 $(STRIP_OPT) ssh-keyscan$(EXEEXT) $(DESTDIR)$(bindir)/ssh-keyscan$(EXEEXT) + $(INSTALL) -m 0755 $(STRIP_OPT) sshd$(EXEEXT) $(DESTDIR)$(sbindir)/sshd$(EXEEXT) +@@ -39264,7 +39263,7 @@ + $(INSTALL) -m 644 ssh.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 + $(INSTALL) -m 644 scp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1 + $(INSTALL) -m 644 ssh-add.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1 +-@@ -400,12 +406,12 @@ ++@@ -400,12 +405,12 @@ + $(INSTALL) -m 644 moduli.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/moduli.5 + $(INSTALL) -m 644 sshd_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/sshd_config.5 + $(INSTALL) -m 644 ssh_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/ssh_config.5 +@@ -39278,7 +39277,7 @@ + + install-sysconf: + $(MKDIR_P) $(DESTDIR)$(sysconfdir) +-@@ -463,10 +469,9 @@ ++@@ -463,10 +468,9 @@ + -rm -f $(DESTDIR)$(bindir)/ssh-keyscan$(EXEEXT) + -rm -f $(DESTDIR)$(bindir)/sftp$(EXEEXT) + -rm -f $(DESTDIR)$(sbindir)/sshd$(EXEEXT) +@@ -39292,7 +39291,7 @@ + -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 + -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1 + -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1 +-@@ -478,7 +483,6 @@ ++@@ -478,7 +482,6 @@ + -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 + -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8 + -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8 +@@ -39300,7 +39299,7 @@ + + regress-prep: + $(MKDIR_P) `pwd`/regress/unittests/test_helper +-@@ -491,11 +495,11 @@ ++@@ -491,11 +494,11 @@ + $(MKDIR_P) `pwd`/regress/unittests/match + $(MKDIR_P) `pwd`/regress/unittests/utf8 + $(MKDIR_P) `pwd`/regress/misc/kexfuzz +@@ -39314,7 +39313,7 @@ + + regress/modpipe$(EXEEXT): $(srcdir)/regress/modpipe.c $(REGRESSLIBS) + $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(srcdir)/regress/modpipe.c \ +-@@ -546,8 +550,7 @@ ++@@ -546,8 +549,7 @@ + regress/unittests/sshkey/tests.o \ + regress/unittests/sshkey/common.o \ + regress/unittests/sshkey/test_file.o \ +@@ -39344,7 +39343,7 @@ + + regress/unittests/hostkeys/test_hostkeys$(EXEEXT): \ + ${UNITTESTS_TEST_HOSTKEYS_OBJS} \ +-@@ -618,35 +619,18 @@ ++@@ -618,35 +618,18 @@ + -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) + + MISC_KEX_FUZZ_OBJS=\ +@@ -39382,7 +39381,7 @@ + regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \ + regress/unittests/sshkey/test_sshkey$(EXEEXT) \ + regress/unittests/bitmap/test_bitmap$(EXEEXT) \ +-@@ -657,36 +641,29 @@ ++@@ -657,36 +640,29 @@ + regress/unittests/utf8/test_utf8$(EXEEXT) \ + regress/misc/kexfuzz/kexfuzz$(EXEEXT) + +@@ -39439,7 +39438,7 @@ + TEST_SSH_IPV6="@TEST_SSH_IPV6@" ; \ + TEST_SSH_UTF8="@TEST_SSH_UTF8@" ; \ + TEST_SSH_ECC="@TEST_SSH_ECC@" ; \ +-@@ -708,8 +685,6 @@ ++@@ -708,8 +684,6 @@ + TEST_SSH_SSHPKCS11HELPER="$${TEST_SSH_SSHPKCS11HELPER}" \ + TEST_SSH_SSHKEYSCAN="$${TEST_SSH_SSHKEYSCAN}" \ + TEST_SSH_SFTP="$${TEST_SSH_SFTP}" \ +@@ -39448,7 +39447,7 @@ + TEST_SSH_SFTPSERVER="$${TEST_SSH_SFTPSERVER}" \ + TEST_SSH_PLINK="$${TEST_SSH_PLINK}" \ + TEST_SSH_PUTTYGEN="$${TEST_SSH_PUTTYGEN}" \ +-@@ -717,17 +692,35 @@ ++@@ -717,17 +691,35 @@ + TEST_SSH_IPV6="$${TEST_SSH_IPV6}" \ + TEST_SSH_UTF8="$${TEST_SSH_UTF8}" \ + TEST_SSH_ECC="$${TEST_SSH_ECC}" \ +@@ -39487,7 +39486,7 @@ + + survey: survey.sh ssh + @$(SHELL) ./survey.sh > survey +-@@ -743,4 +736,8 @@ ++@@ -743,4 +735,8 @@ + sh buildpkg.sh; \ + fi + +@@ -98042,16 +98041,6 @@ + + return mbtowc(NULL, s, n); + +} + +#endif +-diff -ruN openssh-8.2p1/version.h openssh-8.2p1+x509-12.4.2/version.h +---- openssh-8.2p1/version.h 2020-02-14 02:40:54.000000000 +0200 +-+++ openssh-8.2p1+x509-12.4.2/version.h 2020-02-23 11:07:00.000000000 +0200 +-@@ -2,5 +2,4 @@ +- +- #define SSH_VERSION "OpenSSH_8.2" +- +--#define SSH_PORTABLE "p1" +--#define SSH_RELEASE SSH_VERSION SSH_PORTABLE +-+#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1" + diff -ruN openssh-8.2p1/version.m4 openssh-8.2p1+x509-12.4.2/version.m4 + --- openssh-8.2p1/version.m4 1970-01-01 02:00:00.000000000 +0200 + +++ openssh-8.2p1+x509-12.4.2/version.m4 2020-02-23 11:07:00.000000000 +0200 diff --git a/net-misc/openssh/files/openssh-8.2_p1-X509-glue-12.4.patch b/net-misc/openssh/files/openssh-8.2_p1-X509-glue-12.4.patch deleted file mode 100644 index 6c9d80de9bc2..000000000000 --- a/net-misc/openssh/files/openssh-8.2_p1-X509-glue-12.4.patch +++ /dev/null @@ -1,150 +0,0 @@ -diff -ur --exclude '*.un~' a/openssh-8.2p1+x509-12.4.diff b/openssh-8.2p1+x509-12.4.diff ---- a/openssh-8.2p1+x509-12.4.diff 2020-02-15 10:50:06.441041447 -0800 -+++ b/openssh-8.2p1+x509-12.4.diff 2020-02-15 10:52:52.241790237 -0800 -@@ -39197,16 +39197,15 @@ - - install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config - install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf --@@ -378,6 +379,8 @@ -+@@ -378,6 +379,7 @@ - $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5 - $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8 - $(MKDIR_P) $(DESTDIR)$(libexecdir) - + $(MKDIR_P) $(DESTDIR)$(sshcadir) --+ $(MKDIR_P) $(DESTDIR)$(piddir) - $(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH) - $(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT) - $(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT) --@@ -386,11 +389,14 @@ -+@@ -386,11 +388,14 @@ - $(INSTALL) -m 0755 $(STRIP_OPT) ssh-keygen$(EXEEXT) $(DESTDIR)$(bindir)/ssh-keygen$(EXEEXT) - $(INSTALL) -m 0755 $(STRIP_OPT) ssh-keyscan$(EXEEXT) $(DESTDIR)$(bindir)/ssh-keyscan$(EXEEXT) - $(INSTALL) -m 0755 $(STRIP_OPT) sshd$(EXEEXT) $(DESTDIR)$(sbindir)/sshd$(EXEEXT) -@@ -39225,7 +39224,7 @@ - $(INSTALL) -m 644 ssh.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 - $(INSTALL) -m 644 scp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1 - $(INSTALL) -m 644 ssh-add.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1 --@@ -400,12 +406,12 @@ -+@@ -400,12 +405,12 @@ - $(INSTALL) -m 644 moduli.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/moduli.5 - $(INSTALL) -m 644 sshd_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/sshd_config.5 - $(INSTALL) -m 644 ssh_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/ssh_config.5 -@@ -39239,7 +39238,7 @@ - - install-sysconf: - $(MKDIR_P) $(DESTDIR)$(sysconfdir) --@@ -463,10 +469,9 @@ -+@@ -463,10 +468,9 @@ - -rm -f $(DESTDIR)$(bindir)/ssh-keyscan$(EXEEXT) - -rm -f $(DESTDIR)$(bindir)/sftp$(EXEEXT) - -rm -f $(DESTDIR)$(sbindir)/sshd$(EXEEXT) -@@ -39253,7 +39252,7 @@ - -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 - -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1 - -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1 --@@ -478,7 +483,6 @@ -+@@ -478,7 +482,6 @@ - -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 - -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8 - -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8 -@@ -39261,7 +39260,7 @@ - - regress-prep: - $(MKDIR_P) `pwd`/regress/unittests/test_helper --@@ -491,11 +495,11 @@ -+@@ -491,11 +494,11 @@ - $(MKDIR_P) `pwd`/regress/unittests/match - $(MKDIR_P) `pwd`/regress/unittests/utf8 - $(MKDIR_P) `pwd`/regress/misc/kexfuzz -@@ -39275,7 +39274,7 @@ - - regress/modpipe$(EXEEXT): $(srcdir)/regress/modpipe.c $(REGRESSLIBS) - $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(srcdir)/regress/modpipe.c \ --@@ -546,8 +550,7 @@ -+@@ -546,8 +549,7 @@ - regress/unittests/sshkey/tests.o \ - regress/unittests/sshkey/common.o \ - regress/unittests/sshkey/test_file.o \ -@@ -39285,7 +39284,7 @@ - - regress/unittests/sshkey/test_sshkey$(EXEEXT): ${UNITTESTS_TEST_SSHKEY_OBJS} \ - regress/unittests/test_helper/libtest_helper.a libssh.a --@@ -576,8 +579,7 @@ -+@@ -576,8 +578,7 @@ - - UNITTESTS_TEST_KEX_OBJS=\ - regress/unittests/kex/tests.o \ -@@ -39295,7 +39294,7 @@ - - regress/unittests/kex/test_kex$(EXEEXT): ${UNITTESTS_TEST_KEX_OBJS} \ - regress/unittests/test_helper/libtest_helper.a libssh.a --@@ -587,8 +589,7 @@ -+@@ -587,8 +588,7 @@ - - UNITTESTS_TEST_HOSTKEYS_OBJS=\ - regress/unittests/hostkeys/tests.o \ -@@ -39305,7 +39304,7 @@ - - regress/unittests/hostkeys/test_hostkeys$(EXEEXT): \ - ${UNITTESTS_TEST_HOSTKEYS_OBJS} \ --@@ -618,35 +619,18 @@ -+@@ -618,35 +618,18 @@ - -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) - - MISC_KEX_FUZZ_OBJS=\ -@@ -39343,7 +39342,7 @@ - regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \ - regress/unittests/sshkey/test_sshkey$(EXEEXT) \ - regress/unittests/bitmap/test_bitmap$(EXEEXT) \ --@@ -657,36 +641,29 @@ -+@@ -657,36 +640,29 @@ - regress/unittests/utf8/test_utf8$(EXEEXT) \ - regress/misc/kexfuzz/kexfuzz$(EXEEXT) - -@@ -39400,7 +39399,7 @@ - TEST_SSH_IPV6="@TEST_SSH_IPV6@" ; \ - TEST_SSH_UTF8="@TEST_SSH_UTF8@" ; \ - TEST_SSH_ECC="@TEST_SSH_ECC@" ; \ --@@ -708,8 +685,6 @@ -+@@ -708,8 +684,6 @@ - TEST_SSH_SSHPKCS11HELPER="$${TEST_SSH_SSHPKCS11HELPER}" \ - TEST_SSH_SSHKEYSCAN="$${TEST_SSH_SSHKEYSCAN}" \ - TEST_SSH_SFTP="$${TEST_SSH_SFTP}" \ -@@ -39409,7 +39408,7 @@ - TEST_SSH_SFTPSERVER="$${TEST_SSH_SFTPSERVER}" \ - TEST_SSH_PLINK="$${TEST_SSH_PLINK}" \ - TEST_SSH_PUTTYGEN="$${TEST_SSH_PUTTYGEN}" \ --@@ -717,17 +692,35 @@ -+@@ -717,17 +691,35 @@ - TEST_SSH_IPV6="$${TEST_SSH_IPV6}" \ - TEST_SSH_UTF8="$${TEST_SSH_UTF8}" \ - TEST_SSH_ECC="$${TEST_SSH_ECC}" \ -@@ -39448,7 +39447,7 @@ - - survey: survey.sh ssh - @$(SHELL) ./survey.sh > survey --@@ -743,4 +736,8 @@ -+@@ -743,4 +735,8 @@ - sh buildpkg.sh; \ - fi - -@@ -97723,19 +97722,6 @@ - + return mbtowc(NULL, s, n); - +} - +#endif --diff -ruN openssh-8.2p1/version.h openssh-8.2p1+x509-12.4/version.h ----- openssh-8.2p1/version.h 2020-02-14 02:40:54.000000000 +0200 --+++ openssh-8.2p1+x509-12.4/version.h 2020-02-15 09:07:00.000000000 +0200 --@@ -1,6 +1,5 @@ ---/* $OpenBSD: version.h,v 1.86 2020/02/14 00:39:20 djm Exp $ */ --+/* $OpenBSD: version.h,v 1.85 2019/10/09 00:04:57 djm Exp $ */ -- ---#define SSH_VERSION "OpenSSH_8.2" --+#define SSH_VERSION "OpenSSH_8.1" -- ---#define SSH_PORTABLE "p1" ---#define SSH_RELEASE SSH_VERSION SSH_PORTABLE --+#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1" - diff -ruN openssh-8.2p1/version.m4 openssh-8.2p1+x509-12.4/version.m4 - --- openssh-8.2p1/version.m4 1970-01-01 02:00:00.000000000 +0200 - +++ openssh-8.2p1+x509-12.4/version.m4 2020-02-15 09:07:00.000000000 +0200 diff --git a/net-misc/openssh/openssh-8.1_p1-r2.ebuild b/net-misc/openssh/openssh-8.1_p1-r2.ebuild index 7b622cca1583..5921f6945b0c 100644 --- a/net-misc/openssh/openssh-8.1_p1-r2.ebuild +++ b/net-misc/openssh/openssh-8.1_p1-r2.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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" # Probably want to drop ssl defaulting to on in a future version. IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie sctp selinux +ssl static test X X509 xmss" diff --git a/net-misc/openssh/openssh-8.2_p1-r1.ebuild b/net-misc/openssh/openssh-8.2_p1-r1.ebuild deleted file mode 100644 index 23a61c4f6d01..000000000000 --- a/net-misc/openssh/openssh-8.2_p1-r1.ebuild +++ /dev/null @@ -1,481 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit user-info flag-o-matic multilib autotools pam systemd toolchain-funcs - -# Make it more portable between straight releases -# and _p? releases. -PARCH=${P/_} -HPN_PV="8.1_P1" - -HPN_VER="14.20" -HPN_PATCHES=( - ${PN}-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff - ${PN}-${HPN_PV/./_}-hpn-AES-CTR-${HPN_VER}.diff - ${PN}-${HPN_PV/./_}-hpn-PeakTput-${HPN_VER}.diff -) - -SCTP_VER="1.2" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz" -X509_VER="12.4" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz" - -DESCRIPTION="Port of OpenBSD's free SSH release" -HOMEPAGE="https://www.openssh.com/" -SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz - ${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/${SCTP_PATCH} )} - ${HPN_VER:+hpn? ( $(printf "mirror://sourceforge/hpnssh/HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}/%s\n" "${HPN_PATCHES[@]}") )} - ${X509_PATCH:+X509? ( https://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )} -" -S="${WORKDIR}/${PARCH}" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -# Probably want to drop ssl defaulting to on in a future version. -IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie sctp security-key selinux +ssl static test X X509 xmss" - -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - ldns? ( ssl ) - pie? ( !static ) - static? ( !kerberos !pam ) - X509? ( !sctp !security-key ssl ) - test? ( ssl ) -" - -LIB_DEPEND=" - audit? ( sys-process/audit[static-libs(+)] ) - ldns? ( - net-libs/ldns[static-libs(+)] - !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) - bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) - ) - libedit? ( dev-libs/libedit:=[static-libs(+)] ) - sctp? ( net-misc/lksctp-tools[static-libs(+)] ) - security-key? ( dev-libs/libfido2:=[static-libs(+)] ) - selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) - ssl? ( - !libressl? ( - || ( - ( - >=dev-libs/openssl-1.0.1:0[bindist=] - =dev-libs/openssl-1.1.0g:0[bindist=] - ) - dev-libs/openssl:0=[static-libs(+)] - ) - libressl? ( dev-libs/libressl:0=[static-libs(+)] ) - ) - virtual/libcrypt:=[static-libs(+)] - >=sys-libs/zlib-1.2.3:=[static-libs(+)] -" -RDEPEND=" - acct-group/sshd - acct-user/sshd - !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - pam? ( sys-libs/pam ) - kerberos? ( virtual/krb5 ) -" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} ) - virtual/os-headers -" -RDEPEND="${RDEPEND} - pam? ( >=sys-auth/pambase-20081028 ) - userland_GNU? ( virtual/shadow ) - X? ( x11-apps/xauth ) -" -BDEPEND=" - virtual/pkgconfig - sys-devel/autoconf -" - -pkg_pretend() { - # this sucks, but i'd rather have people unable to `emerge -u openssh` - # than not be able to log in to their server any more - maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; } - local fail=" - $(use hpn && maybe_fail hpn HPN_VER) - $(use sctp && maybe_fail sctp SCTP_PATCH) - $(use X509 && maybe_fail X509 X509_PATCH) - " - fail=$(echo ${fail}) - if [[ -n ${fail} ]] ; then - eerror "Sorry, but this version does not yet support features" - eerror "that you requested: ${fail}" - eerror "Please mask ${PF} for now and check back later:" - eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask" - die "booooo" - fi - - # Make sure people who are using tcp wrappers are notified of its removal. #531156 - if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then - ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like" - ewarn "you're trying to use it. Update your ${EROOT}/etc/hosts.{allow,deny} please." - fi -} - -src_prepare() { - sed -i \ - -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \ - pathnames.h || die - - # don't break .ssh/authorized_keys2 for fun - sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die - - eapply "${FILESDIR}"/${PN}-7.9_p1-include-stdlib.patch - eapply "${FILESDIR}"/${PN}-8.2_p1-GSSAPI-dns.patch #165444 integrated into gsskex - eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch - eapply "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch - eapply "${FILESDIR}"/${PN}-8.0_p1-fix-putty-tests.patch - eapply "${FILESDIR}"/${PN}-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch - - [[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches - - local PATCHSET_VERSION_MACROS=() - - if use X509 ; then - pushd "${WORKDIR}" &>/dev/null || die - eapply "${FILESDIR}/${P}-X509-glue-"${X509_VER}".patch" - popd &>/dev/null || die - - eapply "${WORKDIR}"/${X509_PATCH%.*} - eapply "${FILESDIR}"/${P}-X509-$(ver_cut 1-2 ${X509_VER})-tests.patch - - # We need to patch package version or any X.509 sshd will reject our ssh client - # with "userauth_pubkey: could not parse key: string is too large [preauth]" - # error - einfo "Patching package version for X.509 patch set ..." - sed -i \ - -e "s/^AC_INIT(\[OpenSSH\], \[Portable\]/AC_INIT([OpenSSH], [${X509_VER}]/" \ - "${S}"/configure.ac || die "Failed to patch package version for X.509 patch" - - einfo "Patching version.h to expose X.509 patch set ..." - sed -i \ - -e "/^#define SSH_PORTABLE.*/a #define SSH_X509 \"-PKIXSSH-${X509_VER}\"" \ - "${S}"/version.h || die "Failed to sed-in X.509 patch version" - PATCHSET_VERSION_MACROS+=( 'SSH_X509' ) - fi - - if use sctp ; then - eapply "${WORKDIR}"/${SCTP_PATCH%.*} - - einfo "Patching version.h to expose SCTP patch set ..." - sed -i \ - -e "/^#define SSH_PORTABLE/a #define SSH_SCTP \"-sctp-${SCTP_VER}\"" \ - "${S}"/version.h || die "Failed to sed-in SCTP patch version" - PATCHSET_VERSION_MACROS+=( 'SSH_SCTP' ) - - einfo "Disabling know failing test (cfgparse) caused by SCTP patch ..." - sed -i \ - -e "/\t\tcfgparse \\\/d" \ - "${S}"/regress/Makefile || die "Failed to disable known failing test (cfgparse) caused by SCTP patch" - fi - - if use hpn ; then - local hpn_patchdir="${T}/${P}-hpn${HPN_VER}" - mkdir "${hpn_patchdir}" || die - cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}" || die - pushd "${hpn_patchdir}" &>/dev/null || die - eapply "${FILESDIR}"/${P}-hpn-${HPN_VER}-glue.patch - if use X509; then - # einfo "Will disable MT AES cipher due to incompatbility caused by X509 patch set" - # # X509 and AES-CTR-MT don't get along, let's just drop it - # rm openssh-${HPN_PV//./_}-hpn-AES-CTR-${HPN_VER}.diff || die - eapply "${FILESDIR}"/${P}-hpn-${HPN_VER}-X509-glue.patch - fi - use sctp && eapply "${FILESDIR}"/${P}-hpn-${HPN_VER}-sctp-glue.patch - popd &>/dev/null || die - - eapply "${hpn_patchdir}" - - use X509 || eapply "${FILESDIR}/openssh-8.0_p1-hpn-version.patch" - - einfo "Patching Makefile.in for HPN patch set ..." - sed -i \ - -e "/^LIBS=/ s/\$/ -lpthread/" \ - "${S}"/Makefile.in || die "Failed to patch Makefile.in" - - einfo "Patching version.h to expose HPN patch set ..." - sed -i \ - -e "/^#define SSH_PORTABLE/a #define SSH_HPN \"-hpn${HPN_VER//./v}\"" \ - "${S}"/version.h || die "Failed to sed-in HPN patch version" - PATCHSET_VERSION_MACROS+=( 'SSH_HPN' ) - - if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then - einfo "Disabling known non-working MT AES cipher per default ..." - - cat > "${T}"/disable_mtaes.conf <<- EOF - - # HPN's Multi-Threaded AES CTR cipher is currently known to be broken - # and therefore disabled per default. - DisableMTAES yes - EOF - sed -i \ - -e "/^#HPNDisabled.*/r ${T}/disable_mtaes.conf" \ - "${S}"/sshd_config || die "Failed to disabled MT AES ciphers in sshd_config" - - sed -i \ - -e "/AcceptEnv.*_XXX_TEST$/a \\\tDisableMTAES\t\tyes" \ - "${S}"/regress/test-exec.sh || die "Failed to disable MT AES ciphers in test config" - fi - fi - - if use X509 || use sctp || use hpn ; then - einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..." - sed -i \ - -e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \ - "${S}"/sshconnect.c || die "Failed to patch send_client_banner() to use SSH_RELEASE (sshconnect.c)" - - einfo "Patching sshd.c to use SSH_RELEASE in sshd_exchange_identification() ..." - sed -i \ - -e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \ - "${S}"/sshd.c || die "Failed to patch sshd_exchange_identification() to use SSH_RELEASE (sshd.c)" - - einfo "Patching version.h to add our patch sets to SSH_RELEASE ..." - sed -i \ - -e "s/^#define SSH_RELEASE.*/#define SSH_RELEASE SSH_VERSION SSH_PORTABLE ${PATCHSET_VERSION_MACROS[*]}/" \ - "${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)" - fi - - sed -i \ - -e "/#UseLogin no/d" \ - "${S}"/sshd_config || die "Failed to remove removed UseLogin option (sshd_config)" - - eapply_user #473004 - - tc-export PKG_CONFIG - local sed_args=( - -e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):" - # Disable PATH reset, trust what portage gives us #254615 - -e 's:^PATH=/:#PATH=/:' - # Disable fortify flags ... our gcc does this for us - -e 's:-D_FORTIFY_SOURCE=2::' - ) - - # The -ftrapv flag ICEs on hppa #505182 - use hppa && sed_args+=( - -e '/CFLAGS/s:-ftrapv:-fdisable-this-test:' - -e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d' - ) - # _XOPEN_SOURCE causes header conflicts on Solaris - [[ ${CHOST} == *-solaris* ]] && sed_args+=( - -e 's/-D_XOPEN_SOURCE//' - ) - sed -i "${sed_args[@]}" configure{.ac,} || die - - eautoreconf -} - -src_configure() { - addwrite /dev/ptmx - - use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG - use static && append-ldflags -static - use xmss && append-cflags -DWITH_XMSS - - local myconf=( - --with-ldflags="${LDFLAGS}" - --disable-strip - --with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run - --sysconfdir="${EPREFIX}"/etc/ssh - --libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc - --datadir="${EPREFIX}"/usr/share/openssh - --with-privsep-path="${EPREFIX}"/var/empty - --with-privsep-user=sshd - $(use_with audit audit linux) - $(use_with kerberos kerberos5 "${EPREFIX}"/usr) - # We apply the sctp patch conditionally, so can't pass --without-sctp - # unconditionally else we get unknown flag warnings. - $(use sctp && use_with sctp) - $(use_with ldns ldns "${EPREFIX}"/usr) - $(use_with libedit) - $(use_with pam) - $(use_with pie) - $(use_with selinux) - $(use_with security-key security-key-builtin) - $(use_with ssl openssl) - $(use_with ssl md5-passwords) - $(use_with ssl ssl-engine) - $(use_with !elibc_Cygwin hardening) #659210 - ) - - # stackprotect is broken on musl x86 and ppc - use elibc_musl && ( use x86 || use ppc ) && myconf+=( --without-stackprotect ) - - # The seccomp sandbox is broken on x32, so use the older method for now. #553748 - use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit ) - - econf "${myconf[@]}" -} - -src_test() { - local t skipped=() failed=() passed=() - local tests=( interop-tests compat-tests ) - - local shell=$(egetshell "${UID}") - if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then - elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'" - elog "user, so we will run a subset only." - skipped+=( tests ) - else - tests+=( tests ) - fi - - # It will also attempt to write to the homedir .ssh. - local sshhome=${T}/homedir - mkdir -p "${sshhome}"/.ssh - for t in "${tests[@]}" ; do - # Some tests read from stdin ... - HOMEDIR="${sshhome}" HOME="${sshhome}" SUDO="" \ - emake -k -j1 ${t} > "${ED}"/etc/ssh/sshd_config - - # Allow client to pass locale environment variables. #367017 - AcceptEnv ${locale_vars[*]} - - # Allow client to pass COLORTERM to match TERM. #658540 - AcceptEnv COLORTERM - EOF - - # Then the client config. - cat <<-EOF >> "${ED}"/etc/ssh/ssh_config - - # Send locale environment variables. #367017 - SendEnv ${locale_vars[*]} - - # Send COLORTERM to match TERM. #658540 - SendEnv COLORTERM - EOF - - if use pam ; then - sed -i \ - -e "/^#UsePAM /s:.*:UsePAM yes:" \ - -e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \ - -e "/^#PrintMotd /s:.*:PrintMotd no:" \ - -e "/^#PrintLastLog /s:.*:PrintLastLog no:" \ - "${ED}"/etc/ssh/sshd_config || die - fi - - if use livecd ; then - sed -i \ - -e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \ - "${ED}"/etc/ssh/sshd_config || die - fi -} - -src_install() { - emake install-nokeys DESTDIR="${D}" - fperms 600 /etc/ssh/sshd_config - dobin contrib/ssh-copy-id - newinitd "${FILESDIR}"/sshd-r1.initd sshd - newconfd "${FILESDIR}"/sshd-r1.confd sshd - - newpamd "${FILESDIR}"/sshd.pam_include.2 sshd - - tweak_ssh_configs - - doman contrib/ssh-copy-id.1 - dodoc CREDITS OVERVIEW README* TODO sshd_config - use hpn && dodoc HPN-README - use X509 || dodoc ChangeLog - - diropts -m 0700 - dodir /etc/skel/.ssh - - keepdir /var/empty - - systemd_dounit "${FILESDIR}"/sshd.{service,socket} - systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service' -} - -pkg_preinst() { - if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]"; then - show_ssl_warning=1 - fi -} - -pkg_postinst() { - local old_ver - for old_ver in ${REPLACING_VERSIONS}; do - if ver_test "${old_ver}" -lt "5.8_p1"; then - elog "Starting with openssh-5.8p1, the server will default to a newer key" - elog "algorithm (ECDSA). You are encouraged to manually update your stored" - elog "keys list as servers update theirs. See ssh-keyscan(1) for more info." - fi - if ver_test "${old_ver}" -lt "7.0_p1"; then - elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream." - elog "Make sure to update any configs that you might have. Note that xinetd might" - elog "be an alternative for you as it supports USE=tcpd." - fi - if ver_test "${old_ver}" -lt "7.1_p1"; then #557388 #555518 - elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their" - elog "weak sizes. If you rely on these key types, you can re-enable the key types by" - elog "adding to your sshd_config or ~/.ssh/config files:" - elog " PubkeyAcceptedKeyTypes=+ssh-dss" - elog "You should however generate new keys using rsa or ed25519." - - elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'" - elog "to 'prohibit-password'. That means password auth for root users no longer works" - elog "out of the box. If you need this, please update your sshd_config explicitly." - fi - if ver_test "${old_ver}" -lt "7.6_p1"; then - elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely." - elog "Furthermore, rsa keys with less than 1024 bits will be refused." - fi - if ver_test "${old_ver}" -lt "7.7_p1"; then - elog "Starting with openssh-7.7p1, we no longer patch openssh to provide LDAP functionality." - elog "Install sys-auth/ssh-ldap-pubkey and use OpenSSH's \"AuthorizedKeysCommand\" option" - elog "if you need to authenticate against LDAP." - elog "See https://wiki.gentoo.org/wiki/SSH/LDAP_migration for more details." - fi - if ver_test "${old_ver}" -lt "8.2_p1"; then - ewarn "After upgrading to openssh-8.2p1 please restart sshd, otherwise you" - ewarn "will not be able to establish new sessions. Restarting sshd over a ssh" - ewarn "connection is generally safe." - fi - done - - if [[ -n ${show_ssl_warning} ]]; then - elog "Be aware that by disabling openssl support in openssh, the server and clients" - elog "no longer support dss/rsa/ecdsa keys. You will need to generate ed25519 keys" - elog "and update all clients/servers that utilize them." - fi - - if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then - elog "" - elog "HPN's multi-threaded AES CTR cipher is currently known to be broken" - elog "and therefore disabled at runtime per default." - elog "Make sure your sshd_config is up to date and contains" - elog "" - elog " DisableMTAES yes" - elog "" - elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher." - elog "" - fi -} diff --git a/net-misc/openssh/openssh-8.2_p1-r3.ebuild b/net-misc/openssh/openssh-8.2_p1-r3.ebuild new file mode 100644 index 000000000000..0579a0af345e --- /dev/null +++ b/net-misc/openssh/openssh-8.2_p1-r3.ebuild @@ -0,0 +1,482 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit user-info flag-o-matic multilib autotools pam systemd toolchain-funcs + +# Make it more portable between straight releases +# and _p? releases. +PARCH=${P/_} +HPN_PV="8.1_P1" + +HPN_VER="14.20" +HPN_PATCHES=( + ${PN}-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff + ${PN}-${HPN_PV/./_}-hpn-AES-CTR-${HPN_VER}.diff + ${PN}-${HPN_PV/./_}-hpn-PeakTput-${HPN_VER}.diff +) + +SCTP_VER="1.2" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz" +X509_VER="12.4.2" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz" + +DESCRIPTION="Port of OpenBSD's free SSH release" +HOMEPAGE="https://www.openssh.com/" +SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz + ${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/${SCTP_PATCH} )} + ${HPN_VER:+hpn? ( $(printf "mirror://sourceforge/hpnssh/HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}/%s\n" "${HPN_PATCHES[@]}") )} + ${X509_PATCH:+X509? ( https://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )} +" +S="${WORKDIR}/${PARCH}" + +LICENSE="BSD GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +# Probably want to drop ssl defaulting to on in a future version. +IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie sctp security-key selinux +ssl static test X X509 xmss" + +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + ldns? ( ssl ) + pie? ( !static ) + static? ( !kerberos !pam ) + X509? ( !sctp !security-key ssl !xmss ) + xmss? ( || ( ssl libressl ) ) + test? ( ssl ) +" + +LIB_DEPEND=" + audit? ( sys-process/audit[static-libs(+)] ) + ldns? ( + net-libs/ldns[static-libs(+)] + !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) + bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) + ) + libedit? ( dev-libs/libedit:=[static-libs(+)] ) + sctp? ( net-misc/lksctp-tools[static-libs(+)] ) + security-key? ( dev-libs/libfido2:=[static-libs(+)] ) + selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) + ssl? ( + !libressl? ( + || ( + ( + >=dev-libs/openssl-1.0.1:0[bindist=] + =dev-libs/openssl-1.1.0g:0[bindist=] + ) + dev-libs/openssl:0=[static-libs(+)] + ) + libressl? ( dev-libs/libressl:0=[static-libs(+)] ) + ) + virtual/libcrypt:=[static-libs(+)] + >=sys-libs/zlib-1.2.3:=[static-libs(+)] +" +RDEPEND=" + acct-group/sshd + acct-user/sshd + !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) + pam? ( sys-libs/pam ) + kerberos? ( virtual/krb5 ) +" +DEPEND="${RDEPEND} + static? ( ${LIB_DEPEND} ) + virtual/os-headers +" +RDEPEND="${RDEPEND} + pam? ( >=sys-auth/pambase-20081028 ) + userland_GNU? ( virtual/shadow ) + X? ( x11-apps/xauth ) +" +BDEPEND=" + virtual/pkgconfig + sys-devel/autoconf +" + +pkg_pretend() { + # this sucks, but i'd rather have people unable to `emerge -u openssh` + # than not be able to log in to their server any more + maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; } + local fail=" + $(use hpn && maybe_fail hpn HPN_VER) + $(use sctp && maybe_fail sctp SCTP_PATCH) + $(use X509 && maybe_fail X509 X509_PATCH) + " + fail=$(echo ${fail}) + if [[ -n ${fail} ]] ; then + eerror "Sorry, but this version does not yet support features" + eerror "that you requested: ${fail}" + eerror "Please mask ${PF} for now and check back later:" + eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask" + die "booooo" + fi + + # Make sure people who are using tcp wrappers are notified of its removal. #531156 + if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then + ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like" + ewarn "you're trying to use it. Update your ${EROOT}/etc/hosts.{allow,deny} please." + fi +} + +src_prepare() { + sed -i \ + -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \ + pathnames.h || die + + # don't break .ssh/authorized_keys2 for fun + sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die + + eapply "${FILESDIR}"/${PN}-7.9_p1-include-stdlib.patch + eapply "${FILESDIR}"/${PN}-8.2_p1-GSSAPI-dns.patch #165444 integrated into gsskex + eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch + eapply "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch + eapply "${FILESDIR}"/${PN}-8.0_p1-fix-putty-tests.patch + eapply "${FILESDIR}"/${PN}-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch + + [[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches + + local PATCHSET_VERSION_MACROS=() + + if use X509 ; then + pushd "${WORKDIR}" &>/dev/null || die + eapply "${FILESDIR}/${P}-X509-glue-"${X509_VER}".patch" + popd &>/dev/null || die + + eapply "${WORKDIR}"/${X509_PATCH%.*} + eapply "${FILESDIR}"/${P}-X509-${X509_VER}-tests.patch + + # We need to patch package version or any X.509 sshd will reject our ssh client + # with "userauth_pubkey: could not parse key: string is too large [preauth]" + # error + einfo "Patching package version for X.509 patch set ..." + sed -i \ + -e "s/^AC_INIT(\[OpenSSH\], \[Portable\]/AC_INIT([OpenSSH], [${X509_VER}]/" \ + "${S}"/configure.ac || die "Failed to patch package version for X.509 patch" + + einfo "Patching version.h to expose X.509 patch set ..." + sed -i \ + -e "/^#define SSH_PORTABLE.*/a #define SSH_X509 \"-PKIXSSH-${X509_VER}\"" \ + "${S}"/version.h || die "Failed to sed-in X.509 patch version" + PATCHSET_VERSION_MACROS+=( 'SSH_X509' ) + fi + + if use sctp ; then + eapply "${WORKDIR}"/${SCTP_PATCH%.*} + + einfo "Patching version.h to expose SCTP patch set ..." + sed -i \ + -e "/^#define SSH_PORTABLE/a #define SSH_SCTP \"-sctp-${SCTP_VER}\"" \ + "${S}"/version.h || die "Failed to sed-in SCTP patch version" + PATCHSET_VERSION_MACROS+=( 'SSH_SCTP' ) + + einfo "Disabling know failing test (cfgparse) caused by SCTP patch ..." + sed -i \ + -e "/\t\tcfgparse \\\/d" \ + "${S}"/regress/Makefile || die "Failed to disable known failing test (cfgparse) caused by SCTP patch" + fi + + if use hpn ; then + local hpn_patchdir="${T}/${P}-hpn${HPN_VER}" + mkdir "${hpn_patchdir}" || die + cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}" || die + pushd "${hpn_patchdir}" &>/dev/null || die + eapply "${FILESDIR}"/${P}-hpn-${HPN_VER}-glue.patch + if use X509; then + # einfo "Will disable MT AES cipher due to incompatbility caused by X509 patch set" + # # X509 and AES-CTR-MT don't get along, let's just drop it + # rm openssh-${HPN_PV//./_}-hpn-AES-CTR-${HPN_VER}.diff || die + eapply "${FILESDIR}"/${P}-hpn-${HPN_VER}-X509-glue.patch + fi + use sctp && eapply "${FILESDIR}"/${P}-hpn-${HPN_VER}-sctp-glue.patch + popd &>/dev/null || die + + eapply "${hpn_patchdir}" + + use X509 || eapply "${FILESDIR}/openssh-8.0_p1-hpn-version.patch" + + einfo "Patching Makefile.in for HPN patch set ..." + sed -i \ + -e "/^LIBS=/ s/\$/ -lpthread/" \ + "${S}"/Makefile.in || die "Failed to patch Makefile.in" + + einfo "Patching version.h to expose HPN patch set ..." + sed -i \ + -e "/^#define SSH_PORTABLE/a #define SSH_HPN \"-hpn${HPN_VER//./v}\"" \ + "${S}"/version.h || die "Failed to sed-in HPN patch version" + PATCHSET_VERSION_MACROS+=( 'SSH_HPN' ) + + if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then + einfo "Disabling known non-working MT AES cipher per default ..." + + cat > "${T}"/disable_mtaes.conf <<- EOF + + # HPN's Multi-Threaded AES CTR cipher is currently known to be broken + # and therefore disabled per default. + DisableMTAES yes + EOF + sed -i \ + -e "/^#HPNDisabled.*/r ${T}/disable_mtaes.conf" \ + "${S}"/sshd_config || die "Failed to disabled MT AES ciphers in sshd_config" + + sed -i \ + -e "/AcceptEnv.*_XXX_TEST$/a \\\tDisableMTAES\t\tyes" \ + "${S}"/regress/test-exec.sh || die "Failed to disable MT AES ciphers in test config" + fi + fi + + if use X509 || use sctp || use hpn ; then + einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..." + sed -i \ + -e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \ + "${S}"/sshconnect.c || die "Failed to patch send_client_banner() to use SSH_RELEASE (sshconnect.c)" + + einfo "Patching sshd.c to use SSH_RELEASE in sshd_exchange_identification() ..." + sed -i \ + -e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \ + "${S}"/sshd.c || die "Failed to patch sshd_exchange_identification() to use SSH_RELEASE (sshd.c)" + + einfo "Patching version.h to add our patch sets to SSH_RELEASE ..." + sed -i \ + -e "s/^#define SSH_RELEASE.*/#define SSH_RELEASE SSH_VERSION SSH_PORTABLE ${PATCHSET_VERSION_MACROS[*]}/" \ + "${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)" + fi + + sed -i \ + -e "/#UseLogin no/d" \ + "${S}"/sshd_config || die "Failed to remove removed UseLogin option (sshd_config)" + + eapply_user #473004 + + tc-export PKG_CONFIG + local sed_args=( + -e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):" + # Disable PATH reset, trust what portage gives us #254615 + -e 's:^PATH=/:#PATH=/:' + # Disable fortify flags ... our gcc does this for us + -e 's:-D_FORTIFY_SOURCE=2::' + ) + + # The -ftrapv flag ICEs on hppa #505182 + use hppa && sed_args+=( + -e '/CFLAGS/s:-ftrapv:-fdisable-this-test:' + -e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d' + ) + # _XOPEN_SOURCE causes header conflicts on Solaris + [[ ${CHOST} == *-solaris* ]] && sed_args+=( + -e 's/-D_XOPEN_SOURCE//' + ) + sed -i "${sed_args[@]}" configure{.ac,} || die + + eautoreconf +} + +src_configure() { + addwrite /dev/ptmx + + use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG + use static && append-ldflags -static + use xmss && append-cflags -DWITH_XMSS + + local myconf=( + --with-ldflags="${LDFLAGS}" + --disable-strip + --with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run + --sysconfdir="${EPREFIX}"/etc/ssh + --libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc + --datadir="${EPREFIX}"/usr/share/openssh + --with-privsep-path="${EPREFIX}"/var/empty + --with-privsep-user=sshd + $(use_with audit audit linux) + $(use_with kerberos kerberos5 "${EPREFIX}"/usr) + # We apply the sctp patch conditionally, so can't pass --without-sctp + # unconditionally else we get unknown flag warnings. + $(use sctp && use_with sctp) + $(use_with ldns ldns "${EPREFIX}"/usr) + $(use_with libedit) + $(use_with pam) + $(use_with pie) + $(use_with selinux) + $(use_with security-key security-key-builtin) + $(use_with ssl openssl) + $(use_with ssl md5-passwords) + $(use_with ssl ssl-engine) + $(use_with !elibc_Cygwin hardening) #659210 + ) + + # stackprotect is broken on musl x86 and ppc + use elibc_musl && ( use x86 || use ppc ) && myconf+=( --without-stackprotect ) + + # The seccomp sandbox is broken on x32, so use the older method for now. #553748 + use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit ) + + econf "${myconf[@]}" +} + +src_test() { + local t skipped=() failed=() passed=() + local tests=( interop-tests compat-tests ) + + local shell=$(egetshell "${UID}") + if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then + elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'" + elog "user, so we will run a subset only." + skipped+=( tests ) + else + tests+=( tests ) + fi + + # It will also attempt to write to the homedir .ssh. + local sshhome=${T}/homedir + mkdir -p "${sshhome}"/.ssh + for t in "${tests[@]}" ; do + # Some tests read from stdin ... + HOMEDIR="${sshhome}" HOME="${sshhome}" SUDO="" \ + emake -k -j1 ${t} > "${ED}"/etc/ssh/sshd_config + + # Allow client to pass locale environment variables. #367017 + AcceptEnv ${locale_vars[*]} + + # Allow client to pass COLORTERM to match TERM. #658540 + AcceptEnv COLORTERM + EOF + + # Then the client config. + cat <<-EOF >> "${ED}"/etc/ssh/ssh_config + + # Send locale environment variables. #367017 + SendEnv ${locale_vars[*]} + + # Send COLORTERM to match TERM. #658540 + SendEnv COLORTERM + EOF + + if use pam ; then + sed -i \ + -e "/^#UsePAM /s:.*:UsePAM yes:" \ + -e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \ + -e "/^#PrintMotd /s:.*:PrintMotd no:" \ + -e "/^#PrintLastLog /s:.*:PrintLastLog no:" \ + "${ED}"/etc/ssh/sshd_config || die + fi + + if use livecd ; then + sed -i \ + -e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \ + "${ED}"/etc/ssh/sshd_config || die + fi +} + +src_install() { + emake install-nokeys DESTDIR="${D}" + fperms 600 /etc/ssh/sshd_config + dobin contrib/ssh-copy-id + newinitd "${FILESDIR}"/sshd-r1.initd sshd + newconfd "${FILESDIR}"/sshd-r1.confd sshd + + newpamd "${FILESDIR}"/sshd.pam_include.2 sshd + + tweak_ssh_configs + + doman contrib/ssh-copy-id.1 + dodoc CREDITS OVERVIEW README* TODO sshd_config + use hpn && dodoc HPN-README + use X509 || dodoc ChangeLog + + diropts -m 0700 + dodir /etc/skel/.ssh + + keepdir /var/empty + + systemd_dounit "${FILESDIR}"/sshd.{service,socket} + systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service' +} + +pkg_preinst() { + if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]"; then + show_ssl_warning=1 + fi +} + +pkg_postinst() { + local old_ver + for old_ver in ${REPLACING_VERSIONS}; do + if ver_test "${old_ver}" -lt "5.8_p1"; then + elog "Starting with openssh-5.8p1, the server will default to a newer key" + elog "algorithm (ECDSA). You are encouraged to manually update your stored" + elog "keys list as servers update theirs. See ssh-keyscan(1) for more info." + fi + if ver_test "${old_ver}" -lt "7.0_p1"; then + elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream." + elog "Make sure to update any configs that you might have. Note that xinetd might" + elog "be an alternative for you as it supports USE=tcpd." + fi + if ver_test "${old_ver}" -lt "7.1_p1"; then #557388 #555518 + elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their" + elog "weak sizes. If you rely on these key types, you can re-enable the key types by" + elog "adding to your sshd_config or ~/.ssh/config files:" + elog " PubkeyAcceptedKeyTypes=+ssh-dss" + elog "You should however generate new keys using rsa or ed25519." + + elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'" + elog "to 'prohibit-password'. That means password auth for root users no longer works" + elog "out of the box. If you need this, please update your sshd_config explicitly." + fi + if ver_test "${old_ver}" -lt "7.6_p1"; then + elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely." + elog "Furthermore, rsa keys with less than 1024 bits will be refused." + fi + if ver_test "${old_ver}" -lt "7.7_p1"; then + elog "Starting with openssh-7.7p1, we no longer patch openssh to provide LDAP functionality." + elog "Install sys-auth/ssh-ldap-pubkey and use OpenSSH's \"AuthorizedKeysCommand\" option" + elog "if you need to authenticate against LDAP." + elog "See https://wiki.gentoo.org/wiki/SSH/LDAP_migration for more details." + fi + if ver_test "${old_ver}" -lt "8.2_p1"; then + ewarn "After upgrading to openssh-8.2p1 please restart sshd, otherwise you" + ewarn "will not be able to establish new sessions. Restarting sshd over a ssh" + ewarn "connection is generally safe." + fi + done + + if [[ -n ${show_ssl_warning} ]]; then + elog "Be aware that by disabling openssl support in openssh, the server and clients" + elog "no longer support dss/rsa/ecdsa keys. You will need to generate ed25519 keys" + elog "and update all clients/servers that utilize them." + fi + + if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then + elog "" + elog "HPN's multi-threaded AES CTR cipher is currently known to be broken" + elog "and therefore disabled at runtime per default." + elog "Make sure your sshd_config is up to date and contains" + elog "" + elog " DisableMTAES yes" + elog "" + elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher." + elog "" + fi +} diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest index db8bd40f5acc..37256c70c37b 100644 --- a/net-misc/rabbitmq-server/Manifest +++ b/net-misc/rabbitmq-server/Manifest @@ -5,15 +5,11 @@ AUX rabbitmq.service 314 BLAKE2B 5489ba8c773f7eccf335d34e3ead22f240fc12e1d089f33 DIST rabbitmq-server-3.6.14.tar.xz 1508216 BLAKE2B 1ca3f933e91ce204cc90df7df619742e6d42e211b6350c629015a15a0ea6cdad05ad1e0139db5b2f1f353f314d1709ba468112a4059c6894ef9fb454fd616cf2 SHA512 22874b81fcebfd954e5ee8f4701bd8743bbc9559c1a1c09f8de03e16039153aa6e6b0bea71067770913493299e57da6b3928ff0ade4ee9ffb5ea48a30a154d9f DIST rabbitmq-server-3.6.9.tar.xz 1422316 BLAKE2B 08f88cf3b592c2fecf3e2a9c7f9a4a2997f7bea6f14a2d72cb42ad8d3254b2bcd32b0605c7687eeae8e1c39a6d3ad1776f89e84292d508903b956ec05f6cd858 SHA512 a003d2343c97e546ac01a5aadc46e94e2dbcc78349072b362950e5c5e11229e2a6fc4020d281f9fbb5cc0f577d2a166ef09671e931ec1470ab2edcdd98443662 DIST rabbitmq-server-3.7.13.tar.xz 2595904 BLAKE2B 3dce5af3b63d84e1ab8ee02ba3f55560087e5f72532e693b483e8083e25d540406d696873b291dd715c45aae1e15945e76fcc33bdd77503c6517860b45f7e7b9 SHA512 33cc3682214782152e4e1270d1011e94df79b454abf6fcf9d56b73be1f8cf42ce0a4a559f243b4721ae25b10897c756960c655909bee2b427395d0f0b63a2fb9 -DIST rabbitmq-server-3.7.17.tar.xz 2808260 BLAKE2B 45a77ebb81d1199219b3638f03698d147b5dd43160647f829163ee35607a3d7ada281b7156f555614b1eec7295e32d241410b8a691bccab2f40f1c548d2e0b51 SHA512 33af52a3f95854e7b3e067308181e37c7b9715b24e0ceb690d606f3e69a8be9cab258a18b68681350c31a01e4fa530825473bf652c7ac10894d36af4fa573a38 -DIST rabbitmq-server-3.7.21.tar.xz 2852548 BLAKE2B 1d437b86e2995bd0101fbcc0d55153bd2a8298b0a12eb8a1f9c2135868a6d349c0ba786371654eac684b6834b37aa6753e81581709e4879f911ac670069f595c SHA512 94a0d470e0ab2ad7ff5b3e195a127696cf538c257f1a5e13406081d381e6749549105c3be9a3385a82f7495bf312ad3b5c728d1c0dcbc0e4c89c2e9393449ab4 -DIST rabbitmq-server-3.8.0.tar.xz 3262332 BLAKE2B f72fc1e2b186ebd3e17fc17ab3d2ebe5186d59de3e6cf269b51977a2cec78b33ec9b95cf44b111b20f3f4d5227dc3829aebdac3044ad3a9e3f3e8e4a9cb7b740 SHA512 9d73cb81190ed3e473f18c21513a3e57fa53a0d3a38fa96f09c3282558421997b8d177195163053e845980f52297bf4e2716017de15abc2660daefdacea584e8 -DIST rabbitmq-server-3.8.1.tar.xz 15167384 BLAKE2B 3f13e5da74e4dd0bcb0ea495d2e79e0adcda4b697f054b0ac0df029833f77f5096ec636fe291881e27540cbb8ccfde71a330c0959b80b1ac82bdfceff75aeb4e SHA512 9db6d1b2e6c946190666cdbd60eed1bb7a42159834e4dfeb4fab1f3c7b6111236338cf45d619d7ffc10c10ded39ec322507386b03bbf8148afb9e457a232c79f +DIST rabbitmq-server-3.7.24.tar.xz 2867964 BLAKE2B 30d49a72f92a9adc4fe7de071e9369cb4d574249b1d414b2e5d492585ae0bc0e5f85ca0c287d73dbf661df4cb249f29d1bfccc7516e6ec5d6ff70a437a01ce00 SHA512 5bf2b69b555ddc89415ce7918d0ab23221d383742fc20036f608b4cf99852fb58b61a5d7616b6357f151e1f16ed660b35d7b54a1c2ea46cf5b4ef67c2d38bd28 +DIST rabbitmq-server-3.8.2.tar.xz 15178744 BLAKE2B 11da75e48415d53f291fffc8fafd89b506e727714e6f9dfce6a0b7c605a0d56bb3b879c779bebbc21f2bc5ada21378f9ed30e6f729c2c71b61ebe00db16eb225 SHA512 ac8cfc002ccbff8cf95c3e5508956cf5622c1c145b730589308ec4ca9173e5efca338829e13aa7dc37db035868dc964ab0e3e0edba15de49c64e18c50247b918 EBUILD rabbitmq-server-3.6.14.ebuild 2866 BLAKE2B 0750fb1c6968b6c97471a940ab2010c44cf4cb831ae06effdec756df77e72fd1a9a0557de56e89daa0ae65097ee6a39ca3f779f9ad3c7b94175a6800ec6cdc06 SHA512 c5804a6938ae7d9f429e9bcfc0325ae276e3deecf9329a850111f099c1206587954a47daee906848dfa0569caa220fe9afd3e43b7823b4db65d353ffd7cd427a EBUILD rabbitmq-server-3.6.9.ebuild 2861 BLAKE2B efc0b3acca1f57d4116a18475c923502febd6ecb4a95030be05bdf94bd726c2cb90a8a95a7a47cc390da3c6c66f84af1eec14279f235b6547d247d2a8437e4c0 SHA512 ebabcbe717134e17d16a1623ff05a7700d7825de626c25c4b2ad8510f0ac42ede1a37ddbfd367c198d6cb4b550f30294c64fd7cbebe64bf6ac0244c9de4dee50 EBUILD rabbitmq-server-3.7.13.ebuild 3105 BLAKE2B 61175864b1b7eab693fdfcf16ff1178c87d37e966a44ed29e08d01242d16af099ef492eeb527e8181b06ceb2222736c354df34cb510dbcce6a929eba63696b05 SHA512 5896fa3e7a2865e42a3f5c485c55504ead488115334e220b489db9dec55d2537d2e12266d8507f6b73ef76b1dadab6ba56a86a092c590e0627478207cbc7f6bf -EBUILD rabbitmq-server-3.7.17.ebuild 3107 BLAKE2B 9addb1aa27f75285878de8689555b079fc9a603c93b22226aa06cb84d9b9185ef5ed26fe8740a5cd776526c68b96792bf338494b5dabd5f80d1b749359bc58e8 SHA512 5f1da605aca09ab102cf3343b96c6db5a2b9cbc2b54f5ffedd547db1ee581b297b3955e668d497e7dc6842e56753be6e96af6b09c368e4d8df8e0d6e852ea64c -EBUILD rabbitmq-server-3.7.21.ebuild 3002 BLAKE2B 88d17f6b0dc0ce19bdfa10ce5e8ad835e305a7432e369382b11bcbba51f6d598321ce5e3097899d26f237f6460855e5574a5c21d1d87328d4ff464d7fb6869f2 SHA512 99e9c605b42906748bc667989b0960397fc9a2910cd549f167912cc9b3721ceeab65ec4e9857e5505c0f660385f4370c7bbcaf81f244492bb7d162d96dc8c8e7 -EBUILD rabbitmq-server-3.8.0.ebuild 3002 BLAKE2B 88d17f6b0dc0ce19bdfa10ce5e8ad835e305a7432e369382b11bcbba51f6d598321ce5e3097899d26f237f6460855e5574a5c21d1d87328d4ff464d7fb6869f2 SHA512 99e9c605b42906748bc667989b0960397fc9a2910cd549f167912cc9b3721ceeab65ec4e9857e5505c0f660385f4370c7bbcaf81f244492bb7d162d96dc8c8e7 -EBUILD rabbitmq-server-3.8.1.ebuild 3002 BLAKE2B 88d17f6b0dc0ce19bdfa10ce5e8ad835e305a7432e369382b11bcbba51f6d598321ce5e3097899d26f237f6460855e5574a5c21d1d87328d4ff464d7fb6869f2 SHA512 99e9c605b42906748bc667989b0960397fc9a2910cd549f167912cc9b3721ceeab65ec4e9857e5505c0f660385f4370c7bbcaf81f244492bb7d162d96dc8c8e7 +EBUILD rabbitmq-server-3.7.24.ebuild 2160 BLAKE2B a3fd5a085ef37088cde4956fb4ab3b0fa595c8a4d004605cdd23415db17ac521b96187971f5d687cdd7767ed1d43dfa78ac845c2f9f5a3e106461461ef694583 SHA512 fad7e1b6606fdf79440994efef5bd5d7fceae456bcc74edd30b1e53ac413112f2ece2c39ccc45e6a1701d8e0529a1b8cb4a50e7a4e491c6568081e513ee03db2 +EBUILD rabbitmq-server-3.8.2.ebuild 2160 BLAKE2B a3fd5a085ef37088cde4956fb4ab3b0fa595c8a4d004605cdd23415db17ac521b96187971f5d687cdd7767ed1d43dfa78ac845c2f9f5a3e106461461ef694583 SHA512 fad7e1b6606fdf79440994efef5bd5d7fceae456bcc74edd30b1e53ac413112f2ece2c39ccc45e6a1701d8e0529a1b8cb4a50e7a4e491c6568081e513ee03db2 MISC metadata.xml 243 BLAKE2B 521acfb5d3a435d6280a45018d424779bc562b0de43396d1fbc0bb5950c2e672a0090552e29cafa59a61c07baf9073d466316eb1b43cdafdded443f9e57c3bf7 SHA512 d44d6b045d6b171e487d632935b2ffd1d5c567b28e273aadde4799d45d94f1dfd75873d296d4e9de1e431d5a8de4a0337e9e3fa648545c182f225e4f45652701 diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.7.17.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.7.17.ebuild deleted file mode 100644 index c403645186f1..000000000000 --- a/net-misc/rabbitmq-server/rabbitmq-server-3.7.17.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python2_7 ) - -inherit python-any-r1 systemd user - -DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang" -HOMEPAGE="https://www.rabbitmq.com/" -SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/rabbitmq-server-${PV}.tar.xz" - -LICENSE="GPL-2 MPL-1.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -RESTRICT="test" - -# dev-lang/erlang-20.3 cloud be used but 21 is easier to specify as it always includes the smp stuff now -RDEPEND=">=dev-lang/erlang-21.0[ssl] - "${S}"/setup.py distutils-r1_python_prepare_all } diff --git a/net-misc/rwhoisd/Manifest b/net-misc/rwhoisd/Manifest index cba64fa2679f..7952b2665f44 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 873 BLAKE2B afb247fb325e53dd810912b5334cb9ec239a8e41008b49d7b8bcf425010664c7489be82c02f5c4a53598fde731af6a36fab822519a295f8d2d5f39be92c8b2ea SHA512 8959505ad0dff653851c312c6be15302163d5ba0b9190ec339a9f6180f2ccd838d5e520018463a0fb0b94567d9722ec2a06fdff3950e17444d40e6ab724acf67 +EBUILD rwhoisd-1.5.9.6.ebuild 868 BLAKE2B 6f84c7e5497469e4910d9aa8dc89fe4356ada17339bdd3290f1bd25a64b7e2de9e90fc505325ab25b40f3d942586bde66518bcccefaa2d36daef2ce235764d3e SHA512 d070616918f5d0161053a0990951055f1faf9880158bfabfd9d657e362d40951598f64c24a54c2c9b707199d567112d51c12fc8aed8f522686975c8682647179 MISC metadata.xml 225 BLAKE2B 19246ee217a79a478dded3e88f6eb021a574016a0bb6dc118ee6dbece7b9cbc5df12e36d8585c71416cb4e3d5533edc652d686674044b188a7457094f53a5fa4 SHA512 0b610f2ab50e3c82c7e3fb9bbe1af0ce84851de95ad8b8caec506e4d8260e3bd64995e7d51d447c29bbd4696285a67d14fc1f10ceab9185e4501802986e27980 diff --git a/net-misc/rwhoisd/rwhoisd-1.5.9.6.ebuild b/net-misc/rwhoisd/rwhoisd-1.5.9.6.ebuild index e08fd625c8a6..2362f2dd48a6 100644 --- a/net-misc/rwhoisd/rwhoisd-1.5.9.6.ebuild +++ b/net-misc/rwhoisd/rwhoisd-1.5.9.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -33,14 +33,14 @@ src_compile() { default } -src_install () { +src_install() { default doinitd "${FILESDIR}"/rwhoisd newconfd "${FILESDIR}"/rwhoisd.conf rwhoisd } -pkg_postinst () { +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 967006929846..f4f5fd89da2d 100644 --- a/net-misc/rygel/Manifest +++ b/net-misc/rygel/Manifest @@ -1,3 +1,5 @@ DIST rygel-0.36.2.tar.xz 4057356 BLAKE2B 3ff1a0df12cdda694ded3a9a5c6d1495eaf0dff7133cbc84b73ad6bc767cd3a5e31ff8b579aff9c0de455f149e49dc972f7d93d64424d25501b02f2a02f66552 SHA512 8c079f83a00c9ad237b634e6274d27acc94a91adfa2829f0336b2485aa801e6898c30ec7268352247f1d12232d9ab3cb7a6f8215370f03aaff5323c4a8fdff7f -EBUILD rygel-0.36.2.ebuild 2199 BLAKE2B 34d05fccbab4270c852c09f9ee842b29da78e2c03645f1f0b2ffe7d31a0943de3cdcaa9040746e531114885631ac2d9fb902af39ab39a123f73dcc00d5d98be2 SHA512 8dd214277ec39e3d623280d1fc54b9592219f2df18a4bb8d362d770c5b15ec646c818cc608c7de5b95b1c340863b11add945cd55d9b148da6a288a98c37cd8fc +DIST rygel-0.38.3.tar.xz 4106460 BLAKE2B 38547cd28b0039440cf5e4a7381914c606479c1f26f91eb8af14276a6aa7d6267f0fba5b2af374ca3f0b933c683d569e26cbcec8cbdd15d620d57bd1ecf32c48 SHA512 787508f809e473dccc8461128c1b3b9d71b118008fa13660144f32ccb4b1ad02f41866ddf00343e102ed6f13552d34278917e14cf50c57ea3ffb6cf474f0ce58 +EBUILD rygel-0.36.2.ebuild 2198 BLAKE2B 75df8d49a81628fc87bc183215d0205c103ea28ff55d139545e6441af846385d7a03799bf534235def840f427c261f303f10dbe4a59e1d78602aaf14d865409c SHA512 f625d54e543ba7e09545b7b87a8cdd7fcccf4ec6a2a1f766269ae1e8019ad93940fec3a77c041bac2add5dbe578b73f4391acbc9b6e41b2d612e2a5e539a1b3f +EBUILD rygel-0.38.3.ebuild 2211 BLAKE2B 7bd7f9e0685fd3a30276b6f8aa7bef83ec4e35d8217391bffedadffc4b1060c009e9125e56dc1355d57a6019660b70a6092a11793b74df167fd7ee0e5390718d SHA512 7272d3d8e46bac598a771c4aa75d2044601969f1ca8c2e82d72de6b8897cb486119390abfc5b025ac68e5aaabb014086fb2df3b59527d2aba484c4c031af685d MISC metadata.xml 431 BLAKE2B 26d8bc725f5e93f39bbc4f3dde70de841cc0cfd407f1c37be3934f25fed17e1d30e1509859e18786baf4af1f502ab420774d6fec95117bba1832f116d1b93274 SHA512 61bc8e851d50b1d47ee5f286aa76e69a9d345514b0a94d643cb6bfc0fe5072f272d0aebcdaa9389734080ef8eda0cbd3a616d90860c88c6ab59309ec05cdc0ce diff --git a/net-misc/rygel/rygel-0.36.2.ebuild b/net-misc/rygel/rygel-0.36.2.ebuild index 5c5186b3df90..f97d1762808b 100644 --- a/net-misc/rygel/rygel-0.36.2.ebuild +++ b/net-misc/rygel/rygel-0.36.2.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 GNOME2_LA_PUNT="yes" -inherit gnome2 systemd virtualx +inherit gnome2 systemd DESCRIPTION="Rygel is an open source UPnP/DLNA MediaServer" HOMEPAGE="https://wiki.gnome.org/Projects/Rygel" @@ -24,8 +24,8 @@ RDEPEND=" media-libs/gst-plugins-base:1.0 >=media-libs/libmediaart-0.7:2.0 media-plugins/gst-plugins-soup:1.0 - >=net-libs/gssdp-0.14.15 - >=net-libs/gupnp-0.20.14 + >=net-libs/gssdp-0.14.15:0/3 + >=net-libs/gupnp-0.20.14:0/4 >=net-libs/gupnp-av-0.12.8 >=net-libs/libsoup-2.44:2.4 >=sys-apps/util-linux-2.20 diff --git a/net-misc/rygel/rygel-0.38.3.ebuild b/net-misc/rygel/rygel-0.38.3.ebuild new file mode 100644 index 000000000000..fdf2b4325976 --- /dev/null +++ b/net-misc/rygel/rygel-0.38.3.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" + +inherit gnome2 systemd + +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="X +introspection +sqlite tracker test transcode" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/glib-2.44.0:2 + >=dev-libs/libgee-0.8:0.8 + >=dev-libs/libxml2-2.7:2 + >=media-libs/gupnp-dlna-0.9.4:2.0 + >=media-libs/gstreamer-1.12:1.0 + >=media-libs/gst-plugins-base-1.12:1.0 + >=media-libs/libmediaart-0.7:2.0 + media-plugins/gst-plugins-soup:1.0 + >=net-libs/gssdp-1.1.0:0= + >=net-libs/gupnp-1.1.0:0= + >=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:= ) + transcode? ( + media-libs/gst-plugins-bad:1.0 + media-plugins/gst-plugins-twolame:1.0 + media-plugins/gst-plugins-libav:1.0 + ) + X? ( >=x11-libs/gtk+-3.22:3 ) +" +DEPEND="${RDEPEND} + dev-util/gtk-doc-am + >=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() { + # 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() { + # We set xsltproc because man pages are provided by upstream + # and we do not want to regenerate them automagically. + gnome2_src_configure \ + XSLTPROC=$(type -P false) \ + --enable-gst-launch-plugin \ + --with-media-engine=gstreamer \ + --enable-nls \ + --with-systemduserunitdir=$(systemd_get_userunitdir) \ + $(use_enable introspection) \ + $(use_enable sqlite media-export-plugin) \ + $(use_enable sqlite lms-plugin) \ + $(use_enable test tests) \ + $(use_enable tracker tracker-plugin) \ + $(use_with X ui) +} diff --git a/net-misc/scponly/Manifest b/net-misc/scponly/Manifest index d63ee2342967..10c979f1f867 100644 --- a/net-misc/scponly/Manifest +++ b/net-misc/scponly/Manifest @@ -1,5 +1,7 @@ AUX scponly-4.8-gcc4.4.0.patch 555 BLAKE2B 0eff2d5cd94f60540dd1bbb6b6f9f1486abbb25e4a32d6eab5c94e55a3d14b77e4724b7c1e70f8a39369becc554d20953bc9f43d44923582f41ed02adc37f665 SHA512 fd9727364591d528e17845eb3e103728382fa7b476b9c0331f16f3e09dc469df7068412047a30b554578887e7897e80574ac820314ec0dae5d58909e3bb5f7de 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 -MISC metadata.xml 1443 BLAKE2B 2a5a24d22c30cfafe590841b6d6e4eb73d9c42dddc469e617c79585eaa05a3a7b1bf31b6cc6fc0f7b1c521610d969e6c40d197af08e3dcce37b7ce65f67d259b SHA512 b44a26ac0944e8b0b99bfd62a21684b9846a52e416a2874a1af9bbcdf270ff337dd26a55a24c6b4dd131ba51ef3b7b40e1375478a14049392782a5adbb1fed07 +EBUILD scponly-4.8-r7.ebuild 6942 BLAKE2B 0a34a9674018a0ed6c4bc023fc2024c7cecc76dc9021a4512f30830ff13a9862db7d79eb38dc6e2042e8d462f4dfcc0f4e2303ce00cd15bfda953621e4bc986d SHA512 8f7564031f1f45c19aba9359225a6203d79f3a22a59c0cd7c5bbc547aa880447e9f1d18638cc73e8d3167751224b016e8370b7bbd5adbeefe5cd80d881801411 +MISC metadata.xml 1730 BLAKE2B b6663a37fe260a5e1552d5bf173d96021cf5588a917a54e3e892eddf7be9618e8b2244328ca6bf87fe8dda4777349fb703f09075975b754026403742a590238a SHA512 86aedd96e8b14fa8b86a2f69a253191777e9292e4547dd8e4e07e11b22068bf1a7b6404a7a0ee4108b7ecc4d99a952c81999482aa9488d45b92ae9c4ba451938 diff --git a/net-misc/scponly/files/scponly-4.8-sftp-server-path.patch b/net-misc/scponly/files/scponly-4.8-sftp-server-path.patch new file mode 100644 index 000000000000..c191de877518 --- /dev/null +++ b/net-misc/scponly/files/scponly-4.8-sftp-server-path.patch @@ -0,0 +1,42 @@ +diff -urNp scponly-4.8-orig/configure scponly-4.8-dwok/configure +--- scponly-4.8-orig/configure 2019-11-26 16:34:19.028544577 +0100 ++++ scponly-4.8-dwok/configure 2019-11-26 16:33:24.571763528 +0100 +@@ -3244,7 +3244,7 @@ else + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-as_dummy="`echo "$PATH:/usr/lib:/usr/lib64:/usr/libexec:/usr/libexec/openssh:/usr/lib/ssh:/usr/lib64/ssh:/usr/local/libexec:/usr/lib/misc:/usr/lib/openssh" | sed -e 's/:/ /'`" ++as_dummy="`echo "$PATH:/usr/lib:/usr/lib64:/usr/lib64/misc:/usr/libexec:/usr/libexec/openssh:/usr/lib/ssh:/usr/lib64/ssh:/usr/local/libexec:/usr/lib/misc:/usr/lib/openssh" | sed -e 's/:/ /'`" + for as_dir in $as_dummy + do + IFS=$as_save_IFS +@@ -4240,7 +4240,7 @@ else + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-as_dummy="`echo "$PATH:/usr/lib:/usr/lib/ssh:/usr/libexec/openssh:/usr/libexec:/usr/local/libexec" | sed -e 's/:/ /'`" ++as_dummy="`echo "$PATH:/usr/lib:/usr/lib64:/usr/lib64/misc:/usr/lib/ssh:/usr/libexec/openssh:/usr/libexec:/usr/local/libexec" | sed -e 's/:/ /'`" + for as_dir in $as_dummy + do + IFS=$as_save_IFS +diff -urNp scponly-4.8-orig/configure.in scponly-4.8-dwok/configure.in +--- scponly-4.8-orig/configure.in 2019-11-26 16:34:19.028544577 +0100 ++++ scponly-4.8-dwok/configure.in 2019-11-26 16:33:28.491819749 +0100 +@@ -231,7 +231,7 @@ AC_ARG_ENABLE([quota-compat], + + if test "x$scponly_scp_compat" != "x"; then + AC_MSG_NOTICE([enabling core WinSCP and Vanilla SCP binaries...]) +- SCPONLY_PATH_PROG_DEFINE([PROG_SFTP_SERVER], [sftp-server],[/usr/lib:/usr/lib64:/usr/libexec:/usr/libexec/openssh:/usr/lib/ssh:/usr/lib64/ssh:/usr/local/libexec:/usr/lib/misc:/usr/lib/openssh]) ++ SCPONLY_PATH_PROG_DEFINE([PROG_SFTP_SERVER], [sftp-server],[/usr/lib:/usr/lib64:/usr/lib64/misc:/usr/libexec:/usr/libexec/openssh:/usr/lib/ssh:/usr/lib64/ssh:/usr/local/libexec:/usr/lib/misc:/usr/lib/openssh]) + SCPONLY_PATH_PROG_DEFINE([PROG_LS], [ls], [/bin:/usr/bin:/sbin:/usr/sbin]) + SCPONLY_PATH_PROG_DEFINE([PROG_SCP], [scp], [/bin:/usr/bin:/sbin:/usr/sbin]) + SCPONLY_PATH_PROG_DEFINE([PROG_RM], [rm], [/bin:/usr/bin:/sbin:/usr/sbin]) +@@ -297,7 +297,7 @@ if test "x$scponly_sftp_compat" != "x"; + if test "x$scponly_explicit_sftpserver_path" = "x"; then + dnl Informed guess: + SCPONLY_PATH_PROG_DEFINE([PROG_SFTP_SERVER], [sftp-server], +- [/usr/lib:/usr/lib/ssh:/usr/libexec/openssh:/usr/libexec:/usr/local/libexec]) ++ [/usr/lib:/usr/lib64:/usr/lib64/misc:/usr/lib/ssh:/usr/libexec/openssh:/usr/libexec:/usr/local/libexec]) + dnl Debian uses /usr/lib + dnl Red Hat uses /usr/libexec/openssh + dnl Many a *BSD uses $PATH itself (which is implicit + checked 1st) diff --git a/net-misc/scponly/metadata.xml b/net-misc/scponly/metadata.xml index cc5fae365f3a..38864027ac19 100644 --- a/net-misc/scponly/metadata.xml +++ b/net-misc/scponly/metadata.xml @@ -1,7 +1,14 @@ - + + hlein@korelogic.com + Hank Leininger + + + proxy-maint@gentoo.org + Proxy Maintainers + scponly is an alternative 'shell' (of sorts) for system administrators who would like to provide access to remote users to both read and write @@ -10,6 +17,7 @@ ssh suite of applications. + Enables adding and configuring an 'scponlyc' chrooted user Enables rsync compatibility with potential security risks Enables Unison compatibility with potential security risks Enables Subversion compatibility with potential security risks diff --git a/net-misc/scponly/scponly-4.8-r7.ebuild b/net-misc/scponly/scponly-4.8-r7.ebuild new file mode 100644 index 000000000000..8128ad5d15a5 --- /dev/null +++ b/net-misc/scponly/scponly-4.8-r7.ebuild @@ -0,0 +1,245 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib readme.gentoo-r1 toolchain-funcs + +DESCRIPTION="A tiny pseudoshell which only permits scp and sftp" +HOMEPAGE="https://github.com/scponly/scponly" +SRC_URI="mirror://sourceforge/scponly/${P}.tgz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="chroot +sftp scp winscp gftp rsync unison subversion wildcards quota passwd logging" +REQUIRED_USE=" + || ( sftp scp winscp rsync unison subversion ) +" + +RDEPEND=" + sys-apps/sed + net-misc/openssh + chroot? ( acct-user/scponly acct-group/scponly ) + quota? ( sys-fs/quota ) + rsync? ( net-misc/rsync ) + subversion? ( dev-vcs/subversion ) + unison? ( net-misc/unison:= ) +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-rsync.patch" + "${FILESDIR}/${P}-gcc4.4.0.patch" + "${FILESDIR}/${P}-sftp-server-path.patch" +) + +src_configure() { + CFLAGS="${CFLAGS} ${LDFLAGS}" econf \ + --with-sftp-server="/usr/$(get_libdir)/misc/sftp-server" \ + --disable-restrictive-names \ + $(use_enable chroot chrooted-binary) \ + $(use_enable chroot chrooted-checkdir) \ + $(use_enable winscp winscp-compat) \ + $(use_enable gftp gftp-compat) \ + $(use_enable scp scp-compat) \ + $(use_enable sftp sftp) \ + $(use_enable quota quota-compat) \ + $(use_enable passwd passwd-compat) \ + $(use_enable rsync rsync-compat) \ + $(use_enable unison unison-compat) \ + $(use_enable subversion svn-compat) \ + $(use_enable subversion svnserv-compat) \ + $(use_enable logging sftp-logging-compat) \ + $(use_enable wildcards wildcards) +} + +src_compile() { + emake CC=$(tc-getCC) +} + +src_install() { + emake DESTDIR="${D}" install + + dodoc AUTHOR BUILDING-JAILS.TXT CHANGELOG CONTRIB README SECURITY TODO + + if use chroot ; then + local DOC_CONTENTS="You might want to run\n + emerge --config =${CATEGORY}/${PF}\n + \nto setup the chroot. Otherwise you will have to setup chroot + manually. Please read the docs in /usr/share/doc/${PF} for more + informations, also the SECURITY file." + ( docinto chroot; dodoc setup_chroot.sh config.h ) + # don't compress setup-script, so it is usable if necessary + docompress -x /usr/share/doc/${PF}/chroot + readme.gentoo_create_doc + fi +} + +pkg_config() { + if ! use chroot ; then + einfo "USE=chroot not enabled, nothing to configure." + return + fi + + myuser="scponly" + myhome="/var/chroot/${myuser}" + mysubdir="/pub" + + # pkg_postinst is based on ${S}/setup_chroot.sh. + + einfo "Collecting binaries and libraries..." + + # Binaries launched in sftp compat mode + if has_version "=${CATEGORY}/${PF}[sftp]" ; then + BINARIES="/usr/$(get_libdir)/misc/sftp-server" + fi + + # Binaries launched by vanilla- and WinSCP modes + if has_version "=${CATEGORY}/${PF}[scp]" || \ + has_version "=${CATEGORY}/${PF}[winscp]" ; then + BINARIES="${BINARIES} /usr/bin/scp /bin/ls /bin/rm /bin/ln /bin/mv" + BINARIES="${BINARIES} /bin/chmod /bin/chown /bin/chgrp /bin/mkdir /bin/rmdir" + fi + + # Binaries launched in WinSCP compatibility mode + if has_version "=${CATEGORY}/${PF}[winscp]" ; then + BINARIES="${BINARIES} /bin/pwd /bin/groups /usr/bin/id /bin/echo" + fi + + # Rsync compatability mode + if has_version "=${CATEGORY}/${PF}[rsync]" ; then + BINARIES="${BINARIES} /usr/bin/rsync" + fi + + # Unison compatability mode + if has_version "=${CATEGORY}/${PF}[unison]" ; then + BINARIES="${BINARIES} /usr/bin/unison" + fi + + # subversion cli/svnserv compatibility + if has_version "=${CATEGORY}/${PF}[subversion]" ; then + BINARIES="${BINARIES} /usr/bin/svn /usr/bin/svnserve" + fi + + # passwd compatibility + if has_version "=${CATEGORY}/${PF}[passwd]" ; then + BINARIES="${BINARIES} /usr/bin/passwd" + fi + + # quota compatibility + if has_version "=${CATEGORY}/${PF}[quota]" ; then + BINARIES="${BINARIES} /usr/bin/quota" + fi + + # build lib dependencies + LIB_LIST=$(ldd ${BINARIES} | sed -n 's:.* => \(/[^ ]\+\).*:\1:p' | sort -u) + + # search and add ld*.so + for LIB in /$(get_libdir)/ld.so /libexec/ld-elf.so /libexec/ld-elf.so.1 \ + /usr/libexec/ld.so /$(get_libdir)/ld-linux*.so.2 /usr/libexec/ld-elf.so.1; do + [ -f "${LIB}" ] && LIB_LIST="${LIB_LIST} ${LIB}" + done + + # search and add libnss_*.so + for LIB in /$(get_libdir)/libnss_{compat,files}*.so.*; do + [ -f "${LIB}" ] && LIB_LIST="${LIB_LIST} ${LIB}" + done + + # create base dirs + if [ ! -d "${myhome}" ]; then + die "Home '${myhome}' should have been created by acct-user but does not exist." + else + einfo "Setting owner for ${myhome}" + chown 0:0 "${myhome}" + fi + + if [ ! -d "${myhome}/etc" ]; then + einfo "Creating ${myhome}/etc" + install -o0 -g0 -m0755 -d "${myhome}/etc" + fi + + if [ ! -d "${myhome}/$(get_libdir)" ]; then + einfo "Creating ${myhome}/$(get_libdir)" + install -o0 -g0 -m0755 -d "${myhome}/$(get_libdir)" + fi + + if [ ! -e "${myhome}/lib" ]; then + einfo "Creating ${myhome}/lib" + ln -snf $(get_libdir) "${myhome}/lib" + fi + + if [ ! -d "${myhome}/usr/$(get_libdir)" ]; then + einfo "Creating ${myhome}/usr/$(get_libdir)" + install -o0 -g0 -m0755 -d "${myhome}/usr/$(get_libdir)" + fi + + if [ ! -e "${myhome}/usr/lib" ]; then + einfo "Creating ${myhome}/usr/lib" + ln -snf $(get_libdir) "${myhome}/usr/lib" + fi + + if [ ! -d "${myhome}${mysubdir}" ]; then + einfo "Creating ${myhome}${mysubdir} directory for uploading files" + install -o${myuser} -g${myuser} -m0755 -d "${myhome}${mysubdir}" + fi + + # create /dev/null (Bug 135505) + if [ ! -e "${myhome}/dev/null" ]; then + install -o0 -g0 -m0755 -d "${myhome}/dev" + mknod -m0777 "${myhome}/dev/null" c 1 3 + fi + + # install binaries + for BIN in ${BINARIES}; do + einfo "Install ${BIN}" + install -o0 -g0 -m0755 -d "${myhome}$(dirname ${BIN})" + if [ "${BIN}" = "/usr/bin/passwd" ]; then # needs suid + install -p -o0 -g0 -m04711 "${BIN}" "${myhome}/${BIN}" + else + install -p -o0 -g0 -m0755 "${BIN}" "${myhome}/${BIN}" + fi + done + + # install libs + for LIB in ${LIB_LIST}; do + einfo "Install ${LIB}" + install -o0 -g0 -m0755 -d "${myhome}$(dirname ${LIB})" + install -p -o0 -g0 -m0755 "${LIB}" "${myhome}/${LIB}" + done + + # create ld.so.conf + einfo "Creating /etc/ld.so.conf" + for LIB in ${LIB_LIST}; do + dirname ${LIB} + done | sort -u | while read DIR; do + if ! grep 2>/dev/null -q "^${DIR}$" "${myhome}/etc/ld.so.conf"; then + echo "${DIR}" >> "${myhome}/etc/ld.so.conf" + fi + done + ldconfig -r "${myhome}" + + # update shells + einfo "Updating /etc/shells" + grep 2>/dev/null -q "^/usr/bin/scponly$" /etc/shells \ + || echo "/usr/bin/scponly" >> /etc/shells + + grep 2>/dev/null -q "^/usr/sbin/scponlyc$" /etc/shells \ + || echo "/usr/sbin/scponlyc" >> /etc/shells + + # create /etc/passwd + if [ ! -e "${myhome}/etc/passwd" ]; then + ( + echo "root:x:0:0:root:/:/bin/sh" + sed -n "s|^\(${myuser}:[^:]*:[^:]*:[^:]*:[^:]*:\).*|\1${mysubdir}:/bin/sh|p" /etc/passwd + ) > "${myhome}/etc/passwd" + fi + + # create /etc/group + if [ ! -e "${myhome}/etc/group" ]; then + ( + echo "root:x:0:" + sed -n "s|^\(${myuser}:[^:]*:[^:]*:\).*|\1|p" /etc/group + ) > "${myhome}/etc/group" + fi +} diff --git a/net-misc/ser2net/Manifest b/net-misc/ser2net/Manifest index aab5dc56c3d0..78c161909c8d 100644 --- a/net-misc/ser2net/Manifest +++ b/net-misc/ser2net/Manifest @@ -1,5 +1,5 @@ AUX ser2net.confd 879 BLAKE2B 41e159da088c7db25415da24f545435e4e1ee94af9f922ddb3accc392a5fd9ec0517e79a6a37d9dcfae6911739306e02711580ce1c0059fb1f5e38495ebe929b SHA512 15054f7aa604f93bd5a54c2bb96c9a3168905be5ace50bcd2ebeeaf9dc9ae19426388e6118e9e4850125349090ee29542c24487e64c349593a76366be4a5e501 AUX ser2net.initd 1528 BLAKE2B 509df2c77f6c8495a669aaf017c9809f342ec9bb50033461f94a5a4c729d7be49e8ef3cfca2fcefa49769ba98e5c53b743dfe67b58ae1189ec8d75e957716fa1 SHA512 d98032d8de463d2023f087106ff68367077dcd4680c673e41e50e42c91578925c72f741508e2b36b0711478e9bc12c61efef76d57c578bc726950c9d6fd2f5c3 DIST ser2net-2.10.0.tar.gz 364322 BLAKE2B db041297069ea0a111ed73d6b1fc8a639971f113952fbcd499a81671bbd873ee3e1724146bfb5c6975d1812acd8e545e9df2bde445f4a86af57a0ae5b9b19ec1 SHA512 dd3e37619b10d8bf20d738e90c253bc2d109e0a57ee9f3a8b2a85a69399afa5a8459a4602b2856f0b655427023a36c78330851bf7f8d8da0f28d1fe22c1d5e10 -EBUILD ser2net-2.10.0.ebuild 622 BLAKE2B 22edbf4209bf735f55b5c31adef27d77e82b11ddaa9cd1e19c274d47e498d84d71767d93b8889a9b45ff515343614d797230222e8fb79bdb7c80e830718a2991 SHA512 9d6f473e03ec1d181dceb261e98324db26a1cc78006ba8c66e74bb733115bd1db3cec19fcb8986323aeeba7fecdeb874d727c51624fb42064dd62649d61cdb1b +EBUILD ser2net-2.10.0.ebuild 621 BLAKE2B 666010295d8a84759ba44388ff0f1339e22392b84a27d5f51d0f957ec99cf353b1b2122471c5ff0fc5a4e1d0787b77092dc6351f5d75533cb43775d48d301a5d SHA512 78e21c0e0d1de2550035dc8059cf9ba28dc410977cc16d48074dbf8a0498a046ca02ca41c9524f5f6ec858ed224cd4d235eea9783318e845f065f29c9965e4b4 MISC metadata.xml 244 BLAKE2B 31c4948eba2d8d59d90f9f49328291d0d678db43eadabae9c482ccc82e2343160809308451a5f014180a4e017eb85afd24e64b6f630219987b3bbb4df45fd170 SHA512 c026f437d46c264d228d51fe7e6d9fa32e7647aad09124fdb77b2c602885609135c63f2b8fae8092b5c68ba62cf4bda87bc3c321f2918bc2f3e77c4fb42a10c0 diff --git a/net-misc/ser2net/ser2net-2.10.0.ebuild b/net-misc/ser2net/ser2net-2.10.0.ebuild index e7f143006002..16b462a5cb7c 100644 --- a/net-misc/ser2net/ser2net-2.10.0.ebuild +++ b/net-misc/ser2net/ser2net-2.10.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -20,7 +20,7 @@ src_configure() { econf $(use_with tcpd tcp-wrappers) --with-uucp-locking } -src_install () { +src_install() { default insinto /etc diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest index dc5ae0795637..2ae6e6d95b59 100644 --- a/net-misc/smb4k/Manifest +++ b/net-misc/smb4k/Manifest @@ -1,3 +1,3 @@ DIST smb4k-3.0.2.tar.xz 3824972 BLAKE2B 6f15bac77840669b9f9a6640e35f5b36b76653946bcef9d268452fd813c796480594b40744cf86ec5d79307294fb2f9592dc71013576efcb6c8fc607599778b9 SHA512 b60d50732ba84bae9e58f90ec18bb0fe59185814ec92e4f8adc1e699cfce61019f919fbdac2555b365c495ab1720f62b35b95c063f0c7c9466dc31487b8cb564 -EBUILD smb4k-3.0.2.ebuild 1885 BLAKE2B efa1e961a32e1a566f0a0e41784510a044bb76153adac30a8b6bd1239fe279225cd2154fa0835d9674b3bc964d7b801204bb36196774434d06450fc9bf2fd32f SHA512 f1362a9c1b17ecbc0d07ed7c1b25e1d267fd26d0398b0a9ea7852f2f347e7a31ac2ac8eff43712f657ad2977d003cf36447ed28c090143a52d704ff3725463f6 +EBUILD smb4k-3.0.2.ebuild 1886 BLAKE2B e3db0902dea23a31824f963850c243693aea932d8804a0f92126b072e790595e5d41e9a1b226c88fce83e0975e97c9b5183df8a69db9bb91caaed96672f280bb SHA512 76fd0d9aa5695751ef1fa43ad6add6613e515dc85e9537507fb2d0c313b66df0ce3544e2776b573fe20cc77ecca4e5685e1ca8c3cd5295dbaf81d6a8686d09ea MISC metadata.xml 324 BLAKE2B 9e05620c3d07398233f8ac54e9d9d3267e21835594d8bae1c14a68d3650be7a7e904b57281823e6886efcd56a33e4e9d576c8cbfe0d9b148641fae8a7ce01ce4 SHA512 48a26e2c744b920776e2d7a8a33ce6188a785f34ce783e59f9f4898947320b2ce6b0205e0848aff7c03151349d8fd6dd4dda705b695e1c4ed3c46a17347d8711 diff --git a/net-misc/smb4k/smb4k-3.0.2.ebuild b/net-misc/smb4k/smb4k-3.0.2.ebuild index cb76ae6313d8..169b71b8637d 100644 --- a/net-misc/smb4k/smb4k-3.0.2.ebuild +++ b/net-misc/smb4k/smb4k-3.0.2.ebuild @@ -54,7 +54,7 @@ RDEPEND="${DEPEND} ) " -src_configure(){ +src_configure() { local mycmakeargs=( -DINSTALL_PLASMOID=$(usex plasma) ) diff --git a/net-misc/sock/Manifest b/net-misc/sock/Manifest index 402e01420aca..897979fc97a1 100644 --- a/net-misc/sock/Manifest +++ b/net-misc/sock/Manifest @@ -1,3 +1,3 @@ DIST sock-1.1.tar.gz 21951 BLAKE2B aa047f780569727ceab51e0973e0418c180bc845fc2f6649c443f9a850e152f280253028ff6c0067a602af9e6bfac092eeca85f9e95deade1614172dc737c353 SHA512 9ee5155a51df6d4aadef0786904ae710413b0523a7b5a84c44c7ff4fc48035a7a6fc3b1ad6f4491bb8a4d350b88040ee188af528df8c10b8dd1bca17190fd252 -EBUILD sock-1.1-r1.ebuild 414 BLAKE2B dbce0f36b1037cf34065f50ef8ceb09588906260fa26d4d2c1e1b46909c47ebcf4190c905769d5a7a6548f0f3aefcf4f849f8d46b384c76525b2e5cfa7523574 SHA512 fcd6f1ecbbb2a8a346ae3b9da5cf390f1a114e50f389aeb0834f6b56b7f6ba72743f08be139834ed52ccdca11f3809d3f1083c8c79a1d636bfed1ef70e7245f2 +EBUILD sock-1.1-r1.ebuild 410 BLAKE2B 268df857aa00ea48cf504b1e1cab9cf8d41394cb90811367f71b1cbfc6dc7ed1b48b95e3ade3c69f44052ca03eb9ec7fe488b50552a5bb2e7f1f3c339356a0fb SHA512 c5d83faec7d256b095fe030f1c9f37fb709e92676c77ea5be397bb1f2099d63ab41e73ac16b2f70fd326031292ac2575f9fcd98640f240964427fc0574a8be93 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/net-misc/sock/sock-1.1-r1.ebuild b/net-misc/sock/sock-1.1-r1.ebuild index 539cade5b221..6c8d0615f28e 100644 --- a/net-misc/sock/sock-1.1-r1.ebuild +++ b/net-misc/sock/sock-1.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ KEYWORDS="amd64 sparc x86" LICENSE="GPL-2" SLOT="0" -src_install () { +src_install() { dobin "${PN}" doman "${PN}.1" einstalldocs diff --git a/net-misc/sshpass/Manifest b/net-misc/sshpass/Manifest index 29d5c5f7b05c..115ed3d64227 100644 --- a/net-misc/sshpass/Manifest +++ b/net-misc/sshpass/Manifest @@ -1,3 +1,3 @@ DIST sshpass-1.06.tar.gz 112205 BLAKE2B 9bae7ba60ca627664d12bcccb9a9bb76bc92752490458e4d4fdde27cdb14a0d71c94eeeefe83d95810c1cbe0fff0c9ac8a9d6fb8a90e2cd834c387ac2527875b SHA512 fc08fcca5aaa5e4958f16d38116d828739a5d53f8e2a83506ef78ee602941a7bfc0e3f07154dc390660df490dbdf7601e0c7ec17c68c9627d72d565e4c6717f8 -EBUILD sshpass-1.06.ebuild 400 BLAKE2B 9fa468f10e3bed856be325f369ae3f2050f3dbeb68c92056b599c9eaa56376ca2b01c6e573a870cdf371b138783d24cf11afe585b92aba6e8c7370ffa4e9a5f2 SHA512 2abba4fc6da22ce3766c0ebffcef1ff922c16667b3df7f70a276f91b55c5386f0bf3c0d56238bd05e23a378275b3aa9434d9a899b9ff420430037607cc203c8d +EBUILD sshpass-1.06.ebuild 407 BLAKE2B 87d1dd1098ae24d29b5c7776e73fbb4cf59590bc4c8dbb96db713fef6eeaf4d6dbac454532db5d3a8a28f4d821ef5113450bcc4c988f71a34898383eec85a84e SHA512 1acc6a26373c27a52018e954cf81797ec948d379b495c1389dec90e9cc54762ed621a33fbd6d5285a549653632bb7e5e5098460056cd502031a7a92bdceccdf0 MISC metadata.xml 322 BLAKE2B c05a742c8ed098102d51af6f02b578c0d53d26772a99fcd5ef16e58fcce6aaf2b2ff6bfdb2752e1c3f0ecc697bfb1f091bfb294e5ea7e385a3eef506ef3d9d56 SHA512 8cdaa25021136f87ed8c6197def5901ff101fd43b3938baf75f0246699711a8b8d7ad2bdcf4a8f8f5e1183c7e6f151a9496b1b0109690206958b521de15fd8f6 diff --git a/net-misc/sshpass/sshpass-1.06.ebuild b/net-misc/sshpass/sshpass-1.06.ebuild index 4bb6e7ad9c11..c2e5df13fa4f 100644 --- a/net-misc/sshpass/sshpass-1.06.ebuild +++ b/net-misc/sshpass/sshpass-1.06.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos" IUSE="" RDEPEND="net-misc/openssh" diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest index d1f78a6ba8b9..c778474981d1 100644 --- a/net-misc/streamlink/Manifest +++ b/net-misc/streamlink/Manifest @@ -1,4 +1,6 @@ DIST streamlink-1.3.0.tar.gz 694190 BLAKE2B cd262290cd81f1954567e217eaf9568c00180ee7f6955c8227b7067488d685385fe8b4b3bcd6004e7e8f7f66236696a48e744cb24c4d00f2111f00633ffeb1bf SHA512 5a114e0b1e617b2a41f8fe00f9bd6846843dd7643b4283d2fe30ea869cc9d6f495458b0ddb97955a87b7ad64e5628343262af5068b8a7a19d0d84a32020b3365 +DIST streamlink-1.3.1.tar.gz 695736 BLAKE2B 377fdfb6a90b2e680697dda57b4237a14b63df1e33af5fcbf8333ebd3bc85f877e0e3c4698ab965d766560234cc0ddb7399c8b43eac1b3bbbc4984bfd2ed2194 SHA512 d6c299c6ea444d5b5956a752be8a5c192ca2aae25087db4045035c53fa078396b1bf89203cd55a82630c33492117323892caa5cf27c9dc9ea4b64602dbfdd87c EBUILD streamlink-1.3.0-r1.ebuild 2159 BLAKE2B 06e4eedee820ca62d69137842c2ef3146c900a6cae3147579603894b29a031893af853132a37ccf31489cb03b110a2f2200f1cbcb1961bc8f428e101976dd699 SHA512 2396dbe90aa88d795fc818ab6e8e31abad0bd527ee848e3ce63f8335cbcad147458911d3284468acf2638701ed9fa8ba365b3547067d8f95684c6baebc215e3e +EBUILD streamlink-1.3.1.ebuild 2159 BLAKE2B 06e4eedee820ca62d69137842c2ef3146c900a6cae3147579603894b29a031893af853132a37ccf31489cb03b110a2f2200f1cbcb1961bc8f428e101976dd699 SHA512 2396dbe90aa88d795fc818ab6e8e31abad0bd527ee848e3ce63f8335cbcad147458911d3284468acf2638701ed9fa8ba365b3547067d8f95684c6baebc215e3e EBUILD streamlink-9999.ebuild 2159 BLAKE2B 06e4eedee820ca62d69137842c2ef3146c900a6cae3147579603894b29a031893af853132a37ccf31489cb03b110a2f2200f1cbcb1961bc8f428e101976dd699 SHA512 2396dbe90aa88d795fc818ab6e8e31abad0bd527ee848e3ce63f8335cbcad147458911d3284468acf2638701ed9fa8ba365b3547067d8f95684c6baebc215e3e MISC metadata.xml 330 BLAKE2B ad3caca1dc3dd2ea5915a6d14f9741ba7352d8a961939dacf89efdcae0cf1203343ca11ea230efc30cf69d359e09e7cd06218404943f8e4e3853a5c6676f7ff6 SHA512 73730cc94810711b86088a41beba0d0da4f20c4ca377c24122ebeac1ea68e712d03d0e79518df847aa15cb9d8a3f04658715f0b75dfaa1a6dfbedc0a15c33672 diff --git a/net-misc/streamlink/streamlink-1.3.1.ebuild b/net-misc/streamlink/streamlink-1.3.1.ebuild new file mode 100644 index 000000000000..28994a6a0f82 --- /dev/null +++ b/net-misc/streamlink/streamlink-1.3.1.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} = 9999* ]]; then + EGIT_REPO_URI="https://github.com/streamlink/${PN}.git" + GIT_ECLASS="git-r3" +fi + +PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_REQ_USE='xml(+),threads(+)' +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_SETUPTOOLS=rdepend + +inherit distutils-r1 $GIT_ECLASS + +DESCRIPTION="CLI for extracting streams from websites to a video player of your choice" +HOMEPAGE="https://streamlink.github.io/" + +if [[ ${PV} != 9999* ]]; then + SRC_URI="https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="BSD-2 Apache-2.0" +SLOT="0" +IUSE="doc test" +RESTRICT="!test? ( test )" + +# >=urllib3-1.23 only needed for python2, but requests pulls some version anyways, so we might as well guarantee at least that ver for py3 too +DEPEND=" + $(python_gen_cond_dep ' + virtual/python-futures[${PYTHON_MULTI_USEDEP}] + virtual/python-singledispatch[${PYTHON_MULTI_USEDEP}] + >dev-python/requests-2.21.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/urllib3-1.23[${PYTHON_MULTI_USEDEP}] + dev-python/isodate[${PYTHON_MULTI_USEDEP}] + dev-python/websocket-client[${PYTHON_MULTI_USEDEP}] + dev-python/pycountry[${PYTHON_MULTI_USEDEP}] + >=dev-python/pycryptodome-3.4.3[${PYTHON_MULTI_USEDEP}] + ') +" +RDEPEND="${DEPEND} + media-video/rtmpdump + virtual/ffmpeg +" +BDEPEND=" + $(python_gen_cond_dep ' + doc? ( + dev-python/sphinx[${PYTHON_MULTI_USEDEP}] + dev-python/docutils[${PYTHON_MULTI_USEDEP}] + dev-python/recommonmark[${PYTHON_MULTI_USEDEP}] + ) + test? ( + dev-python/mock[${PYTHON_MULTI_USEDEP}] + dev-python/requests-mock[${PYTHON_MULTI_USEDEP}] + dev-python/pytest[${PYTHON_MULTI_USEDEP}] + dev-python/freezegun[${PYTHON_MULTI_USEDEP}] + ) + ')" + +python_configure_all() { + # Avoid iso-639, iso3166 dependencies since we use pycountry. + export STREAMLINK_USE_PYCOUNTRY=1 +} + +python_compile_all() { + use doc && emake -C docs html man +} + +python_test() { + esetup.py test +} + +python_install_all() { + if use doc; then + local HTML_DOCS=( docs/_build/html/. ) + doman docs/_build/man/* + fi + distutils-r1_python_install_all +} diff --git a/net-misc/streamtuner/Manifest b/net-misc/streamtuner/Manifest index 7228cc40dac8..314e3980dfbe 100644 --- a/net-misc/streamtuner/Manifest +++ b/net-misc/streamtuner/Manifest @@ -5,5 +5,5 @@ AUX streamtuner-0.99.99-shoutcast.patch 1369 BLAKE2B f74a9495567511cfa62a4f5427d AUX streamtuner-0.99.99-stack_increase.patch 188 BLAKE2B cc22de565ac7d8a68968f50d2df7587c2cce653d08535371a1ae78f60000805aed3c1aa54f76185f939941626edcdfcef535665ce19cb60bb689e68abe8cea6e SHA512 c0340219d24bf54c9043a9d07874899ac971ca69f40da976cb63b76256f848c07a41ee8be5a723df81308b7937021a68b18910eca791c954d0cbb1a2cdd894f7 DIST streamtuner-0.99.99-pygtk-2.6.diff 437 BLAKE2B 737287162292888a482520621366ef2016459103fe80736ff0a8e2b94cedcb37f6aefdbc3b76dae9d82c579218e1f781c43cfd406e529241724fe5348d6037f4 SHA512 2471df9ba05d06b44f0f859d61799c92388bbe4ec78d334c1bb33f6f290b7991b4d4e8c53ecbed9052b3f1aa0cdac71f7bc6a1c183dd37e4f31918e50f17b7f7 DIST streamtuner-0.99.99.tar.gz 948075 BLAKE2B 86520fe5b8cbc5c12400d8c285f525e2b841ca0a62c9c89c3d836ec3186d6cb3a7907aa123014bf759c64e3e767b4b2e5a0c6f0d2ca23621d764da138199f643 SHA512 a0b185847e2c7b70f8e9c393c28379cac889b6508ace0d3db2ddf86afa4f705d1faebccc90c053123d139813730f25c033eac5c0545e9eb9a8ae4b70031cf7ef -EBUILD streamtuner-0.99.99-r5.ebuild 1442 BLAKE2B c2cc48b77d9b55e1a20abd46906a391f8cdd13b78f6d794461b84433d8c9fee4259b5564ff121ef12c9556319c1fcb6279eeeea04c1b6468804a173aa969772d SHA512 2a333a4a363defebf0ab832736848b6428cbd44a540436ecfa9666188b0c29b3e722e515c13bec52d539f2e68d0e2a232f568565fb90e84cca2800f14ccb836c +EBUILD streamtuner-0.99.99-r5.ebuild 1397 BLAKE2B 549cfab09bf8aa35d17b429b2156b7867a62a49d96274aa331e697822c6d5790e8985d6df96fbc7c4208f1812cc95017b8e8a736e5e5dc6f65471782c20926e7 SHA512 537ea3f926d237517724381de1af17d987f600c9cd77627e7e82570fc6bc8a2930700de9416cc952e90bf922e1db69c5551c4464eec49be08e6d783aca059de7 MISC metadata.xml 386 BLAKE2B 2bad51ca881f31fd9babffdecfcc75aacb34dc05f8120b7af401e3dc161418e0173834300c5afff6fc19cc9b5e954e7c4fdeea4398aa541e0414a0ee8efe2393 SHA512 a5e471c0089bd380eb6db90706378de06b4c98516d4f6e37ad7acf83f8577b248e9e0531b12706f26608cd0ca4a1b352ff9bb7ff179aaf23c88bc1ec8ab841fb diff --git a/net-misc/streamtuner/streamtuner-0.99.99-r5.ebuild b/net-misc/streamtuner/streamtuner-0.99.99-r5.ebuild index a8d6ec3abcd8..c07f5be960e3 100644 --- a/net-misc/streamtuner/streamtuner-0.99.99-r5.ebuild +++ b/net-misc/streamtuner/streamtuner-0.99.99-r5.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 + inherit gnome2 DESCRIPTION="Stream directory browser for browsing internet radio streams" @@ -12,14 +13,13 @@ SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.gz LICENSE="BSD" SLOT="0" KEYWORDS="amd64 ~ppc ~sparc x86" -IUSE="python +shout +xiph" +IUSE="+shout +xiph" RDEPEND=" >=x11-libs/gtk+-2.4:2 net-misc/curl xiph? ( dev-libs/libxml2:2 ) >=media-libs/taglib-1.2 - python? ( dev-python/pygtk:2 ) x11-misc/xdg-utils " DEPEND="${RDEPEND} @@ -50,7 +50,7 @@ src_configure() { gnome2_src_configure \ --enable-compile-warnings=yes \ --disable-live365 \ - $(use_enable python) \ + --disable-python \ $(use_enable shout shoutcast) \ $(use_enable xiph) } diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest index d8d662065b3a..f940ed7de241 100644 --- a/net-misc/tigervnc/Manifest +++ b/net-misc/tigervnc/Manifest @@ -6,5 +6,5 @@ AUX xserver120-drmfourcc-header.patch 1300 BLAKE2B d1be2072020a4eff663e56e1210b8 AUX xserver120.patch 3699 BLAKE2B f85933c025dc0347040261710e820232fbb21a572cf311bf8b37e8e1873046919fbecf1023f0178793e939ba33e834b55c6e8277f88bd2b145716badc8b4a5c4 SHA512 bf69a4b65742c5f2351b7d0f0b7ad44f44050dd8f54972d9545ea873f27f8fe88314b016b07746b31ac75bde6648b249f523a1f3d9948a9cb26001d6096d4f3d DIST tigervnc-1.9.0.tar.gz 1506520 BLAKE2B 292c2e5fb9ffe2573e216257e889d259abfdca5964559492c318e24ea00563211e7477a4f1b2b09d0e962343d4aeb2c12dcfdd6857a3282882ee9f91fdf8103a SHA512 333910f567e6b5e4a5a22d898b2d4c3f4b834cb4cc8fc13ff55d31401894c0d5122a127692ec5eb51e412c945ff3ea5b8146f9ab22cbe1e47541e09239ec8c9d DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046 SHA512 1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde -EBUILD tigervnc-1.9.0-r1.ebuild 4571 BLAKE2B 665f5cf2161814693e7eba806f9e7d6a222882163ed1ec3a4486af71f649029072c874278d8437ba2a54e10b3496476c412c4229a707fa6d3427d87e0072f160 SHA512 72172b2cddb740574f7a492027f77b0882dc9a57884de6d959939a25c6c5db5b9a3fe9228df3a9742a39d67c9f20ca1c2f91efd9dbe0349ee1d484c5bc5cf7cd +EBUILD tigervnc-1.9.0-r1.ebuild 4543 BLAKE2B b8511bbbd26837b372db8f50134827ff04ea784bb1e5c80381d21a87d4b47bb3ed71e8293e99040f769d9b462e2acb49f31ebd5d4e69907e34310d4c01221964 SHA512 a06caf72fafbe425b9b626b731a6b6cef18ee33dc7ca9c9e2c63d57dd5bc6f3cf1dee46d387e14f18097f7317274d3f3ddaaffa528943f83d0a0df06c59329b6 MISC metadata.xml 750 BLAKE2B 2a76715a23dd2d3797ae85c20ef7e08854ebfcd74f42969d10bc2605870dcd69a03806437483eceeebc3dfbd52006091609e7464a9278aec2d938295b230cab1 SHA512 768e087e274e83dc9347cf719e61db39597d2ab07aae24ab6158fe9851d93f9594e74ec66579b0da2abf9bc839d9d28d3a31f207d7274bc0a9e1e9c8bbee9997 diff --git a/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild b/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild index 44eb551fcf83..cc9111542258 100644 --- a/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild +++ b/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild @@ -131,7 +131,6 @@ src_configure() { --disable-linux-acpi \ --disable-record \ --disable-selective-werror \ - --disable-silent-rules \ --disable-static \ --disable-unit-tests \ --disable-xephyr \ diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest index c395a64f6e41..8e565a3c75c7 100644 --- a/net-misc/unison/Manifest +++ b/net-misc/unison/Manifest @@ -5,7 +5,7 @@ DIST unison-2.48.4.tar.gz 1200861 BLAKE2B 8e262e3e28b9f4cbe3925340aa3b08e99f1c30 DIST unison-2.51.2-manual.html 311981 BLAKE2B 1e1bc18d5bca5d50976b28c4e59cc27fcc1ef4415514c6a8db4be02659c168949738cf2941f88cb949097c16e455bd3fb50aee0fdc6023d3d36d6821f74acd05 SHA512 2fc47e51ffde2e9176ca85d4d29fe0d254b539112d867782e9bb0f71ea74ad02892a88b6bfe59756268875f0d62abfb125406e4939671a0eb8a64696ba01b997 DIST unison-2.51.2-manual.pdf 518963 BLAKE2B 30d0010e7a11b10bb9fba3f5836e084452429f09a94cfcc639305d17ea69499eeeac1026a0bd35c785b08456d79b1b4c68c348c10237509c8cf4e45720d037e0 SHA512 170b280e5a9ad0fc4ed848aaa1c4a6a8977edfdcc133bf3288c03e1d4d6d20383cfa06593b9d149e746795945f6afb8d807cfa16f5cf8ab47795e3074776518d DIST unison-2.51.2.tar.gz 691251 BLAKE2B 39f72e7229826ec1a2151b7d7af416d85ffe2f9e6f1277be77d2202088d41fa3aca45413b931e661d72b787710f7d3429352542554990bb638589d52f77fe43f SHA512 9ba24f8d46f3f8bf3c26ea1beb396e276a82a742d9e8479cb421ff9f97fa2051fc8fb809b5f47ebc88dcb6a04878e1bdeae8081540e35af710ccbdaead84c115 -EBUILD unison-2.48.4-r1.ebuild 2447 BLAKE2B 5024275888237d751a662dab1359b472f4567687d5149b08a473fd83fc6bd8d7a606e19a88c69a4e0a56e83ca870b410e7ad9666d6e1f0fe5b4b3fb13f684684 SHA512 12ea4b576bf8cc91ffb2cb31b3f7994e7271b13d23ace19901478ce6ec8df38abeae5548b9941c83526e298a00e53916478d646b4a3ac6616af249c5f1cbc928 -EBUILD unison-2.48.4.ebuild 2352 BLAKE2B 28b7cc3e9065028405b3d67586b406b4c66c4096d6d78bbb29c170f78a60c6436069252685108c2851c2d2b5a6d67b79fbad04ec64c8665902812297bb585625 SHA512 ade4c06bdb083b228b759b20db68653e9fa05ba29caa890e505750ae2ba203405981fa5ba048e5b860b9a8ee8816e38354643a7586719f110071cd0f260bea37 -EBUILD unison-2.51.2.ebuild 2162 BLAKE2B 13c270c67910618a119ecdf9c3779c1175b64ab2bc17de2735413120404a7784ff8de8e8b9e48c3b91bed3b5e7aa0e84370a159ce10b5753c28ddff63e4804da SHA512 847b543b1e83d1036e57c4580103ba4c3c0f31c080c8dea96e3261ad87b06bff0a8269a5f861ec559e9e41f977de5ea9f9825aef62e69bd3f666f1b2aa2fd7bd +EBUILD unison-2.48.4-r1.ebuild 2446 BLAKE2B 623ed9dac7a80c7ac9a7419f390f7248532b794d5a3f1e90cbaeafbd90ee98021654a9e690872ebd42bbd2822092ed594c6e50552f5560a542802c8852270b79 SHA512 ca69c3c15068aba7c52aa0822b8b88ee219fec46e2f23ea6bb6c0892c169ea7b099206b2181b30688e441460251a35d11d9e976468d2ac243bba690552d81c96 +EBUILD unison-2.48.4.ebuild 2351 BLAKE2B f9629d54a0a1c47dd448aeee7cd1bbda01253fa422fe37cda0cb4f5f9d1e2906d9cfaf24e23a4ee3222389918beb4059a4d086a47d781bae42fd71ccc50f18ac SHA512 988fc794d474ae672e46580e8f9dcf73a068e79f989baa09fabca37ab35a3279cbd29540925de952bc67bfdacfb0512dcf1d0fc2e1a03c975fb4f6232a938261 +EBUILD unison-2.51.2.ebuild 2161 BLAKE2B 74f35bf07cfa486f07742e421ed117a80735e172de8d601e1a9dd2b8998eb9bb1a9cad0299d622b27d7494d0a0bd5e90587f1eecd3b02bd0fcf6069375581078 SHA512 9b51aadb8cf2bc12ef6933fa22d483d18dd2ef3af934d8a41de1ab8a4fd0254824d1dd2b3fa9b5bdd6b317a356784ccba12095ce7f6cffba72c72616785d0e6d MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/net-misc/unison/unison-2.48.4-r1.ebuild b/net-misc/unison/unison-2.48.4-r1.ebuild index 3cbf95371a25..b76c12b42399 100644 --- a/net-misc/unison/unison-2.48.4-r1.ebuild +++ b/net-misc/unison/unison-2.48.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -65,7 +65,7 @@ src_test() { emake selftest CFLAGS="" } -src_install () { +src_install() { # install manually, since it's just too much # work to force the Makefile to do the right thing. local binname diff --git a/net-misc/unison/unison-2.48.4.ebuild b/net-misc/unison/unison-2.48.4.ebuild index e2ba50d54f28..56ef942628c9 100644 --- a/net-misc/unison/unison-2.48.4.ebuild +++ b/net-misc/unison/unison-2.48.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -67,7 +67,7 @@ src_test() { emake selftest CFLAGS="" } -src_install () { +src_install() { # install manually, since it's just too much # work to force the Makefile to do the right thing. newbin unison unison-${SLOT} diff --git a/net-misc/unison/unison-2.51.2.ebuild b/net-misc/unison/unison-2.51.2.ebuild index 3be608825bf9..3c6d4df6c2e3 100644 --- a/net-misc/unison/unison-2.51.2.ebuild +++ b/net-misc/unison/unison-2.51.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -60,7 +60,7 @@ src_test() { emake selftest CFLAGS="" } -src_install () { +src_install() { # install manually, since it's just too much # work to force the Makefile to do the right thing. local binname diff --git a/net-misc/vino/Manifest b/net-misc/vino/Manifest index 4e1ad4864c6b..e6054f619cff 100644 --- a/net-misc/vino/Manifest +++ b/net-misc/vino/Manifest @@ -6,7 +6,7 @@ AUX vino-segfaults-on-wayland.patch 1172 BLAKE2B c8e3b9316309f78975123cd3ac87fd5 DIST vino-3.22.0-patchset.tar.xz 158480 BLAKE2B fb8b50abde8cb4728410302c1d3a57bc4d344a33ac0bd9f1265fd24eb142dcd52e870845b902c9b63e98134f87873ebf6abfcfcd1efadb72b0cc72b04f9bf4be SHA512 cf96f5dce96d5c060462698c9d8df6f6d94eb9d624cb689c1262830840ed8f3617485f2274832076c273625e92a89732f9c2ae99dbcbf495e5293cf88408064f DIST vino-3.22.0.tar.xz 768716 BLAKE2B 5c3f6df059f129009bbc97527d1767bc8a29d8cbff5e6f9e89dabc4583ffdae2cf235eec66cbcb5f9e73c9a0a7c05a504e4e90221bf5adfc2ecbbbd518fdc84a SHA512 29b88e151b0b8c69bce1565ae3ec2e788f48c7645429984329fb2d3daaf03cc5ac100abbf70247bf0516c6d03a3b9aeb78d018c8f1bf35fd241919117fd1105f EBUILD vino-3.22.0-r1.ebuild 1821 BLAKE2B 14db439bf16ef23f58c0cdfb8b5119e591a3cbca521de229ff7ebe026a05992db296908cd77b52053691984227029e7c78276b5f700b388219b653ffa450e476 SHA512 8d10fcb421ad25ec3aac15b9ed6b4e6f9aa6c54b572ac0fd5d04c30b06100b99d889807fd8f3f5844ae1a68d740042adeeca0a5212e32ad21bc83cae48bae5b8 -EBUILD vino-3.22.0-r2.ebuild 2006 BLAKE2B e624588d848c5f078ae4f025ef3e338aad712403267214a8564f04c1857be791d983baf700056e5948e5bec87e22412055c994b7299f234e9463c47eef07298b SHA512 f2ea280caa7560ff05fcead6d8720d70476b8f347deb86a26530a870ba21cd0506acea72a3c5877c341cdb415f801ccfa56be33e5ba3f404286afd66ed118ec4 -EBUILD vino-3.22.0-r3.ebuild 1956 BLAKE2B 04ca02b942477d1df887ece1e69cda37ccc1487c2eb9aa13c86eaf3bb0476ddf7a14a1a9f06c81275ed314510ec11e1cce5e566886e993fa6625b95ee21143c7 SHA512 fa0f12b45f610fd4c971316d21841f24dd7d9d80bc01810024ceef7ddb9b23c7c1915d38488a022a6eb3a5bd3fe06f7f81f19504e1bcbdcbde99933f8829badc +EBUILD vino-3.22.0-r2.ebuild 2062 BLAKE2B ccc686e8c3a255b8399b3d06e58b71922ae2d19302f811f93f1cd2748201e4d17920f801f36536104b634ef6f5ecf8f90f8426e0fc715499c6bdc663d874945b SHA512 e30814d36f8f82c765c734db4021d5816b7c3c11321b139564ef77c0536dcdfe6043982bdeda92bca15abe64ec0e258b1dff21317e7e425700cddddf31c961ba +EBUILD vino-3.22.0-r3.ebuild 2014 BLAKE2B b08e9770c1df52d1cd802839edb533ae944cbfcabdd5a0b0c7efb970116f810f0f8d487019fda59bab1577c2b6ebf13aa1d9177dd88432817820c85b01335bdc SHA512 73cc5dc16a06b7ede31bed2e8901dd58ef81269301571a433dc83af261c4f89d454c5e20c1a4deec83c1150f4e0070dcb8900be2e4bef16e347eae4cb79095a2 EBUILD vino-3.22.0.ebuild 1641 BLAKE2B cb05d5798cb4873e688bbe0e9c11b9648ae19400973599c854a243418aa25cb8381dc7aa761c31a11c4de5b7bf750df5850fbc3c1f8d94f64fdf2b9c035b61ef SHA512 e4f75abf8c4b63f7e7c2856cc6aaf1773fde72464d6f58277a922145676db3f634625c1448479d9ebe0d8fe7d946ceef1d094679dc498ad0368f326ab6e1a883 MISC metadata.xml 343 BLAKE2B 92816370ecc7d4e3b9d3f4513ee7c437b98ea3ca798107beb1b4885ab778768e19a20dbf8a3c19dd1c6d2b812a2498a9d1e2b4f4211dad0f350f620420a523e2 SHA512 dc33b648174ba60a62212dd252f1d358ee7a05ddbd41ae2b31dbdf362f4f780207c5183c0b180d68c8df5a613e91c1336231f2d75100076a01517e4d70d8252d diff --git a/net-misc/vino/vino-3.22.0-r2.ebuild b/net-misc/vino/vino-3.22.0-r2.ebuild index bb0874d055d7..0fa70f9a2063 100644 --- a/net-misc/vino/vino-3.22.0-r2.ebuild +++ b/net-misc/vino/vino-3.22.0-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" IUSE="crypt debug gnome-keyring ipv6 jpeg ssl systemd +telepathy zeroconf +zlib" # bug #394611; tight encoding requires zlib encoding REQUIRED_USE="jpeg? ( zlib )" @@ -50,9 +50,11 @@ DEPEND="${RDEPEND} app-crypt/libsecret dev-util/glib-utils >=dev-util/intltool-0.50 + gnome-base/gnome-common virtual/pkgconfig " # libsecret is always required at build time per bug 322763 +# eautoreconf needs gnome-common PATCHES=( "${WORKDIR}"/patches/ # Patches from master branch at 2020-02-15 state; needs autoreconf diff --git a/net-misc/vino/vino-3.22.0-r3.ebuild b/net-misc/vino/vino-3.22.0-r3.ebuild index b53f4ca1bcb7..6cab14992cc4 100644 --- a/net-misc/vino/vino-3.22.0-r3.ebuild +++ b/net-misc/vino/vino-3.22.0-r3.ebuild @@ -49,9 +49,11 @@ DEPEND="${RDEPEND} app-crypt/libsecret dev-util/glib-utils >=dev-util/intltool-0.50 + gnome-base/gnome-common virtual/pkgconfig " # libsecret is always required at build time per bug 322763 +# eautoreconf needs gnome-common PATCHES=( "${WORKDIR}"/patches/ # Patches from master branch at 2020-02-15 state; needs autoreconf diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest index fe2709df405b..4bbe2dc37c68 100644 --- a/net-misc/whois/Manifest +++ b/net-misc/whois/Manifest @@ -1,10 +1,10 @@ AUX whois-4.7.2-config-file.patch 202 BLAKE2B b5c421655f40c22fcb9c9ac3194821e6e4100657bd11013ed220cea3c81c77e3c7e50432361c8e08274b59d96ff04ca22d8f500436fbefef981d587e26ef75a7 SHA512 932ce9dd51b29750a88da3082bdb1f3fd994e1d859fbdef45fadd3c833ee24d12acb6530989db60f4df3df9481d34cc5cabbdad4bf5150389a06ef7c832daf65 AUX whois-5.3.0-libidn_automagic.patch 778 BLAKE2B b9214f6f0c081abf6141057ee9f82db30dad7306fe611b1cb70d256b235d0ba544887f8b084d7b71a21486ad68d312ad98075aed51765f59ecbf7ced45684772 SHA512 8df8c99320ee4a4327f35a62dbaca0b071a3472d398604304d772f2424d607d109d87056b1a138b041c4c391409828cc7397dc62ed973dee500b2eb9f1735676 DIST whois-5.5.5.tar.gz 103424 BLAKE2B ef406985be6ca6fe1d73e5c23817c99aa1c111f9ec74707f96602e53e519b77585fc27feaf11baf0cfc4f1fa94fbd876fd6631ea0a4c2b3d7b4bcd99cfd2e786 SHA512 0fcdd5b7fbdf4123edda2af58a2fcf0a1a87c454dc6cb83c86c1d200f80659967a7d08d54d3b010c40465004aa219de2a8efcc4b41524a8aefc2e6050d868d1b +DIST whois-5.5.6.tar.gz 103581 BLAKE2B 7e4aebeb440b95a278a0f0d0e51dbec2003599ee9f6e6355f29a5b043ba5cbad19310058964120142d417e6a5df86bd68d03d7ac4358be488538584c2a56740f SHA512 97a139a8e24b9a92c5597bc31e1b8d5d5bcab1ec4cc53f80cbdb7f2e5b7e54f36b3a8a8d90fd7b86452aad36adc0ba2015aaf936643b290c8a777f5f6cb27ef3 DIST whois_5.4.3.tar.xz 83904 BLAKE2B 19b78ca984c86ad711c317ca6090003ae354eee2b39f353081e99f44396e254b3cb75d38c8f6df9fe88283c5036e9e02f38c74401de8245dbd4f5dae3a6e1a0a SHA512 762feec983d29696796bea87fb47c5bd7357ca96d701b2e30cccb186c248225c45b451289ab45936d7e3eed5c0ff4e8fa249255ceb061a4e1ba1f6cd8fcdf084 -DIST whois_5.5.3.tar.xz 85456 BLAKE2B fb64150ef2a3c40c7e9b7467198f1187b07d7b0a75e7f89f36a613cd9480016434a187607f93c102142f2f82cba405f5b0a7b16314f1b13aea793da6eb3b9ade SHA512 cf92c17b9187da1fb5ef38d3e814cb5590fc9bcb5c8f53640428cb7680fd003ce71d8a6819279b571138da1b31042b65eb1dac5d3b220ab725d191958c4ba47b EBUILD whois-5.4.3.ebuild 1574 BLAKE2B 95a98d315c975ca42f98f0ba09f39e5002f46f1c6bd6024fc78dd2bffe8cd422afb0f2d2e735ed10d69f77f5d575c946e273be69d59f8a78ee0503c86f41a2e7 SHA512 e1be4caba92dd2bcc92238a158d941adc733686bac889c2a5cc578c0e9d99faa4caee097ec2ba4f8b44f7374075312d400a7c3dad9179f0913690ffd022c51e7 -EBUILD whois-5.5.3.ebuild 1802 BLAKE2B 279625a4d204dc2544fcb48101184872927bc62b006f3fc6dd95741849cd83ceafa61c8df9b9eff12e9335944de820762c3ac267bcb7fbf796cbb4f14c9f8c67 SHA512 2ce870c80ec1cef69657609b0bcbd930d290506a631a157cfee5f58921caff808d4561a4ea2e560117cfe14b6bfa49aba18e03c991c5e1f07f38d46a6c609196 EBUILD whois-5.5.5.ebuild 1803 BLAKE2B 18abf8ebc9dc0b9e47d911344cd64876aae9bd0c88a22bc40489759824116c42510e65c1f698513ecdf048eef7bb58a841e949083aaae55b4adae1dfd9ddf268 SHA512 c8ea7771d38c1e138899fbf1859d33b8fa2d448306403ad2561c940b4dfefbb20dd2555ed38780187beec2ead11c6e118e87aee01aa667e5cada372610cee3bc +EBUILD whois-5.5.6.ebuild 1803 BLAKE2B 18abf8ebc9dc0b9e47d911344cd64876aae9bd0c88a22bc40489759824116c42510e65c1f698513ecdf048eef7bb58a841e949083aaae55b4adae1dfd9ddf268 SHA512 c8ea7771d38c1e138899fbf1859d33b8fa2d448306403ad2561c940b4dfefbb20dd2555ed38780187beec2ead11c6e118e87aee01aa667e5cada372610cee3bc EBUILD whois-9999.ebuild 1780 BLAKE2B 31fb99160417ba67d2f2e5867f22d558bf53ac1222ac00b3161a83e770eda8cfe9fd9fc5ad269d4982ae8d7696d9bbc3ccaaf43517a07924b7f32d7350746293 SHA512 e067181f4cdfce4e0640181349b673a4217bba36470dcc1390645bbb79d078ea83e3d8f10cfb2a1d78963e320b9ee8f628ca3fcbb38f0478a62985df785545b1 MISC metadata.xml 335 BLAKE2B 105a64d3c2f98d051101083c04232489e806ea86a66e27bbd33ebaf00cd7ce3cde1e4cce051adf86c6b61201973f9aec9c10f5b49f11586208260b7d7b40b292 SHA512 81d7c5fe370408b1cd3470c7e6b46127a8de700db07da3b0c7416263d7f0f7558da56dd2256cb4120a2fd398765d8a295436a517fbd0e9313d6abe9f5358d51d diff --git a/net-misc/whois/whois-5.5.3.ebuild b/net-misc/whois/whois-5.5.3.ebuild deleted file mode 100644 index c05c758875ac..000000000000 --- a/net-misc/whois/whois-5.5.3.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -MY_P="${P/-/_}" -DESCRIPTION="improved Whois Client" -HOMEPAGE="https://github.com/rfc1036/whois" -if [[ "${PV}" == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/rfc1036/whois.git" -else - SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz" - #SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" -fi -LICENSE="GPL-2" -SLOT="0" -IUSE="iconv idn nls" -RESTRICT="test" #59327 - -RDEPEND="iconv? ( virtual/libiconv ) - idn? ( net-dns/libidn2:= ) - nls? ( virtual/libintl )" -DEPEND="${RDEPEND}" -BDEPEND=" - app-arch/xz-utils - >=dev-lang/perl-5 - virtual/pkgconfig - nls? ( sys-devel/gettext )" - -S="${WORKDIR}/${PN}" - -PATCHES=( - "${FILESDIR}"/${PN}-4.7.2-config-file.patch - "${FILESDIR}"/${PN}-5.3.0-libidn_automagic.patch -) - -src_prepare() { - default - if use nls ; then - sed -i -e 's:#\(.*pos\):\1:' Makefile || die - else - sed -i -e '/ENABLE_NLS/s:define:undef:' config.h || die - - # don't generate po files when nls is disabled (bug #419889) - sed -i -e '/^all:/s/ pos//' \ - -e '/^install:/s/ install-pos//' Makefile || die - fi -} - -src_configure() { :; } # expected no-op - -src_compile() { - unset HAVE_ICONV HAVE_LIBIDN - use iconv && export HAVE_ICONV=1 - use idn && export HAVE_LIBIDN=1 - tc-export CC - emake CFLAGS="${CFLAGS} ${CPPFLAGS}" -} - -src_install() { - emake BASEDIR="${ED}" prefix=/usr install - insinto /etc - doins whois.conf - dodoc README debian/changelog - - if [[ ${USERLAND} != "GNU" ]]; then - mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die - mv "${ED}"/usr/bin/{whois,mdwhois} || die - fi -} diff --git a/net-misc/whois/whois-5.5.6.ebuild b/net-misc/whois/whois-5.5.6.ebuild new file mode 100644 index 000000000000..5c2065a97ce5 --- /dev/null +++ b/net-misc/whois/whois-5.5.6.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +MY_P="${P/-/_}" +DESCRIPTION="improved Whois Client" +HOMEPAGE="https://github.com/rfc1036/whois" +if [[ "${PV}" == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/rfc1036/whois.git" +else + #SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz" + SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +fi +LICENSE="GPL-2" +SLOT="0" +IUSE="iconv idn nls" +RESTRICT="test" #59327 + +RDEPEND="iconv? ( virtual/libiconv ) + idn? ( net-dns/libidn2:= ) + nls? ( virtual/libintl )" +DEPEND="${RDEPEND}" +BDEPEND=" + app-arch/xz-utils + >=dev-lang/perl-5 + virtual/pkgconfig + nls? ( sys-devel/gettext )" + +#S="${WORKDIR}/${PN}" + +PATCHES=( + "${FILESDIR}"/${PN}-4.7.2-config-file.patch + "${FILESDIR}"/${PN}-5.3.0-libidn_automagic.patch +) + +src_prepare() { + default + if use nls ; then + sed -i -e 's:#\(.*pos\):\1:' Makefile || die + else + sed -i -e '/ENABLE_NLS/s:define:undef:' config.h || die + + # don't generate po files when nls is disabled (bug #419889) + sed -i -e '/^all:/s/ pos//' \ + -e '/^install:/s/ install-pos//' Makefile || die + fi +} + +src_configure() { :; } # expected no-op + +src_compile() { + unset HAVE_ICONV HAVE_LIBIDN + use iconv && export HAVE_ICONV=1 + use idn && export HAVE_LIBIDN=1 + tc-export CC + emake CFLAGS="${CFLAGS} ${CPPFLAGS}" +} + +src_install() { + emake BASEDIR="${ED}" prefix=/usr install + insinto /etc + doins whois.conf + dodoc README debian/changelog + + if [[ ${USERLAND} != "GNU" ]]; then + mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die + mv "${ED}"/usr/bin/{whois,mdwhois} || die + fi +} diff --git a/net-misc/x2goclient/Manifest b/net-misc/x2goclient/Manifest index a9803d2f12a7..0586ee7a0d56 100644 --- a/net-misc/x2goclient/Manifest +++ b/net-misc/x2goclient/Manifest @@ -1,6 +1,8 @@ AUX x2goclient-4.1.2.1-gentoo-17.1.patch 996 BLAKE2B afc5538457142b93deb80832bbfe37352844289304ff07d2bbdb1251b082e471ddba787db5267109a594dd101e936a1552a20d75d8a7e27fc125f4c835ecc54f SHA512 a76e819aae1b8150bf219f58a29c24979bc11c6d49346c3a486d16573819d3663e93e5ef3070c9389a9d0c8c76bcdc4d904cfdf669bdd25176d0c365b2b5b502 AUX x2goclient-4.1.2.1-qt511.patch 678 BLAKE2B d4c6de81d060d415030c7b160eaca2d72fc4c0fbcb4dc4428471069fbf6c6c1b8b918b382efd5b852cbd0accd4a2cd7c76b7b3a957a271bb46fd7b770fca74c6 SHA512 4c2571dfe286dc5e632a278c683df8ed3d5bb7107f9342ba843ac42b36d73df24a140927b0d147484c4e69668a85ccc309dd6a32627a9e0ba82493e0a9529a55 DIST x2goclient-4.1.2.1.tar.gz 2735905 BLAKE2B 9ac70e350b0c586f76915edc187a2c6b179cb69bf28c082ef1d8122d4c32b79dd7bcb685e846a62481a4a3334eb902a3fe84aa8422099a5088559a3b548fbe20 SHA512 0dc4ef0b154c582e62d8e1c5fd0284510fd8c7ddac1d8f49638ca68244ac24f9220c9089e93a105cfa8978d1e2af9a4379deeb934d58741f51ee473ab041d369 -EBUILD x2goclient-4.1.2.1-r1.ebuild 1459 BLAKE2B 09c635edf46779b6448f885d27900186938fd9695865029a896b476d82f78568888f64c03cb99fb30381c5780923cf9684bb013d6ed1535abde7e9dbcf9089f1 SHA512 c129a3a931fd6f228ac4d7ee2e58025692801ae198c995e683e18026033df680bde4d4e586bb21cbbab2ea33162056f848d611bdb88601a713108088a03dea0a +DIST x2goclient-4.1.2.2.tar.gz 2576404 BLAKE2B 2a29f73516282af119cc4ea0a511c29156cdb71564adcdbf307f60298b87c2a7eee0ca121a3e165a63c110130c2704b49b90b3b9abc6a39b6105b1f22ac5afd0 SHA512 85e6db6a34629512be64376883c205d8bf0696c4697cf216970b57a91ffe68dcf7f38bfda0d396c104602f6991b596c5fb0934e75fa4a93f7d0e41c2b3f5ac4d +EBUILD x2goclient-4.1.2.1-r1.ebuild 1457 BLAKE2B 7d246b2e56ff6d84ddca5d1376d9c95399ebd96ac182b0f4b5969d5006a817f872d3984baf30b595bcf59a11509e330e7d4eb850ff9cc27de75352813d625ee9 SHA512 d31d2a343c5cdd006bf76102f8a9bdd9ed080f13c86ec90807024fe4216155966875d787e0df06b22b3e70db4e0c342fecebbde5c81704ae557c7dc6d0d501d0 EBUILD x2goclient-4.1.2.1.ebuild 1419 BLAKE2B 3d5c8683105bb9f6b37e7111343891eb773b3ba1a8fd6755d0cae28ea9509852d1675be7bd67eb74cec52cca218d0cef222002763fb0ebf3486b2d919578b614 SHA512 5877bf18d4b5cb4db3c6541f754ed8a92d3f8d5b058e44eaab052b7b0ed8cf5b4ca9b9a201931a9d0cd176a40b2c37071050144d8901a090f8b397fbf1d79d94 +EBUILD x2goclient-4.1.2.2.ebuild 1277 BLAKE2B 4f24790b33a649d5d153cdf012ebe37ba82b39238161e29881822fb3e133c35a29569879b7828bdce209e5155683091da0a5bf7bdb6b12268fc488dae9a14716 SHA512 5983bb5a824f0968a3151ac430b9b5b2512b3784a0432c4599cea1f9eaecd4c0cf30f42726d960652d4ba2c727ed989e892e64a8ce7ebf35746bcc9788332a7a MISC metadata.xml 307 BLAKE2B 23b74b66a93119c741def7e676af997a2442085095191b9511248b54ae1b638ab7965441881e1a45c22698068a19cebd28b898324ee5570c587428f49b964170 SHA512 c1da89b20bbe06d9193927fd9b28c1ae4b3d58fde4ef79ddc2923894b59a9ff2083b16424d6935755c734069a7f0ccd03a177884cb82c64da77aaf1835c63721 diff --git a/net-misc/x2goclient/x2goclient-4.1.2.1-r1.ebuild b/net-misc/x2goclient/x2goclient-4.1.2.1-r1.ebuild index 953c984a775f..911efdf18aca 100644 --- a/net-misc/x2goclient/x2goclient-4.1.2.1-r1.ebuild +++ b/net-misc/x2goclient/x2goclient-4.1.2.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="ldap" COMMON_DEPEND="dev-qt/qtcore:5 diff --git a/net-misc/x2goclient/x2goclient-4.1.2.2.ebuild b/net-misc/x2goclient/x2goclient-4.1.2.2.ebuild new file mode 100644 index 000000000000..6e14630de53d --- /dev/null +++ b/net-misc/x2goclient/x2goclient-4.1.2.2.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop qmake-utils xdg + +DESCRIPTION="The X2Go Qt client" +HOMEPAGE="http://www.x2go.org" +SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="ldap" + +COMMON_DEPEND="dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + >=net-libs/libssh-0.7.5-r2 + net-print/cups + x11-libs/libXpm + ldap? ( net-nds/openldap )" +DEPEND="${COMMON_DEPEND} + dev-qt/linguist-tools:5" +RDEPEND="${COMMON_DEPEND} + net-misc/nx" + +CLIENT_BUILD="${WORKDIR}"/${P}.client_build +PLUGIN_BUILD="${WORKDIR}"/${P}.plugin_build + +src_prepare() { + default + + if ! use ldap; then + sed -e "s/-lldap//" -i x2goclient.pro || die + sed -e "s/#define USELDAP//" -i src/x2goclientconfig.h || die + fi +} + +src_configure() { + eqmake5 "${S}"/x2goclient.pro +} + +src_install() { + dobin ${PN} + + local size + for size in 16 32 48 64 128 ; do + doicon -s ${size} res/img/icons/${size}x${size}/${PN}.png + done + newicon -s scalable res/img/icons/hildon/${PN}_hildon.svg ${PN}.svg + + insinto /usr/share/pixmaps + doins res/img/icons/${PN}.xpm + + domenu desktop/${PN}.desktop + doman man/man?/* +} diff --git a/net-misc/zerotier/Manifest b/net-misc/zerotier/Manifest index 43c1a509e3b0..9c6cbef3cc57 100644 --- a/net-misc/zerotier/Manifest +++ b/net-misc/zerotier/Manifest @@ -1,5 +1,11 @@ +AUX zerotier-1.4.6-add-armv7a-support.patch 419 BLAKE2B 8670511fb18c3833d17b601e692e141281d429f47281d12b420e5bf84c61a0312642be00785284739d68c33c353ff76b76b0651b03de4789cf7112c352c39648 SHA512 e2be80e39ee1a6f554b60c481f11e04c60a30bd8b198142aaeb7479365fee3d3e73ed9365f1ad7795c33781bf83693cc51a86ea5e294c63030fb111872dbad3a +AUX zerotier-1.4.6-add-mk-ctlr-node-target.patch 1080 BLAKE2B 2c8395a8d32096fa83c7cc4d6600c12aeecd6f0881cf0279d4697ed2a764dbc7d84c87ab8c94fb6b0504c6f343a0d9c776c52f6d24e42cb4394a4d1bd9d42f97 SHA512 a72eb4e2f6c97484ff22b5caa2798d3cc45458b9035b33c325a9489f27196e0170a017a9dbb3b22eaa715d3c7b50365de270aaeaadfa46d910d39eb002770c36 +AUX zerotier-1.4.6-fixup-neon-support.patch 2667 BLAKE2B 39feb92294b2221fa61fbfe93c894bad4218528161854f74d5b5e9c301aef86b9f5a84de567d5050463d323a309179b4efb8e95eb09b22424c4ecfcc065a3da6 SHA512 f032b95f485ae264577f4c7f579a9f4e9ab4a82a5c806c6dc9bd37fb4262d60d98088a19b27a545893d1deedbefb7f1ffdeb52ac102d0b3cfbb82c46b3abca9a +AUX zerotier-1.4.6-respect-ldflags.patch 455 BLAKE2B 2add558b3770e35d9318965eee27219366af4660935d2ee1261bc7735cbd77405ec8c8677f95ad31e02a0f81a9b9f1984b89ba2aeff3b919a84adfdebf7518bf SHA512 8b00309912e64a33086173f0c14649115bf82d5ceaf838642dc604e6ae1ec49d883c90ad5fcd93c9291fb7491cdd06b4d609ffc80c512425ee7c9988bb67149f AUX zerotier.init 437 BLAKE2B a43cc014d5ad311d14b13324e118c73c694623621c252ad6957af53064ccb53cda7c028cf2348e6999508262e86576fdd5c02feba81af6e1a9a88653bbd7a0e7 SHA512 938dcdf16228ca62a14c18658d746054590104dc50028d5dc4d56dba139dfc894d88d567e918533820df81723d56411cc046050b4b7c0e11e1128bef599fb12a AUX zerotier.service 179 BLAKE2B 8c27616a5092084a2450f08e5046528ce25f7697fca914436d9dddd003538e4d9bcfb50126e522936cf997d5f225f32751f59229d28cd6e85778b6b1bed8edb2 SHA512 80b685e2e6e851af924c1f84970be761e15086f52280819d75279b947f0e2a11f890035570b85becef85f208ef8f7952323f85fb811984701ff9f39e37d6c701 DIST zerotier-1.2.12.tar.gz 6058902 BLAKE2B 851d0d871fac7f6cdd9feafb375f97181f9155c265f13e44122424bd7adcaff10e3f2c2a4484d2e2ad1f4f2f174fc723681451c1a728c9aa324bdcb02300af57 SHA512 a35029993d9266f3529a9922daa606b0d56a332514545f8cfab2092a4c9db4fc7217223f3bd7dbe59e536de325ee9b4f0226d673c0f0ec5859cf2937e8a4a2d4 +DIST zerotier-1.4.6.tar.gz 13055818 BLAKE2B 46003d9c3ad09e30dbefaa441422ed4570bdbdfb99f2f24fb82246f9e970501d38d96c19dc9771a1d0d30bc49bd8be2b79ebd2e5c8bd85e88b738b29f0a1dcc3 SHA512 72f00602f67190d03ac0c8caa6b79e7f346b10745bdf772c68f77a3a940cdd718d05ec642bc862a6235aab9bd3bfefb0c57571f358ae55f38761f45500f0f189 EBUILD zerotier-1.2.12.ebuild 914 BLAKE2B b321d596dcc72e2495c2a324b79a5d9a630f1e280a0ed40b7876dc2af359c166fb9024a00f49db1b19ca13a5dea2b5c69bacaf4254729c95e0fc58c8f15f6a46 SHA512 a102dc5a09237e6a98e4b8bf51c3397d4fc9ea698bdc6847c5efe5d31f0333f9281c3700abc6b477ef95e9cda68ede2a080cada13b1b2a6316ff87a2238d6d53 -MISC metadata.xml 550 BLAKE2B b2337f927bef36ec75e2329459f9f654e3e786ec8d4dfa2016e42c5c857db77a539df1e2e6398483995e72d2a71f9eee3bf81df3e26501354c8bdd8ac5243222 SHA512 2c76feb941ce99247828da120bf10b4c9152065a361230b06c2717716fe0eb8798fa59eb737dff449d9c2d8f7f99025576e42a1592ac7183163bd4d8e7e9ba8a +EBUILD zerotier-1.4.6.ebuild 1802 BLAKE2B 3fa9f53c3568d53c528a20610d58400e3d51ec02d6b6c3781350fddcd133dc8c30aae6f74d4b6a43e06708bc3b71281b60a1c0958b2e1390d0caeb62d5c04d23 SHA512 712437b743c70d5941f72206c0ab9025b85809453ddf5c33e8d18ace4a9771f3c5c861b491758cc2f2b8ee455a50738f7d0b16ac3d87784998ba966f8d56fbb1 +MISC metadata.xml 482 BLAKE2B 8aaebdfd4d9a6454f3a426fb472a12e50f64e7cc356795b10175f9a3e3bfc5a181f503d609bb431b9619e73675ffa6e24059452696cdbe6f2d4aeff5f3a8cd11 SHA512 54bdb668f32bc05faee9dca6f29c3648127abe60c5338a4f1cdb71b3812e33314f1e6b691801caeb3fc3e5dfaa8ccc89b9f73469eb964321fc9f983ec669dadc diff --git a/net-misc/zerotier/files/zerotier-1.4.6-add-armv7a-support.patch b/net-misc/zerotier/files/zerotier-1.4.6-add-armv7a-support.patch new file mode 100644 index 000000000000..802b1a873f58 --- /dev/null +++ b/net-misc/zerotier/files/zerotier-1.4.6-add-armv7a-support.patch @@ -0,0 +1,14 @@ +--- a/make-linux.mk 2019-09-05 11:02:16.000000000 -0700 ++++ b/make-linux.mk 2019-09-27 21:01:21.000000000 -0700 +@@ -195,6 +195,11 @@ + override DEFS+=-DZT_NO_TYPE_PUNNING + ZT_USE_ARM32_NEON_ASM_CRYPTO=1 + endif ++ifeq ($(CC_MACH),armv7a) ++ ZT_ARCHITECTURE=3 ++ override DEFS+=-DZT_NO_TYPE_PUNNING ++ ZT_USE_ARM32_NEON_ASM_CRYPTO=1 ++endif + ifeq ($(CC_MACH),armv7l) + ZT_ARCHITECTURE=3 + override DEFS+=-DZT_NO_TYPE_PUNNING diff --git a/net-misc/zerotier/files/zerotier-1.4.6-add-mk-ctlr-node-target.patch b/net-misc/zerotier/files/zerotier-1.4.6-add-mk-ctlr-node-target.patch new file mode 100644 index 000000000000..0d19099865b7 --- /dev/null +++ b/net-misc/zerotier/files/zerotier-1.4.6-add-mk-ctlr-node-target.patch @@ -0,0 +1,27 @@ +diff --git a/make-linux.mk b/make-linux.mk +index 9fd4f7b9..a7eb7f6a 100644 +--- a/make-linux.mk ++++ b/make-linux.mk +@@ -45,6 +45,12 @@ endif + # Trying to use dynamically linked libhttp-parser causes tons of compatibility problems. + ONE_OBJS+=ext/http-parser/http_parser.o + ++ifeq ($(ZT_CONTROLLER),1) ++ #LIBS+=-lpq -lrabbitmq ++ #DEFS+=-DZT_CONTROLLER_USE_LIBPQ -DZT_CONTROLLER ++ override DEFS+=-DZT_CONTROLLER ++endif ++ + # Build with address sanitization library for advanced debugging (clang) + ifeq ($(ZT_SANITIZE),1) + DEFS+=-fsanitize=address -DASAN_OPTIONS=symbolize=1 +@@ -331,6 +337,9 @@ official: FORCE + docker: FORCE + docker build -f ext/installfiles/linux/zerotier-containerized/Dockerfile -t zerotier-containerized . + ++controller-node: FORCE ++ make DEFS+="-DZT_CONTROLLER" one ++ + central-controller: FORCE + make -j4 LDLIBS="-L/usr/pgsql-10/lib/ -lpq -Lext/librabbitmq/centos_x64/lib/ -lrabbitmq" CXXFLAGS="-I/usr/pgsql-10/include -I./ext/librabbitmq/centos_x64/include -fPIC" DEFS="-DZT_CONTROLLER_USE_LIBPQ -DZT_CONTROLLER" ZT_OFFICIAL=1 ZT_USE_X64_ASM_ED25519=1 one + diff --git a/net-misc/zerotier/files/zerotier-1.4.6-fixup-neon-support.patch b/net-misc/zerotier/files/zerotier-1.4.6-fixup-neon-support.patch new file mode 100644 index 000000000000..a6ca7f7ca382 --- /dev/null +++ b/net-misc/zerotier/files/zerotier-1.4.6-fixup-neon-support.patch @@ -0,0 +1,96 @@ +--- a/make-linux.mk 2019-09-27 21:35:39.000000000 -0700 ++++ b/make-linux.mk 2019-09-27 21:36:01.000000000 -0700 +@@ -118,6 +118,7 @@ + # Determine system build architecture from compiler target + CC_MACH=$(shell $(CC) -dumpmachine | cut -d '-' -f 1) + ZT_ARCHITECTURE=999 ++ZT_DISABLE_NEON?= + ifeq ($(CC_MACH),x86_64) + ZT_ARCHITECTURE=2 + ZT_USE_X64_ASM_SALSA=1 +@@ -158,57 +159,57 @@ + ifeq ($(CC_MACH),arm) + ZT_ARCHITECTURE=3 + override DEFS+=-DZT_NO_TYPE_PUNNING +- ZT_USE_ARM32_NEON_ASM_CRYPTO=1 ++ ZT_DISABLE_NEON?=0 + endif + ifeq ($(CC_MACH),armel) + ZT_ARCHITECTURE=3 + override DEFS+=-DZT_NO_TYPE_PUNNING +- ZT_USE_ARM32_NEON_ASM_CRYPTO=1 ++ ZT_DISABLE_NEON?=1 + endif + ifeq ($(CC_MACH),armhf) + ZT_ARCHITECTURE=3 + override DEFS+=-DZT_NO_TYPE_PUNNING +- ZT_USE_ARM32_NEON_ASM_CRYPTO=1 ++ ZT_DISABLE_NEON?=0 + endif + ifeq ($(CC_MACH),armv6) + ZT_ARCHITECTURE=3 + override DEFS+=-DZT_NO_TYPE_PUNNING +- ZT_USE_ARM32_NEON_ASM_CRYPTO=1 ++ ZT_DISABLE_NEON?=1 + endif + ifeq ($(CC_MACH),armv6l) + ZT_ARCHITECTURE=3 + override DEFS+=-DZT_NO_TYPE_PUNNING +- ZT_USE_ARM32_NEON_ASM_CRYPTO=1 ++ ZT_DISABLE_NEON?=1 + endif + ifeq ($(CC_MACH),armv6zk) + ZT_ARCHITECTURE=3 + override DEFS+=-DZT_NO_TYPE_PUNNING +- ZT_USE_ARM32_NEON_ASM_CRYPTO=1 ++ ZT_DISABLE_NEON?=1 + endif + ifeq ($(CC_MACH),armv6kz) + ZT_ARCHITECTURE=3 + override DEFS+=-DZT_NO_TYPE_PUNNING +- ZT_USE_ARM32_NEON_ASM_CRYPTO=1 ++ ZT_DISABLE_NEON?=1 + endif + ifeq ($(CC_MACH),armv7) + ZT_ARCHITECTURE=3 + override DEFS+=-DZT_NO_TYPE_PUNNING +- ZT_USE_ARM32_NEON_ASM_CRYPTO=1 ++ ZT_DISABLE_NEON?=0 + endif + ifeq ($(CC_MACH),armv7a) + ZT_ARCHITECTURE=3 + override DEFS+=-DZT_NO_TYPE_PUNNING +- ZT_USE_ARM32_NEON_ASM_CRYPTO=1 ++ ZT_DISABLE_NEON?=0 + endif + ifeq ($(CC_MACH),armv7l) + ZT_ARCHITECTURE=3 + override DEFS+=-DZT_NO_TYPE_PUNNING +- ZT_USE_ARM32_NEON_ASM_CRYPTO=1 ++ ZT_DISABLE_NEON?=0 + endif + ifeq ($(CC_MACH),armv7hl) + ZT_ARCHITECTURE=3 + override DEFS+=-DZT_NO_TYPE_PUNNING +- ZT_USE_ARM32_NEON_ASM_CRYPTO=1 ++ ZT_DISABLE_NEON?=0 + endif + ifeq ($(CC_MACH),arm64) + ZT_ARCHITECTURE=4 +@@ -268,10 +269,13 @@ + override CFLAGS+=-march=armv5 -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm + override CXXFLAGS+=-march=armv5 -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm + ZT_USE_ARM32_NEON_ASM_CRYPTO=0 +- else +- override CFLAGS+=-march=armv5 -mno-unaligned-access -marm -fexceptions +- override CXXFLAGS+=-march=armv5 -mno-unaligned-access -marm -fexceptions ++ endif ++ ifeq ($(ZT_DISABLE_NEON),1) ++ override CFLAGS+=-mno-unaligned-access -marm -fexceptions ++ override CXXFLAGS+=-mno-unaligned-access -marm -fexceptions + ZT_USE_ARM32_NEON_ASM_CRYPTO=0 ++ else ++ ZT_USE_ARM32_NEON_ASM_CRYPTO=1 + endif + endif + diff --git a/net-misc/zerotier/files/zerotier-1.4.6-respect-ldflags.patch b/net-misc/zerotier/files/zerotier-1.4.6-respect-ldflags.patch new file mode 100644 index 000000000000..46e24fd7a928 --- /dev/null +++ b/net-misc/zerotier/files/zerotier-1.4.6-respect-ldflags.patch @@ -0,0 +1,11 @@ +--- a/make-linux.mk 2019-09-05 11:02:16.000000000 -0700 ++++ b/make-linux.mk 2019-09-27 21:01:21.000000000 -0700 +@@ -77,7 +77,7 @@ + override CFLAGS+=-Wall -Wno-deprecated -pthread $(INCLUDES) -DNDEBUG $(DEFS) + CXXFLAGS?=-O3 -fstack-protector -fPIE + override CXXFLAGS+=-Wall -Wno-deprecated -std=c++11 -pthread $(INCLUDES) -DNDEBUG $(DEFS) +- LDFLAGS=-pie -Wl,-z,relro,-z,now ++ LDFLAGS?=-pie -Wl,-z,relro,-z,now + STRIP?=strip + STRIP+=--strip-all + endif diff --git a/net-misc/zerotier/metadata.xml b/net-misc/zerotier/metadata.xml index 9a0bb99004b4..e422a4abe39a 100644 --- a/net-misc/zerotier/metadata.xml +++ b/net-misc/zerotier/metadata.xml @@ -1,16 +1,13 @@ - - ramage.lucas@protonmail.com - Lucas Ramage - - - proxy-maint@gentoo.org - Proxy Maintainers - + https://github.com/zerotier/ZeroTierOne/raw/master/RELEASE-NOTES.md zerotier/ZeroTierOne + + Use Clang compiler instead of GCC + Enable ARM32 neon-salsa2012-asm code + diff --git a/net-misc/zerotier/zerotier-1.4.6.ebuild b/net-misc/zerotier/zerotier-1.4.6.ebuild new file mode 100644 index 000000000000..49c7f7ed5ff9 --- /dev/null +++ b/net-misc/zerotier/zerotier-1.4.6.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2020 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 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}/${P}-respect-ldflags.patch" + "${FILESDIR}/${P}-add-armv7a-support.patch" + "${FILESDIR}/${P}-fixup-neon-support.patch" ) + +DOCS=( README.md AUTHORS.md ) + +LLVM_MAX_SLOT=9 + +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 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 "${PN}" + systemd_dounit "${FILESDIR}/${PN}".service + doman doc/zerotier-{cli.1,idtool.1,one.8} +} -- cgit v1.2.3