From 586819755b4dbfdffdc8a725ab7c0f86095b8489 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 15 Sep 2018 17:37:09 +0100 Subject: gentoo resync : 15.09.2018 --- net-misc/Manifest.gz | Bin 60504 -> 60497 bytes net-misc/apt-cacher-ng/Manifest | 4 +- net-misc/apt-cacher-ng/apt-cacher-ng-3.2.ebuild | 118 ++++++ net-misc/apt-cacher-ng/apt-cacher-ng-3.ebuild | 117 ------ net-misc/aria2/Manifest | 4 +- net-misc/aria2/aria2-1.33.1.ebuild | 152 ------- net-misc/aria2/aria2-1.34.0.ebuild | 2 +- net-misc/curl/Manifest | 2 +- net-misc/curl/curl-7.61.1.ebuild | 2 +- net-misc/dhcp/Manifest | 2 +- net-misc/dhcp/dhcp-4.3.6_p1.ebuild | 2 +- net-misc/geoipupdate/Manifest | 4 +- net-misc/geoipupdate/geoipupdate-2.5.0.ebuild | 26 -- net-misc/geoipupdate/geoipupdate-3.1.1.ebuild | 26 ++ net-misc/memcached/Manifest | 4 +- net-misc/memcached/memcached-1.5.10.ebuild | 2 +- net-misc/memcached/memcached-1.5.9.ebuild | 95 ----- net-misc/netpipe/Manifest | 4 +- net-misc/netpipe/netpipe-1.0.0_beta2-r1.ebuild | 31 -- net-misc/netpipe/netpipe-1.0.0_beta2-r2.ebuild | 2 +- net-misc/netpipe/netpipe-1.0.0_beta2.ebuild | 34 -- net-misc/openssh/Manifest | 11 + .../openssh/files/openssh-7.8_p1-GSSAPI-dns.patch | 359 +++++++++++++++++ .../files/openssh-7.8_p1-X509-no-version.patch | 19 + .../files/openssh-7.8_p1-hpn-X509-glue.patch | 79 ++++ .../openssh/files/openssh-7.8_p1-hpn-glue.patch | 112 ++++++ .../files/openssh-7.8_p1-hpn-sctp-glue.patch | 17 + net-misc/openssh/openssh-7.8_p1.ebuild | 438 +++++++++++++++++++++ net-misc/qtm/Manifest | 4 +- net-misc/qtm/qtm-1.3.18-r1.ebuild | 52 --- net-misc/qtm/qtm-1.3.19.ebuild | 2 +- net-misc/snarf/Manifest | 2 +- net-misc/snarf/snarf-7.0-r4.ebuild | 2 +- net-misc/streamlink/Manifest | 14 +- net-misc/streamlink/streamlink-0.1.0.ebuild | 39 -- net-misc/streamlink/streamlink-0.11.0.ebuild | 59 --- net-misc/streamlink/streamlink-0.14.2-r1.ebuild | 70 ++++ net-misc/streamlink/streamlink-0.4.0.ebuild | 51 --- net-misc/streamlink/streamlink-0.6.0.ebuild | 51 --- net-misc/streamlink/streamlink-0.7.0.ebuild | 54 --- net-misc/streamlink/streamlink-0.9.0.ebuild | 59 --- net-misc/youtube-dl/Manifest | 8 +- net-misc/youtube-dl/youtube-dl-2018.08.28.ebuild | 115 ------ net-misc/youtube-dl/youtube-dl-2018.09.01.ebuild | 115 ------ net-misc/youtube-dl/youtube-dl-2018.09.08.ebuild | 115 ++++++ net-misc/youtube-dl/youtube-dl-2018.09.10.ebuild | 115 ++++++ 46 files changed, 1503 insertions(+), 1092 deletions(-) create mode 100644 net-misc/apt-cacher-ng/apt-cacher-ng-3.2.ebuild delete mode 100644 net-misc/apt-cacher-ng/apt-cacher-ng-3.ebuild delete mode 100644 net-misc/aria2/aria2-1.33.1.ebuild delete mode 100644 net-misc/geoipupdate/geoipupdate-2.5.0.ebuild create mode 100644 net-misc/geoipupdate/geoipupdate-3.1.1.ebuild delete mode 100644 net-misc/memcached/memcached-1.5.9.ebuild delete mode 100644 net-misc/netpipe/netpipe-1.0.0_beta2-r1.ebuild delete mode 100644 net-misc/netpipe/netpipe-1.0.0_beta2.ebuild create mode 100644 net-misc/openssh/files/openssh-7.8_p1-GSSAPI-dns.patch create mode 100644 net-misc/openssh/files/openssh-7.8_p1-X509-no-version.patch create mode 100644 net-misc/openssh/files/openssh-7.8_p1-hpn-X509-glue.patch create mode 100644 net-misc/openssh/files/openssh-7.8_p1-hpn-glue.patch create mode 100644 net-misc/openssh/files/openssh-7.8_p1-hpn-sctp-glue.patch create mode 100644 net-misc/openssh/openssh-7.8_p1.ebuild delete mode 100644 net-misc/qtm/qtm-1.3.18-r1.ebuild delete mode 100644 net-misc/streamlink/streamlink-0.1.0.ebuild delete mode 100644 net-misc/streamlink/streamlink-0.11.0.ebuild create mode 100644 net-misc/streamlink/streamlink-0.14.2-r1.ebuild delete mode 100644 net-misc/streamlink/streamlink-0.4.0.ebuild delete mode 100644 net-misc/streamlink/streamlink-0.6.0.ebuild delete mode 100644 net-misc/streamlink/streamlink-0.7.0.ebuild delete mode 100644 net-misc/streamlink/streamlink-0.9.0.ebuild delete mode 100644 net-misc/youtube-dl/youtube-dl-2018.08.28.ebuild delete mode 100644 net-misc/youtube-dl/youtube-dl-2018.09.01.ebuild create mode 100644 net-misc/youtube-dl/youtube-dl-2018.09.08.ebuild create mode 100644 net-misc/youtube-dl/youtube-dl-2018.09.10.ebuild (limited to 'net-misc') diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz index 13ab7623accf..5d8fc4584242 100644 Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest index d858fe3ee705..427b16afadb7 100644 --- a/net-misc/apt-cacher-ng/Manifest +++ b/net-misc/apt-cacher-ng/Manifest @@ -4,7 +4,7 @@ AUX initd 725 BLAKE2B 3984d5c7f4b34fdb16420d29935edf2a5975e5f7aca2559506ba839d21 AUX initd-r1 906 BLAKE2B 828ac672348454842e3daeb62e39436dce86f3ff9ba2319755f2bc64a20d3dc9e73689c27f79e7f521b6d6553c5d6922eb1b8d72a52a97c7f92b2847b6322b9d SHA512 c4aa04ea30734f00c617684ea014c632bf0d43580ae7b7c6e9ae58e2c947d15177f93e7b92fd9f7b79d1898d0c6a386de1da7fa038dace6381cd72907845e57c AUX logrotate 377 BLAKE2B deaa8badb74a660419df29efc02d0f00d3100c4357f43e02c7c9eba305902a204d3b61073a3e483b0f7d614ddf4053bdc731737c5199b792380a922e25e2a49f SHA512 c2f4be7294953a63a89e5beee40029e03faa1db49986a6f8d974def67b064d391be13ecddec0d6b4d7ec369db6dcd0bafc328e90b54ccec911df739c719fd885 DIST apt-cacher-ng_3.1.orig.tar.xz 319308 BLAKE2B 6c312cda0f7ffb008b1175fc28fb8fdf9a521f0011c72d651f54d0f2f30856982be137f2facc05bc9770793f41ad445f5bbb96a3916be15d53858abffab5dbc0 SHA512 daebbf2fa6e140903eb6ddebcc62a4333486f2fa29a951724d316e4376b602e265094c42c9ffa5ba1f54aa93b1599d65c5c1bede39e088e9a52e4019276362fd -DIST apt-cacher-ng_3.orig.tar.xz 319996 BLAKE2B e744e3d9fa5441bf97e6fa8918f6a49f63792a0fb9a61b2223db99488f4929db0e97a3520dd4b8f1297d8e809150f8d33f0d45cba967412843d227b16d26d4a0 SHA512 4eb520d724c1397b9deefe8dc1b0af81f2151e50d1cabfc2480f040233ae1ee95434d0dcf2b4db8aec918204ae676a49e19e3c885674c7fb389972c2da64c3d4 +DIST apt-cacher-ng_3.2.orig.tar.xz 319036 BLAKE2B 576fc7a409556d34ee702edd57527c9c35eb033d0e8c8ea4f7b8a8a2dae86f75cd1ca3a7fb0e02845e70d6f8715692b638ff9d574ce1664b67fec9247b60fbc0 SHA512 7dfee4a8f38e7c5251c761a5faae063926c5001fe0b97136d938cdbff907e97fb0a20b89dcf685645a518e92be04fe5660d840e738960b4465408f04fe532cae EBUILD apt-cacher-ng-3.1.ebuild 2490 BLAKE2B 97ee553ef1c8102928c4db5c843ab46072fa8f1bb430013351ed1ed9c43eab83f4a9bcbbc14ca5ae56c5cc0fe339d072b80d0795b631db453f7413c12797a1fb SHA512 1b40a054f5a67e5ae802570a191691fa97d8fa275d11789a210b2d9c8e6c6c625fdcb46d6aa09736ede0c0133e77b873a033d18a414cc79c99152656c28573f6 -EBUILD apt-cacher-ng-3.ebuild 2490 BLAKE2B 97ee553ef1c8102928c4db5c843ab46072fa8f1bb430013351ed1ed9c43eab83f4a9bcbbc14ca5ae56c5cc0fe339d072b80d0795b631db453f7413c12797a1fb SHA512 1b40a054f5a67e5ae802570a191691fa97d8fa275d11789a210b2d9c8e6c6c625fdcb46d6aa09736ede0c0133e77b873a033d18a414cc79c99152656c28573f6 +EBUILD apt-cacher-ng-3.2.ebuild 2497 BLAKE2B bcf3587c34503a6bad3b32b1a666f2b8d42abd1f5d401dc40c92ae8bb94515b6c2b51aa1f41f2a79ee23919c41ec0a1c18f364188eea4a5376338d20380e2022 SHA512 ec023741c65c638d144b74f12e3340428f70982db16e020bccf2e9d2c1a5edcfc1c94a4e5ac2932fac32dcc019c6964f70902eada986c74390e848ada334540e MISC metadata.xml 493 BLAKE2B 6c2fb1f7abaee7df8db9ccdd7b71774230ddf2dc860d59f65a1cb77560532eb363e550bef6df18a63a78858a0a2469b0eb011d8bf0d41bf36a4c1b11223f0b2d SHA512 58f1345b841c7d5105432d0dab345033b9cefcfd4dedfe05f52d25135716be336a2f4a5fee3288236239bae9bbb1381deff0917fff8c80d81caaf64e8706b5a6 diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.2.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.2.ebuild new file mode 100644 index 000000000000..fb6f30e111ad --- /dev/null +++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.2.ebuild @@ -0,0 +1,118 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit cmake-utils toolchain-funcs user + +DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages" +HOMEPAGE=" + https://www.unix-ag.uni-kl.de/~bloch/acng/ + https://packages.qa.debian.org/a/apt-cacher-ng.html +" +LICENSE="BSD-4 ZLIB public-domain" +SLOT="0" +SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.orig.tar.xz" + +KEYWORDS="~amd64 ~x86" +IUSE="doc fuse systemd tcpd" + +COMMON_DEPEND=" + app-arch/bzip2 + app-arch/xz-utils + dev-libs/openssl:* + sys-libs/zlib + systemd? ( + sys-apps/systemd + ) +" +DEPEND=" + ${COMMON_DEPEND} + dev-util/cmake + >sys-devel/gcc-4.8 + virtual/pkgconfig +" +RDEPEND=" + ${COMMON_DEPEND} + dev-lang/perl + fuse? ( sys-fs/fuse ) + tcpd? ( sys-apps/tcp-wrappers ) +" + +S=${WORKDIR}/${P/_} + +pkg_pretend() { + if [[ $(gcc-major-version) -lt 4 ]]; then + die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)" + elif [[ $(gcc-major-version) = 4 ]] && [[ $(gcc-minor-version) -lt 8 ]]; then + die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)" + fi +} + +pkg_setup() { + # add new user & group for daemon + enewgroup ${PN} + enewuser ${PN} -1 -1 -1 ${PN} +} + +src_configure(){ + mycmakeargs=( "-DCMAKE_INSTALL_PREFIX=/usr" ) + if use fuse; then + mycmakeargs+=( "-DHAVE_FUSE_25=yes" ) + else + mycmakeargs+=( "-DHAVE_FUSE_25=no" ) + fi + if use tcpd; then + mycmakeargs=( "-DHAVE_LIBWRAP=yes" ) + else + mycmakeargs=( "-DHAVE_LIBWRAP=no" ) + fi + + cmake-utils_src_configure +} + +src_install() { + pushd ${CMAKE_BUILD_DIR} + dosbin ${PN} + if use fuse; then + dobin acngfs + fi + popd + + newinitd "${FILESDIR}"/initd-r1 ${PN} + newconfd "${FILESDIR}"/confd ${PN} + + insinto /etc/logrotate.d + newins "${FILESDIR}"/logrotate ${PN} + + doman doc/man/${PN}* + if use fuse; then + doman doc/man/acngfs* + fi + + # Documentation + dodoc doc/README TODO VERSION INSTALL ChangeLog + if use doc; then + dodoc doc/*.pdf + docinto html + dodoc doc/html/* + docinto examples/conf + dodoc conf/* + fi + + # perl daily cron script + dosbin scripts/expire-caller.pl + exeinto /etc/cron.daily + newexe "${FILESDIR}"/cron.daily ${PN} + + # default configuration + insinto /etc/${PN} + newins "${CMAKE_BUILD_DIR}"/conf/acng.conf ${PN}.conf + doins $( echo conf/* | sed 's|conf/acng.conf.in||g' ) + + keepdir /var/log/${PN} + # Some directories must exists + keepdir /var/log/${PN} + fowners -R ${PN}:${PN} \ + /etc/${PN} \ + /var/log/${PN} +} diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.ebuild deleted file mode 100644 index 092180f5b76f..000000000000 --- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit cmake-utils eutils toolchain-funcs user - -DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages" -HOMEPAGE=" - https://www.unix-ag.uni-kl.de/~bloch/acng/ - https://packages.qa.debian.org/a/apt-cacher-ng.html -" -LICENSE="BSD-4 ZLIB public-domain" -SLOT="0" -SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.orig.tar.xz" - -KEYWORDS="~amd64 ~x86" -IUSE="doc fuse systemd tcpd" - -COMMON_DEPEND=" - app-arch/bzip2 - app-arch/xz-utils - dev-libs/openssl:* - sys-libs/zlib - systemd? ( - sys-apps/systemd - ) -" -DEPEND=" - ${COMMON_DEPEND} - dev-util/cmake - >sys-devel/gcc-4.8 - virtual/pkgconfig -" -RDEPEND=" - ${COMMON_DEPEND} - dev-lang/perl - fuse? ( sys-fs/fuse ) - tcpd? ( sys-apps/tcp-wrappers ) -" - -S=${WORKDIR}/${P/_} - -pkg_pretend() { - if [[ $(gcc-major-version) -lt 4 ]]; then - die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)" - elif [[ $(gcc-major-version) = 4 ]] && [[ $(gcc-minor-version) -lt 8 ]]; then - die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)" - fi -} - -pkg_setup() { - # add new user & group for daemon - enewgroup ${PN} - enewuser ${PN} -1 -1 -1 ${PN} -} - -src_configure(){ - mycmakeargs=( "-DCMAKE_INSTALL_PREFIX=/usr" ) - if use fuse; then - mycmakeargs+=( "-DHAVE_FUSE_25=yes" ) - else - mycmakeargs+=( "-DHAVE_FUSE_25=no" ) - fi - if use tcpd; then - mycmakeargs=( "-DHAVE_LIBWRAP=yes" ) - else - mycmakeargs=( "-DHAVE_LIBWRAP=no" ) - fi - - cmake-utils_src_configure -} - -src_install() { - pushd ${CMAKE_BUILD_DIR} - dosbin ${PN} - if use fuse; then - dobin acngfs - fi - popd - - newinitd "${FILESDIR}"/initd-r1 ${PN} - newconfd "${FILESDIR}"/confd ${PN} - - insinto /etc/logrotate.d - newins "${FILESDIR}"/logrotate ${PN} - - doman doc/man/${PN}* - if use fuse; then - doman doc/man/acngfs* - fi - - # Documentation - dodoc doc/README TODO VERSION INSTALL ChangeLog - if use doc; then - dodoc doc/*.pdf - dohtml doc/html/* - docinto examples/conf - dodoc conf/* - fi - - # perl daily cron script - dosbin scripts/expire-caller.pl - exeinto /etc/cron.daily - newexe "${FILESDIR}"/cron.daily ${PN} - - # default configuration - insinto /etc/${PN} - newins "${CMAKE_BUILD_DIR}"/conf/acng.conf ${PN}.conf - doins $( echo conf/* | sed 's|conf/acng.conf.in||g' ) - - keepdir /var/log/${PN} - # Some directories must exists - keepdir /var/log/${PN} - fowners -R ${PN}:${PN} \ - /etc/${PN} \ - /var/log/${PN} -} diff --git a/net-misc/aria2/Manifest b/net-misc/aria2/Manifest index ba5662426a67..1e7409ab07c0 100644 --- a/net-misc/aria2/Manifest +++ b/net-misc/aria2/Manifest @@ -1,6 +1,4 @@ AUX aria2-1.34.0-make_unique.patch 1403 BLAKE2B 115ba6241c92d622e49a7059aabec6925b7c8a1a0ef1ccd1a17f812d6289b2aa62a0cac5e12daeff442124a8eae7ceaafcaa9ea6420873d1fef060ae4263e3a0 SHA512 f49ae23e698acbc13c4455efa6edff4fb7f467b94711ed10ad34e8898d96985f401295d5402d66a410ad8e946a39d586f6d082f5393884963ddaf8fa10601af0 -DIST aria2-1.33.1.tar.xz 1505208 BLAKE2B fb74add042d0cda81ca1b9c9d9b27b559ba859829c681520d6ece6322411f139667a1eaddc6f8aef23931e301ba4aab599ab17595df8d6ef477000f5e8fa83f0 SHA512 5379768a0960e46ed616a2540508d0dda4172c8d1a05021e50243241adb64448f5fa01878868ea206ec6b462fea39fa82284bb0f78ceec299eb289f94815b94a DIST aria2-1.34.0.tar.xz 1525908 BLAKE2B 479145af229f5fe864e54c511197bedb306199dbda608416aa295930a8392c7a118993b5a1634db20b380ab448cc8a397a351b6b64560ca263a0818d47a1ae64 SHA512 80bc43e242c06acc95030021cb347b4ec230729f3d7e512ca1932941b34ef95c312a34007a226869e5d720839a400e66cdb072ccab5d42228d8cf3d828723dcc -EBUILD aria2-1.33.1.ebuild 4277 BLAKE2B 8fe6f7b2df6988e9e89ae3da97d7d6561b28ac0fe4d3891147c04915158acfa806706fbb3152edb21a92ab6b7c6eb1413cdb36b03512ec45e4477e93591fc44d SHA512 5b79fa4264165da13935a75b20edb66edf315e7cb37180e0f02723209190d1c455b950844464557b7d5461d3048559a30835a8d7d067ab37cbf62d4227f221f3 -EBUILD aria2-1.34.0.ebuild 4323 BLAKE2B b390a7fb675010a26cda3e9ffc5dc6f6b15b19c07cda307f0adbd90ee3e807c57833c43927633070d024fda721895c95c3293fcbf9bcaf4240a815ee1aa2b575 SHA512 dcdcb363d7f3e7fdad8b6637cfc870fbc34cb124cf7bfc4831753035306e2a02cf139087d5467cd279999b59516b2acbcabacb4c35e7ef1b278f43294ed3b550 +EBUILD aria2-1.34.0.ebuild 4322 BLAKE2B 8348642130cd7dc2707a417a90385ee4c3c292a6375acd89f37aa698c6d146982316c74d8286ad5eb715fb9d0330f60ba2f4ae4c59d6bc7a768750de9bbac192 SHA512 cffd85573414498aa96533c4b04d033330dfd5b573ab60abebb8ff93d141c5f715e9d6083ef5f888c3581a188d076b7401a06207f9d023766e321833cefed9f2 MISC metadata.xml 1325 BLAKE2B 83433182337142e2aa760993e9b259c375158d834537052c816fdf81543aec6bb1786e3fe88dcc5d9f2fa9939ee357e470de2043998b30ffc5864d46e8cb5c86 SHA512 2fd19122ed71fd5bb2a50285bfa022f6f69fb0b5f610536d7fb71da5ef923c97743c0e2d228ba8712b818da526abe0bc60cb6829bb564d33d2cbe0b8aa93613f diff --git a/net-misc/aria2/aria2-1.33.1.ebuild b/net-misc/aria2/aria2-1.33.1.ebuild deleted file mode 100644 index 2acce9e8fd75..000000000000 --- a/net-misc/aria2/aria2-1.33.1.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit bash-completion-r1 - -DESCRIPTION="A download utility with segmented downloading with BitTorrent support" -HOMEPAGE="https://aria2.github.io/" -SRC_URI="https://github.com/aria2/${PN}/releases/download/release-${PV}/${P}.tar.xz" - -LICENSE="GPL-2" -KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" -SLOT="0" -IUSE="adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc" - -CDEPEND="sys-libs/zlib:0= - ssl? ( - app-misc/ca-certificates - gnutls? ( >=net-libs/gnutls-1.2.9:0= ) - !gnutls? ( dev-libs/openssl:0= ) ) - adns? ( >=net-dns/c-ares-1.5.0:0= ) - bittorrent? ( - ssl? ( - gnutls? ( - nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= ) - !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) ) - !ssl? ( - nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= ) - !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) ) - jemalloc? ( dev-libs/jemalloc ) - libuv? ( >=dev-libs/libuv-1.13:0= ) - metalink? ( - libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) - !libxml2? ( dev-libs/expat:0= ) ) - sqlite? ( dev-db/sqlite:3= ) - ssh? ( net-libs/libssh2:= ) - tcmalloc? ( dev-util/google-perftools ) - xmlrpc? ( - libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) - !libxml2? ( dev-libs/expat:0= ) )" - -DEPEND="${CDEPEND} - app-arch/xz-utils - virtual/pkgconfig - nls? ( sys-devel/gettext ) - test? ( >=dev-util/cppunit-1.12.0:0 )" -RDEPEND="${CDEPEND} - nls? ( virtual/libiconv virtual/libintl ) - scripts? ( dev-lang/ruby )" - -# xmlrpc has no explicit switch, it's turned out by any XML library -# so metalink implicitly forces it on -REQUIRED_USE="?? ( jemalloc tcmalloc ) - metalink? ( xmlrpc )" -RESTRICT="!test? ( test )" - -pkg_setup() { - if use scripts && ! use xmlrpc; then - ewarn "Please note that you may need to enable USE=xmlrpc to run the aria2rpc" - ewarn "and aria2mon scripts against the local aria2." - fi -} - -src_prepare() { - default - sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed" -} - -src_configure() { - local myconf=( - # threads, epoll: check for best portability - - # do not try to compile and run a test LIBXML program - --disable-xmltest - # enable the shared library - --enable-libaria2 - # zlib should always be available anyway - --with-libz - --with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" - - # optional features - $(use_enable bittorrent) - $(use_enable metalink) - $(use_enable nls) - $(use_with adns libcares) - $(use_with jemalloc) - $(use_with libuv) - $(use_with sqlite sqlite3) - $(use_with ssh libssh2) - $(use_with tcmalloc) - ) - - # SSL := gnutls / openssl - # USE=ssl - # + USE=gnutls -> gnutls - # + USE=-gnutls -> openssl - - if use ssl; then - myconf+=( $(use_with gnutls) $(use_with !gnutls openssl) ) - else - myconf+=( --without-gnutls --without-openssl ) - fi - - # message-digest := nettle / gcrypt / openssl - # bignum := nettle+gmp / gcrypt / openssl - # bittorrent := message-digest + bignum - # USE=bittorrent - # + USE=(ssl -gnutls) -> openssl - # + USE=nettle -> nettle+gmp - # + USE=-nettle -> gcrypt - - if use !bittorrent || use ssl && use !gnutls; then - myconf+=( --without-libgcrypt --without-libnettle --without-libgmp ) - else - myconf+=( $(use_with !nettle libgcrypt) - $(use_with nettle libnettle) $(use_with nettle libgmp) ) - fi - - # metalink+xmlrpc := libxml2 / expat - # USE=(metalink || xmlrpc) - # + USE=libxml2 -> libxml2 - # + USE=-libxml2 -> expat - - if use metalink || use xmlrpc; then - myconf+=( $(use_with !libxml2 libexpat) $(use_with libxml2) ) - else - myconf+=( --without-libexpat --without-libxml2 ) - fi - - # Note: - # - always enable gzip/http compression since zlib should always be available anyway - # - always enable epoll since we can assume kernel 2.6.x - # - other options for threads: solaris, pth, win32 - econf "${myconf[@]}" -} - -src_install() { - default - rm -rf "${D}"/usr/share/doc/aria2 \ - "${D}"/usr/share/doc/${PF}/README{,.html} - - dobashcomp doc/bash_completion/aria2c - use scripts && dobin doc/xmlrpc/aria2{mon,rpc} -} - -pkg_postinst() { - if use xmlrpc; then - elog "If you would like to use the additional aria2mon and aria2rpc tools," - elog "you need to have \033[1mdev-lang/ruby\033[0m installed." - fi -} diff --git a/net-misc/aria2/aria2-1.34.0.ebuild b/net-misc/aria2/aria2-1.34.0.ebuild index f941e79d8c01..8da582d6b7be 100644 --- a/net-misc/aria2/aria2-1.34.0.ebuild +++ b/net-misc/aria2/aria2-1.34.0.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://aria2.github.io/" SRC_URI="https://github.com/aria2/${PN}/releases/download/release-${PV}/${P}.tar.xz" LICENSE="GPL-2" -KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" SLOT="0" IUSE="adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc" diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest index 7fc3fcddbe7f..40e2c7177fe5 100644 --- a/net-misc/curl/Manifest +++ b/net-misc/curl/Manifest @@ -7,5 +7,5 @@ DIST curl-7.61.1.tar.bz2 2965173 BLAKE2B 16ef6962f64e18a4b67c3cccff78120084a2660 EBUILD curl-7.60.0-r1.ebuild 7203 BLAKE2B 1302225c56ec6d716f61a991cbcc6a22dbb3f3afb0d7c004c7d2781e27dd2906122c0f5e551c9b94f72ec95897f8ee6386faa323f93d26bade91d4d2ca63e014 SHA512 fa7af993d95984b8cda2be0abe798b9c9a4f41b92210d8b10beab7e08ab7f51608ff7a3c96dc508837ac81ee5508b102f60f372dd750c5c6ce460929d6799f59 EBUILD curl-7.60.0.ebuild 7179 BLAKE2B 279d31842ec1e10dc54f45d18164ff6cc29119c6540d2284d5710ab569a1550ce0112e5c76d96fc5879cea9c502711269fc130d32e0eb43ed1029bda3f08edbf SHA512 012886e831b66d1df5e2d577c6e148c6081f0dc729df06671c672e4069e7377e3f2670dc72b5820d34c775a9991a839cf1c727595fc2b44c87e23df7a36119f7 EBUILD curl-7.61.0.ebuild 7190 BLAKE2B 526a2302f0c6fc7f7ea05320497d9a481c456b962680355094f63d37c59cbd79f014e2569e5e423e508406d287fdfcb18134eb40b256fb5c4a2bbe308e0ee204 SHA512 666d3c972e2f9cebc462bd27a1651465a8ce4105587e5d77a95c0564d377baacc09c024b8f12dec06698f0a2bb6d8b07a6a2e42cab328c18cf425968b6121fd6 -EBUILD curl-7.61.1.ebuild 7196 BLAKE2B 068454eefa89a11158dc2ecf4895a3aa1af1ca87a11b56e8b67c78d50a1e8d38bf140b284d88d3001bc0ce2bfe21dc4cc1952b2ddec23f3222ef7375e2171100 SHA512 3ceb5226371240d4adb13d6fd60b162505162a7e51eb1be8586619f0b1c2ebc01cf18433e4a335d47a4f8856d748845f2e044c5bf76da2e8630d4548959fa009 +EBUILD curl-7.61.1.ebuild 7190 BLAKE2B 526a2302f0c6fc7f7ea05320497d9a481c456b962680355094f63d37c59cbd79f014e2569e5e423e508406d287fdfcb18134eb40b256fb5c4a2bbe308e0ee204 SHA512 666d3c972e2f9cebc462bd27a1651465a8ce4105587e5d77a95c0564d377baacc09c024b8f12dec06698f0a2bb6d8b07a6a2e42cab328c18cf425968b6121fd6 MISC metadata.xml 900 BLAKE2B a370dc14334bd729842d0ac979d804d0ff35332dc1fade6e2fbc33649a02db17ef04897c61727d786a4bc3d8acc2a20ddcfe97abdc350b65d9ecfdfe4509f9ef SHA512 ff16407a74d8688f4ed0d7158ea5bd31bc47e828672c874e2f43f4cda1fcd741922c98c5ff5d7f114154b149983e252319f0e812197b4ca7a0979683b5cec8ad diff --git a/net-misc/curl/curl-7.61.1.ebuild b/net-misc/curl/curl-7.61.1.ebuild index f25694aee71e..568697aa80e0 100644 --- a/net-misc/curl/curl-7.61.1.ebuild +++ b/net-misc/curl/curl-7.61.1.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 ~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 ~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/dhcp/Manifest b/net-misc/dhcp/Manifest index 984404f8b2eb..1294b0aabd5d 100644 --- a/net-misc/dhcp/Manifest +++ b/net-misc/dhcp/Manifest @@ -27,6 +27,6 @@ AUX dhcrelay6.service 237 BLAKE2B 2b32d453de82873f18ce905c5c336e974d4d5263415b51 AUX dhcrelay6.service.conf 220 BLAKE2B 936c3f0b4e6cfb4e8160dbf01c12d8ceafe62d6c9153dd26c4a0e6df687ca284554fa1d2b304af2f2dbdaac9a3cfafafc362befe8864d386f304588fa4c61092 SHA512 2ac54a5ebdf009854700e6f6b70662b36787b71a5b917fc61be35d31762508ede0e81b3874965b91de655a088914dbe43927911d8df1a16c262cb68389c168a9 DIST dhcp-4.3.6-P1.tar.gz 10189202 BLAKE2B 5dfbda82fa76d1011c552c9d9b5f15296834c2f380795e11fc6419010dd533fa45b9544fc10fc9da45095127f54ffe136b5fd7cc584589150b1b0a9a054e800c SHA512 cb04af2fb0fa8c5621e8b3dcb41e81422475218e1569b0eac6e13c876a21279928a3348f799253d7207517720466523b1cc28005c671542e37b1a391342b1e62 DIST dhcp-4.4.1.tar.gz 11164378 BLAKE2B fd3c65d8802c42cb936ff75ee19784e4f533c9b36aa08a61280aa8acae5cf581c67cd70222b46eb24b1f9a571e1c028cc853952feac4b6a12f9b7d7d3dbc2fc9 SHA512 684ae349f224918c9f8cec7bd6c55cd0b83ad2b5827375b2876ca088eb05b7ff1364e50f6dc24f2485c610d9be94d4ba3020f60a0fa0ef63962349d191b887e7 -EBUILD dhcp-4.3.6_p1.ebuild 7815 BLAKE2B 16aac3ec35aada27508873e22e49435ddf30cbf02fd853e2382323068e3b7d20a43e08241f94ba3a0c308b9e9abfbb7ea3d9728f1bb3556c70ec68a085b5a33c SHA512 a52eb5396db0ed1fedd6b7b86ccc2d762973eebfda13a35cd99f4b7815d62144398c35d025d2a043ed390d257310804adfe7acf02268617d3592a9a71cc7f256 +EBUILD dhcp-4.3.6_p1.ebuild 7814 BLAKE2B e3bb178b440b23c39e97fc082af1949dcd3bc9c5b9ba0b778ffbb10cfb8e99e3b8cc3d3c79b1dfa10bb7d924f7b643704a9acfef4289d822b78a71910f632721 SHA512 627121c2f592bdf85e3d1b7b1d98209caa7eda69fa2ca6d9042ed3e6c07b9a4ef2b4b9d985930d21e7275e55ea6bcba816c87b6339f88249d29554d7cf2771b4 EBUILD dhcp-4.4.1.ebuild 7927 BLAKE2B d59c3bc1bffab0dd9f2065082a06b22f455910475d1d415482d12819cf2fead427c5946658ea58f70eedd3cecc271477e89b46d53a21f1f859f09d46ec1097c7 SHA512 2e223ac06d25a7f9dddd04b664c744479f1b0d8f20f46f807da0ff5e2885bce57e64f0f940be9e38e794d64ab2181caa6e3dd2f7c5b28ca717286ff8b170118b MISC metadata.xml 669 BLAKE2B 27f8b039b9fdca5cb487c31d12bdfe550efff35a3705ba3fd20e6a783c70e48d4d6ca26fdb966230517bb0f3182da2df3d565396e2ced70f6fd94b15a1d4f601 SHA512 854b5b781642506f45df585d2072a79164620ec16e2b59abe2ef55e474f229d676f69f4820b4db1f6dce04df55bc5e3a20bcff959a34b3cc41bf61cce31f1efd diff --git a/net-misc/dhcp/dhcp-4.3.6_p1.ebuild b/net-misc/dhcp/dhcp-4.3.6_p1.ebuild index b8dc4ed2b868..934d0e56fbb2 100644 --- a/net-misc/dhcp/dhcp-4.3.6_p1.ebuild +++ b/net-misc/dhcp/dhcp-4.3.6_p1.ebuild @@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd" IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax" DEPEND=" diff --git a/net-misc/geoipupdate/Manifest b/net-misc/geoipupdate/Manifest index 01650cd230ba..277dd5e1ba30 100644 --- a/net-misc/geoipupdate/Manifest +++ b/net-misc/geoipupdate/Manifest @@ -1,7 +1,7 @@ DIST geoipupdate-2.3.1.tar.gz 362497 BLAKE2B e07eb22d6b4897d735af0c354f99111931646e8d194d493cf6992ac76a065a02816e5eaf0c974f752aeabb9cde7e7f8ec70d70529402b0b58072c44994e39e53 SHA512 98537e17ea03dbc0e377bf3fd045a96cbcf2f36f1fbcdf494f0a60d15f9ea5d2f0cd5e127245c6425e0ff8b77028147a2a6316034752298c8e9671007b7245a1 -DIST geoipupdate-2.5.0.tar.gz 371882 BLAKE2B 52a1794f2d3e91d4fcb274ddd5b65f9c8c99400d8c278ea9bdfd11208269da3e6ff3002c92a2cf5a805f6b81b0b0c8321b1a2bf4df1a0455a335828f4a61efc5 SHA512 2733c06b77634cf80e161168ff452aa7a4ade21e33260bd7dd01167b4edb5b88d62d2ef15cf014e5d059699e5a9b9ba3f265a324f4c91cec8f935fba3d5c243f DIST geoipupdate-3.1.0.tar.gz 370293 BLAKE2B 5cd7b4563ca0b6820b863e24b80054f27c49bd9e89898f6b7248d3389a81f9c680f9979293fa2acaab0727b3c915926396404e19e90ffbb0ef6647a64d30c14a SHA512 9efd30593df0a2564f98a0e99d02ac3671e5752034d8c747d84a204cd620845e619bec511b6004d895cdb611a2d98b921eb830192d258c572ac9efd603cd5c99 +DIST geoipupdate-3.1.1.tar.gz 366789 BLAKE2B 1f823bd51553c9c96ad78bab893a15d4bc3f4ee5cea873f2fd3fbcbe7a38f22d2995558f8196f4c4030fb6f24b179104912af3290d3b7ed9bde9fbe5ff37862c SHA512 24e6a9f72449df1a2763314f188828332b5516962dbd75892689e505516af967bece60cc846fe17cfcc1ddb4d6111c9cd7d5c0ebc9d3e8e7af355f8a1c7f1a2f EBUILD geoipupdate-2.3.1.ebuild 573 BLAKE2B 1a4e9421d90bed8da5b4ddb282b53a9bb2cd9d7123007a8c7a207ed807480abf95ec3c2e7cea6a987d399fd73c7148778f6b28b9c66ea0f48f2c1cb4d9ae4435 SHA512 add023538fe12026667cf0feba8c1ebf1157609ba2ac9622466920d2ed7c128bec10ba7ac1a12acb358067e0ec757996ad0eec63c91c7b4a7c9d75984b06bcff -EBUILD geoipupdate-2.5.0.ebuild 582 BLAKE2B e6010078e17ecfe850fe2b58c3af7d6aea924d9859f2a9b4668fe629b52f3c37ef58225b51668e2e5e1526008f84b97958b99a09f521b95206a47345b05b219d SHA512 f96dbf26af4c15369a5fce9b2a0a9e5571b7940304031e98c201231cc662b8ddf179a55b5454d6cd91855b68653eda03bf078043eb55edffb4e7992a8d5815f8 EBUILD geoipupdate-3.1.0.ebuild 582 BLAKE2B 106db9ba7a0f95104f0728fd820da17c03ed7c1fa79481d3fe09e666594b707b64ec4522b5095c1f19b0afecc0cfa9f5dd6e60829d12cb0887910ddc82e66053 SHA512 b6fddee463197592d4bff439b9ba4e407725895544af9875c9157fad695cc700ce2d3ab293da271fa6d3826b458a1a20c477c1df51daef6367d59798b4ad1392 +EBUILD geoipupdate-3.1.1.ebuild 582 BLAKE2B 106db9ba7a0f95104f0728fd820da17c03ed7c1fa79481d3fe09e666594b707b64ec4522b5095c1f19b0afecc0cfa9f5dd6e60829d12cb0887910ddc82e66053 SHA512 b6fddee463197592d4bff439b9ba4e407725895544af9875c9157fad695cc700ce2d3ab293da271fa6d3826b458a1a20c477c1df51daef6367d59798b4ad1392 MISC metadata.xml 364 BLAKE2B f11ecee4030939844eddfd97da927e39bc333cd90a489176fdd1ae86fdce4da2793a984f6bbb7a2947585c7cba2f4f94789c342e37cca9c95c69777d6f6ad8e5 SHA512 0969b8629e162f85c16b9dd67dd0e5d1a980197e627cc47056a7e1bdece5d5e9816e0a00bace7cfb9b683e5ccfccc898791a2dfb9f274f46cc594708074a82cc diff --git a/net-misc/geoipupdate/geoipupdate-2.5.0.ebuild b/net-misc/geoipupdate/geoipupdate-2.5.0.ebuild deleted file mode 100644 index c853ab96cf0b..000000000000 --- a/net-misc/geoipupdate/geoipupdate-2.5.0.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="performs automatic updates of GeoIP2 and GeoIP Legacy binary databases" -HOMEPAGE="https://github.com/maxmind/geoipupdate" -SRC_URI="https://github.com/maxmind/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd" - -DEPEND=" - net-misc/curl - sys-libs/zlib -" -RDEPEND=" - ${DEPEND} - !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 with a minimal environment. + * Returns pid on success, 0 on failure. +diff --git a/canohost.c b/canohost.c +index f71a0856..3e162d8c 100644 +--- 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; ++ } ++} +diff --git a/readconf.c b/readconf.c +index db5f2d54..67feffa5 100644 +--- a/readconf.c ++++ b/readconf.c +@@ -161,6 +161,7 @@ typedef enum { + oClearAllForwardings, oNoHostAuthenticationForLocalhost, + oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout, + oAddressFamily, oGssAuthentication, oGssDelegateCreds, ++ oGssTrustDns, + oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly, + oSendEnv, oSetEnv, oControlPath, oControlMaster, oControlPersist, + oHashKnownHosts, +@@ -202,9 +203,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 }, +@@ -977,6 +980,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; +@@ -1818,6 +1825,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; +@@ -1964,6 +1972,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) +diff --git a/readconf.h b/readconf.h +index c5688781..af809cc8 100644 +--- a/readconf.h ++++ b/readconf.h +@@ -41,6 +41,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. */ +diff --git a/ssh_config.5 b/ssh_config.5 +index f499396a..be758544 100644 +--- a/ssh_config.5 ++++ b/ssh_config.5 +@@ -722,6 +722,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 +diff --git a/sshconnect2.c b/sshconnect2.c +index 10e4f0a0..4f7d49e3 100644 +--- a/sshconnect2.c ++++ b/sshconnect2.c +@@ -657,6 +657,13 @@ userauth_gssapi(Authctxt *authctxt) + static u_int mech = 0; + OM_uint32 min; + int r, 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. */ +@@ -669,7 +676,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/openssh-7.8_p1-X509-no-version.patch b/net-misc/openssh/files/openssh-7.8_p1-X509-no-version.patch new file mode 100644 index 000000000000..66641c27473e --- /dev/null +++ b/net-misc/openssh/files/openssh-7.8_p1-X509-no-version.patch @@ -0,0 +1,19 @@ +--- a/openssh-7.8p1+x509-11.4.diff 2018-08-24 14:55:19.153936872 -0700 ++++ b/openssh-7.8p1+x509-11.4.diff 2018-08-24 14:55:58.116677254 -0700 +@@ -63643,16 +63643,6 @@ + setlocale(LC_CTYPE, "POSIX.UTF-8") != NULL)) + return; + setlocale(LC_CTYPE, "C"); +-diff -ruN openssh-7.8p1/version.h openssh-7.8p1+x509-11.4/version.h +---- openssh-7.8p1/version.h 2018-08-23 08:41:42.000000000 +0300 +-+++ openssh-7.8p1+x509-11.4/version.h 2018-08-24 20:07:00.000000000 +0300 +-@@ -2,5 +2,4 @@ +- +- #define SSH_VERSION "OpenSSH_7.8" +- +--#define SSH_PORTABLE "p1" +--#define SSH_RELEASE SSH_VERSION SSH_PORTABLE +-+#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1" + diff -ruN openssh-7.8p1/version.m4 openssh-7.8p1+x509-11.4/version.m4 + --- openssh-7.8p1/version.m4 1970-01-01 02:00:00.000000000 +0200 + +++ openssh-7.8p1+x509-11.4/version.m4 2018-08-24 20:00:00.000000000 +0300 diff --git a/net-misc/openssh/files/openssh-7.8_p1-hpn-X509-glue.patch b/net-misc/openssh/files/openssh-7.8_p1-hpn-X509-glue.patch new file mode 100644 index 000000000000..c76d454c92f8 --- /dev/null +++ b/net-misc/openssh/files/openssh-7.8_p1-hpn-X509-glue.patch @@ -0,0 +1,79 @@ +--- temp/openssh-7_8_P1-hpn-AES-CTR-14.16.diff.orig 2018-09-12 15:58:57.377986085 -0700 ++++ temp/openssh-7_8_P1-hpn-AES-CTR-14.16.diff 2018-09-12 16:07:15.376711327 -0700 +@@ -4,8 +4,8 @@ + +++ b/Makefile.in + @@ -42,7 +42,7 @@ CC=@CC@ + LD=@LD@ +- CFLAGS=@CFLAGS@ +- CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ ++ CFLAGS=@CFLAGS@ $(CFLAGS_EXTRA) ++ CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@ + -LIBS=@LIBS@ + +LIBS=@LIBS@ -lpthread + K5LIBS=@K5LIBS@ +@@ -788,8 +788,8 @@ + ssh_packet_set_connection(struct ssh *ssh, int fd_in, int fd_out) + { + struct session_state *state; +-- const struct sshcipher *none = cipher_by_name("none"); +-+ struct sshcipher *none = cipher_by_name("none"); ++- const struct sshcipher *none = cipher_none(); +++ struct sshcipher *none = cipher_none(); + int r; + + if (none == NULL) { +@@ -933,9 +933,9 @@ + /* Portable-specific options */ + sUsePAM, + + sDisableMTAES, +- /* Standard Options */ +- sPort, sHostKeyFile, sLoginGraceTime, +- sPermitRootLogin, sLogFacility, sLogLevel, ++ /* X.509 Standard Options */ ++ sHostbasedAlgorithms, ++ sPubkeyAlgorithms, + @@ -626,6 +630,7 @@ static struct { + { "trustedusercakeys", sTrustedUserCAKeys, SSHCFG_ALL }, + { "authorizedprincipalsfile", sAuthorizedPrincipalsFile, SSHCFG_ALL }, +--- temp/openssh-7_8_P1-hpn-DynWinNoneSwitch-14.16.diff.orig 2018-09-12 16:38:16.947447218 -0700 ++++ temp/openssh-7_8_P1-hpn-DynWinNoneSwitch-14.16.diff 2018-09-12 16:32:35.479700864 -0700 +@@ -382,7 +382,7 @@ + @@ -822,6 +822,10 @@ kex_choose_conf(struct ssh *ssh) + int nenc, nmac, ncomp; + u_int mode, ctos, need, dh_need, authlen; +- int r, first_kex_follows; ++ int r, first_kex_follows = 0; + + int auth_flag; + + + + auth_flag = packet_authentication_state(ssh); +@@ -1125,15 +1125,6 @@ + index a738c3a..b32dbe0 100644 + --- a/sshd.c + +++ b/sshd.c +-@@ -373,7 +373,7 @@ sshd_exchange_identification(struct ssh *ssh, int sock_in, int sock_out) +- char remote_version[256]; /* Must be at least as big as buf. */ +- +- xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s\r\n", +-- PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, +-+ PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, +- *options.version_addendum == '\0' ? "" : " ", +- options.version_addendum); +- + @@ -1037,6 +1037,8 @@ listen_on_addrs(struct listenaddr *la) + int ret, listen_sock; + struct addrinfo *ai; +@@ -1213,14 +1204,3 @@ + # Example of overriding settings on a per-user basis + #Match User anoncvs + # X11Forwarding no +-diff --git a/version.h b/version.h +-index f1bbf00..21a70c2 100644 +---- a/version.h +-+++ b/version.h +-@@ -3,4 +3,5 @@ +- #define SSH_VERSION "OpenSSH_7.8" +- +- #define SSH_PORTABLE "p1" +--#define SSH_RELEASE SSH_VERSION SSH_PORTABLE +-+#define SSH_RELEASE SSH_VERSION SSH_PORTABLE SSH_HPN +-+ diff --git a/net-misc/openssh/files/openssh-7.8_p1-hpn-glue.patch b/net-misc/openssh/files/openssh-7.8_p1-hpn-glue.patch new file mode 100644 index 000000000000..0561e3814067 --- /dev/null +++ b/net-misc/openssh/files/openssh-7.8_p1-hpn-glue.patch @@ -0,0 +1,112 @@ +--- temp/openssh-7_8_P1-hpn-DynWinNoneSwitch-14.16.diff.orig 2018-09-11 17:19:19.968420409 -0700 ++++ temp/openssh-7_8_P1-hpn-DynWinNoneSwitch-14.16.diff 2018-09-11 17:39:19.977535398 -0700 +@@ -409,18 +409,10 @@ + index dcf35e6..da4ced0 100644 + --- a/packet.c + +++ b/packet.c +-@@ -920,6 +920,24 @@ ssh_set_newkeys(struct ssh *ssh, int mode) ++@@ -920,6 +920,16 @@ ssh_set_newkeys(struct ssh *ssh, int mode) + return 0; + } + +-+/* this supports the forced rekeying required for the NONE cipher */ +-+int rekey_requested = 0; +-+void +-+packet_request_rekeying(void) +-+{ +-+ rekey_requested = 1; +-+} +-+ + +/* used to determine if pre or post auth when rekeying for aes-ctr + + * and none cipher switch */ + +int +@@ -434,20 +426,6 @@ + #define MAX_PACKETS (1U<<31) + static int + ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len) +-@@ -946,6 +964,13 @@ ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len) +- if (state->p_send.packets == 0 && state->p_read.packets == 0) +- return 0; +- +-+ /* used to force rekeying when called for by the none +-+ * cipher switch methods -cjr */ +-+ if (rekey_requested == 1) { +-+ rekey_requested = 0; +-+ return 1; +-+ } +-+ +- /* Time-based rekeying */ +- if (state->rekey_interval != 0 && +- (int64_t)state->rekey_time + state->rekey_interval <= monotime()) + diff --git a/packet.h b/packet.h + index 170203c..f4d9df2 100644 + --- a/packet.h +@@ -476,9 +454,9 @@ + /* Format of the configuration file: + + @@ -166,6 +167,8 @@ typedef enum { +- oHashKnownHosts, + oTunnel, oTunnelDevice, + oLocalCommand, oPermitLocalCommand, oRemoteCommand, ++ oDisableMTAES, + + oTcpRcvBufPoll, oTcpRcvBuf, oHPNDisabled, oHPNBufferSize, + + oNoneEnabled, oNoneSwitch, + oVisualHostKey, +@@ -615,9 +593,9 @@ + int ip_qos_bulk; /* IP ToS/DSCP/class for bulk traffic */ + SyslogFacility log_facility; /* Facility for system logging. */ + @@ -111,7 +115,10 @@ typedef struct { +- + int enable_ssh_keysign; + int64_t rekey_limit; ++ int disable_multithreaded; /*disable multithreaded aes-ctr*/ + + int none_switch; /* Use none cipher */ + + int none_enabled; /* Allow none to be used */ + int rekey_interval; +@@ -673,9 +651,9 @@ + /* Portable-specific options */ + if (options->use_pam == -1) + @@ -391,6 +400,43 @@ fill_default_server_options(ServerOptions *options) +- } +- if (options->permit_tun == -1) + options->permit_tun = SSH_TUNMODE_NO; ++ if (options->disable_multithreaded == -1) ++ options->disable_multithreaded = 0; + + if (options->none_enabled == -1) + + options->none_enabled = 0; + + if (options->hpn_disabled == -1) +@@ -1092,7 +1070,7 @@ + xxx_host = host; + xxx_hostaddr = hostaddr; + +-@@ -412,6 +423,28 @@ ssh_userauth2(const char *local_user, const char *server_user, char *host, ++@@ -412,6 +423,27 @@ ssh_userauth2(const char *local_user, const char *server_user, char *host, + + if (!authctxt.success) + fatal("Authentication failed."); +@@ -1117,10 +1095,9 @@ + + fprintf(stderr, "NONE cipher switch disabled when a TTY is allocated\n"); + + } + + } +-+ +- debug("Authentication succeeded (%s).", authctxt.method->name); +- } + ++ #ifdef WITH_OPENSSL ++ if (options.disable_multithreaded == 0) { + diff --git a/sshd.c b/sshd.c + index a738c3a..b32dbe0 100644 + --- a/sshd.c +@@ -1217,11 +1194,10 @@ + index f1bbf00..21a70c2 100644 + --- a/version.h + +++ b/version.h +-@@ -3,4 +3,6 @@ ++@@ -3,4 +3,5 @@ + #define SSH_VERSION "OpenSSH_7.8" + + #define SSH_PORTABLE "p1" + -#define SSH_RELEASE SSH_VERSION SSH_PORTABLE +-+#define SSH_HPN "-hpn14v16" + +#define SSH_RELEASE SSH_VERSION SSH_PORTABLE SSH_HPN + + diff --git a/net-misc/openssh/files/openssh-7.8_p1-hpn-sctp-glue.patch b/net-misc/openssh/files/openssh-7.8_p1-hpn-sctp-glue.patch new file mode 100644 index 000000000000..a7d51ad94839 --- /dev/null +++ b/net-misc/openssh/files/openssh-7.8_p1-hpn-sctp-glue.patch @@ -0,0 +1,17 @@ +--- dd/openssh-7_8_P1-hpn-DynWinNoneSwitch-14.16.diff.orig 2018-09-12 18:18:51.851536374 -0700 ++++ dd/openssh-7_8_P1-hpn-DynWinNoneSwitch-14.16.diff 2018-09-12 18:19:01.116475099 -0700 +@@ -1190,14 +1190,3 @@ + # Example of overriding settings on a per-user basis + #Match User anoncvs + # X11Forwarding no +-diff --git a/version.h b/version.h +-index f1bbf00..21a70c2 100644 +---- a/version.h +-+++ b/version.h +-@@ -3,4 +3,5 @@ +- #define SSH_VERSION "OpenSSH_7.8" +- +- #define SSH_PORTABLE "p1" +--#define SSH_RELEASE SSH_VERSION SSH_PORTABLE +-+#define SSH_RELEASE SSH_VERSION SSH_PORTABLE SSH_HPN +-+ diff --git a/net-misc/openssh/openssh-7.8_p1.ebuild b/net-misc/openssh/openssh-7.8_p1.ebuild new file mode 100644 index 000000000000..3ce6916d6e9b --- /dev/null +++ b/net-misc/openssh/openssh-7.8_p1.ebuild @@ -0,0 +1,438 @@ +# 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 + +# Make it more portable between straight releases +# and _p? releases. +PARCH=${P/_} +CAP_PV="${PV^^}" + +HPN_VER="14.16" +HPN_PATCHES=( + ${PN}-${CAP_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff + ${PN}-${CAP_PV/./_}-hpn-AES-CTR-${HPN_VER}.diff +) +HPN_DISABLE_MTAES=1 # unit tests hang on MT-AES-CTR +SCTP_VER="1.1" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz" +X509_VER="11.4" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz" + +DESCRIPTION="Port of OpenBSD's free SSH release" +HOMEPAGE="https://www.openssh.com/" +SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz + ${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/${SCTP_PATCH} )} + ${HPN_VER:+hpn? ( $(printf "mirror://sourceforge/hpnssh/HPN-SSH%%20${HPN_VER/./v}%%20${PV/_}/%s\n" "${HPN_PATCHES[@]}") )} + ${X509_PATCH:+X509? ( https://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )} + " + +LICENSE="BSD GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +# Probably want to drop ssl defaulting to on in a future version. +IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie sctp selinux +ssl static test X X509" +RESTRICT="!test? ( test )" +REQUIRED_USE="ldns? ( ssl ) + pie? ( !static ) + static? ( !kerberos !pam ) + X509? ( !sctp ssl ) + test? ( ssl )" + +LIB_DEPEND=" + audit? ( sys-process/audit[static-libs(+)] ) + ldns? ( + net-libs/ldns[static-libs(+)] + !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) + bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) + ) + libedit? ( dev-libs/libedit:=[static-libs(+)] ) + sctp? ( net-misc/lksctp-tools[static-libs(+)] ) + selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) + ssl? ( + !libressl? ( + >=dev-libs/openssl-1.0.1:0=[bindist=] + dev-libs/openssl: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 )" +DEPEND="${RDEPEND} + static? ( ${LIB_DEPEND} ) + virtual/pkgconfig + virtual/os-headers + sys-devel/autoconf" +RDEPEND="${RDEPEND} + pam? ( >=sys-auth/pambase-20081028 ) + userland_GNU? ( virtual/shadow ) + X? ( x11-apps/xauth )" + +S="${WORKDIR}/${PARCH}" + +pkg_pretend() { + # this sucks, but i'd rather have people unable to `emerge -u openssh` + # than not be able to log in to their server any more + maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; } + local fail=" + $(use hpn && maybe_fail hpn HPN_VER) + $(use sctp && maybe_fail sctp SCTP_PATCH) + $(use X509 && maybe_fail X509 X509_PATCH) + " + fail=$(echo ${fail}) + if [[ -n ${fail} ]] ; then + eerror "Sorry, but this version does not yet support features" + eerror "that you requested: ${fail}" + eerror "Please mask ${PF} for now and check back later:" + eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask" + die "booooo" + fi + + # Make sure people who are using tcp wrappers are notified of its removal. #531156 + if grep -qs '^ *sshd *:' "${EROOT%/}"/etc/hosts.{allow,deny} ; then + ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like" + ewarn "you're trying to use it. Update your ${EROOT}etc/hosts.{allow,deny} please." + fi +} + +src_prepare() { + sed -i \ + -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX%/}/usr/bin/xauth:" \ + pathnames.h || die + + # don't break .ssh/authorized_keys2 for fun + sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die + + eapply "${FILESDIR}"/${PN}-7.8_p1-GSSAPI-dns.patch #165444 integrated into gsskex + eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch + eapply "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch + + local PATCHSET_VERSION_MACROS=() + + if use X509 ; then + pushd "${WORKDIR}" || die + eapply "${FILESDIR}/${P}-X509-no-version.patch" + popd || die + + eapply "${WORKDIR}"/${X509_PATCH%.*} + + # We need to patch package version or any X.509 sshd will reject our ssh client + # with "userauth_pubkey: could not parse key: string is too large [preauth]" + # error + einfo "Patching package version for X.509 patch set ..." + sed -i \ + -e "s/^AC_INIT(\[OpenSSH\], \[Portable\]/AC_INIT([OpenSSH], [${X509_VER}]/" \ + "${S}"/configure.ac || die "Failed to patch package version for X.509 patch" + + einfo "Patching version.h to expose X.509 patch set ..." + sed -i \ + -e "/^#define SSH_PORTABLE.*/a #define SSH_X509 \"-PKIXSSH-${X509_VER}\"" \ + "${S}"/version.h || die "Failed to sed-in X.509 patch version" + PATCHSET_VERSION_MACROS+=( 'SSH_X509' ) + fi + + if use sctp ; then + eapply "${WORKDIR}"/${SCTP_PATCH%.*} + + einfo "Patching version.h to expose SCTP patch set ..." + sed -i \ + -e "/^#define SSH_PORTABLE/a #define SSH_SCTP \"-sctp-${SCTP_VER}\"" \ + "${S}"/version.h || die "Failed to sed-in SCTP patch version" + PATCHSET_VERSION_MACROS+=( 'SSH_SCTP' ) + + einfo "Disabling know failing test (cfgparse) caused by SCTP patch ..." + sed -i \ + -e "/\t\tcfgparse \\\/d" \ + "${S}"/regress/Makefile || die "Failed to disable known failing test (cfgparse) caused by SCTP patch" + fi + + if use hpn ; then + local hpn_patchdir="${T}/${P}-hpn${HPN_VER}" + mkdir "${hpn_patchdir}" + cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}" + pushd "${hpn_patchdir}" + eapply "${FILESDIR}"/${P}-hpn-glue.patch + use X509 && eapply "${FILESDIR}"/${P}-hpn-X509-glue.patch + use sctp && eapply "${FILESDIR}"/${P}-hpn-sctp-glue.patch + popd + + eapply "${hpn_patchdir}" + + einfo "Patching Makefile.in for HPN patch set ..." + sed -i \ + -e "/^LIBS=/ s/\$/ -lpthread/" \ + "${S}"/Makefile.in || die "Failed to patch Makefile.in" + + einfo "Patching version.h to expose HPN patch set ..." + sed -i \ + -e "/^#define SSH_PORTABLE/a #define SSH_HPN \"-hpn${HPN_VER//./v}\"" \ + "${S}"/version.h || die "Failed to sed-in HPN patch version" + PATCHSET_VERSION_MACROS+=( 'SSH_HPN' ) + + if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then + einfo "Disabling known non-working MT AES cipher per default ..." + + cat > "${T}"/disable_mtaes.conf <<- EOF + + # HPN's Multi-Threaded AES CTR cipher is currently known to be broken + # and therefore disabled per default. + DisableMTAES yes + EOF + sed -i \ + -e "/^#HPNDisabled.*/r ${T}/disable_mtaes.conf" \ + "${S}"/sshd_config || die "Failed to disabled MT AES ciphers in sshd_config" + + sed -i \ + -e "/AcceptEnv.*_XXX_TEST$/a \\\tDisableMTAES\t\tyes" \ + "${S}"/regress/test-exec.sh || die "Failed to disable MT AES ciphers in test config" + fi + fi + + if use X509 || use sctp || use hpn ; then + einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..." + sed -i \ + -e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \ + "${S}"/sshconnect.c || die "Failed to patch send_client_banner() to use SSH_RELEASE (sshconnect.c)" + + einfo "Patching sshd.c to use SSH_RELEASE in sshd_exchange_identification() ..." + sed -i \ + -e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \ + "${S}"/sshd.c || die "Failed to patch sshd_exchange_identification() to use SSH_RELEASE (sshd.c)" + + einfo "Patching version.h to add our patch sets to SSH_RELEASE ..." + sed -i \ + -e "s/^#define SSH_RELEASE.*/#define SSH_RELEASE SSH_VERSION SSH_PORTABLE ${PATCHSET_VERSION_MACROS[*]}/" \ + "${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)" + fi + + sed -i \ + -e "/#UseLogin no/d" \ + "${S}"/sshd_config || die "Failed to remove removed UseLogin option (sshd_config)" + + [[ -d ${WORKDIR}/patch ]] && eapply "${WORKDIR}"/patch + + eapply_user #473004 + + tc-export PKG_CONFIG + local sed_args=( + -e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):" + # Disable PATH reset, trust what portage gives us #254615 + -e 's:^PATH=/:#PATH=/:' + # Disable fortify flags ... our gcc does this for us + -e 's:-D_FORTIFY_SOURCE=2::' + ) + + # The -ftrapv flag ICEs on hppa #505182 + use hppa && sed_args+=( + -e '/CFLAGS/s:-ftrapv:-fdisable-this-test:' + -e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d' + ) + # _XOPEN_SOURCE causes header conflicts on Solaris + [[ ${CHOST} == *-solaris* ]] && sed_args+=( + -e 's/-D_XOPEN_SOURCE//' + ) + sed -i "${sed_args[@]}" configure{.ac,} || die + + eautoreconf +} + +src_configure() { + addwrite /dev/ptmx + + use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG + use static && append-ldflags -static + + local myconf=( + --with-ldflags="${LDFLAGS}" + --disable-strip + --with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run + --sysconfdir="${EPREFIX%/}"/etc/ssh + --libexecdir="${EPREFIX%/}"/usr/$(get_libdir)/misc + --datadir="${EPREFIX%/}"/usr/share/openssh + --with-privsep-path="${EPREFIX%/}"/var/empty + --with-privsep-user=sshd + $(use_with audit audit linux) + $(use_with kerberos kerberos5 "${EPREFIX%/}"/usr) + # We apply the sctp patch conditionally, so can't pass --without-sctp + # unconditionally else we get unknown flag warnings. + $(use sctp && use_with sctp) + $(use_with ldns) + $(use_with libedit) + $(use_with pam) + $(use_with pie) + $(use_with selinux) + $(use_with ssl openssl) + $(use_with ssl md5-passwords) + $(use_with ssl ssl-engine) + $(use_with !elibc_Cygwin hardening) #659210 + ) + + # stackprotect is broken on musl x86 + use elibc_musl && use x86 && myconf+=( --without-stackprotect ) + + # The seccomp sandbox is broken on x32, so use the older method for now. #553748 + use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit ) + + econf "${myconf[@]}" +} + +src_test() { + local t skipped=() failed=() passed=() + local tests=( interop-tests compat-tests ) + + local shell=$(egetshell "${UID}") + if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then + elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'" + elog "user, so we will run a subset only." + skipped+=( tests ) + else + tests+=( tests ) + fi + + # It will also attempt to write to the homedir .ssh. + local sshhome=${T}/homedir + mkdir -p "${sshhome}"/.ssh + for t in "${tests[@]}" ; do + # Some tests read from stdin ... + HOMEDIR="${sshhome}" HOME="${sshhome}" \ + emake -k -j1 ${t} > "${ED%/}"/etc/ssh/sshd_config + + # Allow client to pass locale environment variables. #367017 + AcceptEnv ${locale_vars[*]} + + # Allow client to pass COLORTERM to match TERM. #658540 + AcceptEnv COLORTERM + EOF + + # Then the client config. + cat <<-EOF >> "${ED%/}"/etc/ssh/ssh_config + + # Send locale environment variables. #367017 + SendEnv ${locale_vars[*]} + + # Send COLORTERM to match TERM. #658540 + SendEnv COLORTERM + EOF + + if use pam ; then + sed -i \ + -e "/^#UsePAM /s:.*:UsePAM yes:" \ + -e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \ + -e "/^#PrintMotd /s:.*:PrintMotd no:" \ + -e "/^#PrintLastLog /s:.*:PrintLastLog no:" \ + "${ED%/}"/etc/ssh/sshd_config || die + fi + + if use livecd ; then + sed -i \ + -e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \ + "${ED%/}"/etc/ssh/sshd_config || die + fi +} + +src_install() { + emake install-nokeys DESTDIR="${D}" + fperms 600 /etc/ssh/sshd_config + dobin contrib/ssh-copy-id + newinitd "${FILESDIR}"/sshd.initd sshd + newconfd "${FILESDIR}"/sshd-r1.confd sshd + + newpamd "${FILESDIR}"/sshd.pam_include.2 sshd + + tweak_ssh_configs + + doman contrib/ssh-copy-id.1 + dodoc CREDITS OVERVIEW README* TODO sshd_config + use hpn && dodoc HPN-README + use X509 || dodoc ChangeLog + + diropts -m 0700 + dodir /etc/skel/.ssh + + keepdir /var/empty + + systemd_dounit "${FILESDIR}"/sshd.{service,socket} + systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service' +} + +pkg_preinst() { + enewgroup sshd 22 + enewuser sshd 22 -1 /var/empty sshd +} + +pkg_postinst() { + if has_version "<${CATEGORY}/${PN}-5.8_p1" ; then + elog "Starting with openssh-5.8p1, the server will default to a newer key" + elog "algorithm (ECDSA). You are encouraged to manually update your stored" + elog "keys list as servers update theirs. See ssh-keyscan(1) for more info." + fi + if has_version "<${CATEGORY}/${PN}-7.0_p1" ; then + elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream." + elog "Make sure to update any configs that you might have. Note that xinetd might" + elog "be an alternative for you as it supports USE=tcpd." + fi + if has_version "<${CATEGORY}/${PN}-7.1_p1" ; then #557388 #555518 + elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their" + elog "weak sizes. If you rely on these key types, you can re-enable the key types by" + elog "adding to your sshd_config or ~/.ssh/config files:" + elog " PubkeyAcceptedKeyTypes=+ssh-dss" + elog "You should however generate new keys using rsa or ed25519." + + elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'" + elog "to 'prohibit-password'. That means password auth for root users no longer works" + elog "out of the box. If you need this, please update your sshd_config explicitly." + fi + if has_version "<${CATEGORY}/${PN}-7.6_p1" ; then + elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely." + elog "Furthermore, rsa keys with less than 1024 bits will be refused." + fi + if has_version "<${CATEGORY}/${PN}-7.7_p1" ; then + elog "Starting with openssh-7.7p1, we no longer patch openssh to provide LDAP functionality." + elog "Install sys-auth/ssh-ldap-pubkey and use OpenSSH's \"AuthorizedKeysCommand\" option" + elog "if you need to authenticate against LDAP." + elog "See https://wiki.gentoo.org/wiki/SSH/LDAP_migration for more details." + fi + if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]" ; then + elog "Be aware that by disabling openssl support in openssh, the server and clients" + elog "no longer support dss/rsa/ecdsa keys. You will need to generate ed25519 keys" + elog "and update all clients/servers that utilize them." + fi + + if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then + elog "" + elog "HPN's multi-threaded AES CTR cipher is currently known to be broken" + elog "and therefore disabled at runtime per default." + elog "Make sure your sshd_config is up to date and contains" + elog "" + elog " DisableMTAES yes" + elog "" + elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher." + elog "" + fi +} diff --git a/net-misc/qtm/Manifest b/net-misc/qtm/Manifest index 3351cad8e058..adc246173725 100644 --- a/net-misc/qtm/Manifest +++ b/net-misc/qtm/Manifest @@ -1,6 +1,4 @@ AUX qtm-1.3.19-qt-5.11.patch 757 BLAKE2B f0bc6f3858e7864efa343193d8519a1e83444e69e4532219077f5d3e852bbd4d0bf979023fadbb53d817d41e1632244baf9232434f8b274dcb6d0eec06070ec3 SHA512 c4e886726686ea2fbf785aaaafd1238affbe778f20a0b11cea98360570f52c421a6942b03f27fe57bc08894a93c92427920509a1efac8b23d502464b353e6df0 -DIST qtm-1.3.18.tar.bz2 186137 BLAKE2B b405bc922246d5c8fe65fc68250b3eb401be3b17dd55cc81bfa70d6ddd72280398df25c850b2d71cc4383b9463e3aff6d641ce4080c100d10ae79f9002793055 SHA512 d4685f22a883e1d7513dcac57a807b0d21c26dfceda547b22889ee980758de1a49c2e898c745bb597efd709823d96da59f7494015c0915edb34e9141fa60e2ca DIST qtm-1.3.19.tar.bz2 191559 BLAKE2B e193e75771f04b7ecf772a55305c5a0b923449570933c76716235912223417e1340462893b5c566a22c3d6689eb2fc66b7b41aa3148afcbbc4db65abfcc06545 SHA512 a56a5c1d6098213637806a8a8c3889bbfbd11cb5b1d568520197c6c21e51d99f95975359c18f63961aba945b58a5ce3abf3ff85f552a555b91965414934f9565 -EBUILD qtm-1.3.18-r1.ebuild 1067 BLAKE2B 17f2d02385d6b3eadf1feef09dea8e882ca1a7a3a24acdecdfacbc97edf088640b2b70bd23d229615a5df0d75f2d126a0568e03feef0374068f7cfbdf59c7e0f SHA512 a41516a90aa8e5c692bce38e2101c3f0c4ae58aa06b8286aed98a22e83b708cd8022daa4a24f68a93000e855b693281cbf9df1f5931e1e86ee617ecc6e0726df -EBUILD qtm-1.3.19.ebuild 1112 BLAKE2B ff156e4af9dd3c8492287bf7d6110227605f13507f9fc2a7ba94de9399b2ef9ae80928f95f5b735ae8db9c75c155042764d74dd7df6f708cbe2efd823c303b4e SHA512 001f4de05b04f4578f07948fa9dbd6eef7053c7719c18a574d5459242df5774673aea3a209de6bfc337360dcdcaa63a378532842be58a19a3f31fb5286cb0e1c +EBUILD qtm-1.3.19.ebuild 1110 BLAKE2B 4229f674c8ce4cd3fd9a6b1f95352ccec99df534453a788ebfb83ad322e63c60f056c24f172beaab5a6fe96ca9a05382000b101af2f67604b952cfbcfa881d3c SHA512 67bf5642cc29061088593baa092e536ad179d7afcef3b33987b6af7e1c6d024fd2a9eb3e7cc58c1b120f5b7376d61416cdc23928112b588134c83ee2f375dd25 MISC metadata.xml 382 BLAKE2B f06322dd6521d5ca81b3b9f409189f4c0a4e1e1e31dc04a8b5ec03c0b265fe947a377437e75cc906de5f9b8fb1783abd176fa812c5d193663febefe88699f22e SHA512 009632d82fedc2deb9796dba8a2de9910afd0b67617f5c1d9ecd14fc641f61839812815197089dc186a201a8848de3706d56802f12f33f22a3badad2cd99420f diff --git a/net-misc/qtm/qtm-1.3.18-r1.ebuild b/net-misc/qtm/qtm-1.3.18-r1.ebuild deleted file mode 100644 index 9c3589a7bc35..000000000000 --- a/net-misc/qtm/qtm-1.3.18-r1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -CMAKE_IN_SOURCE_BUILD="1" -inherit cmake-utils versionator - -DESCRIPTION="Qt blogging client" -HOMEPAGE="http://qtm.blogistan.co.uk" -SRC_URI="https://bitbucket.org/IndigoJo/${PN}-$(get_version_component_range 1-2)/downloads/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="dbus debug" -RESTRICT="strip" - -RDEPEND="dev-lang/perl - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - virtual/perl-Digest-MD5 - dbus? ( dev-qt/qtdbus:5 )" -DEPEND="${RDEPEND} - x11-base/xorg-proto - virtual/pkgconfig" - -DOCS=( Changelog README ) - -src_prepare() { - # bug 463810 - sed -i -e '/Categories/s/Application;//' qtm-desktop.sh || die 'sed on qtm-desktop.sh failed' - - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DQt5=ON - -DDONT_USE_PTE=OFF - -DINSTALL_MARKDOWN=ON - -DNO_SSL=OFF - -DUSE_DBUS=$(usex dbus) - -DDONT_USE_DBUS=$(usex !dbus) - -DQDEBUG=$(usex debug) - ) - - cmake-utils_src_configure -} diff --git a/net-misc/qtm/qtm-1.3.19.ebuild b/net-misc/qtm/qtm-1.3.19.ebuild index 94d9740b4632..ab8d12142a5f 100644 --- a/net-misc/qtm/qtm-1.3.19.ebuild +++ b/net-misc/qtm/qtm-1.3.19.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://bitbucket.org/IndigoJo/${PN}-$(ver_cut 1-2)/downloads/${P}.tar. LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="dbus debug" RESTRICT="strip" diff --git a/net-misc/snarf/Manifest b/net-misc/snarf/Manifest index 26c91b415dd7..5e82d2421fd1 100644 --- a/net-misc/snarf/Manifest +++ b/net-misc/snarf/Manifest @@ -3,5 +3,5 @@ AUX snarf-fix-off-by-ones.diff 1592 BLAKE2B 5d6e72b792ceb95c40185211d3e1221afec7 AUX snarf-unlink-empty.diff 1581 BLAKE2B 09cd54db80c7b427cf84f413ac9253eb1aab44d3c4999e5c005c4fc9cfe45dfc280c2a7cf855545ab3f41896a1a5196662d628264f7384730450d7f0b6e7619f SHA512 bb33a2b5c4d929d8a35fce94812c8231f76b54914c9dc57d07dee7bf311e4fd034a97a343c588eba5479cbacd406cb82acc1835e15c911cd04100eff2dd3d398 DIST snarf-7.0.tar.gz 64495 BLAKE2B d91930e0578a4a89b200a76aa69834d5f7c974a280c56d3c5f4a6f6b4e127145c90a397c410cb339d0865468a53aa433c7387dc2cb205ef8decd2f7a794168d0 SHA512 311c3e4a1b32fd024da8a5c8167888f254608d538695e30b3c632c606f67d1e3d94d8c88deb7850f782f38412f1bfd9022b0ee780c8644655f0648ccf0a0354e EBUILD snarf-7.0-r3.ebuild 873 BLAKE2B 6491965a46adebe68e9d65e4af1fa4d68bfa0cdbe53407454102cff3e45dfdaa95ba3bed1ffa79e13c3cd574585827d27643d7c4a5c427cc9ecba9ee6513b195 SHA512 c7c4958ddb62a03f42c0ac655e2ec780f715354913448f1aab950596e66ed0e82578f65e6bf194f56ef6b38aad186d0a68e8b8d5e7be7bf051d98f8d57c076ed -EBUILD snarf-7.0-r4.ebuild 881 BLAKE2B 138ca1465b440fa02e75f1c6b929e94dcb1faf6d5e9ed8a18e8bfeb19d9f2f493872015a9a4c0230161ee0ec24760b5ddd57d02de49ec92298e95aba0536e721 SHA512 62552b4504742c37562c3ca85a2523ea5b12b1da5da0ff78fe508cc7feae3e272b41cee6066a36d4d531d373e83dde61c35b591497051d788b2dfc909874eeda +EBUILD snarf-7.0-r4.ebuild 878 BLAKE2B b79750db0ec78a66e801bce3d6a11415009b206f6396cf78916cc17607228d8983fc36e5ef620475452ca690854b55cc33b5269aa666c884c98b82cc74f8a583 SHA512 2f6257daeca2f279befed04db8c055555f01bf8ee95441ce180ee8cf49bafae2de53b5f21db0622d02db87a4512e599a23fe293358f632cd9db7718ee6f60a6e MISC metadata.xml 386 BLAKE2B d3a94565f431c48179a81f6699a36b362e12acdea5565186d5ca41286308c943c7ee99c3511ae22acba8128b82608f3feb076147ec95d53f98e159421934b8b7 SHA512 07d79153adfb5b7d447668c0fb6d22db9c2c026d5adfca658999107018ca392e55fb673273de986263479e493133e143a2523ef6133867db5c65a8f84f6a220a diff --git a/net-misc/snarf/snarf-7.0-r4.ebuild b/net-misc/snarf/snarf-7.0-r4.ebuild index dacf70a7a6c3..df683bcced37 100644 --- a/net-misc/snarf/snarf-7.0-r4.ebuild +++ b/net-misc/snarf/snarf-7.0-r4.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="Small and fast CLI resource grabber for http, gopher, finger, ftp" HOMEPAGE="https://www.xach.com/snarf/" SRC_URI="https://www.xach.com/snarf/${P}.tar.gz" -KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" +KEYWORDS="alpha ~amd64 ~ppc sparc x86" LICENSE="GPL-2" SLOT="0" IUSE="" diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest index 51c8da4e45e8..1c50cb59d755 100644 --- a/net-misc/streamlink/Manifest +++ b/net-misc/streamlink/Manifest @@ -1,14 +1,4 @@ -DIST streamlink-0.1.0.tar.gz 960622 BLAKE2B 8d035784fc3585c738135a901b6da35b9acee2cc993e4b99b0ed609e6d68eefd6df5fff5ae4b63ef2267fd0606b2f5e29b56da4d40cf49a41c433ab58570a561 SHA512 78b5bd9d35c2fc9c1d9fe3954b439e56cfee48f2b73a95a2c08a53c3a66143938ba162f2d2ba29c8af989565c920756cab605ae772d73828a3dd5a41fc6d30c2 -DIST streamlink-0.11.0.tar.gz 30718822 BLAKE2B cbda2783bed0e7d721dad44ca8815fa862531fdff84007245a76205dd869098d9ef2d371035e784e1d002497bbbcf8268aa4ee94c63fdc0f16082cf55d878b8f SHA512 a62e906f7b37c9cd33ce5e7d5d84bfee9fa8ca5ddd4699e4985ed932147a346188026fd868b30e6b26ce6b5806217f838bbf8191074f9b0271dd87aaee501f7f -DIST streamlink-0.4.0.tar.gz 30674625 BLAKE2B 301ff7e2086425604c59d12063cd5b14f789dc39249bba96faedb0fece663f9e5d65f1f696d40f92f07a95a9edd5c915c71d22dcd1afb378cc000bac6eeebd5e SHA512 58a4110b1e6b20f0b05842ee8450a93d646d523a284cf60ad878b460b8e80081d78658f5abb67744609cfdd0a88ebbf97faf6453b2b53709f259e4f9cc093eed -DIST streamlink-0.6.0.tar.gz 30696706 BLAKE2B d735c9605b1d0bb9aa6c52c145b1ee3d9645d5a1be0ab0bbc4a84a3e9c5b527a8a35f3d61c2bc5e51d1549f6328802e13ca83231c08bebc90496144fb25c7dfe SHA512 b9f75bfd2cab577688ed84a6c690f776b2e3af38fa60edb7f2fd73f2c25246c81098652180c3adae61eec8798a7805988cad01c366989a961efdb1e12578af49 -DIST streamlink-0.7.0.tar.gz 30709251 BLAKE2B 215a8aa8b273e9b46fb86020dd53cb15bd19cb3de77e0b6e4a124916b964077a012cec5358d81707782834031490921fcae8a3a8321b70a43a4b538321eac06e SHA512 6e908229295c4d129d2bb9bfc26c76b20d45c2c9dc8193528a259c572cddd4ea620f9f903fb639ddad206bcad05a416ccc50328d01489a7684ec724a8cf1c3c1 -DIST streamlink-0.9.0.tar.gz 30720281 BLAKE2B b0a19f78f26908ff7b35cbcc3a95539969cb00e6b54c1cdb4c4c72685e77f9291ced933238708cfd4cdb6225c7dade4fd49e9a98a7092a1aff2d91297aacd951 SHA512 3d8aea95cd71968dc8a77eb1ad243abad10db76d6f9729498826876465e10ad2ac6204f26ec528d05ddd352236789ba8f8a86347abd50ed2d558b7ffc41349cd -EBUILD streamlink-0.1.0.ebuild 973 BLAKE2B a150b16f5aac63906c1078d50d0cb70f905236ac2e25b05b09c555e72a190d95c6d3c10091272243696809501a50b7516d4c57812f39b36df7e793082e099c3a SHA512 4a1e98fb0c7538490c6c8b11f99e5674e032f3ab8de0a7a1996cbea422c79ec150d09ee15069a2ef7e8e4dd504add42f2f9ec6acd3fc6d5c5945cb903f1962c1 -EBUILD streamlink-0.11.0.ebuild 1580 BLAKE2B 553cd49a5b1ef86e706c9b850075335750436f2047076a7c44c007d7132508bd20e826cbe1860f3a5d72d1c248579363e7eb56752f0dafdd174759cf5bd70658 SHA512 736b3bbafb3eaff9acda15ac18bbe467ab06b886e64d422f6ef0c77c51437c1d7ef3193c07c1aa1cf0bb44c79413468aa99cc8214e6f102cb4dd3745d3850372 -EBUILD streamlink-0.4.0.ebuild 1439 BLAKE2B 1a6306a4cfb1b1c316a9ca93b5b944a7549da96918cf3262efbf13158a20b3078570f6f72eb4bd84f38ae464aaaa1d98612a8764fa64c52e56dc0c00b9367ed7 SHA512 b7ffa7b4f89be630249571a8aecbe852689e1992b6075750a9bc7235e3a3c37dcd77a028155e6f120962e0de2173f6611a26a503c16df26796106885d3279c2c -EBUILD streamlink-0.6.0.ebuild 1439 BLAKE2B 1a6306a4cfb1b1c316a9ca93b5b944a7549da96918cf3262efbf13158a20b3078570f6f72eb4bd84f38ae464aaaa1d98612a8764fa64c52e56dc0c00b9367ed7 SHA512 b7ffa7b4f89be630249571a8aecbe852689e1992b6075750a9bc7235e3a3c37dcd77a028155e6f120962e0de2173f6611a26a503c16df26796106885d3279c2c -EBUILD streamlink-0.7.0.ebuild 1481 BLAKE2B 2a8f4ba7ed184a3b02c312da078b3e30b821aacdd66abe716da99ccb051d7f25e9b12126d6d50e18ad88890786b4720bbef84ba00ef2613d9f085248e7a4eda7 SHA512 d9fa66ff97771b07bcbf78800ec02ca3ad575a23228571b66ef45e674d379bfb55b2c11b71b5f6993d6108acf2d22a504c05f29c0948751290c02fc28ae21fa7 -EBUILD streamlink-0.9.0.ebuild 1580 BLAKE2B 425851d87baf78adf1b50410361483d73f959d7f959702ee2d505ab05173b8dfc306a2bb4c28c14c94b8789c604191131618176a0a72853bd0b18729adfe4557 SHA512 854aa7667c70e74acf2aa62f143032957d0b5d0360a3d774328358be3b084d371a4d8de29a051c979291705862ab670ed1763f328bf128e36a5d6d55b25e3eac +DIST streamlink-0.14.2.tar.gz 643695 BLAKE2B ea28daac32903738206226bce85a4615338b6039be1e4cce18325e977112c3301d6e6ed90d1210f4f362c898397fd980c136a98d8a0d5ff7ee2b6c5cf077f2c6 SHA512 0d9f1db32915392f9d29bcfb40743058352a924435a8ee77f1218c108e937204e88041c908d2f93546beaa70e18db62c961ea31fbdd85c5e7e4315a18118e276 +EBUILD streamlink-0.14.2-r1.ebuild 1873 BLAKE2B d65929f452d2263b895ed0fd7f0299ee045d649efff7f95e95e88460f262f5a6ca9db1ac20316704a67726e8b7c6c513a69259638f57d64e66ed01872d7068cf SHA512 98a52a9ead5700b82281343bca40bc010303e63be8961cdaa8eb29b68a328e8d233272a2b93cb6d6405a25da7b0092532011eb900c8272f591b42603ef5599f2 EBUILD streamlink-9999.ebuild 1546 BLAKE2B 034d354005c4e72d769bc33de4068aa537d239050a64b83c3c260662ee1609d80a478fcb58bf42a94a50224e43a16ca2972d6ac7a2e9f31d54ddc1a643f5a235 SHA512 3c5f51958877bd15cd3c5f82c42c076bd8ff1ff52102702508d48a746b03b955520bccc14dbd13b80688f1824e68f79fb5a6fba565847a07e553bf42eb94b554 MISC metadata.xml 330 BLAKE2B ad3caca1dc3dd2ea5915a6d14f9741ba7352d8a961939dacf89efdcae0cf1203343ca11ea230efc30cf69d359e09e7cd06218404943f8e4e3853a5c6676f7ff6 SHA512 73730cc94810711b86088a41beba0d0da4f20c4ca377c24122ebeac1ea68e712d03d0e79518df847aa15cb9d8a3f04658715f0b75dfaa1a6dfbedc0a15c33672 diff --git a/net-misc/streamlink/streamlink-0.1.0.ebuild b/net-misc/streamlink/streamlink-0.1.0.ebuild deleted file mode 100644 index 7ce96657145b..000000000000 --- a/net-misc/streamlink/streamlink-0.1.0.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) - -inherit distutils-r1 - -DESCRIPTION="CLI for extracting streams from websites to a video player of your choice" -HOMEPAGE="https://streamlink.github.io/" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -KEYWORDS="~amd64 ~arm ~x86" -LICENSE="BSD-2" -SLOT="0" -IUSE="doc test" - -RDEPEND="dev-python/pycrypto[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - virtual/python-futures[${PYTHON_USEDEP}] - virtual/python-singledispatch[${PYTHON_USEDEP}] - media-video/rtmpdump" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - test? ( ${RDEPEND} )" - -python_compile_all() { - use doc && emake -C docs html -} - -python_test() { - esetup.py test -} - -python_install_all() { - use doc && local HTML_DOCS=( docs/_build/html/. ) - distutils-r1_python_install_all -} diff --git a/net-misc/streamlink/streamlink-0.11.0.ebuild b/net-misc/streamlink/streamlink-0.11.0.ebuild deleted file mode 100644 index 6096587d059d..000000000000 --- a/net-misc/streamlink/streamlink-0.11.0.ebuild +++ /dev/null @@ -1,59 +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} ) -PYTHON_REQ_USE='xml(+),threads(+)' - -inherit distutils-r1 - -DESCRIPTION="CLI for extracting streams from websites to a video player of your choice" -HOMEPAGE="https://streamlink.github.io/" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -KEYWORDS="~amd64 ~x86" -LICENSE="BSD-2 Apache-2.0" -SLOT="0" -IUSE="doc test" - -RDEPEND="dev-python/pycryptodome[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - virtual/python-futures[${PYTHON_USEDEP}] - virtual/python-singledispatch[${PYTHON_USEDEP}] - dev-python/backports-shutil_which[$(python_gen_usedep 'python2*')] - $(python_gen_cond_dep 'dev-python/backports-shutil_get_terminal_size[${PYTHON_USEDEP}]' 'python2*') - dev-python/pycountry[${PYTHON_USEDEP}] - dev-python/websocket-client[${PYTHON_USEDEP}] - media-video/rtmpdump - virtual/ffmpeg" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/docutils[${PYTHON_USEDEP}] - ) - test? ( - $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*') - ${RDEPEND} - )" - -python_configure_all() { - # Avoid iso-639, iso3166 dependencies since we use pycountry. - export STREAMLINK_USE_PYCOUNTRY=1 -} - -python_compile_all() { - use doc && emake -C docs html man -} - -python_test() { - esetup.py test -} - -python_install_all() { - if use doc; then - local HTML_DOCS=( docs/_build/html/. ) - doman docs/_build/man/* - fi - distutils-r1_python_install_all -} diff --git a/net-misc/streamlink/streamlink-0.14.2-r1.ebuild b/net-misc/streamlink/streamlink-0.14.2-r1.ebuild new file mode 100644 index 000000000000..acb189b5ae85 --- /dev/null +++ b/net-misc/streamlink/streamlink-0.14.2-r1.ebuild @@ -0,0 +1,70 @@ +# 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} ) +PYTHON_REQ_USE='xml(+),threads(+)' +DISTUTILS_SINGLE_IMPL=1 + +inherit distutils-r1 + +DESCRIPTION="CLI for extracting streams from websites to a video player of your choice" +HOMEPAGE="https://streamlink.github.io/" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz" + +KEYWORDS="~amd64 ~x86" +LICENSE="BSD-2 Apache-2.0" +SLOT="0" +IUSE="doc test" + +RDEPEND=" + virtual/python-futures[${PYTHON_USEDEP}] + virtual/python-singledispatch[${PYTHON_USEDEP}] + >dev-python/requests-2.17.1[${PYTHON_USEDEP}] + dev-python/urllib3[${PYTHON_USEDEP}] + dev-python/isodate[${PYTHON_USEDEP}] + dev-python/websocket-client[${PYTHON_USEDEP}] + $(python_gen_cond_dep 'dev-python/backports-shutil_which[${PYTHON_USEDEP}]' 'python2*') + $(python_gen_cond_dep 'dev-python/backports-shutil_get_terminal_size[${PYTHON_USEDEP}]' 'python2*') + dev-python/pycountry[${PYTHON_USEDEP}] + >=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + doc? ( + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/docutils[${PYTHON_USEDEP}] + dev-python/recommonmark[${PYTHON_USEDEP}] + ) + test? ( + dev-python/mock[${PYTHON_USEDEP}] + dev-python/requests-mock[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/freezegun[${PYTHON_USEDEP}] + )" +RDEPEND="${RDEPEND} + media-video/rtmpdump + virtual/ffmpeg +" + +python_configure_all() { + # Avoid iso-639, iso3166 dependencies since we use pycountry. + export STREAMLINK_USE_PYCOUNTRY=1 +} + +python_compile_all() { + use doc && emake -C docs html man +} + +python_test() { + esetup.py test +} + +python_install_all() { + if use doc; then + local HTML_DOCS=( docs/_build/html/. ) + doman docs/_build/man/* + fi + distutils-r1_python_install_all +} diff --git a/net-misc/streamlink/streamlink-0.4.0.ebuild b/net-misc/streamlink/streamlink-0.4.0.ebuild deleted file mode 100644 index 885ed74fd2b4..000000000000 --- a/net-misc/streamlink/streamlink-0.4.0.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) -PYTHON_REQ_USE='xml(+),threads(+)' - -inherit distutils-r1 - -DESCRIPTION="CLI for extracting streams from websites to a video player of your choice" -HOMEPAGE="https://streamlink.github.io/" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -KEYWORDS="~amd64 ~x86" -LICENSE="BSD-2 Apache-2.0" -SLOT="0" -IUSE="doc test" - -RDEPEND="dev-python/pycryptodome[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - virtual/python-futures[${PYTHON_USEDEP}] - virtual/python-singledispatch[${PYTHON_USEDEP}] - dev-python/backports-shutil_which[$(python_gen_usedep 'python2*')] - dev-python/backports-shutil_get_terminal_size[$(python_gen_usedep 'python2*')] - dev-python/pycountry[${PYTHON_USEDEP}] - media-video/rtmpdump - virtual/ffmpeg" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/docutils[${PYTHON_USEDEP}] ) - test? ( dev-python/mock[$(python_gen_usedep 'python2*')] - ${RDEPEND} )" - -python_configure_all() { - # Avoid iso-639, iso3166 dependencies since we use pycountry. - export STREAMLINK_USE_PYCOUNTRY=1 -} - -python_compile_all() { - use doc && emake -C docs html -} - -python_test() { - esetup.py test -} - -python_install_all() { - use doc && local HTML_DOCS=( docs/_build/html/. ) - distutils-r1_python_install_all -} diff --git a/net-misc/streamlink/streamlink-0.6.0.ebuild b/net-misc/streamlink/streamlink-0.6.0.ebuild deleted file mode 100644 index 885ed74fd2b4..000000000000 --- a/net-misc/streamlink/streamlink-0.6.0.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) -PYTHON_REQ_USE='xml(+),threads(+)' - -inherit distutils-r1 - -DESCRIPTION="CLI for extracting streams from websites to a video player of your choice" -HOMEPAGE="https://streamlink.github.io/" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -KEYWORDS="~amd64 ~x86" -LICENSE="BSD-2 Apache-2.0" -SLOT="0" -IUSE="doc test" - -RDEPEND="dev-python/pycryptodome[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - virtual/python-futures[${PYTHON_USEDEP}] - virtual/python-singledispatch[${PYTHON_USEDEP}] - dev-python/backports-shutil_which[$(python_gen_usedep 'python2*')] - dev-python/backports-shutil_get_terminal_size[$(python_gen_usedep 'python2*')] - dev-python/pycountry[${PYTHON_USEDEP}] - media-video/rtmpdump - virtual/ffmpeg" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/docutils[${PYTHON_USEDEP}] ) - test? ( dev-python/mock[$(python_gen_usedep 'python2*')] - ${RDEPEND} )" - -python_configure_all() { - # Avoid iso-639, iso3166 dependencies since we use pycountry. - export STREAMLINK_USE_PYCOUNTRY=1 -} - -python_compile_all() { - use doc && emake -C docs html -} - -python_test() { - esetup.py test -} - -python_install_all() { - use doc && local HTML_DOCS=( docs/_build/html/. ) - distutils-r1_python_install_all -} diff --git a/net-misc/streamlink/streamlink-0.7.0.ebuild b/net-misc/streamlink/streamlink-0.7.0.ebuild deleted file mode 100644 index 65c5b4adf486..000000000000 --- a/net-misc/streamlink/streamlink-0.7.0.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) -PYTHON_REQ_USE='xml(+),threads(+)' - -inherit distutils-r1 - -DESCRIPTION="CLI for extracting streams from websites to a video player of your choice" -HOMEPAGE="https://streamlink.github.io/" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -KEYWORDS="~amd64 ~x86" -LICENSE="BSD-2 Apache-2.0" -SLOT="0" -IUSE="doc test" - -RDEPEND="dev-python/pycryptodome[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - virtual/python-futures[${PYTHON_USEDEP}] - virtual/python-singledispatch[${PYTHON_USEDEP}] - dev-python/backports-shutil_which[$(python_gen_usedep 'python2*')] - dev-python/backports-shutil_get_terminal_size[$(python_gen_usedep 'python2*')] - dev-python/pycountry[${PYTHON_USEDEP}] - media-video/rtmpdump - virtual/ffmpeg" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/docutils[${PYTHON_USEDEP}] ) - test? ( dev-python/mock[$(python_gen_usedep 'python2*')] - ${RDEPEND} )" - -python_configure_all() { - # Avoid iso-639, iso3166 dependencies since we use pycountry. - export STREAMLINK_USE_PYCOUNTRY=1 -} - -python_compile_all() { - use doc && emake -C docs html man -} - -python_test() { - esetup.py test -} - -python_install_all() { - if use doc; then - local HTML_DOCS=( docs/_build/html/. ) - doman docs/_build/man/* - fi - distutils-r1_python_install_all -} diff --git a/net-misc/streamlink/streamlink-0.9.0.ebuild b/net-misc/streamlink/streamlink-0.9.0.ebuild deleted file mode 100644 index 30393d7be3f5..000000000000 --- a/net-misc/streamlink/streamlink-0.9.0.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2017 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} ) -PYTHON_REQ_USE='xml(+),threads(+)' - -inherit distutils-r1 - -DESCRIPTION="CLI for extracting streams from websites to a video player of your choice" -HOMEPAGE="https://streamlink.github.io/" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -KEYWORDS="~amd64 ~x86" -LICENSE="BSD-2 Apache-2.0" -SLOT="0" -IUSE="doc test" - -RDEPEND="dev-python/pycryptodome[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - virtual/python-futures[${PYTHON_USEDEP}] - virtual/python-singledispatch[${PYTHON_USEDEP}] - dev-python/backports-shutil_which[$(python_gen_usedep 'python2*')] - $(python_gen_cond_dep 'dev-python/backports-shutil_get_terminal_size[${PYTHON_USEDEP}]' 'python2*') - dev-python/pycountry[${PYTHON_USEDEP}] - dev-python/websocket-client[${PYTHON_USEDEP}] - media-video/rtmpdump - virtual/ffmpeg" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/docutils[${PYTHON_USEDEP}] - ) - test? ( - $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*') - ${RDEPEND} - )" - -python_configure_all() { - # Avoid iso-639, iso3166 dependencies since we use pycountry. - export STREAMLINK_USE_PYCOUNTRY=1 -} - -python_compile_all() { - use doc && emake -C docs html man -} - -python_test() { - esetup.py test -} - -python_install_all() { - if use doc; then - local HTML_DOCS=( docs/_build/html/. ) - doman docs/_build/man/* - fi - distutils-r1_python_install_all -} diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest index 2ecfe4a0907a..ee96ecc84887 100644 --- a/net-misc/youtube-dl/Manifest +++ b/net-misc/youtube-dl/Manifest @@ -1,10 +1,10 @@ DIST youtube-dl-2017.11.15.tar.gz 2834012 BLAKE2B fd93e3923f99874be58681a886c09e31ac10063975ab636badf27e59b44743c72cddf05e3a431c49ffd0f7b40f9b005f4d90feff85d4ca889dee80833300b076 SHA512 e10c0d53db7fdfb02610b53f54046c0a9354b305ba05c5d00a43649a283a6449263f66ff56171d52cf18f906c6aeccc25dc48ea708b4b1bb2b8323b937abca96 DIST youtube-dl-2018.08.22.tar.gz 3025389 BLAKE2B e8d2d8bccab8c169d08de35544e5efb05c65799c26894807e075edfe090d36de30fea787f54d59e4fc8b671356ce2e1d9002627948fb05becc9d2e3bc634164c SHA512 ef17c744ac27b3bf547124f18a155908a66ee75f3f6fb5d7dd8a1d8da61a5a598bbade6cf0362e8c93c337dcf47750db5f56357919226430f02d0b764011ffb5 -DIST youtube-dl-2018.08.28.tar.gz 3027906 BLAKE2B dde156395f40aa91247341ab46e909536b3a4f53acea071b543ab8a548608655f2072280c9d927e7845ef79e4b0d7a0c150bafa477fb46df9ff11979cf344c5e SHA512 311abf4410a4e59df9b6941ee7cf03afda1c2e959eac8c1be182a31854d2f4dac9cd016a5103828d4860dce3db0671a8937c296eac2f24364acc67271f8ffd14 -DIST youtube-dl-2018.09.01.tar.gz 3032563 BLAKE2B c1535f1311b03ea5f3b20aba3a14487515427aad7d16e52ddca9d974050fe955405ba05fbac5c91e6e3ac830176b537d44d039a1d1e13fedc32a665610cc2af7 SHA512 172f65f48e81f335e959c119ca13f40f32cca7fc57c123d17e7be836aef2fa072cc20a1255bb5d9584c8cd1d8f8fa4c88d3f2ed5b3fa94075d3f97e7285f30af +DIST youtube-dl-2018.09.08.tar.gz 3034241 BLAKE2B a388c707c771abd57814de119edc4a12c2fc569f72ed2881cc1906a30c2148d44b97c9866513eb8db0d95ce4c25e2275e41002bda796463eaeaeb0c99cdf6b31 SHA512 c1cbf38a185d6ba1525eb08064f95aa252cf8d461f140cb48dc4a795e209f5d31bc1583f4d52c2ea9f1c15dac46c563603e46f72cc896a7fec54dcb2d0a49c0b +DIST youtube-dl-2018.09.10.tar.gz 3036301 BLAKE2B 341e74da88ccb890cf41ce81b3f541118b6afcae6baa6bc7722e41730894ee466e57b3475622309de12dec01e15d51534db90fe5751f785287665416e3ba71de SHA512 ebc0b0357231173718be3b94c2c2974496170e039a69cb58d809a1973a56306af058d91f485d2bacee5d665fea1f96d9f7243960556b42a7280a647611dca750 EBUILD youtube-dl-2017.11.15.ebuild 2365 BLAKE2B cff79a16ba920a6b85b9e7970a12065fade413701a7b0fbd86e739887ea86dde832e7d9344f73fef2480e32d689c8c89ed3926afc9f2cf702b9385550dd38c04 SHA512 5be26dbc448c37d37db450f7b70aed88124794e7f80ba584485ee99fdb6288093e5bae05ca8b2e58eb783b7a398fc5b866728711588d43da6bf46c07f47bf1fb EBUILD youtube-dl-2018.08.22.ebuild 3286 BLAKE2B 998db6c1bf8f4bdb39152fa75712e4ebe98a9d69422b464328da90fb986e8ea07ddeb9e90cbff52dcd8012cce96ab06e48d7e4c87e6a660cc5fd90dfa5bd731a SHA512 927eab9548db77ce0a3455023a2f85bab64a0dae9a03d09d8b1ce96ec891bf32e49b2b2292abc5688db940eefae51473918df6449469f054a859820398782a11 -EBUILD youtube-dl-2018.08.28.ebuild 3289 BLAKE2B a166bf5cd416617633a5809e712fa972fe9ff5c52d550e93e94e4c7c82a03832e6f9d515af8f4316d49cf4332e78f353b74578a85128daa911d748641452bbaf SHA512 be1262c6cda81052b15b443b4c1a5613c50c930fee336cc0dc34ba504db9bdc80afce105cd838e20997ade21cc22185390abc209c2639975efcde017aa72f994 -EBUILD youtube-dl-2018.09.01.ebuild 3289 BLAKE2B a166bf5cd416617633a5809e712fa972fe9ff5c52d550e93e94e4c7c82a03832e6f9d515af8f4316d49cf4332e78f353b74578a85128daa911d748641452bbaf SHA512 be1262c6cda81052b15b443b4c1a5613c50c930fee336cc0dc34ba504db9bdc80afce105cd838e20997ade21cc22185390abc209c2639975efcde017aa72f994 +EBUILD youtube-dl-2018.09.08.ebuild 3289 BLAKE2B a166bf5cd416617633a5809e712fa972fe9ff5c52d550e93e94e4c7c82a03832e6f9d515af8f4316d49cf4332e78f353b74578a85128daa911d748641452bbaf SHA512 be1262c6cda81052b15b443b4c1a5613c50c930fee336cc0dc34ba504db9bdc80afce105cd838e20997ade21cc22185390abc209c2639975efcde017aa72f994 +EBUILD youtube-dl-2018.09.10.ebuild 3289 BLAKE2B a166bf5cd416617633a5809e712fa972fe9ff5c52d550e93e94e4c7c82a03832e6f9d515af8f4316d49cf4332e78f353b74578a85128daa911d748641452bbaf SHA512 be1262c6cda81052b15b443b4c1a5613c50c930fee336cc0dc34ba504db9bdc80afce105cd838e20997ade21cc22185390abc209c2639975efcde017aa72f994 EBUILD youtube-dl-99999999.ebuild 3156 BLAKE2B 3e94ee7379ea96aa47c6276d78bab9683bc2317980a7206d119c9710ccf99ec2da383bb8744208bf4d82af91990b12a769dc66760614330a2ef276c3051f3d05 SHA512 b45f8856a4d7067dfe53f1a7689373c001f0e1b98540cd1654001c9e23c442a245bf41d014945b2b84d818f0e26d0995fd7b35b73d3e3871a6c567c8e664c5e4 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27 diff --git a/net-misc/youtube-dl/youtube-dl-2018.08.28.ebuild b/net-misc/youtube-dl/youtube-dl-2018.08.28.ebuild deleted file mode 100644 index 1c433fb38eca..000000000000 --- a/net-misc/youtube-dl/youtube-dl-2018.08.28.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 ~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 vporn watchindianporn - xbef xnxx xtube xvideos xxxymovies youjizz youporn - ) - # these have multi-line import statements - local mxxx=( - drtuber fourtube motherless pornhub redtube tnaflix tube8 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/vendor_completions.d - doins youtube-dl.fish - - distutils-r1_python_install_all - - rm -r "${ED}"/usr/etc || die - rm -r "${ED}"/usr/share/doc/youtube_dl || die -} - -pkg_postinst() { - elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /" - elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :" - elog - elog "${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.09.01.ebuild b/net-misc/youtube-dl/youtube-dl-2018.09.01.ebuild deleted file mode 100644 index 1c433fb38eca..000000000000 --- a/net-misc/youtube-dl/youtube-dl-2018.09.01.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 ~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 vporn watchindianporn - xbef xnxx xtube xvideos xxxymovies youjizz youporn - ) - # these have multi-line import statements - local mxxx=( - drtuber fourtube motherless pornhub redtube tnaflix tube8 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/vendor_completions.d - doins youtube-dl.fish - - distutils-r1_python_install_all - - rm -r "${ED}"/usr/etc || die - rm -r "${ED}"/usr/share/doc/youtube_dl || die -} - -pkg_postinst() { - elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /" - elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :" - elog - elog "${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.09.08.ebuild b/net-misc/youtube-dl/youtube-dl-2018.09.08.ebuild new file mode 100644 index 000000000000..1c433fb38eca --- /dev/null +++ b/net-misc/youtube-dl/youtube-dl-2018.09.08.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 ~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 vporn watchindianporn + xbef xnxx xtube xvideos xxxymovies youjizz youporn + ) + # these have multi-line import statements + local mxxx=( + drtuber fourtube motherless pornhub redtube tnaflix tube8 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/vendor_completions.d + doins youtube-dl.fish + + distutils-r1_python_install_all + + rm -r "${ED}"/usr/etc || die + rm -r "${ED}"/usr/share/doc/youtube_dl || die +} + +pkg_postinst() { + elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /" + elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :" + elog + elog "${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.09.10.ebuild b/net-misc/youtube-dl/youtube-dl-2018.09.10.ebuild new file mode 100644 index 000000000000..1c433fb38eca --- /dev/null +++ b/net-misc/youtube-dl/youtube-dl-2018.09.10.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 ~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 vporn watchindianporn + xbef xnxx xtube xvideos xxxymovies youjizz youporn + ) + # these have multi-line import statements + local mxxx=( + drtuber fourtube motherless pornhub redtube tnaflix tube8 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/vendor_completions.d + doins youtube-dl.fish + + distutils-r1_python_install_all + + rm -r "${ED}"/usr/etc || die + rm -r "${ED}"/usr/share/doc/youtube_dl || die +} + +pkg_postinst() { + elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /" + elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :" + elog + elog "${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