From 76cba73c47c8694e74377004634daca18f2d9c08 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Apr 2018 01:05:40 +0100 Subject: gentoo resync : 14.04.2018 --- net-misc/Manifest.gz | Bin 60993 -> 61007 bytes net-misc/cfengine/Manifest | 4 +- .../cfengine/files/cfengine-3.6.2-ifconfig.patch | 2 +- net-misc/cfengine/metadata.xml | 5 - net-misc/curl/Manifest | 2 +- net-misc/curl/curl-7.59.0.ebuild | 2 +- net-misc/iputils/Manifest | 3 +- net-misc/iputils/iputils-20171016_pre-r1.ebuild | 181 +++++++++ net-misc/iputils/iputils-99999999.ebuild | 25 +- net-misc/lldpd/Manifest | 8 +- net-misc/lldpd/lldpd-0.9.7.ebuild | 103 ----- net-misc/lldpd/lldpd-0.9.8.ebuild | 103 ----- net-misc/lldpd/lldpd-0.9.9.ebuild | 102 ----- net-misc/lldpd/lldpd-1.0.1.ebuild | 102 +++++ net-misc/miniupnpd/Manifest | 2 + net-misc/miniupnpd/miniupnpd-2.0.20180410.ebuild | 62 +++ net-misc/openssh/Manifest | 8 + .../openssh/files/openssh-7.7_p1-GSSAPI-dns.patch | 351 +++++++++++++++++ net-misc/openssh/files/sshd-r1.confd | 33 ++ net-misc/openssh/files/sshd.rc6.5 | 89 +++++ net-misc/openssh/openssh-7.7_p1-r1.ebuild | 414 +++++++++++++++++++++ net-misc/remmina/Manifest | 4 +- net-misc/remmina/metadata.xml | 3 +- net-misc/remmina/remmina-1.2.0_rc29.ebuild | 85 +++++ net-misc/seafile-client/Manifest | 10 +- .../seafile-client/seafile-client-6.0.7.ebuild | 50 --- .../seafile-client/seafile-client-6.1.0.ebuild | 50 --- .../seafile-client/seafile-client-6.1.3.ebuild | 50 --- .../seafile-client/seafile-client-6.1.4.ebuild | 50 --- .../seafile-client/seafile-client-6.1.7.ebuild | 57 +++ net-misc/seafile/Manifest | 10 +- net-misc/seafile/seafile-6.0.7.ebuild | 36 -- net-misc/seafile/seafile-6.1.0.ebuild | 36 -- net-misc/seafile/seafile-6.1.3.ebuild | 43 --- net-misc/seafile/seafile-6.1.4.ebuild | 43 --- net-misc/seafile/seafile-6.1.7.ebuild | 43 +++ net-misc/socket-burst-dampener/Manifest | 4 +- .../socket-burst-dampener-1.1.0.ebuild | 4 +- .../socket-burst-dampener-1.2.0.ebuild | 4 +- net-misc/taylor-uucp/Manifest | 2 +- net-misc/taylor-uucp/taylor-uucp-1.07-r3.ebuild | 2 +- net-misc/youtube-dl/Manifest | 4 +- net-misc/youtube-dl/youtube-dl-2018.03.20.ebuild | 115 ------ net-misc/youtube-dl/youtube-dl-2018.04.09.ebuild | 115 ++++++ 44 files changed, 1584 insertions(+), 837 deletions(-) create mode 100644 net-misc/iputils/iputils-20171016_pre-r1.ebuild delete mode 100644 net-misc/lldpd/lldpd-0.9.7.ebuild delete mode 100644 net-misc/lldpd/lldpd-0.9.8.ebuild delete mode 100644 net-misc/lldpd/lldpd-0.9.9.ebuild create mode 100644 net-misc/lldpd/lldpd-1.0.1.ebuild create mode 100644 net-misc/miniupnpd/miniupnpd-2.0.20180410.ebuild create mode 100644 net-misc/openssh/files/openssh-7.7_p1-GSSAPI-dns.patch create mode 100644 net-misc/openssh/files/sshd-r1.confd create mode 100644 net-misc/openssh/files/sshd.rc6.5 create mode 100644 net-misc/openssh/openssh-7.7_p1-r1.ebuild create mode 100644 net-misc/remmina/remmina-1.2.0_rc29.ebuild delete mode 100644 net-misc/seafile-client/seafile-client-6.0.7.ebuild delete mode 100644 net-misc/seafile-client/seafile-client-6.1.0.ebuild delete mode 100644 net-misc/seafile-client/seafile-client-6.1.3.ebuild delete mode 100644 net-misc/seafile-client/seafile-client-6.1.4.ebuild create mode 100644 net-misc/seafile-client/seafile-client-6.1.7.ebuild delete mode 100644 net-misc/seafile/seafile-6.0.7.ebuild delete mode 100644 net-misc/seafile/seafile-6.1.0.ebuild delete mode 100644 net-misc/seafile/seafile-6.1.3.ebuild delete mode 100644 net-misc/seafile/seafile-6.1.4.ebuild create mode 100644 net-misc/seafile/seafile-6.1.7.ebuild delete mode 100644 net-misc/youtube-dl/youtube-dl-2018.03.20.ebuild create mode 100644 net-misc/youtube-dl/youtube-dl-2018.04.09.ebuild (limited to 'net-misc') diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz index 96c5994b22b5..9a2f87643f38 100644 Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest index ab0e015e0603..f60386c9e612 100644 --- a/net-misc/cfengine/Manifest +++ b/net-misc/cfengine/Manifest @@ -7,7 +7,7 @@ AUX cfengine-2.2.10-snprintf_buffer_overflow.patch 456 BLAKE2B 9466bbae7d47fccf3 AUX cfengine-3.4.5-acl.patch 1024 BLAKE2B 0cd02ca5c62cc088f9b18e55dae019cd2193d086d4ccba721869f2e2956c4fc613d3af07ad9831593dc06acc9a64788ab6a00ba32c0185a7b07351a578d50583 SHA512 f8e7987cf26c8791d3b0c816a61fdd8b877114729c804d096270f9e98c69f0cdcfe4d72a4120d9d8fa8fd260fae340ef75f9897b4a421da7648d05c10a4bc02b AUX cfengine-3.4.5-ifconfig.patch 1447 BLAKE2B 69fb92a9456705342f1231af7a21f3cf3c4f704cf17c85f99f3c4e85402d3364a03de3fb905912416e4c2ad257de017a76e197a7f07f8617eb530908ce843448 SHA512 e2e3f362777951c9778fe9f98f95fb934fd76a3a0af39612ab3a6aeec320d181834d4531382ab70c0ebc3162180dd9e9508f082ee99fd80fb5144eb1815ebc55 AUX cfengine-3.5.3-ifconfig.patch 1776 BLAKE2B e96d9ac013494d43ad2dcf9c7ee5499eae3f799ddf36cf6c147fa9c416b01f31a2fd9b1de1377e82c4f389fda874b06e862055701343c58e5124eba58ab09e6b SHA512 33c7ce6a3f064e8d9fbb393dcf56816be3ed4e679864dd2163681686b15c458b7694a05731607971acadd643c763c8d94d3fd14d19e5fb1814e4898cfedf9ef9 -AUX cfengine-3.6.2-ifconfig.patch 486 BLAKE2B ce8b91a8afe94fcdd30aa5a59a26b9cc5099e3093fa6a2f0ad1250b810aa6200d1f550ce38314ba1fb57c68364ce348a911086de6c5922dce4cada855be2fd5b SHA512 e0c308dcb1ac1d865b6410e5e4a5afb4619dc56e77ddb247a4c3314e9b2e9ffcab7dd09682ead3acd259dfdc76403c5c7312d3306e53285da7812912f59d8582 +AUX cfengine-3.6.2-ifconfig.patch 486 BLAKE2B c8ccad409a64f1a0232fc800fe3787ece597c63728a7dd890ffbf363bed81d2be22b6354df9acf6d7082fe573418ba53e805ce1581251a458811cccb084a144e SHA512 f2cd1c008f3d4dea418207660c6d6cc4769e7effa50259b59e74ecc3e6fc1581f282fec1482046f50c0e0aa46d40084aa1616bd618de33ae3055ce626bfa9c5d AUX cfengine-3.6.2-sysmacros.patch 555 BLAKE2B e1111a7cd5dd1b28787c0db6af1f55fed2b95ac3f1267eb5ad516584f6bf4c070a5243185808ce772c2a70171bcf3e5eb331bc0cfc5b82a04e8dccd99fdce761 SHA512 404468a5e10b535c8f10c2cff9c8928730a4323145cd29cfc080cd3af9effef1b890fb038f3dad8d84ba67d1af72b402d35cc1f382ff34fb0cdd07b8af23732c AUX cfenvd.rc6 255 BLAKE2B e65d843b93d6eacc657f2fc7d03c48ddf55ec1bee8d278cce9c44e9822bbec352cb2f98480095804d5b4511e260448898182deeab28c2127fc4ca723c83ebf3f SHA512 3b6356bd75d2986d4482a6d603cb1b07697d5314a748f440b8f11e7275670c072ed96fddd5a41d4066e19ebbf1d126f93d70428324e37bbb40185dc414e10994 AUX cfexecd.rc6 260 BLAKE2B c31397f5b0c8473ee4dc1c505ea32bf7618fc5ef25572f0e8023e6bed812ba665d4cd68b050f58035fe29429bbad7b907f0a548deecfaebe24b3ac7e97dc71f0 SHA512 735a34204b6c9d555b454f264edeaf371e1ee7cf80a2c23fcc83d604ed87d3a19dcd9008f6c815a024535b1d9e9a32aac008ce7b4e440f9b688b642050ec7ff1 @@ -23,4 +23,4 @@ EBUILD cfengine-3.3.9.ebuild 3519 BLAKE2B 3be8e09e3e0345eec2e83aed2dee2b8a37c71d EBUILD cfengine-3.4.5.ebuild 3745 BLAKE2B 8bd609d245891a3139fa3e98425bc960436e6a8d95e7d31153b9fb0ce4cbd5a9886804751954dc1bd3df47942cb1d2545b1e7bbddd86488f29e8554a60643f29 SHA512 285447ad8239f57f076ebf10224e5582414be174b4f1f35644dff2f170e2032a65fa76aa2877c22fdb6681abe855492a1cd7da13409563a1d83ef21b45871e89 EBUILD cfengine-3.5.3.ebuild 3812 BLAKE2B 70b4bc5c20970c2da13c36880cb40e6a01b7b75b0e4ce070207234575bb62285dda049805942d8ff388c5ff9db73a93655fce5a6fba9d8d7fe9ad7a153d0ee97 SHA512 d0bec07edd75d17705894a9d771feb112f7fb892cbdae8c341bac6290a82eeef5e90187fc6dc7d7f1b911c5f020d30de9b8f043d196f663805eae628701656b4 EBUILD cfengine-3.6.2.ebuild 4254 BLAKE2B 2215d2dc3d49105049e1eea181b52e22b051820f9a8c8ef8b961e2b4d2e786a97ff0ae1a6161e3e71d595499a67216affbe6cfcca745f78e0113dfc7f63cbbb3 SHA512 30d2adfe8aa0ba9e42daeff457d12d881e2d059781343da9ecb7b6a7fb5f2ce1238e8c33277179396dde2a3a310f2d36a210d770843fd8552e9b4bcc61291733 -MISC metadata.xml 2316 BLAKE2B 841e95b118a868d289099e24f2c8031dd6412220367e404ed2d67724354b90fcd82e1c74b8f70181cd79f7fbbad67be81322355029fc5015bd284c37f9c839f5 SHA512 1879e2df9ae3f23a236ab29bd6b9168b5b3ed7eaf348decd3aace7fda7691ce03f6b8352c01eaa3888a53597cf3b46985e332373d7b21545e78cfa3523b2df3c +MISC metadata.xml 2159 BLAKE2B fce780617a458d494a437239729a7841c860e797e66f1a8c783c4ffce62bef89b92ef644fa8258cf4209e44aa56b566e9df493a1ba34667611b47bf274cb7bd9 SHA512 c30ddd7fce32d4e7231b860d64940d9368085bc8f65851fefa886b312995512c48f7a1291afcfb80921fac64f2a676946c286723483294d13d4a9c89c01659e4 diff --git a/net-misc/cfengine/files/cfengine-3.6.2-ifconfig.patch b/net-misc/cfengine/files/cfengine-3.6.2-ifconfig.patch index ae0f491347f9..a31b3513ded4 100644 --- a/net-misc/cfengine/files/cfengine-3.6.2-ifconfig.patch +++ b/net-misc/cfengine/files/cfengine-3.6.2-ifconfig.patch @@ -5,7 +5,7 @@ } #else - if ((pp = cf_popen("/sbin/ifconfig -a", "r", true)) == NULL) -+ if ((pp = cf_popen("/sbin/ifconfig -a", "r", true)) == NULL || (pp = cf_popen("/bin/ifconfig -a", "r", true)) == NULL) ++ if ((pp = cf_popen("/sbin/ifconfig -a", "r", true)) == NULL && (pp = cf_popen("/bin/ifconfig -a", "r", true)) == NULL) { Log(LOG_LEVEL_VERBOSE, "Could not find interface info"); return; diff --git a/net-misc/cfengine/metadata.xml b/net-misc/cfengine/metadata.xml index 86fa96098b09..3c6b17c9adcc 100644 --- a/net-misc/cfengine/metadata.xml +++ b/net-misc/cfengine/metadata.xml @@ -1,11 +1,6 @@ - - idl0r@gentoo.org - Christian Ruppert - cfengine 2.x only - sysadmin@gentoo.org Gentoo Sysadmin Project diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest index 42f36d1d7c27..cfc413c8b087 100644 --- a/net-misc/curl/Manifest +++ b/net-misc/curl/Manifest @@ -7,5 +7,5 @@ DIST curl-7.59.0.tar.bz2 2904158 BLAKE2B c44d9985a19cb7b1e273f868181b0017c7b0068 EBUILD curl-7.57.0-r1.ebuild 7234 BLAKE2B 9ddf61766ebc6378b9b86446b4dd761630cb7a24a1293a3552d57e360c26d85ec38ac311f66bca6eb6c041f8922e91a587768c5417411842d5bd7850ebd73a9c SHA512 164351baedae507342aa4182882e7122be03964e3355c8e087a425f7c3595cc34dcb4303e781dbfb2576f02623595a1f5399f8dccb462759b1cb2593bf449e3e EBUILD curl-7.57.0.ebuild 7181 BLAKE2B 6b64ba502ac4b586b689b42b90d009c682f1df867e1f0aaa2964c51f5b22b4bd1f8a6da5376d9b3858821708e7a257a2b190188aaf0de2f821d86a80c82cd853 SHA512 65a2058ee302123fc3d18551b68c8be5efa2640f621620084df6d27772e7bdfb6ad8dcc36acb46dfaf63c8f883e6c68933d35a471951ec587d509d6a2c4db9b8 EBUILD curl-7.58.0.ebuild 7224 BLAKE2B c87344a4b7a4a96668e8b4b483f2a93763ed8cd31b2ccc4f2c5946cb71aab90b770507d1aff22032f9171ec819be457f98c8ab0022a2fce1ed14b62c0ef2b0da SHA512 9954591b40a37617c9717780c426a1c400c376e9343d85b0d1f5a5b3cf8cc214d180d87bc67004abc538dd727dae31a8146e42127203f7a3f8cdcc57558fec8b -EBUILD curl-7.59.0.ebuild 7225 BLAKE2B ca0610edf55320aea0aac317f84a20841533c153047cfe5b2415d167c46dbd10e23f5b8a1919aef205ed5ee7156677cb89c1ea0831b61749bd098f5c0e328708 SHA512 f774d7b6b71f2759caacdf6a601ecfa72272f44d56d1fd4bb33c175689e64ae3efc16b276517a58a15cae52902686f33f5851639ad44aca351e9994d232e34b1 +EBUILD curl-7.59.0.ebuild 7224 BLAKE2B c87344a4b7a4a96668e8b4b483f2a93763ed8cd31b2ccc4f2c5946cb71aab90b770507d1aff22032f9171ec819be457f98c8ab0022a2fce1ed14b62c0ef2b0da SHA512 9954591b40a37617c9717780c426a1c400c376e9343d85b0d1f5a5b3cf8cc214d180d87bc67004abc538dd727dae31a8146e42127203f7a3f8cdcc57558fec8b MISC metadata.xml 900 BLAKE2B a370dc14334bd729842d0ac979d804d0ff35332dc1fade6e2fbc33649a02db17ef04897c61727d786a4bc3d8acc2a20ddcfe97abdc350b65d9ecfdfe4509f9ef SHA512 ff16407a74d8688f4ed0d7158ea5bd31bc47e828672c874e2f43f4cda1fcd741922c98c5ff5d7f114154b149983e252319f0e812197b4ca7a0979683b5cec8ad diff --git a/net-misc/curl/curl-7.59.0.ebuild b/net-misc/curl/curl-7.59.0.ebuild index 1f4f4101e6d7..2240efbd3a89 100644 --- a/net-misc/curl/curl-7.59.0.ebuild +++ b/net-misc/curl/curl-7.59.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2" LICENSE="MIT" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads" IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl" IUSE+=" elibc_Winnt" diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest index 27f6126f8cdb..5da9d6b3a239 100644 --- a/net-misc/iputils/Manifest +++ b/net-misc/iputils/Manifest @@ -32,6 +32,7 @@ EBUILD iputils-20121221-r2.ebuild 4051 BLAKE2B 05bb4832d99c0c065b5caffb695929c91 EBUILD iputils-20151218.ebuild 3978 BLAKE2B 8807530ff225015572c8c7c058c47226f6f1071a5dd8e49b511681c7e75c225c4d8be72451c10ffeff1e19e03b368e92ebf3b4fb2bd17385886288ff9b4e6987 SHA512 615defa0483e9a35bf3abe67f332a3b24353ecd53bafbe8b7e45ddf1f72b7072af153deaecf636c9c735a479a98d54776c1cd085c44d5240f9b5fb92d43c8d7b EBUILD iputils-20160308.ebuild 3839 BLAKE2B 88fd40a916daa326e2251411b53c549a09e44f5bab8cd9953ab3d0620894297afdb8667173cd8fbcf86d4a52ee63ad96aebafc3d735e50bad0354d4978386be2 SHA512 79a29a57830234493dad8ecd7d9c84e0654ccae11731d1c7119751a5e2f3867fd60c787fee33b333b3b94e6f2bbe03c55852c1abdd13ef9c89a2c96ed3366cd1 EBUILD iputils-20161105.ebuild 3871 BLAKE2B e6f89efa90125312d980687dda83694906dcdd22f31171ad29452ce706079faa9b383284634064e45ac15483b616cfdf8eeeb4b4b129f53e3f9c32d1c0d3b7f1 SHA512 6b4e5ec940b44759015cb2011330be1898bc3a5228e295958ac4529b28b376b047a065a36c8d52f61f91c3666fda60dd8ab603267e772c64b76c92d024779755 +EBUILD iputils-20171016_pre-r1.ebuild 4043 BLAKE2B 51bdb90db7da6ae5ad2115d042a73657328f3ba856f00fe6bcdfb07185442e630411dda02014635de95a0fff0f37a8b3bfe246685c1c942774e58182f27bbf63 SHA512 aefc58cde5cdb17fa7ffb7824395130c40d226a9c4b6e38b0baf58d0ad015d99f6eba99e9608d1bc3366636a0b6ef676730d348527e75ce2b5233c2853880775 EBUILD iputils-20171016_pre.ebuild 4081 BLAKE2B a69c23852a6ace9986534da61288fee447d0b50e90ddf5bc05293ac8ebe1d4f97e409e7fdb7c8c2d7d8889a0a948f6f849d34665e13dd0b7c051d9bd0e7cfb76 SHA512 9df0e7c539f684643bddd441d90113caa877c1f7ab8113efd592178322b665b0142a409d4598b762c447956a15f0e0b47d651f5e7607817951d14629af3e023b -EBUILD iputils-99999999.ebuild 3906 BLAKE2B 66717e31c585baeef10103195b123ab874b72b71f43d47abbc90c34c8e2794617281f1f70aaf2df0d224c87ba1acd24067ef8515069016d1332baf4c9f4f3a65 SHA512 d9a7f662644e65b8170fc8aa4642bee1f93d96772e011354054100f58b0d5b7d628d914ca136acdf5bd01728c2d532cef2b96d60f78bda66ae5aed14746396cd +EBUILD iputils-99999999.ebuild 3859 BLAKE2B d8d17c0a69ce2547794b778ffa744e63e4ae688e42196d305211ef221981881fd2c2e6fcc2e48c6d9461efded6e307044196b180571712c5d1a6178673ac84a3 SHA512 32434ab695d31e99724208d70485fbec7d85a8b677a885047714a14da14631b5b3870a21fbe7de96202846afea19305e58e9de42d5830c4cf9032b2e672595b1 MISC metadata.xml 1698 BLAKE2B 0351c77626f66e4a50d83072124088cc7195c4666f6a66f6a981fa66b16b3740da6a08d63da9db0b2a4d02f8a75a04f97142e5b78099525ee8ed4921738d0236 SHA512 f1d211dbe4212072614039c5aea1996270560a24dfa3734af86c4f1f4254cc3abf8440c03d8894b925b71b970e70fb60e79682753655a68b82203cdc401f6ebc diff --git a/net-misc/iputils/iputils-20171016_pre-r1.ebuild b/net-misc/iputils/iputils-20171016_pre-r1.ebuild new file mode 100644 index 000000000000..db580f8ee157 --- /dev/null +++ b/net-misc/iputils/iputils-20171016_pre-r1.ebuild @@ -0,0 +1,181 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# For released versions, we precompile the man/html pages and store +# them in a tarball on our mirrors. This avoids ugly issues while +# building stages, and reduces depedencies. +# To regenerate man/html pages emerge iputils-99999999[doc] with +# EGIT_COMMIT set to release tag and tar ${S}/doc folder. + +EAPI="6" + +inherit flag-o-matic toolchain-funcs fcaps + +MY_COMMIT="67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf" + +PATCHES=( + "${FILESDIR}"/${PN}-99999999-tracepath46.patch + "${FILESDIR}"/${PN}-99999999-musl.patch +) + +if [[ ${PV} == "99999999" ]] ; then + EGIT_REPO_URI="https://github.com/iputils/iputils.git" + inherit git-r3 +else + SRC_URI="https://github.com/iputils/iputils/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz + https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux" +fi + +DESCRIPTION="Network monitoring tools including ping and ping6" +HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils" + +LICENSE="BSD GPL-2+ rdisc" +SLOT="0" +IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute" + +LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] ) + idn? ( net-dns/libidn[static-libs(+)] ) + ipv6? ( + ssl? ( + gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) + !gcrypt? ( + nettle? ( dev-libs/nettle[static-libs(+)] ) + !nettle? ( + libressl? ( dev-libs/libressl:0=[static-libs(+)] ) + !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) + ) + ) + ) + ) +" +RDEPEND="arping? ( !net-misc/arping ) + rarpd? ( !net-misc/rarpd ) + traceroute? ( !net-analyzer/traceroute ) + !static? ( ${LIB_DEPEND//\[static-libs(+)]} )" +DEPEND="${RDEPEND} + static? ( ${LIB_DEPEND} ) + virtual/os-headers +" +if [[ ${PV} == "99999999" ]] ; then + DEPEND+="app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 + app-text/docbook-xsl-stylesheets + dev-libs/libxslt:0 + " +fi + +[ "${PV}" = "99999999" ] || S="${WORKDIR}/${PN}-s${PV}" + +S="${WORKDIR}/${PN}-${MY_COMMIT}" + +src_prepare() { + use SECURITY_HAZARD && PATCHES+=( "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch ) + + default +} + +src_configure() { + use static && append-ldflags -static + + TARGETS=( + ping + $(for v in arping clockdiff rarpd rdisc tftpd tracepath ; do usev ${v} ; done) + ) + if use ipv6 ; then + TARGETS+=( + $(usex traceroute 'traceroute6' '') + ) + fi + + myconf=( + USE_CRYPTO=no + USE_GCRYPT=no + USE_NETTLE=no + ) + + if use ipv6 && use ssl ; then + myconf=( + USE_CRYPTO=yes + USE_GCRYPT=$(usex gcrypt) + USE_NETTLE=$(usex nettle) + ) + fi +} + +src_compile() { + tc-export CC + emake \ + USE_CAP=$(usex caps) \ + USE_IDN=$(usex idn) \ + IPV4_DEFAULT=$(usex ipv6 'no' 'yes') \ + TARGETS="${TARGETS[*]}" \ + ${myconf[@]} + + if [[ ${PV} == "99999999" ]] ; then + emake man + + use doc && emake html + fi +} + +src_install() { + into / + dobin ping + dosym ping /bin/ping4 + if use ipv6 ; then + dosym ping /bin/ping6 + dosym ping.8 /usr/share/man/man8/ping6.8 + fi + doman doc/ping.8 + + if use arping ; then + dobin arping + doman doc/arping.8 + fi + + into /usr + + if use tracepath ; then + dosbin tracepath + doman doc/tracepath.8 + dosym tracepath /usr/sbin/tracepath4 + fi + + local u + for u in clockdiff rarpd rdisc tftpd ; do + if use ${u} ; then + case ${u} in + clockdiff) dobin ${u};; + *) dosbin ${u};; + esac + doman doc/${u}.8 + fi + done + + if use tracepath && use ipv6 ; then + dosym tracepath /usr/sbin/tracepath6 + dosym tracepath.8 /usr/share/man/man8/tracepath6.8 + fi + + if use traceroute && use ipv6 ; then + dosbin traceroute6 + doman doc/traceroute6.8 + fi + + if use rarpd ; then + newinitd "${FILESDIR}"/rarpd.init.d rarpd + newconfd "${FILESDIR}"/rarpd.conf.d rarpd + fi + + dodoc INSTALL.md + + use doc && dodoc doc/*.html +} + +pkg_postinst() { + fcaps cap_net_raw \ + bin/ping \ + $(usex arping 'bin/arping' '') \ + $(usex clockdiff 'usr/bin/clockdiff' '') +} diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild index e56a7e5363f9..e935561bb1f5 100644 --- a/net-misc/iputils/iputils-99999999.ebuild +++ b/net-misc/iputils/iputils-99999999.ebuild @@ -27,18 +27,23 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils" LICENSE="BSD GPL-2+ rdisc" SLOT="0" -IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle +openssl rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute" +IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute" LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] ) idn? ( net-dns/libidn2[static-libs(+)] ) - ipv6? ( ssl? ( - gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) - nettle? ( dev-libs/nettle[static-libs(+)] ) - openssl? ( - !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) - libressl? ( dev-libs/libressl[static-libs(+)] ) + ipv6? ( + ssl? ( + gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) + !gcrypt? ( + nettle? ( dev-libs/nettle[static-libs(+)] ) + !nettle? ( + libressl? ( dev-libs/libressl:0=[static-libs(+)] ) + !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) + ) + ) ) - ) )" + ) +" RDEPEND="arping? ( !net-misc/arping ) rarpd? ( !net-misc/rarpd ) traceroute? ( !net-analyzer/traceroute ) @@ -55,8 +60,6 @@ if [[ ${PV} == "99999999" ]] ; then " fi -REQUIRED_USE="ipv6? ( ssl? ( ^^ ( gcrypt nettle openssl ) ) )" - [ "${PV}" = "99999999" ] || S="${WORKDIR}/${PN}-s${PV}" src_prepare() { @@ -86,7 +89,7 @@ src_configure() { if use ipv6 && use ssl ; then myconf=( - USE_CRYPTO=$(usex openssl) + USE_CRYPTO=yes USE_GCRYPT=$(usex gcrypt) USE_NETTLE=$(usex nettle) ) diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest index 1f18ae7709f9..6ec510c74a17 100644 --- a/net-misc/lldpd/Manifest +++ b/net-misc/lldpd/Manifest @@ -8,11 +8,7 @@ AUX lldpd.conf 49 BLAKE2B e0d6b2a386bc2ac794df1de27061c58a193a3d141beac3cb0d893c AUX lldpd.service 205 BLAKE2B 787e9d19def1d4d3cfe207e928b994d46b4fda5d2431ab147d24c4fa2b5b72426af5ee5ac57d40cfb2d1bc3ea6c1b253e1daaa341d998d66889bbc94c83d2438 SHA512 5b5aead569c842c2850fb0180b67beb87b4f0301e9e591d957089f5c659a30ef464fadd44a01f9b5476ff999368c3494c7dc7013db473d518721e5fab41cd054 AUX tmpfilesd 32 BLAKE2B ad674d771fa90bde09e231ef21358928de2f3eccdbe0e9b3e2a0c0438a55899e858c98dc3d49714ee07cec4c921d15d955fd0c34f6dfaa4f3667bc4c0e9dfcde SHA512 58b11cc9241c4da25bf53da31b1ed64a489a7bd0998bc8a395659d77975607fd6ab035ffc830ddbfe2e5be244ff7c308900358452aee728fd56a4a7d4e80ffde DIST lldpd-0.9.3.tar.gz 1601102 BLAKE2B 0ba31d20dad9770c93fa4930a7c439273c36e5cebdb0b4a1674f0a375008f642e33d71b9668c91313ec4bb3311e1b4bd22d0996ed6347d2cacfd7cce24536a58 SHA512 0d40d77bfde78f9ceece56968981f3a36bd7e683b12de05e84e5da0409b8e0d06062e5d665942637a66164af0254a6ac3d1a327aab3bcb48ec91ecfdd2693283 -DIST lldpd-0.9.7.tar.gz 1619527 BLAKE2B 20d255d47cdc92deb65f5f1e43322ace26b3169db1511bb8e534fa8d935e97b4f123be544980f39cbb0764030ace81d087810397df3d076094cda98829375b8f SHA512 6b087de11b54c3f731498081680c836a28b882b7e925150d8ca3a582538f6a9c294d1e94b8e906a7cbb40e9663eedb33699eddb870c186da4d88cf3a88238ae2 -DIST lldpd-0.9.8.tar.gz 1620806 BLAKE2B fb813f827f3adf9db9fe911c10d221f5d28c14f86e50b2d8a15d64e1794bb8a1cb93ca1df4b91cc5dc30c730026ebc88bc7549043ca5a12dd8371b5911890e6c SHA512 d3822d4dbb91cd10e678aacd176c83117d8682cfaf928eab8a0363ef40ca54a6f2d88759f219d0e524da88ad6e283d3c4f33a4e5d01761c5d23b02d7ee1083d6 -DIST lldpd-0.9.9.tar.gz 1615627 BLAKE2B 3518003aa92b499c32dc07a2a3c12fa6ff30a4feda215ce80e4aacf66e7b9ac70f85d07f39e55bb24c8ec7742f93f85fb0d048005a6fb0bc0bef9ff5f81b57ba SHA512 2e517743069da18d406f095e879fa00b1c593e868164e2113db4629bedfa0f250c694f8c85ac5939e6e8feba9de05656bcd1baec3a9b1933e2157a513ffc5a64 +DIST lldpd-1.0.1.tar.gz 1590903 BLAKE2B 37ff1c042537ac31f394986f1bbd3faf13105d07f340ed045a4bbc196912c0c017a5d60b2c6a89b0da9faa5a7ff8e9c4ef0d4d01a39504a31c23288a89eb92a3 SHA512 61b2a7a3a78276c613c6d0b34eb625e69e5c8a206b6658a167d6a09ac6d0e1c943e46c0ff6fc3538a791d9947f193185b65848da581b3d6ecb9bc0befadde8dd EBUILD lldpd-0.9.3-r1.ebuild 2457 BLAKE2B 4db8bd65035df013e9c3d8e70a235f2503c3e313da17f510deb498830966408f6761f42b12c8ee3dd98f296edb815df1de7f4da35f7eeebda7cbcbe9627dda27 SHA512 5426d7c8a2f73286a15b9901134692d77713d3cd4e20e31a4a30be64eb664b348cdd1c27196bc339af49a213e03bbc995bd4b30f8bab7c424b34f6595727b5bd -EBUILD lldpd-0.9.7.ebuild 2424 BLAKE2B 345eca6865bf3dba2ae874353868743983d19406c26da7b179d822da94f63885d747a8025345f8e50604f742b50b3073116ab4264957a756564cfc7def05e5d6 SHA512 5dad3866901c2393af61bbfc3caa827f5997f82cab3cd5286ea609e7ec2858c7229adbeca644f55a49877cbec967b43ca6f56cc067e1e0d8dc511d28aa23738b -EBUILD lldpd-0.9.8.ebuild 2424 BLAKE2B 5bcae9f6fc03b67861c1578bde2d852ccb965560c848c089d60b8cabaa732245792b4e255b175c05dec3c5a75f7a53bdc67eb231a53b87a94bab6f821f33101a SHA512 9ed97513aca887619ca40af24b512fc011238df180b3ad3ed046baca85abeeb40d82a86fdb1a7df43a1943fb464cbec0f8d1774be837b6e46530c769a34d7b2e -EBUILD lldpd-0.9.9.ebuild 2371 BLAKE2B a7926eb76298a0a53c0e2082452904d68f188da49eed3abae777d79ab60e93f68d0dad205effbfabef23c12c2a5ee53fbadad14fac25cb0a11b8df0086ae45fe SHA512 70370f83b91f0f7bd95227e52775386589b641c41f3d7d9ba671f52adab98cfbd78fce3bf02ede734d37b6389383e215bdbb3eefe4853054e4f252a7fa84c440 +EBUILD lldpd-1.0.1.ebuild 2371 BLAKE2B a7926eb76298a0a53c0e2082452904d68f188da49eed3abae777d79ab60e93f68d0dad205effbfabef23c12c2a5ee53fbadad14fac25cb0a11b8df0086ae45fe SHA512 70370f83b91f0f7bd95227e52775386589b641c41f3d7d9ba671f52adab98cfbd78fce3bf02ede734d37b6389383e215bdbb3eefe4853054e4f252a7fa84c440 MISC metadata.xml 2829 BLAKE2B 83e3f2636828107af74952f951e1e5874ce647f786932a509f79e154ab026a0556bc0341576f4c458e40c88feacee187e7a18fd1ee736953425d2cb252e0175c SHA512 a401329c2f122ba079995ce0c7810d32920a91dc94e8678378f3c0eb9f72e613710933df8508eb25ad1516bda1f406d6e459fe1049112dedd8c524a7d8432c01 diff --git a/net-misc/lldpd/lldpd-0.9.7.ebuild b/net-misc/lldpd/lldpd-0.9.7.ebuild deleted file mode 100644 index d6f2a5e38803..000000000000 --- a/net-misc/lldpd/lldpd-0.9.7.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils user systemd bash-completion-r1 autotools - -DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)" -HOMEPAGE="https://vincentbernat.github.com/lldpd/" -SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers - seccomp sonmp snmp static-libs test readline xml zsh-completion" - -RDEPEND="dev-libs/libbsd - >=dev-libs/libevent-2.0.5:= - snmp? ( net-analyzer/net-snmp[extensible(+)] ) - xml? ( dev-libs/libxml2 ) - seccomp? ( sys-libs/libseccomp ) - zsh-completion? ( app-shells/zsh )" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( - graph? ( app-doc/doxygen[dot] ) - !graph? ( app-doc/doxygen ) - ) - test? ( dev-libs/check )" - -REQUIRED_USE="graph? ( doc )" - -PATCHES=( - "${FILESDIR}/${PN}-0.7.11-zsh-completion-dir.patch" - "${FILESDIR}/${PN}-0.9.5-seccomp-add-socket-ops.patch" -) - -pkg_setup() { - ebegin "Creating lldpd user and group" - enewgroup ${PN} - enewuser ${PN} -1 -1 -1 ${PN} - eend $? -} - -src_prepare() { - default - - eautoreconf - elibtoolize -} - -src_configure() { - econf \ - --without-embedded-libevent \ - --with-privsep-user=${PN} \ - --with-privsep-group=${PN} \ - --with-privsep-chroot=/run/${PN} \ - --with-lldpd-ctl-socket=/run/${PN}.socket \ - --with-lldpd-pid-file=/run/${PN}.pid \ - --docdir=/usr/share/doc/${PF} \ - $(use_enable cdp) \ - $(use_enable doc doxygen-man) \ - $(use_enable doc doxygen-pdf) \ - $(use_enable doc doxygen-html) \ - $(use_enable dot1) \ - $(use_enable dot3) \ - $(use_enable edp) \ - $(use_enable fdp) \ - $(use_enable graph doxygen-dot) \ - $(use_enable lldpmed) \ - $(use_enable old-kernel oldies) \ - $(use_enable sonmp) \ - $(use_enable static-libs static) \ - $(use_with readline) \ - $(use_enable sanitizers) \ - $(use_with seccomp) \ - $(use_with snmp) \ - $(use_with xml) -} - -src_compile() { - emake - use doc && emake doxygen-doc -} - -src_install() { - emake DESTDIR="${D}" install - prune_libtool_files - - newinitd "${FILESDIR}"/${PN}-initd-5 ${PN} - newconfd "${FILESDIR}"/${PN}-confd-1 ${PN} - newbashcomp src/client/completion/lldpcli lldpcli - - use doc && dodoc -r doxygen/html - - insinto /etc - doins "${FILESDIR}/lldpd.conf" - keepdir /etc/${PN}.d - - systemd_dounit "${FILESDIR}"/${PN}.service - systemd_newtmpfilesd "${FILESDIR}"/tmpfilesd ${PN}.conf -} diff --git a/net-misc/lldpd/lldpd-0.9.8.ebuild b/net-misc/lldpd/lldpd-0.9.8.ebuild deleted file mode 100644 index 1d0988803acf..000000000000 --- a/net-misc/lldpd/lldpd-0.9.8.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils user systemd bash-completion-r1 autotools - -DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)" -HOMEPAGE="https://vincentbernat.github.com/lldpd/" -SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers - seccomp sonmp snmp static-libs test readline xml zsh-completion" - -RDEPEND="dev-libs/libbsd - >=dev-libs/libevent-2.0.5:= - snmp? ( net-analyzer/net-snmp[extensible(+)] ) - xml? ( dev-libs/libxml2 ) - seccomp? ( sys-libs/libseccomp ) - zsh-completion? ( app-shells/zsh )" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( - graph? ( app-doc/doxygen[dot] ) - !graph? ( app-doc/doxygen ) - ) - test? ( dev-libs/check )" - -REQUIRED_USE="graph? ( doc )" - -PATCHES=( - "${FILESDIR}/${PN}-0.9.5-seccomp-add-socket-ops.patch" - "${FILESDIR}/${PN}-0.9-add-getpid-to-seccomp.patch" -) - -pkg_setup() { - ebegin "Creating lldpd user and group" - enewgroup ${PN} - enewuser ${PN} -1 -1 -1 ${PN} - eend $? -} - -src_prepare() { - default - - eautoreconf - elibtoolize -} - -src_configure() { - econf \ - --without-embedded-libevent \ - --with-privsep-user=${PN} \ - --with-privsep-group=${PN} \ - --with-privsep-chroot=/run/${PN} \ - --with-lldpd-ctl-socket=/run/${PN}.socket \ - --with-lldpd-pid-file=/run/${PN}.pid \ - --docdir=/usr/share/doc/${PF} \ - $(use_enable cdp) \ - $(use_enable doc doxygen-man) \ - $(use_enable doc doxygen-pdf) \ - $(use_enable doc doxygen-html) \ - $(use_enable dot1) \ - $(use_enable dot3) \ - $(use_enable edp) \ - $(use_enable fdp) \ - $(use_enable graph doxygen-dot) \ - $(use_enable lldpmed) \ - $(use_enable old-kernel oldies) \ - $(use_enable sonmp) \ - $(use_enable static-libs static) \ - $(use_with readline) \ - $(use_enable sanitizers) \ - $(use_with seccomp) \ - $(use_with snmp) \ - $(use_with xml) -} - -src_compile() { - emake - use doc && emake doxygen-doc -} - -src_install() { - emake DESTDIR="${D}" install - prune_libtool_files - - newinitd "${FILESDIR}"/${PN}-initd-5 ${PN} - newconfd "${FILESDIR}"/${PN}-confd-1 ${PN} - newbashcomp src/client/completion/lldpcli lldpcli - - use doc && dodoc -r doxygen/html - - insinto /etc - doins "${FILESDIR}/lldpd.conf" - keepdir /etc/${PN}.d - - systemd_dounit "${FILESDIR}"/${PN}.service - systemd_newtmpfilesd "${FILESDIR}"/tmpfilesd ${PN}.conf -} diff --git a/net-misc/lldpd/lldpd-0.9.9.ebuild b/net-misc/lldpd/lldpd-0.9.9.ebuild deleted file mode 100644 index e555b6b4f7ea..000000000000 --- a/net-misc/lldpd/lldpd-0.9.9.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils user systemd bash-completion-r1 autotools - -DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)" -HOMEPAGE="https://vincentbernat.github.com/lldpd/" -SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers - seccomp sonmp snmp static-libs test readline xml zsh-completion" - -RDEPEND="dev-libs/libbsd - >=dev-libs/libevent-2.0.5:= - snmp? ( net-analyzer/net-snmp[extensible(+)] ) - xml? ( dev-libs/libxml2 ) - seccomp? ( sys-libs/libseccomp ) - zsh-completion? ( app-shells/zsh )" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( - graph? ( app-doc/doxygen[dot] ) - !graph? ( app-doc/doxygen ) - ) - test? ( dev-libs/check )" - -REQUIRED_USE="graph? ( doc )" - -PATCHES=( - "${FILESDIR}/${PN}-0.9.5-seccomp-add-socket-ops.patch" -) - -pkg_setup() { - ebegin "Creating lldpd user and group" - enewgroup ${PN} - enewuser ${PN} -1 -1 -1 ${PN} - eend $? -} - -src_prepare() { - default - - eautoreconf - elibtoolize -} - -src_configure() { - econf \ - --without-embedded-libevent \ - --with-privsep-user=${PN} \ - --with-privsep-group=${PN} \ - --with-privsep-chroot=/run/${PN} \ - --with-lldpd-ctl-socket=/run/${PN}.socket \ - --with-lldpd-pid-file=/run/${PN}.pid \ - --docdir=/usr/share/doc/${PF} \ - $(use_enable cdp) \ - $(use_enable doc doxygen-man) \ - $(use_enable doc doxygen-pdf) \ - $(use_enable doc doxygen-html) \ - $(use_enable dot1) \ - $(use_enable dot3) \ - $(use_enable edp) \ - $(use_enable fdp) \ - $(use_enable graph doxygen-dot) \ - $(use_enable lldpmed) \ - $(use_enable old-kernel oldies) \ - $(use_enable sonmp) \ - $(use_enable static-libs static) \ - $(use_with readline) \ - $(use_enable sanitizers) \ - $(use_with seccomp) \ - $(use_with snmp) \ - $(use_with xml) -} - -src_compile() { - emake - use doc && emake doxygen-doc -} - -src_install() { - emake DESTDIR="${D}" install - prune_libtool_files - - newinitd "${FILESDIR}"/${PN}-initd-5 ${PN} - newconfd "${FILESDIR}"/${PN}-confd-1 ${PN} - newbashcomp src/client/completion/lldpcli lldpcli - - use doc && dodoc -r doxygen/html - - insinto /etc - doins "${FILESDIR}/lldpd.conf" - keepdir /etc/${PN}.d - - systemd_dounit "${FILESDIR}"/${PN}.service - systemd_newtmpfilesd "${FILESDIR}"/tmpfilesd ${PN}.conf -} diff --git a/net-misc/lldpd/lldpd-1.0.1.ebuild b/net-misc/lldpd/lldpd-1.0.1.ebuild new file mode 100644 index 000000000000..e555b6b4f7ea --- /dev/null +++ b/net-misc/lldpd/lldpd-1.0.1.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils user systemd bash-completion-r1 autotools + +DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)" +HOMEPAGE="https://vincentbernat.github.com/lldpd/" +SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers + seccomp sonmp snmp static-libs test readline xml zsh-completion" + +RDEPEND="dev-libs/libbsd + >=dev-libs/libevent-2.0.5:= + snmp? ( net-analyzer/net-snmp[extensible(+)] ) + xml? ( dev-libs/libxml2 ) + seccomp? ( sys-libs/libseccomp ) + zsh-completion? ( app-shells/zsh )" +DEPEND="${RDEPEND} + virtual/pkgconfig + doc? ( + graph? ( app-doc/doxygen[dot] ) + !graph? ( app-doc/doxygen ) + ) + test? ( dev-libs/check )" + +REQUIRED_USE="graph? ( doc )" + +PATCHES=( + "${FILESDIR}/${PN}-0.9.5-seccomp-add-socket-ops.patch" +) + +pkg_setup() { + ebegin "Creating lldpd user and group" + enewgroup ${PN} + enewuser ${PN} -1 -1 -1 ${PN} + eend $? +} + +src_prepare() { + default + + eautoreconf + elibtoolize +} + +src_configure() { + econf \ + --without-embedded-libevent \ + --with-privsep-user=${PN} \ + --with-privsep-group=${PN} \ + --with-privsep-chroot=/run/${PN} \ + --with-lldpd-ctl-socket=/run/${PN}.socket \ + --with-lldpd-pid-file=/run/${PN}.pid \ + --docdir=/usr/share/doc/${PF} \ + $(use_enable cdp) \ + $(use_enable doc doxygen-man) \ + $(use_enable doc doxygen-pdf) \ + $(use_enable doc doxygen-html) \ + $(use_enable dot1) \ + $(use_enable dot3) \ + $(use_enable edp) \ + $(use_enable fdp) \ + $(use_enable graph doxygen-dot) \ + $(use_enable lldpmed) \ + $(use_enable old-kernel oldies) \ + $(use_enable sonmp) \ + $(use_enable static-libs static) \ + $(use_with readline) \ + $(use_enable sanitizers) \ + $(use_with seccomp) \ + $(use_with snmp) \ + $(use_with xml) +} + +src_compile() { + emake + use doc && emake doxygen-doc +} + +src_install() { + emake DESTDIR="${D}" install + prune_libtool_files + + newinitd "${FILESDIR}"/${PN}-initd-5 ${PN} + newconfd "${FILESDIR}"/${PN}-confd-1 ${PN} + newbashcomp src/client/completion/lldpcli lldpcli + + use doc && dodoc -r doxygen/html + + insinto /etc + doins "${FILESDIR}/lldpd.conf" + keepdir /etc/${PN}.d + + systemd_dounit "${FILESDIR}"/${PN}.service + systemd_newtmpfilesd "${FILESDIR}"/tmpfilesd ${PN}.conf +} diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest index c116049c4f3c..9b446dd8787b 100644 --- a/net-misc/miniupnpd/Manifest +++ b/net-misc/miniupnpd/Manifest @@ -3,7 +3,9 @@ AUX miniupnpd-init.d-r1 659 BLAKE2B fc2cfeabf10b4e163ea47fb5ba814df0a52a181380bc DIST miniupnpd-2.0.20171212.tar.gz 222617 BLAKE2B 6ac33048b18d9f8aeb5103f57c9982fec956a61155f8592118c38dea70801597d9e867690ef2f1cdfaf848a25d7ddb4891b3ebf37cd391b33518d6b02e6f9b4a SHA512 3ab81c840953736c662bcb6f074421052a846c7827768acd7a961a23906b9e3d3389f5b593fb6f8011c8e717dae6cd3907b6d34e7904d560378671a7fc1dd3b2 DIST miniupnpd-2.0.20180203.tar.gz 223084 BLAKE2B 14d7b1f8136be5e211ee2e5374b8ee77dfeb3e64e1308f918d9334a8600234e38581caa293b613cd3736d4a8cfc196a54839cffa8091a36961f4e0e79c727455 SHA512 ef02e33cd93225992c193a13be2320de02255610532de77cf704573384c777d82a4cb89c295982bb660ce056e38ef341223ab362bab74b2cb6954ed4e62b0219 DIST miniupnpd-2.0.20180222.tar.gz 223697 BLAKE2B f551c9219a3a0a0eda905c953c5f9f45df3f192d3d253111cb35ce51351561ae2547351cb901b91eafc1765bd89b75760063e109bacfae625ff8090563913883 SHA512 a7ee306ccac0673e55780129b3c61de025ec63a653383ae475f08695a95647ae83e5e5978ce6ee166e8d0270a5bd08250613593acaabd0b730178ca2e52dc482 +DIST miniupnpd-2.0.20180410.tar.gz 224736 BLAKE2B 76bb4eba8cd3985ff46b1e46543018171a44cee636affb6db75c7b4bfcfa5ef19a678a23467280cf7d199b8fe332cfae6595848c4a2446da2095aecadb82d5f6 SHA512 4a3392b3883e72689e6160941b80533f7254dbaf54407fe2899caef8848d7dbe82ece6079fc39446c162053c1ea1dc10912af0a31d71eb16fbfbec0029dbc645 EBUILD miniupnpd-2.0.20171212.ebuild 1468 BLAKE2B 646f5b6e83f38035a0658a43659645fe1df0ce75b29e2422c758c2240d73f74bdab91abd7ebdb78b030808285edd73aba09e284058e159405292b096dbda6f31 SHA512 ef1a6777848cc09930a15321ec2ad90fc458a3ce2bbc5e0387de5f4093583eaa69911ec0c8f79c5fb56f2fa916759553ce3b78606111be5aba8c36c9c224460e EBUILD miniupnpd-2.0.20180203.ebuild 1402 BLAKE2B 59507c9084ae623e60841402020c0b8a019e5f1af91deb3cadda0ec964119a787c1c6f90c95ceedebd62305672cb18c1baf262e5c83a3b1e7027b8156c9fd57c SHA512 13bc544d18529b3a242dc1f18add4d9b287a490b93133184cdd9f9395fbf284a01477e3abda52c8863d9c88e271ba2ae8049c99f12816878fd23687e27d88899 EBUILD miniupnpd-2.0.20180222.ebuild 1402 BLAKE2B 59507c9084ae623e60841402020c0b8a019e5f1af91deb3cadda0ec964119a787c1c6f90c95ceedebd62305672cb18c1baf262e5c83a3b1e7027b8156c9fd57c SHA512 13bc544d18529b3a242dc1f18add4d9b287a490b93133184cdd9f9395fbf284a01477e3abda52c8863d9c88e271ba2ae8049c99f12816878fd23687e27d88899 +EBUILD miniupnpd-2.0.20180410.ebuild 1402 BLAKE2B 59507c9084ae623e60841402020c0b8a019e5f1af91deb3cadda0ec964119a787c1c6f90c95ceedebd62305672cb18c1baf262e5c83a3b1e7027b8156c9fd57c SHA512 13bc544d18529b3a242dc1f18add4d9b287a490b93133184cdd9f9395fbf284a01477e3abda52c8863d9c88e271ba2ae8049c99f12816878fd23687e27d88899 MISC metadata.xml 923 BLAKE2B e7b26fae1c4f3f67ae6a3a7da57607cdca2c2999174c35ddf9db972d4871eacac116a4c0f068e4be467c9670294de7ec797a64b06106a54f986336bb111b0c38 SHA512 8e6c396f3601ccbba09e16cd48b0432616d692700b4b402484d4c592101f71a4434772efe63a4e9a2887d00e39eda9865173d74930aa6f792c61eb24b847af69 diff --git a/net-misc/miniupnpd/miniupnpd-2.0.20180410.ebuild b/net-misc/miniupnpd/miniupnpd-2.0.20180410.ebuild new file mode 100644 index 000000000000..9f786c4d43a2 --- /dev/null +++ b/net-misc/miniupnpd/miniupnpd-2.0.20180410.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit toolchain-funcs + +DESCRIPTION="MiniUPnP IGD Daemon" +HOMEPAGE="http://miniupnp.free.fr/" +SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="+leasefile igd2 ipv6 pcp-peer portinuse strict" + +RDEPEND=">=net-firewall/iptables-1.4.6:0=[ipv6?] + net-libs/libnfnetlink:= + net-libs/libmnl:= + dev-libs/gmp:0= + sys-apps/util-linux + dev-libs/openssl:0=" +DEPEND="${RDEPEND} + sys-apps/lsb-release" + +src_prepare() { + default + mv Makefile.linux Makefile || die +} + +src_configure() { + local -a opts + opts=( + --vendorcfg + $(usex igd2 '--igd2' '') + $(usex ipv6 '--ipv6' '') + $(usex leasefile '--leasefile' '') + $(usex portinuse '--portinuse' '') + $(usex pcp-peer '--pcp-peer' '') + $(usex strict '--strict' '') + ) + + emake CONFIG_OPTIONS="${opts[*]}" config.h +} + +src_compile() { + # By default, it builds a bunch of unittests that are missing wrapper + # scripts in the tarball + emake CC="$(tc-getCC)" STRIP=true miniupnpd +} + +src_install() { + emake PREFIX="${ED}" STRIP=true install + + newinitd "${FILESDIR}"/${PN}-init.d-r1 ${PN} + newconfd "${FILESDIR}"/${PN}-conf.d-r1 ${PN} +} + +pkg_postinst() { + elog "Please correct the external interface in the top of the two" + elog "scripts in /etc/miniupnpd and edit the config file in there too" +} diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest index 6dd3137ca1ee..cb8cfcff2def 100644 --- a/net-misc/openssh/Manifest +++ b/net-misc/openssh/Manifest @@ -10,9 +10,12 @@ AUX openssh-7.6_p1-hpn-x509-11.2-glue.patch 2188 BLAKE2B 2be559ea9fbe4dcd619cb13 AUX openssh-7.6_p1-permitopen-x509-glue.patch 1906 BLAKE2B 7b78577535bff9fc3c19d76bf5ebe1710b6e2743c40a336dbdfd65d2ba6c9f04979ebfa0a0bf3e8d87eb038fea945d7e5ad287adef13dec8a20b9160d964a226 SHA512 ad531ef8ce6cba778b66c3c912e6a57c8012d173f3e516ed4f9910213f0dc04b4fc76f4da6623a6a4ffc6f789c9f162279216aac801c67e4b62e33b0e1883e9d AUX openssh-7.6_p1-permitopen.patch 1857 BLAKE2B f2f7e091b99d96e77ec95353789cfd8051ced60a198219a88ae409cdedde8751af9bea5b048c76a610411f86a4e802e488fb2c5b4045e1410a6b2f2cc1a34227 SHA512 1fc3410f52e86930af5188cadf9e9f1046e7a695639e27b95da9e25a781e8f4445e279c54cd010d280e7b4df58da404b97fce8e6192ae5d456d33b498aaf00c7 AUX openssh-7.6_p1-warnings.patch 324 BLAKE2B d9fb6e710f797b687b285f70b7c7b32abaa34bd57aeb32558f5d9978df5b5eb5ba5dc1ac8c46ed430619318fa3cfd3475a9c24e3f594ad05d081decd0e4c2f36 SHA512 08a9caf1cbb4dbde2828f14075b41762dad24a8a88882cc61cb133783caa1200f63f052824409b0334c832365c0d934f44b2eeac947228ff52be24a09548cd22 +AUX openssh-7.7_p1-GSSAPI-dns.patch 11342 BLAKE2B e648273cdd04bcd46b25a2ae2b4ffdfff455c7ab04f6c56cb5ad91859231c267211564f6b2785d9fad1b78c4fe0a095302c7acf732357efdb2273ebab9ceebab SHA512 bbfe702786636006dfe4560d8245d9007f9a94768a2df17a3ca3ead7bd1351edd2960f993e322b96828a0054ad55f71fcb77793a05ba2e52d8d9286431cc538a +AUX sshd-r1.confd 774 BLAKE2B df3f3f28cb4d35b49851399b52408c42e242ae3168ff3fc79add211903567da370cfe86a267932ca9cf13c3afbc38a8f1b53e753a31670ee61bf8ba8747832f8 SHA512 3a69752592126024319a95f1c1747af508fd639c86eca472106c5d6c23d5eeaa441ca74740d4b1aafaa0db759d38879e3c1cee742b08d6166ebc58cddac1e2fe AUX sshd.confd 396 BLAKE2B 2fc146e83512d729e120cfe331441e8fe27eba804906cc0c463b938ddaf052e7392efbcda6699467afde22652c599e7d55b0ce18a344137263cd78647fea255f SHA512 b9ae816af54a55e134a9307e376f05367b815f1b3fd545c2a2c312d18aedcf907f413e8bad8db980cdd9aad4011a72a79e1e94594f69500939a9cb46287f2f81 AUX sshd.pam_include.2 156 BLAKE2B 91ebefbb1264fe3fe98df0a72ac22a4cd8a787b3b391af5769798e0b0185f0a588bc089d229c76138fd2db39fbe6bd33924f0d53e0513074d9c2d7abf88dcb78 SHA512 d3f7e6ca8c9f2b5060ebccb259316bb59c9a7e158e8ef9466765a20db263a4043a590811f1a3ab072b718dbd70898bc69b77e0b19603d7f394b5ac1bd0a4a56c AUX sshd.rc6.4 2108 BLAKE2B 55b66dddb45aadccde794667195f716f84c521576d886a3acc56f6f66087f0ff7167bde629c876da4ee1306a4995b8a4cd089eece35037616d17ee4b691b4cf8 SHA512 fe58e950514743a72467233ff2f2a63112c50e5db843d61e141a5ca3dd8ef8f42a616cd9de7748ae582054c47c2cc38ce48b638e2d88be39c1387f77e79c83e1 +AUX sshd.rc6.5 2723 BLAKE2B 3509a84c3f3d09ac3946f3e59c07ce615fb263ed7580815384589b9451e4c3df9c6c82a6d7cbd738e87d8b2dd2a4e7907e59b179250c828a191e395e25900fa9 SHA512 b65910477e6d255cb0eb8a49ffd2c43b1d8876f9e6cf8dd4c7161dbedd17ed757aea7ead4ebecc29d830e2675f66a0974c063fbcf93849c06f1599cbf0ff9d1b AUX sshd.service 242 BLAKE2B e77eb1e0adad0641b60a59d243e911e0a6286a87acda25f3e478582068d8a7a2a12ec88e14bf2c01c7f4c2025ce2d2ce1b1273a93c096bc96da47a69878a823e SHA512 77f50c85a2c944995a39819916eb860cfdc1aff90986e93282e669a0de73c287ecb92d550fd118cfcc8ab538eab677e0d103b23cd959b7e8d9801bc37250c39c AUX sshd.socket 136 BLAKE2B 22e218c831fc384a3151ef97c391253738fa9002e20cf4628c6fe3d52d4b0ac3b957da58f816950669d0a6f8f2786251c6dfc31bbb863f837a3f52631341dc2e SHA512 4d31d373b7bdae917dc0cf05418c71d4743e98e354aefcf055f88f55c9c644a5a0e0e605dbb8372c1b98d17c0ea1c8c0fee27d38ab8dbe23c7e420a6a78c6d42 AUX sshd_at.service 176 BLAKE2B 316c2de6af05e97ad2271dfda9fc3276b5c049aa1e56ea7c4acc20d5dd6f4444b0ed3122db90959dc8c009e36f59dbe8e8b969f21eaca98c513ac46b4f80f46e SHA512 662a9c2668902633e6dbcb9435ac35bec3e224afdb2ab6a1df908618536ae9fc1958ba1d611e146c01fddb0c8f41eefdc26de78f45b7f165b1d6b2ee2f23be2a @@ -24,9 +27,14 @@ DIST openssh-7.6_p1-sctp.patch.xz 6996 BLAKE2B 4a857afdc8fa5cb2bfb9dd1805ac6343e DIST openssh-7.6p1+x509-11.2.diff.gz 466657 BLAKE2B 3f4f108e2d97eb292c215bc3a6e2c64ae6b9e49704f46f46a21496a71d5ebd051ab648446bf71ef141e2114f4a03363d8cd043f5813f957c2c5f2e2eb193931d SHA512 1c0fea91037bfcaed7aa3f0cb01d262410a99d3e1b98a25a012db5d683f3275ab52f78f1e446bd7e543c78f9d406b1dce2bb3997214534ae94e11c254658080f DIST openssh-7.6p1-hpnssh14v12-r1.tar.xz 15440 BLAKE2B e140852a3ce63e4f744ed4b18b474cf88d09ca55509e5a16d26eef5cf8574466b472073eef56e19467932959d9ba7e941ab561d9ea0704dfee3fd08a6ba7ba8c SHA512 9d0450ec99fe550d790e471cb7815d0863788cf9c41dfef653d102f02be3d38a09e5103e537658279216a5815c1a075ded9f011e05ce216beee2c7daeea8c75a DIST openssh-7.6p1.tar.gz 1489788 BLAKE2B 938bfeeff0a0aaa2fc7e4c345f04561c6c071c526e354a7d344a08742cb70ab1f4a41d325b31720f2fba5c4afa4db11f3fc87055c8c9c8bea37b29cc11dc8f39 SHA512 de17fdcb8239401f76740c8d689a8761802f6df94e68d953f3c70b9f4f8bdb403617c48c1d01cc8c368d88e9d50aee540bf03d5a36687dfb39dfd28d73029d72 +DIST openssh-7.7p1-hpnssh14v14-gentoo1.patch.xz 21448 BLAKE2B 51d9324990d8098707359f355b9212679db38569e566f47659ffdae8046bdbb4e6873bd67ecb7da0b5706c5243f44f82089f08ecbc59c7e39062fceb4be78316 SHA512 63d2ffbcfe121ddedaa07955b1025d2c6e196ea694464610437368835cf46dd507d4d17361548cae93db53a1e3d93d9c409910620bbd0cd619d82b6215c833b5 +DIST openssh-7.7p1-sctp-1.0.patch.xz 7380 BLAKE2B 6ad40972ece131ff148ede6ba94d63bffc606e0bcabb959d4c9056196cb6f4fddc285f97d7b49b73fde7ee84e3c981c07bddb058ad88eb7c7c2fe716e657c630 SHA512 bc5f50805ba25415f93f61b6654e5bcbaef673b0af48d339116ca9c94b6152afae294c5a9144adeb40190da97c2fc73b43e3ac7ac34feb4a647628327a7cac0a +DIST openssh-7.7p1-x509-11.3.1.patch.xz 362672 BLAKE2B 55b8b0ef00dc4d962a0db1115406b7b1e84110870c74198e9e4cb081b2ffde8daca67cb281c69d73b4c5cbffde361429d62634be194b57e888a0b434a0f42a37 SHA512 f84744f6d2e5a15017bce37bfa65ebb47dbafeac07ea9aab46bdc780b4062ff70687512d9d512cab81e3b9c701adb6ce17c5474f35cb4b49f57db2e2d45ac9ac +DIST openssh-7.7p1.tar.gz 1536900 BLAKE2B 7aee360f2cea5bfa3f8426fcbd66fde2568f05f9c8e623326b60f03b7c5f8abf223e178aa1d5958015b51627565bf5b1ace35b57f309638c908f5a7bf5500d21 SHA512 597252cb48209a0cb98ca1928a67e8d63e4275252f25bc37269204c108f034baade6ba0634e32ae63422fddd280f73096a6b31ad2f2e7a848dde75ca30e14261 DIST openssh-lpk-7.5p1-0.3.14.patch.xz 17040 BLAKE2B 5b2204316dd244bb8dd11db50d5bc3a194e2cc4b64964a2d3df68bbe54c53588f15fc5176dbc3811e929573fa3e41cf91f412aa2513bb9a4b6ed02c2523c1e24 SHA512 9ce5d7e5d831c972f0f866b686bf93a048a03979ab38627973f5491eeeaa45f9faab0520b3a7ed90a13a67213fdc9cd4cf11e423acad441ea91b71037c8b435b DIST openssh-lpk-7.6p1-0.3.14.patch.xz 17044 BLAKE2B a31dcb15848d3a22306108a4e181b1d52b195e6adcd2a78d5c7bf57f33c8ed62c3affa434c8d31c07eae84b59f1a3968a3f2a92e702f9225b121127616cb9d61 SHA512 e9a2b18fd6a58354198b6e48199059d055451a5f09c99bf7293d0d54137a59c581a9cb3bd906f31589e03d8450fb017b9015e18c67b7b6ae840e336039436974 EBUILD openssh-7.5_p1-r4.ebuild 11115 BLAKE2B 31bfee62343a2124e48733c4db1367fcce121d5eff25008135d2e715a34a45a176c02a5fcee99271db723d437a62d0e79297cb17df1b1ab6a12534ad2cb0c0b5 SHA512 00dbc65bf70747906f2ae5ae538579b5bd4935bae224c59ad2de92820fc64f969ca2bddc1bf0ed8924f7b6825e5665730e3fa65b5682a7f7a170233b41b73acb EBUILD openssh-7.6_p1-r4.ebuild 11099 BLAKE2B 975314f6b62e9191bf6300becb51f6282e52edc889407996ba640b07755dc713f28f9669e84a7f269d2be58764c561d7c2a14ff9af03ea7664794eb7f8656d9a SHA512 40276711daceea7e595a57b9805d5a4099e644650c6d2b501d581f5297bfc59bc20b325db455ce9e959d1a8d85bc25471e873177af5feadf1813f50205d6bb35 EBUILD openssh-7.6_p1-r5.ebuild 11292 BLAKE2B 0f8a0e888c539172a72cba3fbc08727de705df525c188e71f6f3e0fc7a4f314fc18b60e2c5fa09c35953b0684dc0ab69c0413172463588deba215af2688d22b1 SHA512 5fdc1fe303b7e183da3948fb177c5963e13df98cb61f24a81f291ff67c4820dc0afd8bc9d34077a966ccf5fc9fb7ff8f936689246f54686512ec45f61e3b7a97 +EBUILD openssh-7.7_p1-r1.ebuild 14657 BLAKE2B b7539268f745f7edf9f654992a0971dd6d77c609b19f945ba3230a3901b85a675f8c951d146089efc238d66e9a0b5d38e1ab5272133e2af8aa4c7989dad8461d SHA512 e2bd77e37b10bb12350da25468a7f1733985dd375824e572a2de0df84cefdeb7bb1fda30014f9a5a3b86aa546c8419264f2b5b761a77482bf3a4fa65bf8a4e72 MISC metadata.xml 2212 BLAKE2B 889550b17d2ba8072686ca5f398c64946fc04721fd7093c88fd7c1c5c7e4610fb01964f8e3d78e20cd0e9b9343895439772fee43b5635db893f3fc13ae9437cb SHA512 958845fbdfb4f1d267fdbc3a005c6338da54c6a0715180a1982416a841ab4865c536de5f10bb8493d07830e182786d0c3f2ac710c9168434b3d077a59ed2ddd5 diff --git a/net-misc/openssh/files/openssh-7.7_p1-GSSAPI-dns.patch b/net-misc/openssh/files/openssh-7.7_p1-GSSAPI-dns.patch new file mode 100644 index 000000000000..2840652a9b47 --- /dev/null +++ b/net-misc/openssh/files/openssh-7.7_p1-GSSAPI-dns.patch @@ -0,0 +1,351 @@ +https://bugs.gentoo.org/165444 +https://bugzilla.mindrot.org/show_bug.cgi?id=1008 + +--- a/auth.c ++++ b/auth.c +@@ -728,120 +728,6 @@ fakepw(void) + return (&fake); + } + +-/* +- * Returns the remote DNS hostname as a string. The returned string must not +- * be freed. NB. this will usually trigger a DNS query the first time it is +- * called. +- * This function does additional checks on the hostname to mitigate some +- * attacks on legacy rhosts-style authentication. +- * XXX is RhostsRSAAuthentication vulnerable to these? +- * XXX Can we remove these checks? (or if not, remove RhostsRSAAuthentication?) +- */ +- +-static char * +-remote_hostname(struct ssh *ssh) +-{ +- struct sockaddr_storage from; +- socklen_t fromlen; +- struct addrinfo hints, *ai, *aitop; +- char name[NI_MAXHOST], ntop2[NI_MAXHOST]; +- const char *ntop = ssh_remote_ipaddr(ssh); +- +- /* Get IP address of client. */ +- fromlen = sizeof(from); +- memset(&from, 0, sizeof(from)); +- if (getpeername(ssh_packet_get_connection_in(ssh), +- (struct sockaddr *)&from, &fromlen) < 0) { +- debug("getpeername failed: %.100s", strerror(errno)); +- return strdup(ntop); +- } +- +- ipv64_normalise_mapped(&from, &fromlen); +- if (from.ss_family == AF_INET6) +- fromlen = sizeof(struct sockaddr_in6); +- +- debug3("Trying to reverse map address %.100s.", ntop); +- /* Map the IP address to a host name. */ +- if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name), +- NULL, 0, NI_NAMEREQD) != 0) { +- /* Host name not found. Use ip address. */ +- return strdup(ntop); +- } +- +- /* +- * if reverse lookup result looks like a numeric hostname, +- * someone is trying to trick us by PTR record like following: +- * 1.1.1.10.in-addr.arpa. IN PTR 2.3.4.5 +- */ +- memset(&hints, 0, sizeof(hints)); +- hints.ai_socktype = SOCK_DGRAM; /*dummy*/ +- hints.ai_flags = AI_NUMERICHOST; +- if (getaddrinfo(name, NULL, &hints, &ai) == 0) { +- logit("Nasty PTR record \"%s\" is set up for %s, ignoring", +- name, ntop); +- freeaddrinfo(ai); +- return strdup(ntop); +- } +- +- /* Names are stored in lowercase. */ +- lowercase(name); +- +- /* +- * Map it back to an IP address and check that the given +- * address actually is an address of this host. This is +- * necessary because anyone with access to a name server can +- * define arbitrary names for an IP address. Mapping from +- * name to IP address can be trusted better (but can still be +- * fooled if the intruder has access to the name server of +- * the domain). +- */ +- memset(&hints, 0, sizeof(hints)); +- hints.ai_family = from.ss_family; +- hints.ai_socktype = SOCK_STREAM; +- if (getaddrinfo(name, NULL, &hints, &aitop) != 0) { +- logit("reverse mapping checking getaddrinfo for %.700s " +- "[%s] failed.", name, ntop); +- return strdup(ntop); +- } +- /* Look for the address from the list of addresses. */ +- for (ai = aitop; ai; ai = ai->ai_next) { +- if (getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop2, +- sizeof(ntop2), NULL, 0, NI_NUMERICHOST) == 0 && +- (strcmp(ntop, ntop2) == 0)) +- break; +- } +- freeaddrinfo(aitop); +- /* If we reached the end of the list, the address was not there. */ +- if (ai == NULL) { +- /* Address not found for the host name. */ +- logit("Address %.100s maps to %.600s, but this does not " +- "map back to the address.", ntop, name); +- return strdup(ntop); +- } +- return strdup(name); +-} +- +-/* +- * Return the canonical name of the host in the other side of the current +- * connection. The host name is cached, so it is efficient to call this +- * several times. +- */ +- +-const char * +-auth_get_canonical_hostname(struct ssh *ssh, int use_dns) +-{ +- static char *dnsname; +- +- if (!use_dns) +- return ssh_remote_ipaddr(ssh); +- else if (dnsname != NULL) +- return dnsname; +- else { +- dnsname = remote_hostname(ssh); +- return dnsname; +- } +-} +- + /* + * Runs command in a subprocess wuth a minimal environment. + * Returns pid on success, 0 on failure. +--- a/canohost.c ++++ b/canohost.c +@@ -202,3 +202,117 @@ get_local_port(int sock) + { + return get_sock_port(sock, 1); + } ++ ++/* ++ * Returns the remote DNS hostname as a string. The returned string must not ++ * be freed. NB. this will usually trigger a DNS query the first time it is ++ * called. ++ * This function does additional checks on the hostname to mitigate some ++ * attacks on legacy rhosts-style authentication. ++ * XXX is RhostsRSAAuthentication vulnerable to these? ++ * XXX Can we remove these checks? (or if not, remove RhostsRSAAuthentication?) ++ */ ++ ++static char * ++remote_hostname(struct ssh *ssh) ++{ ++ struct sockaddr_storage from; ++ socklen_t fromlen; ++ struct addrinfo hints, *ai, *aitop; ++ char name[NI_MAXHOST], ntop2[NI_MAXHOST]; ++ const char *ntop = ssh_remote_ipaddr(ssh); ++ ++ /* Get IP address of client. */ ++ fromlen = sizeof(from); ++ memset(&from, 0, sizeof(from)); ++ if (getpeername(ssh_packet_get_connection_in(ssh), ++ (struct sockaddr *)&from, &fromlen) < 0) { ++ debug("getpeername failed: %.100s", strerror(errno)); ++ return strdup(ntop); ++ } ++ ++ ipv64_normalise_mapped(&from, &fromlen); ++ if (from.ss_family == AF_INET6) ++ fromlen = sizeof(struct sockaddr_in6); ++ ++ debug3("Trying to reverse map address %.100s.", ntop); ++ /* Map the IP address to a host name. */ ++ if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name), ++ NULL, 0, NI_NAMEREQD) != 0) { ++ /* Host name not found. Use ip address. */ ++ return strdup(ntop); ++ } ++ ++ /* ++ * if reverse lookup result looks like a numeric hostname, ++ * someone is trying to trick us by PTR record like following: ++ * 1.1.1.10.in-addr.arpa. IN PTR 2.3.4.5 ++ */ ++ memset(&hints, 0, sizeof(hints)); ++ hints.ai_socktype = SOCK_DGRAM; /*dummy*/ ++ hints.ai_flags = AI_NUMERICHOST; ++ if (getaddrinfo(name, NULL, &hints, &ai) == 0) { ++ logit("Nasty PTR record \"%s\" is set up for %s, ignoring", ++ name, ntop); ++ freeaddrinfo(ai); ++ return strdup(ntop); ++ } ++ ++ /* Names are stored in lowercase. */ ++ lowercase(name); ++ ++ /* ++ * Map it back to an IP address and check that the given ++ * address actually is an address of this host. This is ++ * necessary because anyone with access to a name server can ++ * define arbitrary names for an IP address. Mapping from ++ * name to IP address can be trusted better (but can still be ++ * fooled if the intruder has access to the name server of ++ * the domain). ++ */ ++ memset(&hints, 0, sizeof(hints)); ++ hints.ai_family = from.ss_family; ++ hints.ai_socktype = SOCK_STREAM; ++ if (getaddrinfo(name, NULL, &hints, &aitop) != 0) { ++ logit("reverse mapping checking getaddrinfo for %.700s " ++ "[%s] failed.", name, ntop); ++ return strdup(ntop); ++ } ++ /* Look for the address from the list of addresses. */ ++ for (ai = aitop; ai; ai = ai->ai_next) { ++ if (getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop2, ++ sizeof(ntop2), NULL, 0, NI_NUMERICHOST) == 0 && ++ (strcmp(ntop, ntop2) == 0)) ++ break; ++ } ++ freeaddrinfo(aitop); ++ /* If we reached the end of the list, the address was not there. */ ++ if (ai == NULL) { ++ /* Address not found for the host name. */ ++ logit("Address %.100s maps to %.600s, but this does not " ++ "map back to the address.", ntop, name); ++ return strdup(ntop); ++ } ++ return strdup(name); ++} ++ ++/* ++ * Return the canonical name of the host in the other side of the current ++ * connection. The host name is cached, so it is efficient to call this ++ * several times. ++ */ ++ ++const char * ++auth_get_canonical_hostname(struct ssh *ssh, int use_dns) ++{ ++ static char *dnsname; ++ ++ if (!use_dns) ++ return ssh_remote_ipaddr(ssh); ++ else if (dnsname != NULL) ++ return dnsname; ++ else { ++ dnsname = remote_hostname(ssh); ++ return dnsname; ++ } ++} +--- a/readconf.c ++++ b/readconf.c +@@ -160,6 +160,7 @@ typedef enum { + oClearAllForwardings, oNoHostAuthenticationForLocalhost, + oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout, + oAddressFamily, oGssAuthentication, oGssDelegateCreds, ++ oGssTrustDns, + oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly, + oSendEnv, oControlPath, oControlMaster, oControlPersist, + oHashKnownHosts, +@@ -200,9 +201,11 @@ static struct { + #if defined(GSSAPI) + { "gssapiauthentication", oGssAuthentication }, + { "gssapidelegatecredentials", oGssDelegateCreds }, ++ { "gssapitrustdns", oGssTrustDns }, + # else + { "gssapiauthentication", oUnsupported }, + { "gssapidelegatecredentials", oUnsupported }, ++ { "gssapitrustdns", oUnsupported }, + #endif + #ifdef ENABLE_PKCS11 + { "smartcarddevice", oPKCS11Provider }, +@@ -954,6 +957,10 @@ parse_time: + intptr = &options->gss_deleg_creds; + goto parse_flag; + ++ case oGssTrustDns: ++ intptr = &options->gss_trust_dns; ++ goto parse_flag; ++ + case oBatchMode: + intptr = &options->batch_mode; + goto parse_flag; +@@ -1766,6 +1773,7 @@ initialize_options(Options * options) + options->challenge_response_authentication = -1; + options->gss_authentication = -1; + options->gss_deleg_creds = -1; ++ options->gss_trust_dns = -1; + options->password_authentication = -1; + options->kbd_interactive_authentication = -1; + options->kbd_interactive_devices = NULL; +@@ -1908,6 +1916,8 @@ fill_default_options(Options * options) + options->gss_authentication = 0; + if (options->gss_deleg_creds == -1) + options->gss_deleg_creds = 0; ++ if (options->gss_trust_dns == -1) ++ options->gss_trust_dns = 0; + if (options->password_authentication == -1) + options->password_authentication = 1; + if (options->kbd_interactive_authentication == -1) +--- a/readconf.h ++++ b/readconf.h +@@ -43,6 +43,7 @@ typedef struct { + /* Try S/Key or TIS, authentication. */ + int gss_authentication; /* Try GSS authentication */ + int gss_deleg_creds; /* Delegate GSS credentials */ ++ int gss_trust_dns; /* Trust DNS for GSS canonicalization */ + int password_authentication; /* Try password + * authentication. */ + int kbd_interactive_authentication; /* Try keyboard-interactive auth. */ +--- a/ssh_config.5 ++++ b/ssh_config.5 +@@ -731,6 +731,16 @@ The default is + Forward (delegate) credentials to the server. + The default is + .Cm no . ++Note that this option applies to protocol version 2 connections using GSSAPI. ++.It Cm GSSAPITrustDns ++Set to ++.Dq yes to indicate that the DNS is trusted to securely canonicalize ++the name of the host being connected to. If ++.Dq no, the hostname entered on the ++command line will be passed untouched to the GSSAPI library. ++The default is ++.Dq no . ++This option only applies to protocol version 2 connections using GSSAPI. + .It Cm HashKnownHosts + Indicates that + .Xr ssh 1 +--- a/sshconnect2.c ++++ b/sshconnect2.c +@@ -643,6 +643,13 @@ userauth_gssapi(Authctxt *authctxt) + static u_int mech = 0; + OM_uint32 min; + int ok = 0; ++ const char *gss_host; ++ ++ if (options.gss_trust_dns) { ++ extern const char *auth_get_canonical_hostname(struct ssh *ssh, int use_dns); ++ gss_host = auth_get_canonical_hostname(active_state, 1); ++ } else ++ gss_host = authctxt->host; + + /* Try one GSSAPI method at a time, rather than sending them all at + * once. */ +@@ -655,7 +662,7 @@ userauth_gssapi(Authctxt *authctxt) + /* My DER encoding requires length<128 */ + if (gss_supported->elements[mech].length < 128 && + ssh_gssapi_check_mechanism(&gssctxt, +- &gss_supported->elements[mech], authctxt->host)) { ++ &gss_supported->elements[mech], gss_host)) { + ok = 1; /* Mechanism works */ + } else { + mech++; +-- diff --git a/net-misc/openssh/files/sshd-r1.confd b/net-misc/openssh/files/sshd-r1.confd new file mode 100644 index 000000000000..cf430371bf0f --- /dev/null +++ b/net-misc/openssh/files/sshd-r1.confd @@ -0,0 +1,33 @@ +# /etc/conf.d/sshd: config file for /etc/init.d/sshd + +# Where is your sshd_config file stored? + +SSHD_CONFDIR="${RC_PREFIX%/}/etc/ssh" + + +# Any random options you want to pass to sshd. +# See the sshd(8) manpage for more info. + +SSHD_OPTS="" + + +# Wait one second (length chosen arbitrarily) to see if sshd actually +# creates a PID file, or if it crashes for some reason like not being +# able to bind to the address in ListenAddress. + +#SSHD_SSD_OPTS="--wait 1000" + + +# Pid file to use (needs to be absolute path). + +#SSHD_PIDFILE="${RC_PREFIX%/}/run/sshd.pid" + + +# Path to the sshd binary (needs to be absolute path). + +#SSHD_BINARY="${RC_PREFIX%/}/usr/sbin/sshd" + + +# Path to the ssh-keygen binary (needs to be absolute path). + +#SSHD_KEYGEN_BINARY="${RC_PREFIX%/}/usr/bin/ssh-keygen" diff --git a/net-misc/openssh/files/sshd.rc6.5 b/net-misc/openssh/files/sshd.rc6.5 new file mode 100644 index 000000000000..044cbe7268f2 --- /dev/null +++ b/net-misc/openssh/files/sshd.rc6.5 @@ -0,0 +1,89 @@ +#!/sbin/openrc-run +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +extra_commands="checkconfig" +extra_started_commands="reload" + +: ${SSHD_CONFDIR:=${RC_PREFIX%/}/etc/ssh} +: ${SSHD_CONFIG:=${SSHD_CONFDIR}/sshd_config} +: ${SSHD_PIDFILE:=${RC_PREFIX%/}/run/${SVCNAME}.pid} +: ${SSHD_BINARY:=${RC_PREFIX%/}/usr/sbin/sshd} +: ${SSHD_KEYGEN_BINARY:=${RC_PREFIX%/}/usr/bin/ssh-keygen} + +command="${SSHD_BINARY}" +pidfile="${SSHD_PIDFILE}" +command_args="${SSHD_OPTS} -o PidFile=${pidfile} -f ${SSHD_CONFIG}" + +# Wait one second (length chosen arbitrarily) to see if sshd actually +# creates a PID file, or if it crashes for some reason like not being +# able to bind to the address in ListenAddress (bug 617596). +: ${SSHD_SSD_OPTS:=--wait 1000} +start_stop_daemon_args="${SSHD_SSD_OPTS}" + +depend() { + # Entropy can be used by ssh-keygen, among other things, but + # is not strictly required (bug 470020). + use logger dns entropy + if [ "${rc_need+set}" = "set" ] ; then + : # Do nothing, the user has explicitly set rc_need + else + local x warn_addr + for x in $(awk '/^ListenAddress/{ print $2 }' "$SSHD_CONFIG" 2>/dev/null) ; do + case "${x}" in + 0.0.0.0|0.0.0.0:*) ;; + ::|\[::\]*) ;; + *) warn_addr="${warn_addr} ${x}" ;; + esac + done + if [ -n "${warn_addr}" ] ; then + need net + ewarn "You are binding an interface in ListenAddress statement in your sshd_config!" + ewarn "You must add rc_need=\"net.FOO\" to your ${RC_PREFIX%/}/etc/conf.d/sshd" + ewarn "where FOO is the interface(s) providing the following address(es):" + ewarn "${warn_addr}" + fi + fi +} + +checkconfig() { + checkpath --directory "${RC_PREFIX%/}/var/empty" + + if [ ! -e "${SSHD_CONFIG}" ] ; then + eerror "You need an ${SSHD_CONFIG} file to run sshd" + eerror "There is a sample file in /usr/share/doc/openssh" + return 1 + fi + + ${SSHD_KEYGEN_BINARY} -A || return 2 + + "${command}" -t ${command_args} || return 3 +} + +start_pre() { + # If this isn't a restart, make sure that the user's config isn't + # busted before we try to start the daemon (this will produce + # better error messages than if we just try to start it blindly). + # + # If, on the other hand, this *is* a restart, then the stop_pre + # action will have ensured that the config is usable and we don't + # need to do that again. + if [ "${RC_CMD}" != "restart" ] ; then + checkconfig || return $? + fi +} + +stop_pre() { + # If this is a restart, check to make sure the user's config + # isn't busted before we stop the running daemon. + if [ "${RC_CMD}" = "restart" ] ; then + checkconfig || return $? + fi +} + +reload() { + checkconfig || return $? + ebegin "Reloading ${SVCNAME}" + start-stop-daemon --signal HUP --pidfile "${pidfile}" + eend $? +} diff --git a/net-misc/openssh/openssh-7.7_p1-r1.ebuild b/net-misc/openssh/openssh-7.7_p1-r1.ebuild new file mode 100644 index 000000000000..cfcfc30327fc --- /dev/null +++ b/net-misc/openssh/openssh-7.7_p1-r1.ebuild @@ -0,0 +1,414 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit user flag-o-matic multilib autotools pam systemd versionator + +# Make it more portable between straight releases +# and _p? releases. +PARCH=${P/_} + +HPN_VER="14v14-gentoo1" HPN_PATCH="${PARCH}-hpnssh${HPN_VER}.patch.xz" HPN_DISABLE_MTAES=1 +SCTP_VER="1.0" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz" +X509_VER="11.3.1" X509_PATCH="${PARCH}-x509-${X509_VER}.patch.xz" + +# Disable LDAP support until someone will rewrite the patch, +# upstream removed auth_parse_options() via commit 7c856857607112a3dfe6414696bf4c7ab7fb0cb3 +#LDAP_VER="0.3.14" LDAP_PATCH="${PN}-lpk-7.7p1-${LDAP_VER}.patch.xz" + +DESCRIPTION="Port of OpenBSD's free SSH release" +HOMEPAGE="https://www.openssh.com/" +SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz + ${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~whissi/dist/openssh/${SCTP_PATCH} )} + ${HPN_PATCH:+hpn? ( https://dev.gentoo.org/~whissi/dist/openssh/${HPN_PATCH} )} + ${LDAP_PATCH:+ldap? ( https://dev.gentoo.org/~whissi/dist/openssh/${LDAP_PATCH} )} + ${X509_PATCH:+X509? ( https://dev.gentoo.org/~whissi/dist/openssh/${X509_PATCH} )} + " + +LICENSE="BSD GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ldap ldns libedit libressl livecd pam +pie sctp selinux skey +ssl static test X X509" +REQUIRED_USE="ldns? ( ssl ) + pie? ( !static ) + static? ( !kerberos !pam ) + X509? ( !ldap !sctp ssl ) + test? ( ssl )" + +LIB_DEPEND=" + audit? ( sys-process/audit[static-libs(+)] ) + ldns? ( + net-libs/ldns[static-libs(+)] + !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) + bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) + ) + libedit? ( dev-libs/libedit:=[static-libs(+)] ) + sctp? ( net-misc/lksctp-tools[static-libs(+)] ) + selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) + skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] ) + ssl? ( + !libressl? ( + >=dev-libs/openssl-1.0.1:0=[bindist=] + dev-libs/openssl:0=[static-libs(+)] + ) + libressl? ( dev-libs/libressl:0=[static-libs(+)] ) + ) + >=sys-libs/zlib-1.2.3:=[static-libs(+)]" +RDEPEND=" + !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) + pam? ( virtual/pam ) + kerberos? ( virtual/krb5 ) + ldap? ( net-nds/openldap )" +DEPEND="${RDEPEND} + static? ( ${LIB_DEPEND} ) + virtual/pkgconfig + virtual/os-headers + sys-devel/autoconf" +RDEPEND="${RDEPEND} + pam? ( >=sys-auth/pambase-20081028 ) + userland_GNU? ( virtual/shadow ) + X? ( x11-apps/xauth )" + +S="${WORKDIR}/${PARCH}" + +pkg_pretend() { + # this sucks, but i'd rather have people unable to `emerge -u openssh` + # than not be able to log in to their server any more + maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; } + local fail=" + $(use hpn && maybe_fail hpn HPN_PATCH) + $(use ldap && maybe_fail ldap LDAP_PATCH) + $(use sctp && maybe_fail sctp SCTP_PATCH) + $(use X509 && maybe_fail X509 X509_PATCH) + " + fail=$(echo ${fail}) + if [[ -n ${fail} ]] ; then + eerror "Sorry, but this version does not yet support features" + eerror "that you requested: ${fail}" + eerror "Please mask ${PF} for now and check back later:" + eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask" + die "booooo" + fi + + # Make sure people who are using tcp wrappers are notified of its removal. #531156 + if grep -qs '^ *sshd *:' "${EROOT%/}"/etc/hosts.{allow,deny} ; then + ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like" + ewarn "you're trying to use it. Update your ${EROOT}etc/hosts.{allow,deny} please." + fi +} + +src_prepare() { + sed -i \ + -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX%/}/usr/bin/xauth:" \ + pathnames.h || die + + # don't break .ssh/authorized_keys2 for fun + sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die + + eapply "${FILESDIR}"/${PN}-7.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex + eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch + + local PATCHSET_VERSION_MACROS=() + + if use X509 ; then + eapply "${WORKDIR}"/${X509_PATCH%.*} + + # We need to patch package version or any X.509 sshd will reject our ssh client + # with "userauth_pubkey: could not parse key: string is too large [preauth]" + # error + einfo "Patching package version for X.509 patch set ..." + sed -i \ + -e "s/^AC_INIT(\[OpenSSH\], \[Portable\]/AC_INIT([OpenSSH], [${X509_VER}]/" \ + "${S}"/configure.ac || die "Failed to patch package version for X.509 patch" + + einfo "Patching version.h to expose X.509 patch set ..." + sed -i \ + -e "/^#define SSH_PORTABLE.*/a #define SSH_X509 \"-PKIXSSH-${X509_VER}\"" \ + "${S}"/version.h || die "Failed to sed-in X.509 patch version" + PATCHSET_VERSION_MACROS+=( 'SSH_X509' ) + + einfo "Disabling broken X.509 agent test ..." + sed -i \ + -e "/^ agent$/d" \ + "${S}"/tests/CA/config || die "Failed to disable broken X.509 agent test" + fi + + if use ldap ; then + eapply "${WORKDIR}"/${LDAP_PATCH%.*} + + einfo "Patching version.h to expose LDAP patch set ..." + sed -i \ + -e "/^#define SSH_PORTABLE.*/a #define SSH_LDAP \"-ldap-${LDAP_VER}\"" \ + "${S}"/version.h || die "Failed to sed-in LDAP patch version" + PATCHSET_VERSION_MACROS+=( 'SSH_LDAP' ) + fi + + if use sctp ; then + eapply "${WORKDIR}"/${SCTP_PATCH%.*} + + einfo "Patching version.h to expose SCTP patch set ..." + sed -i \ + -e "/^#define SSH_PORTABLE/a #define SSH_SCTP \"-sctp-${SCTP_VER}\"" \ + "${S}"/version.h || die "Failed to sed-in SCTP patch version" + PATCHSET_VERSION_MACROS+=( 'SSH_SCTP' ) + + einfo "Disabling know failing test (cfgparse) caused by SCTP patch ..." + sed -i \ + -e "/\t\tcfgparse \\\/d" \ + "${S}"/regress/Makefile || die "Failed to disable known failing test (cfgparse) caused by SCTP patch" + fi + + if use hpn ; then + eapply "${WORKDIR}"/${HPN_PATCH%.*} + + einfo "Patching Makefile.in for HPN patch set ..." + sed -i \ + -e "/^LIBS=/ s/\$/ -lpthread/" \ + "${S}"/Makefile.in || die "Failed to patch Makefile.in" + + einfo "Patching version.h to expose HPN patch set ..." + sed -i \ + -e "/^#define SSH_PORTABLE/a #define SSH_HPN \"-hpn${HPN_VER}\"" \ + "${S}"/version.h || die "Failed to sed-in HPN patch version" + PATCHSET_VERSION_MACROS+=( 'SSH_HPN' ) + + if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then + einfo "Disabling known non-working MT AES cipher per default ..." + + cat > "${T}"/disable_mtaes.conf <<- EOF + + # HPN's Multi-Threaded AES CTR cipher is currently known to be broken + # and therefore disabled per default. + DisableMTAES yes + EOF + sed -i \ + -e "/^#HPNDisabled.*/r ${T}/disable_mtaes.conf" \ + "${S}"/sshd_config || die "Failed to disabled MT AES ciphers in sshd_config" + + sed -i \ + -e "/AcceptEnv.*_XXX_TEST$/a \\\tDisableMTAES\t\tyes" \ + "${S}"/regress/test-exec.sh || die "Failed to disable MT AES ciphers in test config" + fi + fi + + if use X509 || use hpn ; then + einfo "Patching packet.c for X509 and/or HPN patch set ..." + sed -i \ + -e "s/const struct sshcipher/struct sshcipher/" \ + "${S}"/packet.c || die "Failed to patch ssh_packet_set_connection() (packet.c)" + fi + + if use X509 || use sctp || use ldap || 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 + + eapply_user #473004 + + tc-export PKG_CONFIG + local sed_args=( + -e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):" + # Disable PATH reset, trust what portage gives us #254615 + -e 's:^PATH=/:#PATH=/:' + # Disable fortify flags ... our gcc does this for us + -e 's:-D_FORTIFY_SOURCE=2::' + ) + + # The -ftrapv flag ICEs on hppa #505182 + use hppa && sed_args+=( + -e '/CFLAGS/s:-ftrapv:-fdisable-this-test:' + -e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d' + ) + # _XOPEN_SOURCE causes header conflicts on Solaris + [[ ${CHOST} == *-solaris* ]] && sed_args+=( + -e 's/-D_XOPEN_SOURCE//' + ) + sed -i "${sed_args[@]}" configure{.ac,} || die + + eautoreconf +} + +src_configure() { + addwrite /dev/ptmx + + use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG + use static && append-ldflags -static + + local myconf=( + --with-ldflags="${LDFLAGS}" + --disable-strip + --with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run + --sysconfdir="${EPREFIX%/}"/etc/ssh + --libexecdir="${EPREFIX%/}"/usr/$(get_libdir)/misc + --datadir="${EPREFIX%/}"/usr/share/openssh + --with-privsep-path="${EPREFIX%/}"/var/empty + --with-privsep-user=sshd + $(use_with audit audit linux) + $(use_with kerberos kerberos5 "${EPREFIX%/}"/usr) + # We apply the ldap and sctp patch conditionally, so can't pass --without-{ldap,sctp} + # unconditionally else we get unknown flag warnings. + $(use ldap && use_with ldap) + $(use sctp && use_with sctp) + $(use_with ldns) + $(use_with libedit) + $(use_with pam) + $(use_with pie) + $(use_with selinux) + $(use_with skey) + $(use_with ssl openssl) + $(use_with ssl md5-passwords) + $(use_with ssl ssl-engine) + ) + + # The seccomp sandbox is broken on x32, so use the older method for now. #553748 + use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit ) + + econf "${myconf[@]}" +} + +src_test() { + local t skipped=() failed=() passed=() + local tests=( interop-tests compat-tests ) + + local shell=$(egetshell "${UID}") + if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then + elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'" + elog "user, so we will run a subset only." + skipped+=( tests ) + else + tests+=( tests ) + fi + + # It will also attempt to write to the homedir .ssh. + local sshhome=${T}/homedir + mkdir -p "${sshhome}"/.ssh + for t in "${tests[@]}" ; do + # Some tests read from stdin ... + HOMEDIR="${sshhome}" HOME="${sshhome}" \ + emake -k -j1 ${t} > "${ED%/}"/etc/ssh/sshd_config + + # Allow client to pass locale environment variables #367017 + AcceptEnv LANG LC_* + EOF + cat <<-EOF >> "${ED%/}"/etc/ssh/ssh_config + + # Send locale environment variables #367017 + SendEnv LANG LC_* + EOF + + if use livecd ; then + sed -i \ + -e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \ + "${ED%/}"/etc/ssh/sshd_config || die + fi + + if use ldap && [[ -n ${LDAP_PATCH} ]] ; then + insinto /etc/openldap/schema/ + newins openssh-lpk_openldap.schema openssh-lpk.schema + fi + + doman contrib/ssh-copy-id.1 + dodoc CREDITS OVERVIEW README* TODO sshd_config + use hpn && dodoc HPN-README + use X509 || dodoc ChangeLog + + diropts -m 0700 + dodir /etc/skel/.ssh + + keepdir /var/empty + + systemd_dounit "${FILESDIR}"/sshd.{service,socket} + systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service' +} + +pkg_preinst() { + enewgroup sshd 22 + enewuser sshd 22 -1 /var/empty sshd +} + +pkg_postinst() { + if has_version "<${CATEGORY}/${PN}-5.8_p1" ; then + elog "Starting with openssh-5.8p1, the server will default to a newer key" + elog "algorithm (ECDSA). You are encouraged to manually update your stored" + elog "keys list as servers update theirs. See ssh-keyscan(1) for more info." + fi + if has_version "<${CATEGORY}/${PN}-7.0_p1" ; then + elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream." + elog "Make sure to update any configs that you might have. Note that xinetd might" + elog "be an alternative for you as it supports USE=tcpd." + fi + if has_version "<${CATEGORY}/${PN}-7.1_p1" ; then #557388 #555518 + elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their" + elog "weak sizes. If you rely on these key types, you can re-enable the key types by" + elog "adding to your sshd_config or ~/.ssh/config files:" + elog " PubkeyAcceptedKeyTypes=+ssh-dss" + elog "You should however generate new keys using rsa or ed25519." + + elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'" + elog "to 'prohibit-password'. That means password auth for root users no longer works" + elog "out of the box. If you need this, please update your sshd_config explicitly." + fi + if has_version "<${CATEGORY}/${PN}-7.6_p1" ; then + elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely." + elog "Furthermore, rsa keys with less than 1024 bits will be refused." + fi + if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]" ; then + elog "Be aware that by disabling openssl support in openssh, the server and clients" + elog "no longer support dss/rsa/ecdsa keys. You will need to generate ed25519 keys" + elog "and update all clients/servers that utilize them." + fi + + if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then + elog "" + elog "HPN's multi-threaded AES CTR cipher is currently known to be broken" + elog "and therefore disabled at runtime per default." + elog "Make sure your sshd_config is up to date and contains" + elog "" + elog " DisableMTAES yes" + elog "" + elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher." + elog "" + fi +} diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest index 03f9ebcc81c4..916720fdd13b 100644 --- a/net-misc/remmina/Manifest +++ b/net-misc/remmina/Manifest @@ -1,3 +1,5 @@ DIST remmina-1.2.0_rc24.tar.gz 1052140 BLAKE2B 57b3d2ed8a765f98f1ffd3c79df076d07e00329bf95dfddb9094d8bc62838b0f6742b404b4deef0a037bd88259751799e1842fb97313337e11b8f0faed8ad302 SHA512 aab421c580e434ca673be063f3662f1d9128cc83aaee6f9bc6acf6996af0379af6fb99cc63273941c40c6b989653b972de6c43b575ca06bf56ec7c266590c17e +DIST remmina-1.2.0_rc29.tar.gz 1194267 BLAKE2B c4059ed56f3903f248009eacc20201fc533d47c2ad5d4e053c2ce225e8bc3fe50fc4c01cf912eb77dde220418589d5a85808b7c5e4b6083f6919dc5695aa049d SHA512 ae1190762588857ac59c86c43c66ba0aa3f584820a6e87ea7b7bb81a63f71acc7407d544d9f25edf9be4f45a536d3a2bb8de34e2448de6cd5d0f130de05ff52c EBUILD remmina-1.2.0_rc24.ebuild 2007 BLAKE2B 30c5e90c97fa5c9dc329108320e90d82ebcffc846634e727fe0e6e25d32e5febbe68e249bca955c91449da1c3cc4f22f5a6184c4515d1fef4685236573e37857 SHA512 b69b8a14476ed2ccc75ae82e723d0f780a513f8978d2b27f2331b7c0cfd77797bc1351441fcd048338ad33f1a16cffda4e514e43314c782ccd5e8bf846e18b3a -MISC metadata.xml 1103 BLAKE2B 8d9213d5206f2b6de83934229c6e55abb44881b8a476c3769cbd4ba8a855913050c43e02885619bc607dc0ca6a1c714e55c862e8e02e200d955b329221b786e6 SHA512 d66f42ffd1e2f32434a4dcfc7332144313431896f98ba2b740e774811fe995a351d54221850c3a4f02b55f068277afeae63eac06e40d1d38f8a0a9dca66c0d9d +EBUILD remmina-1.2.0_rc29.ebuild 2052 BLAKE2B 8ab6645318cae08d1423f3d09b50a5ae905f67434b4e03a8cfbd60a74f672d6d2222d04364e5ed0b29b4ad89cbdf38a3ae29af2fe408c9675cc212f95ad7968c SHA512 06350d9edd0d563257a582c2e815c1f2d23d34010ee3418fc81e71ec77fd7a525cf5494e00a186e05ca22092a216fac56cf47785b281bfe4192615dfeff8a044 +MISC metadata.xml 1150 BLAKE2B b75ab4d0b30c602c1bdf2d9bb5701444570ea7cc53a97e3a27dde34044ab69f0f550fb2f8ca3d76ff04b0ff0a30164fc20696443896f3f732c4ce589a4a57b0d SHA512 9ed39584a65811d52192ff8390d02c3630f88a213c998e7990acf74f1aa26cb2abb54f4f75eb01cfe88b1986756eb9d59f2362e1ccfacc9e81c99e044a739809 diff --git a/net-misc/remmina/metadata.xml b/net-misc/remmina/metadata.xml index 08dfa5575c9b..49d6116aa5e7 100644 --- a/net-misc/remmina/metadata.xml +++ b/net-misc/remmina/metadata.xml @@ -19,10 +19,11 @@ Support connecting to SPICE-enabled virtual machines - Enable support for SSH/SFTP protocol; see also 'vte' + Enable support for SSH/SFTP protocol Enable telepathy support FreeRDP/Remmina + https://github.com/FreeRDP/Remmina/issues diff --git a/net-misc/remmina/remmina-1.2.0_rc29.ebuild b/net-misc/remmina/remmina-1.2.0_rc29.ebuild new file mode 100644 index 000000000000..15b7089b74ac --- /dev/null +++ b/net-misc/remmina/remmina-1.2.0_rc29.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils eutils gnome2-utils + +MY_PV="${PV//_rc/-rcgit.}" + +DESCRIPTION="A GTK+ RDP, SPICE, VNC, XDMCP and SSH client" +HOMEPAGE="https://remmina.org/" +SRC_URI="https://github.com/FreeRDP/Remmina/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+-with-openssl-exception" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="ayatana crypt rdp gnome-keyring nls spice ssh telepathy vnc zeroconf" + +CDEPEND=" + dev-libs/glib:2 + dev-libs/openssl:0 + x11-libs/gdk-pixbuf + x11-libs/gtk+:3 + x11-libs/libX11 + x11-libs/libxkbfile + ayatana? ( dev-libs/libappindicator:3 ) + crypt? ( dev-libs/libgcrypt:0= ) + rdp? ( >=net-misc/freerdp-2.0.0_rc0 ) + gnome-keyring? ( app-crypt/libsecret ) + spice? ( net-misc/spice-gtk[gtk3] ) + ssh? ( net-libs/libssh[sftp] + x11-libs/vte:2.91 ) + telepathy? ( net-libs/telepathy-glib ) + vnc? ( net-libs/libvncserver ) + zeroconf? ( net-dns/avahi[gtk3] ) +" +DEPEND="${CDEPEND} + dev-util/intltool + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" +RDEPEND="${CDEPEND} + virtual/freedesktop-icon-theme +" + +DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md ) + +S="${WORKDIR}/Remmina-${MY_PV}" + +src_configure() { + local mycmakeargs=( + -DWITH_APPINDICATOR=$(usex ayatana) + -DWITH_GCRYPT=$(usex crypt) + -DWITH_LIBSECRET=$(usex gnome-keyring) + -DWITH_GETTEXT=$(usex nls) + -DWITH_TRANSLATIONS=$(usex nls) + -DWITH_FREERDP=$(usex rdp) + -DWITH_SPICE=$(usex spice) + -DWITH_LIBSSH=$(usex ssh) + -DWITH_VTE=$(usex ssh) + -DWITH_TELEPATHY=$(usex telepathy) + -DWITH_LIBVNCSERVER=$(usex vnc) + -DWITH_AVAHI=$(usex zeroconf) + -DGTK_VERSION=3 + ) + cmake-utils_src_configure +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update + + elog "To get additional features, some optional runtime dependencies" + elog "may be installed:" + elog "" + optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt] + optfeature "XDMCP support" x11-base/xorg-server[xephyr] +} + +pkg_postrm() { + gnome2_icon_cache_update +} diff --git a/net-misc/seafile-client/Manifest b/net-misc/seafile-client/Manifest index fe027afbd473..847963768e75 100644 --- a/net-misc/seafile-client/Manifest +++ b/net-misc/seafile-client/Manifest @@ -1,10 +1,4 @@ AUX seafile-client-select-qt5.patch 807 BLAKE2B bc28c24a114899fa4d864a3ea10d1d2ab08410d0360e8499d40aee2a26358b5bc401edd8e57121306a5e840b674c50930840c3b8723eae1930421eaf3dbfe919 SHA512 565cd7a3b4f187ef52b9a95b0d657a35cc9722c78e92dfc413b64f781c3cae129aba23ab302f80c7526ccab234b0354709e95d1e79d356a502cce47370524f41 -DIST seafile-client-6.0.7.tar.gz 2192384 BLAKE2B 89bd8821b2b5a10ddb94d48ea43f796622acab24db7982ae7006c32117f4dd4fe63839643c308e3e1dc97c47be813248ae3164caded4c1551fed3f86aa6dd83f SHA512 4baa15d454a9c937c9ae944b2bcc6b549fc41a1558e40578a273497ccb120a9131580f2b5db047ce6d7e0503105bd0fa5312e823ab475241fb07f5ba0021224f -DIST seafile-client-6.1.0.tar.gz 2246388 BLAKE2B f57e89e9ae9364e8712e2f3a464cf2204b72a3ed141a7562a54c5c6f678497053b37ba64ca3de84e114a596a76fd1391ee8f98574627536abf8aee5271c7c154 SHA512 c6e3191afcaa833876c24690566be36ccc94e7a333c94f78df9201f23a3eed37397641e237e63b70cdc413ed6dc5683737d2eefa5c2c628b5e207bef1176b0d5 -DIST seafile-client-6.1.3.tar.gz 2358459 BLAKE2B 75bd2a98de25c135060e5c14ac984a98dc0d6da903b675cc456b1bb52475c5a60a2c2b78be5665aa80a4c05d3fc8f2cf5e016e28ba25feb8e957a1d8d9d93ad1 SHA512 be5426ef472ac7e788e164f601c4c2b2ca91e305b15dac7eddf9874af5639141bf845e36c5385c4af1d2f6df4c7af6554497bd107cbccb35f8c904694705497d -DIST seafile-client-6.1.4.tar.gz 2210086 BLAKE2B 35b118c28ab8cc011e6ebf6ff7532f7078d4acb7251e7cfadf3e1b4e7d4507b09f5beefca1fdb2ba9daafcb118981af743b80698662cf4ed73b15781c0282c87 SHA512 582b630d6da28c06ef8c3841268d3e8cbfd7dbd8fc8f78fb77e20d86f6fb97ee72f5a1cac722cd1cb5874d9ad6e687e4d03097971230f92c90ce6b02da90c243 -EBUILD seafile-client-6.0.7.ebuild 1244 BLAKE2B 4f357fa335b147a3cd78ec018736a86d51eb86c2fa0b170d9f7820d698831caa5df8beb531d14e8aead6341d71700cb678b07587e8cad64bf41057c56e3bea97 SHA512 e85ebb350d51f3f83fe2720f1c905e8943055f5298cb83a8b050422ef42823d20be6daae242c1c8178a0fb4fa81c26688cd719358ca8da040a000633cca8968b -EBUILD seafile-client-6.1.0.ebuild 1244 BLAKE2B 4f357fa335b147a3cd78ec018736a86d51eb86c2fa0b170d9f7820d698831caa5df8beb531d14e8aead6341d71700cb678b07587e8cad64bf41057c56e3bea97 SHA512 e85ebb350d51f3f83fe2720f1c905e8943055f5298cb83a8b050422ef42823d20be6daae242c1c8178a0fb4fa81c26688cd719358ca8da040a000633cca8968b -EBUILD seafile-client-6.1.3.ebuild 1244 BLAKE2B 4f357fa335b147a3cd78ec018736a86d51eb86c2fa0b170d9f7820d698831caa5df8beb531d14e8aead6341d71700cb678b07587e8cad64bf41057c56e3bea97 SHA512 e85ebb350d51f3f83fe2720f1c905e8943055f5298cb83a8b050422ef42823d20be6daae242c1c8178a0fb4fa81c26688cd719358ca8da040a000633cca8968b -EBUILD seafile-client-6.1.4.ebuild 1244 BLAKE2B 4f357fa335b147a3cd78ec018736a86d51eb86c2fa0b170d9f7820d698831caa5df8beb531d14e8aead6341d71700cb678b07587e8cad64bf41057c56e3bea97 SHA512 e85ebb350d51f3f83fe2720f1c905e8943055f5298cb83a8b050422ef42823d20be6daae242c1c8178a0fb4fa81c26688cd719358ca8da040a000633cca8968b +DIST seafile-client-6.1.7.tar.gz 2260217 BLAKE2B 96d032d5d9332cd40fabc135a132ad96e74520e677ab3071c3bb5765d17fb2ec0f7e243a8110e482137ce599672b5513b3e83d1d2ebb0cf4be66149a2891e068 SHA512 545f47a93c16fff9c000add19f55784c08878cf3b1448a8307fc0d25f7f5c35d671dd20940842c4f9e97df3ae3754fbbf170d0669097d67484226aad60ba09da +EBUILD seafile-client-6.1.7.ebuild 1333 BLAKE2B e43343c956390b439e47bf7738b2fb9999b451e6e51c3db0bed3cf05e9d1c9628bf2c6a307663fe182b4db60151da302c250537f1dd0cd145bc6384f8eea878b SHA512 99e4fa02aa9270e7467a7c719f527a8bd892d56fa99fe011fe198fe9d61c652ad62ff4ab3723ab1484821a997d282dcaa9acbbb30bcac5936961e93ac8d6e121 MISC metadata.xml 515 BLAKE2B 3392b5f9ca2c3ad648b045eb8896f417fdab9ab8591b11fe1634272f0738fb5114b22a1b46bf5c618de53d6d7594ba748682210201b9843a55a52b1d37ff2a99 SHA512 80554cfef46d79142fa4a00b3f84ea3ba55ddad45d9b0bb08f76302581e9268f51e16e7ac20de15241fdf1d8765fc515c49a41a14bedea0dae3844e7f7f4ecb6 diff --git a/net-misc/seafile-client/seafile-client-6.0.7.ebuild b/net-misc/seafile-client/seafile-client-6.0.7.ebuild deleted file mode 100644 index 69b7bcb82bb7..000000000000 --- a/net-misc/seafile-client/seafile-client-6.0.7.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit cmake-utils - -DESCRIPTION="Seafile desktop client" -HOMEPAGE="https://github.com/haiwen/seafile-client/ http://www.seafile.com/" -SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="shibboleth test" - -RDEPEND="net-libs/libsearpc - =net-libs/ccnet-${PV} - =net-misc/seafile-${PV} - >=dev-libs/libevent-2.0 - >=dev-libs/jansson-2.0 - dev-libs/openssl:0= - dev-db/sqlite:3 - - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtnetwork:5 - dev-qt/qtdbus:5 - shibboleth? ( || ( dev-qt/qtwebengine:5[widgets] dev-qt/qtwebkit:5 ) )" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 - test? ( dev-qt/qttest:5 )" - -src_prepare() { - eapply "${FILESDIR}/${PN}-select-qt5.patch" - cmake-utils_src_prepare - if use shibboleth ; then - if ! has_version "dev-qt/qtwebengine:5[widgets]" ; then - sed -i -e 's/IF(WIN32 OR DETECTED_QT_VERSION VERSION_LESS 5.6.0)/IF(TRUE)/' CMakeLists.txt || die - fi - fi -} - -src_configure() { - local mycmakeargs=( - -DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)" - -DBUILD_TESTING="$(usex test)" - ) - cmake-utils_src_configure -} diff --git a/net-misc/seafile-client/seafile-client-6.1.0.ebuild b/net-misc/seafile-client/seafile-client-6.1.0.ebuild deleted file mode 100644 index 69b7bcb82bb7..000000000000 --- a/net-misc/seafile-client/seafile-client-6.1.0.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit cmake-utils - -DESCRIPTION="Seafile desktop client" -HOMEPAGE="https://github.com/haiwen/seafile-client/ http://www.seafile.com/" -SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="shibboleth test" - -RDEPEND="net-libs/libsearpc - =net-libs/ccnet-${PV} - =net-misc/seafile-${PV} - >=dev-libs/libevent-2.0 - >=dev-libs/jansson-2.0 - dev-libs/openssl:0= - dev-db/sqlite:3 - - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtnetwork:5 - dev-qt/qtdbus:5 - shibboleth? ( || ( dev-qt/qtwebengine:5[widgets] dev-qt/qtwebkit:5 ) )" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 - test? ( dev-qt/qttest:5 )" - -src_prepare() { - eapply "${FILESDIR}/${PN}-select-qt5.patch" - cmake-utils_src_prepare - if use shibboleth ; then - if ! has_version "dev-qt/qtwebengine:5[widgets]" ; then - sed -i -e 's/IF(WIN32 OR DETECTED_QT_VERSION VERSION_LESS 5.6.0)/IF(TRUE)/' CMakeLists.txt || die - fi - fi -} - -src_configure() { - local mycmakeargs=( - -DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)" - -DBUILD_TESTING="$(usex test)" - ) - cmake-utils_src_configure -} diff --git a/net-misc/seafile-client/seafile-client-6.1.3.ebuild b/net-misc/seafile-client/seafile-client-6.1.3.ebuild deleted file mode 100644 index 69b7bcb82bb7..000000000000 --- a/net-misc/seafile-client/seafile-client-6.1.3.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit cmake-utils - -DESCRIPTION="Seafile desktop client" -HOMEPAGE="https://github.com/haiwen/seafile-client/ http://www.seafile.com/" -SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="shibboleth test" - -RDEPEND="net-libs/libsearpc - =net-libs/ccnet-${PV} - =net-misc/seafile-${PV} - >=dev-libs/libevent-2.0 - >=dev-libs/jansson-2.0 - dev-libs/openssl:0= - dev-db/sqlite:3 - - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtnetwork:5 - dev-qt/qtdbus:5 - shibboleth? ( || ( dev-qt/qtwebengine:5[widgets] dev-qt/qtwebkit:5 ) )" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 - test? ( dev-qt/qttest:5 )" - -src_prepare() { - eapply "${FILESDIR}/${PN}-select-qt5.patch" - cmake-utils_src_prepare - if use shibboleth ; then - if ! has_version "dev-qt/qtwebengine:5[widgets]" ; then - sed -i -e 's/IF(WIN32 OR DETECTED_QT_VERSION VERSION_LESS 5.6.0)/IF(TRUE)/' CMakeLists.txt || die - fi - fi -} - -src_configure() { - local mycmakeargs=( - -DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)" - -DBUILD_TESTING="$(usex test)" - ) - cmake-utils_src_configure -} diff --git a/net-misc/seafile-client/seafile-client-6.1.4.ebuild b/net-misc/seafile-client/seafile-client-6.1.4.ebuild deleted file mode 100644 index 69b7bcb82bb7..000000000000 --- a/net-misc/seafile-client/seafile-client-6.1.4.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit cmake-utils - -DESCRIPTION="Seafile desktop client" -HOMEPAGE="https://github.com/haiwen/seafile-client/ http://www.seafile.com/" -SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="shibboleth test" - -RDEPEND="net-libs/libsearpc - =net-libs/ccnet-${PV} - =net-misc/seafile-${PV} - >=dev-libs/libevent-2.0 - >=dev-libs/jansson-2.0 - dev-libs/openssl:0= - dev-db/sqlite:3 - - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtnetwork:5 - dev-qt/qtdbus:5 - shibboleth? ( || ( dev-qt/qtwebengine:5[widgets] dev-qt/qtwebkit:5 ) )" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 - test? ( dev-qt/qttest:5 )" - -src_prepare() { - eapply "${FILESDIR}/${PN}-select-qt5.patch" - cmake-utils_src_prepare - if use shibboleth ; then - if ! has_version "dev-qt/qtwebengine:5[widgets]" ; then - sed -i -e 's/IF(WIN32 OR DETECTED_QT_VERSION VERSION_LESS 5.6.0)/IF(TRUE)/' CMakeLists.txt || die - fi - fi -} - -src_configure() { - local mycmakeargs=( - -DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)" - -DBUILD_TESTING="$(usex test)" - ) - cmake-utils_src_configure -} diff --git a/net-misc/seafile-client/seafile-client-6.1.7.ebuild b/net-misc/seafile-client/seafile-client-6.1.7.ebuild new file mode 100644 index 000000000000..08b04cd8efc6 --- /dev/null +++ b/net-misc/seafile-client/seafile-client-6.1.7.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit cmake-utils gnome2-utils + +DESCRIPTION="Seafile desktop client" +HOMEPAGE="https://github.com/haiwen/seafile-client/ http://www.seafile.com/" +SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="shibboleth test" + +RDEPEND="net-libs/libsearpc + =net-libs/ccnet-${PV} + =net-misc/seafile-${PV} + dev-libs/libevent + dev-libs/jansson + dev-libs/openssl:0 + dev-db/sqlite:3 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtnetwork:5 + dev-qt/qtdbus:5 + shibboleth? ( || ( dev-qt/qtwebengine:5[widgets] dev-qt/qtwebkit:5 ) )" +DEPEND="${RDEPEND} + dev-qt/linguist-tools:5 + test? ( dev-qt/qttest:5 )" + +src_prepare() { + eapply "${FILESDIR}/${PN}-select-qt5.patch" + cmake-utils_src_prepare + if use shibboleth ; then + if ! has_version "dev-qt/qtwebengine:5[widgets]" ; then + sed -i -e 's/IF(WIN32 OR DETECTED_QT_VERSION VERSION_LESS 5.6.0)/IF(TRUE)/' CMakeLists.txt || die + fi + fi +} + +src_configure() { + local mycmakeargs=( + -DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)" + -DBUILD_TESTING="$(usex test)" + ) + cmake-utils_src_configure +} + +pkg_postinst() { + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update +} diff --git a/net-misc/seafile/Manifest b/net-misc/seafile/Manifest index 54b8a899c3c7..275b26ff554e 100644 --- a/net-misc/seafile/Manifest +++ b/net-misc/seafile/Manifest @@ -1,9 +1,3 @@ -DIST seafile-6.0.7.tar.gz 823384 BLAKE2B eedb4e4333d01bc6e5a7d18bc0035aa921a00d2c2fadc151dc34971dbb0191c7220607e91422a5b75d957f037d90aa814faffdf3f7cd4dbc5bee5d17a49c1c92 SHA512 ec33fbb6b925d4be9b89140d75287115e09f570654946aff994eb50d2ca46e233005b8e0e917682822806d0b5fd70cb9b8a728bb0fd09d124adaadaf3efc849a -DIST seafile-6.1.0.tar.gz 823289 BLAKE2B 446606192eac43b5c0b56a322452e0573b1f9f80d66167fa67a99dc236f0e7f2d8d167129a01f70d138208afca467779ffab6f911f7f0bc99a4c730c0181c3ba SHA512 ccf2c66288093da7a00c24d019a1d765c6072485584d045b0d7acec4faee3448f52448113976eaf63950b1feda2c08d8ebda274f3178ca8ca6c643a822dde3fa -DIST seafile-6.1.3.tar.gz 823078 BLAKE2B 320f237db2d4c6f1bc7928627c404a1fcdc55a381d62a572e31a086e06abc35cae6ae848d28771e0882911a51477322436c8da58fc7948af201f731ea88b27c7 SHA512 c8c046952d5c8910f0ba444cdcaa2659260d328ba6449099777850e7d04f494186c56a2fd00e43fd20372c817d977e1a2fe36be040521ca92742c48d83d0b777 -DIST seafile-6.1.4.tar.gz 824276 BLAKE2B c21d01640128d52a9ee0ff05454107d84535942d5f5117de507e1898367fb9cd6adcaa15054a86ca3abbf9f5e69810cf26ac75d9f12b1439811d88aa5b87603f SHA512 5efcb3122877f9091f76b0946ba66104baf626bc1be9bc0eb980e26aa07ffdbe5ee74ea6780043796603d0f2bfe7ea2800718085acdae6f07268275a8f54269f -EBUILD seafile-6.0.7.ebuild 955 BLAKE2B 53f8c76e2b79df08a64fc82b0fbd347c924e8e71b546ed749e8b1d56173f7497dc3555cbe7df59b92b30118a32ad27598e6aad3325909090d1eec94da01e7057 SHA512 57e1abde70f6f9c75070d206c49975ee2433cb7318c266a5e5e42732deb29b47b3c3b9d0f2cc61da192820a397540220e3a538169fb48d869ab86b7f7c4321ba -EBUILD seafile-6.1.0.ebuild 955 BLAKE2B 53f8c76e2b79df08a64fc82b0fbd347c924e8e71b546ed749e8b1d56173f7497dc3555cbe7df59b92b30118a32ad27598e6aad3325909090d1eec94da01e7057 SHA512 57e1abde70f6f9c75070d206c49975ee2433cb7318c266a5e5e42732deb29b47b3c3b9d0f2cc61da192820a397540220e3a538169fb48d869ab86b7f7c4321ba -EBUILD seafile-6.1.3.ebuild 1126 BLAKE2B 91321048dba6b1de7317e93cb57976d4c808e2ed5216a3cad08518e53612360ec567b2055a63a34dfd0d56e95c105750d27f3912a3d90c76e7fa214086234e9b SHA512 c8f564ca319459320d0059e81e94e728aef02e92f5d780a0f63928dcb845aaf53f93d0d05af6e9b8950390d65ed341c7f1e1760d2eaa2b9c7e0a0df59edb7947 -EBUILD seafile-6.1.4.ebuild 1126 BLAKE2B 91321048dba6b1de7317e93cb57976d4c808e2ed5216a3cad08518e53612360ec567b2055a63a34dfd0d56e95c105750d27f3912a3d90c76e7fa214086234e9b SHA512 c8f564ca319459320d0059e81e94e728aef02e92f5d780a0f63928dcb845aaf53f93d0d05af6e9b8950390d65ed341c7f1e1760d2eaa2b9c7e0a0df59edb7947 +DIST seafile-6.1.7.tar.gz 825734 BLAKE2B 204ede4870f15cbfa9da7e51f565078290b4d03d36a0f8f7a35d54ca1f26c414c350ac05628054d290723b067dfda45aeec1777a2d32e1b376654323106083a4 SHA512 5ae27b2f8e84d57ecd9d81a42fab9611d56a260adb027fba427a700d0d17cd215b3c5b5b37df7e14181bb9ae7df611df9895181de135425ec42da44511d2545e +EBUILD seafile-6.1.7.ebuild 1091 BLAKE2B dab7de91b98b99108a2aed235ccfdb5b72e3a3aa5fb56f0ae8cdd5611b6c0b72656a80bf02de318f5ee5656591e73c734417dc4df70db37cc63a710e459f15d6 SHA512 bc9b4513c3c7217c26a0a71dbd140197fd4c762e3718796e1a9a3f871d7a2e838e59525cfff0ea52e0687c8b7ff30b924a6e082eac2dd1617b4b6638259ba290 MISC metadata.xml 416 BLAKE2B 72bb9c35eb247e292093a6fc05fc13228080139c50b1b3468fad25d08accd6bdc0a5c0bcbe27e058d123d9b289f6af01d9bde66843583faa7ab59b38f2018bc3 SHA512 e4d42b41560e43e00c0892649631a8f9a2114c95a2dda910b30bb4784c110a46f7effd1af0f09fcefcc7cf9287d5da8dfc51b69dfefc3e7d328387a842a6b000 diff --git a/net-misc/seafile/seafile-6.0.7.ebuild b/net-misc/seafile/seafile-6.0.7.ebuild deleted file mode 100644 index 1317706f5e46..000000000000 --- a/net-misc/seafile/seafile-6.0.7.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -inherit autotools python-single-r1 vala - -DESCRIPTION="File syncing and sharing software with file encryption and group sharing" -HOMEPAGE="https://github.com/haiwen/seafile/ http://www.seafile.com/" -SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+-with-openssl-exception" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - net-libs/libsearpc[${PYTHON_USEDEP}] - =net-libs/ccnet-${PV}[${PYTHON_USEDEP}] - >=dev-libs/glib-2.16.0:2 - >=dev-libs/libevent-2.0 - >=dev-libs/jansson-2.2.1 - >=sys-libs/zlib-1.2.0 - >=net-misc/curl-7.17 - dev-libs/openssl:0= - dev-db/sqlite:3" -DEPEND="${RDEPEND} - $(vala_depend)" - -src_prepare() { - default - sed -i -e 's/valac /${VALAC} /' lib/Makefile.am || die - eautoreconf - vala_src_prepare -} diff --git a/net-misc/seafile/seafile-6.1.0.ebuild b/net-misc/seafile/seafile-6.1.0.ebuild deleted file mode 100644 index 1317706f5e46..000000000000 --- a/net-misc/seafile/seafile-6.1.0.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -inherit autotools python-single-r1 vala - -DESCRIPTION="File syncing and sharing software with file encryption and group sharing" -HOMEPAGE="https://github.com/haiwen/seafile/ http://www.seafile.com/" -SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+-with-openssl-exception" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - net-libs/libsearpc[${PYTHON_USEDEP}] - =net-libs/ccnet-${PV}[${PYTHON_USEDEP}] - >=dev-libs/glib-2.16.0:2 - >=dev-libs/libevent-2.0 - >=dev-libs/jansson-2.2.1 - >=sys-libs/zlib-1.2.0 - >=net-misc/curl-7.17 - dev-libs/openssl:0= - dev-db/sqlite:3" -DEPEND="${RDEPEND} - $(vala_depend)" - -src_prepare() { - default - sed -i -e 's/valac /${VALAC} /' lib/Makefile.am || die - eautoreconf - vala_src_prepare -} diff --git a/net-misc/seafile/seafile-6.1.3.ebuild b/net-misc/seafile/seafile-6.1.3.ebuild deleted file mode 100644 index 8c268d75d841..000000000000 --- a/net-misc/seafile/seafile-6.1.3.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -inherit autotools python-single-r1 vala - -DESCRIPTION="File syncing and sharing software with file encryption and group sharing" -HOMEPAGE="https://github.com/haiwen/seafile/ http://www.seafile.com/" -SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+-with-openssl-exception" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - net-libs/libsearpc[${PYTHON_USEDEP}] - =net-libs/ccnet-${PV}[${PYTHON_USEDEP}] - >=dev-libs/glib-2.16.0:2 - >=dev-libs/libevent-2.0 - >=dev-libs/jansson-2.2.1 - >=sys-libs/zlib-1.2.0 - >=net-misc/curl-7.17 - dev-libs/openssl:0= - dev-db/sqlite:3" -DEPEND="${RDEPEND} - $(vala_depend)" - -src_prepare() { - default - sed -i -e 's/valac /${VALAC} /' lib/Makefile.am || die - eautoreconf - vala_src_prepare -} - -src_install() { - default - # Remove unnecessary .la files, as recommended by ltprune.eclass - find "${ED}" -name '*.la' -delete || die - python_fix_shebang "${ED}"usr/bin -} diff --git a/net-misc/seafile/seafile-6.1.4.ebuild b/net-misc/seafile/seafile-6.1.4.ebuild deleted file mode 100644 index 8c268d75d841..000000000000 --- a/net-misc/seafile/seafile-6.1.4.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -inherit autotools python-single-r1 vala - -DESCRIPTION="File syncing and sharing software with file encryption and group sharing" -HOMEPAGE="https://github.com/haiwen/seafile/ http://www.seafile.com/" -SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+-with-openssl-exception" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - net-libs/libsearpc[${PYTHON_USEDEP}] - =net-libs/ccnet-${PV}[${PYTHON_USEDEP}] - >=dev-libs/glib-2.16.0:2 - >=dev-libs/libevent-2.0 - >=dev-libs/jansson-2.2.1 - >=sys-libs/zlib-1.2.0 - >=net-misc/curl-7.17 - dev-libs/openssl:0= - dev-db/sqlite:3" -DEPEND="${RDEPEND} - $(vala_depend)" - -src_prepare() { - default - sed -i -e 's/valac /${VALAC} /' lib/Makefile.am || die - eautoreconf - vala_src_prepare -} - -src_install() { - default - # Remove unnecessary .la files, as recommended by ltprune.eclass - find "${ED}" -name '*.la' -delete || die - python_fix_shebang "${ED}"usr/bin -} diff --git a/net-misc/seafile/seafile-6.1.7.ebuild b/net-misc/seafile/seafile-6.1.7.ebuild new file mode 100644 index 000000000000..5e871abceb5b --- /dev/null +++ b/net-misc/seafile/seafile-6.1.7.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) +inherit autotools python-single-r1 vala + +DESCRIPTION="File syncing and sharing software with file encryption and group sharing" +HOMEPAGE="https://github.com/haiwen/seafile/ http://www.seafile.com/" +SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+-with-openssl-exception" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + net-libs/libsearpc[${PYTHON_USEDEP}] + =net-libs/ccnet-${PV}[${PYTHON_USEDEP}] + dev-libs/glib:2 + dev-libs/libevent:0 + dev-libs/jansson + sys-libs/zlib:0 + net-misc/curl + dev-libs/openssl:0 + dev-db/sqlite:3" +DEPEND="${RDEPEND} + $(vala_depend)" + +src_prepare() { + default + sed -i -e 's/valac /${VALAC} /' lib/Makefile.am || die + eautoreconf + vala_src_prepare +} + +src_install() { + default + # Remove unnecessary .la files, as recommended by ltprune.eclass + find "${ED}" -name '*.la' -delete || die + python_fix_shebang "${ED}"usr/bin +} diff --git a/net-misc/socket-burst-dampener/Manifest b/net-misc/socket-burst-dampener/Manifest index 064d6bdd6b60..b1aba8ffc103 100644 --- a/net-misc/socket-burst-dampener/Manifest +++ b/net-misc/socket-burst-dampener/Manifest @@ -1,5 +1,5 @@ DIST socket-burst-dampener-1.1.0.tar.gz 3188 BLAKE2B f9a13844aaff9961c52fbb3bbc2c44a6756a4586151f2fa2e25abe352d3407fd2588dc5cb69c050aedcf920ebc8b76d55316a7ecdf93451772fc0372da329718 SHA512 f77e3e0cb26655c1c4477309f358f3d167e6ac89cfbd1e21c12aff7f33a22a956a8d2c77c28c888360f03b9aff4c9b1fa7174e4830e874bfc515285189c36cb9 DIST socket-burst-dampener-1.2.0.tar.gz 3823 BLAKE2B 44a24eb357647873e328bad302e89cb08ec48389deb0e2abb9b7cfcba32001805929b3e5df0045ca38e64d51fce0784e9bafd17b9f840d65e0114c25a4228592 SHA512 e2130abf33c95255dc4249fb82a628b2569a0db8582f4b42b07b0c2c88d7f3968634062a4befc9ab4a257c750e31dbc5ffc5512a9b1ab2e34c8f660f598da080 -EBUILD socket-burst-dampener-1.1.0.ebuild 637 BLAKE2B abe8b976b005696e313484277dca0ae9e8c6aabf0af098b090aa8915fc75a714227eb89e311a58483e39fb5ef79e620734c5d68ce638ad0fa63c09864639028f SHA512 61e6653587c014c870cf35bed564c7687523c501be33a8559e8958514a43b87140e590727ae79bb7e17c137657913ad01e79f6a0b5b33a167eed2edb31a135ea -EBUILD socket-burst-dampener-1.2.0.ebuild 639 BLAKE2B 8346878af5108cc7250dac7a324444efa46d5a32b797e2b501b6e22a46c1d58728cd624357dee6ba35e8216e2f7c9053beb59b63a40670cfbdeb433699e1927e SHA512 696c82341529eaefc676aa00472a8930002b34d0296eb21cf011d20e5819d795e2a543b33e11dac560a93be8fe3e02619e49048d1c5f9f5b47a5784118e06adb +EBUILD socket-burst-dampener-1.1.0.ebuild 652 BLAKE2B 2dbc38dbb3ae31cb910ce298742e73e34f9c8a4b865e515d0f812a7827fe9d409b799b9c61fab4cb762af016a81bc00590377af4ac063c979b913e34f6125276 SHA512 cd4fb995af5c8b4c6dc6ca361b7680f017013997ef80c2f2e9c3fcb20e6bf946f888384c74c35c4b875b6c229840a0ee27d2587615fe36449f984db3552b238e +EBUILD socket-burst-dampener-1.2.0.ebuild 654 BLAKE2B bfbbc8d6f874f6490e5bddf0feb4d1ab4f3b80492a9a9bb21b730e7224e856cd7dc62ff64e101ce8318688c4d120c2ba50f0905bf5a102fbd29f71af663f03bd SHA512 7425146c93f6fae56e73a8250a48153c1b160261976120f7f07393373467f60dd6b148534c3adac718508596e68b196bc2af02939f30ee74016f4d678367777d MISC metadata.xml 312 BLAKE2B af48a35f7fa9f645522293faddb615bea586daf209350d9697863ddc979f489863cbad923786c8dde79284d103110347f095ca0dfe8913ea328dbd9d142255bc SHA512 ba8571dd5e13df29810fdc4fc852da5bc40fc5e4c6b58fe94b85801b678c768ed2c0a7908303a46307351ee282705fd547e4b0e92b3ab8fd18338d819a0cf4b1 diff --git a/net-misc/socket-burst-dampener/socket-burst-dampener-1.1.0.ebuild b/net-misc/socket-burst-dampener/socket-burst-dampener-1.1.0.ebuild index 572942950dbf..1fbe27ec7f16 100644 --- a/net-misc/socket-burst-dampener/socket-burst-dampener-1.1.0.ebuild +++ b/net-misc/socket-burst-dampener/socket-burst-dampener-1.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{4,5} ) inherit distutils-r1 DESCRIPTION="A daemon that spawns one command per connection, and dampens connection bursts" -HOMEPAGE="https://github.com/zmedico/${PN}" +HOMEPAGE="https://github.com/zmedico/socket-burst-damener" SRC_URI="https://github.com/zmedico/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" diff --git a/net-misc/socket-burst-dampener/socket-burst-dampener-1.2.0.ebuild b/net-misc/socket-burst-dampener/socket-burst-dampener-1.2.0.ebuild index f3abae3360a3..717d3e2470e6 100644 --- a/net-misc/socket-burst-dampener/socket-burst-dampener-1.2.0.ebuild +++ b/net-misc/socket-burst-dampener/socket-burst-dampener-1.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{4,5,6} ) inherit distutils-r1 DESCRIPTION="A daemon that spawns one command per connection, and dampens connection bursts" -HOMEPAGE="https://github.com/zmedico/${PN}" +HOMEPAGE="https://github.com/zmedico/socket-burst-damener" SRC_URI="https://github.com/zmedico/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" diff --git a/net-misc/taylor-uucp/Manifest b/net-misc/taylor-uucp/Manifest index 41820f752f89..31f281eb17de 100644 --- a/net-misc/taylor-uucp/Manifest +++ b/net-misc/taylor-uucp/Manifest @@ -2,5 +2,5 @@ AUX taylor-uucp-1.07-fprintf.patch 188 BLAKE2B 13900fdaffd964d5e38a4bc3d2acce267 AUX taylor-uucp-1.07-gentoo.patch 5049 BLAKE2B 3d010ff0841df59196d38e7450b85c4d36c2ccd770a4c31d29962e3c3f87d5a264977fa2f715a9bb91fec44f60dd5e045eed440e0fb482be525702497f3ad2a1 SHA512 8d259ddf10c80ff6c349d3bec531f858d561f3f488fd6066d69ddb8d2242e9f22ff8781ce47dcdb10f3dbf4a073bc4bf3492f6fced30d8d129e6f81e860f971a DIST uucp-1.07.tar.gz 1013234 BLAKE2B 5734bd1b8afcc9cb9b0dcc25afe73ee89b6007249a73d286bc39975bc0cd7a1907e360dfaa050175d87e34a7d468a70a7cae75124c920f00f03ff52f16629bb3 SHA512 13d215890234e638bed53dce7bab6eb78e0ce6b658f23ac1d7f8abc6e1d97963bef76aa4148ca644f450d5a1678fac940b73fbcd5845d7f5bea3afbd8055229b EBUILD taylor-uucp-1.07-r2.ebuild 1335 BLAKE2B 208bd348ed599458c28218bb70cda5210fa8b94edc48408a170029f06f31f4463e2cf55279525c591d7902a7cbbc490842bffca4626a5d218d7480b83f151ead SHA512 9c9311da8d8771912a782bb53bb98863cef91f6bbbd8f3d6aefa6c46e28f8fa90a036c8e5befc58a71b26b6c1bba19a2b4b5a605388b7599a7c10a031d979e90 -EBUILD taylor-uucp-1.07-r3.ebuild 1370 BLAKE2B 023b033715d11cea36398327555f1031f513c6cf8e454718b92a633335ceddb4679ef47277705d958f74d24c61d081e25d27bde3a33d1b6fbefe6429b0c56f7a SHA512 58b767f927226044edcd16db462e32bd27d27ce5ee0d129111b46231117aee928f99d755e18bb307b58797d1bd99cd9774a6a88cfb3b6a2483517bd324d0fb53 +EBUILD taylor-uucp-1.07-r3.ebuild 1369 BLAKE2B 0f05ddedbee644109c9f404e87d4df108d1bb83da1c28204c84763450a7c304e67a55ba28aa67d745bb7bc1f2e883b2b47048dee7224d675dca9e7cf5e7c9e1f SHA512 d6363bdfde01a5348389589ec82a98b3c29765f688f22e9cbe87b2c6b42359e96d505528a38911f30b4e4b3f10a379f914039dc167a3eb23965567553248bf30 MISC metadata.xml 319 BLAKE2B f7bd226c6082b2d19d38b6d20aa6d859e6076e226cf2ae3a4013ee5ff558f7dba27cee1fcd159785679fe03b37082d57232d7ecf6f86e832a60e3d8c4f528d57 SHA512 14fddbb3e6a6f0defe184c909d8ae29072782e3060dd5c91f852572039ca81be95f9cae98f6a4a011711cd991bcfa886638d725372463b3af4ee7f15654ad22d diff --git a/net-misc/taylor-uucp/taylor-uucp-1.07-r3.ebuild b/net-misc/taylor-uucp/taylor-uucp-1.07-r3.ebuild index 5f7b74f252f6..eaf9e839e961 100644 --- a/net-misc/taylor-uucp/taylor-uucp-1.07-r3.ebuild +++ b/net-misc/taylor-uucp/taylor-uucp-1.07-r3.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/uucp/uucp-${PV}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 ~arm ia64 ~ppc sparc ~x86" +KEYWORDS="alpha amd64 ~arm ia64 ~ppc sparc x86" S="${WORKDIR}/uucp-${PV}" diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest index 52cf7fd82675..dedc24254ffc 100644 --- a/net-misc/youtube-dl/Manifest +++ b/net-misc/youtube-dl/Manifest @@ -1,8 +1,8 @@ DIST youtube-dl-2017.11.15.tar.gz 2834012 BLAKE2B fd93e3923f99874be58681a886c09e31ac10063975ab636badf27e59b44743c72cddf05e3a431c49ffd0f7b40f9b005f4d90feff85d4ca889dee80833300b076 SHA512 e10c0d53db7fdfb02610b53f54046c0a9354b305ba05c5d00a43649a283a6449263f66ff56171d52cf18f906c6aeccc25dc48ea708b4b1bb2b8323b937abca96 -DIST youtube-dl-2018.03.20.tar.gz 2934486 BLAKE2B 52149045f4832e14c92203e2b59904134a88cd58c817b4391f03592d7fc6ad83ce1681733af8d2c21305b67008805d3840cf54ca109f0d101c443534e66baa31 SHA512 5423454a72dbb81f492b594b421a77c804d9a54fc11d287336b413d4ce5934cc58125ac8da318475d888d18dbb2c24f49a8f3d3c014d730a57857a9c7c93c0d7 DIST youtube-dl-2018.04.03.tar.gz 2941371 BLAKE2B 6fef90822cca2b8d8302b3ef7489be4d22b6d74ae944b11f47f45c2bdf366126beee035cbf3a5b686f87cdb5c5d22040520106d4a4ae6826bd4033e2ae54e1f4 SHA512 a26c34c61bb9871706f39b48406e40abd7c037c444e9573343617f2f48a6516316f95de753cfd359e81fb77d2654746f23fe282e0664d02470cf8551247bb4d9 +DIST youtube-dl-2018.04.09.tar.gz 2944297 BLAKE2B 3c89b4d7de10f7ce181281788d0eb32d75fe1ee398b28ca1fb3a7dc0178c9f60a5a366b0db14d82e107fd00143d161165385f8797f8a34873c69cd3eb3ddeb94 SHA512 48c2d56493d5a0db911ea3e443dc7a87fe345de2da2094cad037901267480c3b44f8f927480547ffa527240ea4c1b650f31e01068ba72c49518c4895e554572f EBUILD youtube-dl-2017.11.15.ebuild 2376 BLAKE2B 184105b328f74b20fbb61357b33aeff4b3d4a984179398c9ebbd67a3973a0e0730b98e3414e52d7cf89c7bb15340491d110dc0480b033d4c49714c0cd3ff387c SHA512 baefa087e59c737053e923f7a384ab22ba727f3b9ffd02fad2d80d0fea957babe2ca40f19889eabbf4237416df9cdacfe4b5df2b106a3a7dd4fe1aed9c62a49f -EBUILD youtube-dl-2018.03.20.ebuild 3291 BLAKE2B 9b8e6327eeadff5e7a88a1b8ef124ff4bc062b4315342a28ec0475f08e128c74b676732444bb85effa3e6d13dc1fc00d85d080e4ca519ad6a6b2edfcc3b64dc7 SHA512 9e9f103435767d8210fbbe3fcc6637507d3a949a669ed3df1b8059404eef9ea8ba6c2cb4d0d350c3670f365bf5e91d1350e14bd50a3bfe9d698a3a590d892d43 EBUILD youtube-dl-2018.04.03.ebuild 3291 BLAKE2B 9b8e6327eeadff5e7a88a1b8ef124ff4bc062b4315342a28ec0475f08e128c74b676732444bb85effa3e6d13dc1fc00d85d080e4ca519ad6a6b2edfcc3b64dc7 SHA512 9e9f103435767d8210fbbe3fcc6637507d3a949a669ed3df1b8059404eef9ea8ba6c2cb4d0d350c3670f365bf5e91d1350e14bd50a3bfe9d698a3a590d892d43 +EBUILD youtube-dl-2018.04.09.ebuild 3291 BLAKE2B 9b8e6327eeadff5e7a88a1b8ef124ff4bc062b4315342a28ec0475f08e128c74b676732444bb85effa3e6d13dc1fc00d85d080e4ca519ad6a6b2edfcc3b64dc7 SHA512 9e9f103435767d8210fbbe3fcc6637507d3a949a669ed3df1b8059404eef9ea8ba6c2cb4d0d350c3670f365bf5e91d1350e14bd50a3bfe9d698a3a590d892d43 EBUILD youtube-dl-99999999.ebuild 2089 BLAKE2B df876c715ffaa403d175515951e751611df0cb89e815515b045bebb29add327aa0df50f25303864e1ff0abe8f19a53718e9d20c64dd9d3ead549ad57125376d0 SHA512 a390ee79a77aa98603ca01a702df6621ac4630e62e7afd089e065bd4468fc38bfd13bba365e28916024f0eb9e92627133281985f57692432522aeb4671a0cf11 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27 diff --git a/net-misc/youtube-dl/youtube-dl-2018.03.20.ebuild b/net-misc/youtube-dl/youtube-dl-2018.03.20.ebuild deleted file mode 100644 index cb6c9aff43e0..000000000000 --- a/net-misc/youtube-dl/youtube-dl-2018.03.20.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6}) -inherit bash-completion-r1 distutils-r1 readme.gentoo-r1 - -DESCRIPTION="Download videos from YouTube.com (and more sites...)" -HOMEPAGE="https://rg3.github.com/youtube-dl/" -SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" -IUSE="+offensive test" - -RDEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] -" -DEPEND=" - ${RDEPEND} - test? ( dev-python/nose[coverage(+)] ) -" - -S="${WORKDIR}/${PN}" - -python_prepare_all() { - if ! use offensive; then - sed -i -e "/..version../s|'$|+gentoo.no.offensive.sites'|g" \ - youtube_dl/version.py || die - # these have single line import statements - local xxx=( - alphaporno anysex behindkink camwithher chaturbate eporner - eroprofile extremetube foxgay goshgay hellporno hentaistigma - hornbunny keezmovies lovehomeporn mofosex myvidster porn91 porncom - pornflip pornhd pornotube pornovoisines pornoxo ruleporn sexu - slutload spankbang spankwire sunporno thisav tube8 vporn - watchindianporn xbef xnxx xtube xvideos xxxymovies youjizz youporn - ) - # these have multi-line import statements - local mxxx=( - drtuber fourtube motherless pornhub redtube tnaflix xhamster - ) - # do single line imports - sed -i \ - -e $( printf '/%s/d;' ${xxx[@]} ) \ - youtube_dl/extractor/extractors.py \ - || die - - # do multiple line imports - sed -i \ - -e $( printf '/%s/,/)/d;' ${mxxx[@]} ) \ - youtube_dl/extractor/extractors.py \ - || die - - sed -i \ - -e $( printf '/%s/d;' ${mxxx[@]} ) \ - youtube_dl/extractor/generic.py \ - || die - - rm \ - $( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \ - $( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \ - test/test_age_restriction.py \ - || die - fi - - eapply_user - - distutils-r1_python_prepare_all -} - -src_compile() { - distutils-r1_src_compile -} - -python_test() { - emake test -} - -python_install_all() { - dodoc README.txt - doman ${PN}.1 - - newbashcomp ${PN}.bash-completion ${PN} - - insinto /usr/share/zsh/site-functions - newins youtube-dl.zsh _youtube-dl - - insinto /usr/share/fish/completions - doins youtube-dl.fish - - distutils-r1_python_install_all - - rm -r "${ED}"/usr/etc || die - rm -r "${ED}"/usr/share/doc/youtube_dl || die -} - -pkg_postinst() { - elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /" - elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :" - elog - elog "${PN} works fine on its own on most sites. However, if you want" - elog "to convert video/audio, you'll need avconf (media-video/libav) or" - elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -" - elog "videos can be retrieved in a higher quality format without sound." - elog "${PN} will detect whether avconv/ffmpeg is present and" - elog "automatically pick the best option." - - elog - elog "Videos or video formats streamed via RTMP protocol can only be" - elog "downloaded when rtmpdump (media-video/rtmpdump) is installed." - elog "Downloading MMS and RTSP videos requires either mplayer" - elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed." -} diff --git a/net-misc/youtube-dl/youtube-dl-2018.04.09.ebuild b/net-misc/youtube-dl/youtube-dl-2018.04.09.ebuild new file mode 100644 index 000000000000..cb6c9aff43e0 --- /dev/null +++ b/net-misc/youtube-dl/youtube-dl-2018.04.09.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6}) +inherit bash-completion-r1 distutils-r1 readme.gentoo-r1 + +DESCRIPTION="Download videos from YouTube.com (and more sites...)" +HOMEPAGE="https://rg3.github.com/youtube-dl/" +SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" +IUSE="+offensive test" + +RDEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] +" +DEPEND=" + ${RDEPEND} + test? ( dev-python/nose[coverage(+)] ) +" + +S="${WORKDIR}/${PN}" + +python_prepare_all() { + if ! use offensive; then + sed -i -e "/..version../s|'$|+gentoo.no.offensive.sites'|g" \ + youtube_dl/version.py || die + # these have single line import statements + local xxx=( + alphaporno anysex behindkink camwithher chaturbate eporner + eroprofile extremetube foxgay goshgay hellporno hentaistigma + hornbunny keezmovies lovehomeporn mofosex myvidster porn91 porncom + pornflip pornhd pornotube pornovoisines pornoxo ruleporn sexu + slutload spankbang spankwire sunporno thisav tube8 vporn + watchindianporn xbef xnxx xtube xvideos xxxymovies youjizz youporn + ) + # these have multi-line import statements + local mxxx=( + drtuber fourtube motherless pornhub redtube tnaflix xhamster + ) + # do single line imports + sed -i \ + -e $( printf '/%s/d;' ${xxx[@]} ) \ + youtube_dl/extractor/extractors.py \ + || die + + # do multiple line imports + sed -i \ + -e $( printf '/%s/,/)/d;' ${mxxx[@]} ) \ + youtube_dl/extractor/extractors.py \ + || die + + sed -i \ + -e $( printf '/%s/d;' ${mxxx[@]} ) \ + youtube_dl/extractor/generic.py \ + || die + + rm \ + $( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \ + $( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \ + test/test_age_restriction.py \ + || die + fi + + eapply_user + + distutils-r1_python_prepare_all +} + +src_compile() { + distutils-r1_src_compile +} + +python_test() { + emake test +} + +python_install_all() { + dodoc README.txt + doman ${PN}.1 + + newbashcomp ${PN}.bash-completion ${PN} + + insinto /usr/share/zsh/site-functions + newins youtube-dl.zsh _youtube-dl + + insinto /usr/share/fish/completions + doins youtube-dl.fish + + distutils-r1_python_install_all + + rm -r "${ED}"/usr/etc || die + rm -r "${ED}"/usr/share/doc/youtube_dl || die +} + +pkg_postinst() { + elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /" + elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :" + elog + elog "${PN} works fine on its own on most sites. However, if you want" + elog "to convert video/audio, you'll need avconf (media-video/libav) or" + elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -" + elog "videos can be retrieved in a higher quality format without sound." + elog "${PN} will detect whether avconv/ffmpeg is present and" + elog "automatically pick the best option." + + elog + elog "Videos or video formats streamed via RTMP protocol can only be" + elog "downloaded when rtmpdump (media-video/rtmpdump) is installed." + elog "Downloading MMS and RTSP videos requires either mplayer" + elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed." +} -- cgit v1.2.3