From 09351e78166b5e864197c4456ebae3f89dd0bed9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 22 Jan 2019 10:09:44 +0000 Subject: gentoo resync : 22.01.2019 --- net-misc/Manifest.gz | Bin 61356 -> 61361 bytes net-misc/connman/Manifest | 1 + net-misc/connman/connman-1.36-r1.ebuild | 95 +++++ net-misc/curl/Manifest | 5 +- net-misc/curl/curl-7.61.1-r1.ebuild | 247 ----------- net-misc/curl/curl-7.61.1.ebuild | 247 ----------- net-misc/curl/curl-7.62.0.ebuild | 2 +- net-misc/gnome-online-miners/Manifest | 2 +- .../gnome-online-miners-3.24.0.ebuild | 4 +- net-misc/iputils/Manifest | 2 +- net-misc/iputils/iputils-20180629.ebuild | 4 +- net-misc/linuxptp/Manifest | 8 +- net-misc/linuxptp/linuxptp-1.5.ebuild | 36 -- net-misc/linuxptp/linuxptp-1.6.ebuild | 36 -- net-misc/linuxptp/linuxptp-1.7.ebuild | 36 -- net-misc/linuxptp/linuxptp-2.0.ebuild | 36 ++ net-misc/mobile-broadband-provider-info/Manifest | 2 + .../mobile-broadband-provider-info-20190116.ebuild | 20 + net-misc/netkit-rsh/Manifest | 2 +- net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild | 4 +- net-misc/networkmanager-strongswan/Manifest | 2 +- .../networkmanager-strongswan-1.4.4-r1.ebuild | 50 +++ .../networkmanager-strongswan-1.4.4.ebuild | 45 -- net-misc/openssh/Manifest | 2 + .../files/openssh-7.9_p1-CVE-2018-20685.patch | 16 + net-misc/openssh/openssh-7.9_p1-r2.ebuild | 451 +++++++++++++++++++++ net-misc/putty/Manifest | 2 +- net-misc/putty/putty-9999.ebuild | 9 +- net-misc/spice-gtk/Manifest | 2 +- net-misc/spice-gtk/spice-gtk-9999.ebuild | 7 +- net-misc/stunnel/Manifest | 2 +- net-misc/stunnel/stunnel-5.43.ebuild | 4 +- net-misc/youtube-dl/Manifest | 6 +- net-misc/youtube-dl/youtube-dl-2019.01.02.ebuild | 117 ------ net-misc/youtube-dl/youtube-dl-2019.01.10.ebuild | 117 ------ net-misc/youtube-dl/youtube-dl-2019.01.17.ebuild | 117 ++++++ 36 files changed, 822 insertions(+), 916 deletions(-) create mode 100644 net-misc/connman/connman-1.36-r1.ebuild delete mode 100644 net-misc/curl/curl-7.61.1-r1.ebuild delete mode 100644 net-misc/curl/curl-7.61.1.ebuild delete mode 100644 net-misc/linuxptp/linuxptp-1.5.ebuild delete mode 100644 net-misc/linuxptp/linuxptp-1.6.ebuild delete mode 100644 net-misc/linuxptp/linuxptp-1.7.ebuild create mode 100644 net-misc/linuxptp/linuxptp-2.0.ebuild create mode 100644 net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190116.ebuild create mode 100644 net-misc/networkmanager-strongswan/networkmanager-strongswan-1.4.4-r1.ebuild delete mode 100644 net-misc/networkmanager-strongswan/networkmanager-strongswan-1.4.4.ebuild create mode 100644 net-misc/openssh/files/openssh-7.9_p1-CVE-2018-20685.patch create mode 100644 net-misc/openssh/openssh-7.9_p1-r2.ebuild delete mode 100644 net-misc/youtube-dl/youtube-dl-2019.01.02.ebuild delete mode 100644 net-misc/youtube-dl/youtube-dl-2019.01.10.ebuild create mode 100644 net-misc/youtube-dl/youtube-dl-2019.01.17.ebuild (limited to 'net-misc') diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz index e98b9fbe79a5..8e2e94a57909 100644 Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest index 96dfd881b019..278d6e8886a6 100644 --- a/net-misc/connman/Manifest +++ b/net-misc/connman/Manifest @@ -9,5 +9,6 @@ AUX connman.service 198 BLAKE2B 8b943dc995fed630b15bcfe1040598e13a5b2118967f9fb6 DIST connman-1.35.tar.xz 686092 BLAKE2B 706d8333dc2fcbee8d0ef3849325c4975dfe312a7a542ee96859a1724e05b1302c244a0108ab70033b398301c235fb13cb9509e9147dc2bb049e900f3799cd98 SHA512 2234b4d18b038f9a33939035cddebd31c74ce962e5616c2c30b2912476612ef3f7d5b9edca64bf6e69fa358252ed432124e036ac3516b291b86695cb9a96c6a8 DIST connman-1.36.tar.xz 692616 BLAKE2B 7d8cea55365fbfe78cd897b5b65d8edf475a737220732c46c95dda4c6b12badddca38150dbedddcc95c29bce486d86fe130a9d65043c6e18ed6b1eba3fe5aec0 SHA512 c0b9e924a28d58539d44c314168ae7aa46dfea8ce9d125198f525a6d6ef95ca77fd0357c4c4c7548b362b9de8e6f85c7915b1a4cf89b65116c4cbc4df75318e1 EBUILD connman-1.35-r1.ebuild 2555 BLAKE2B 7369ceafa9bd072bd8020da45453bd07ddacb10606bb3d61ceddfd3367b15bdbf890a00aa579536d548b52fd6c6656d79cdb31d290d2ac6301a6f04ffbd0724d SHA512 640be0029a8c6568a47973743f968cc641a579523f4288cc5ac0347b72721f547f608729c2865b2a31e15394e2c85a18b360936e082ac3f7069296e9977870b8 +EBUILD connman-1.36-r1.ebuild 2587 BLAKE2B ed3365fca807716a3e51e4ec9dc6b24baa144bd9f48d72e5d68b30a512663e9ba0d3497d1f8532a3b3d260d546df37f489b1c7fdb7f1d70931bd3043a9a881ea SHA512 4ba0e07568052cea00aeb6ccb8dbccc4e339712ddbb8c2b22716659298afd09863de1a2b3f1f3325b0ff40e24d8345fe1fc408085874a8ee5897be861df3bfdd EBUILD connman-1.36.ebuild 2568 BLAKE2B 902e767beeeb20850f0387485444905ac4b607dbdcca5fe73b4db808df7534829d2a2ccec1636c1ecaf8cbcc0c60bea9dc8b8865d8da13b1d748fd778a62d551 SHA512 f9c93a7263ce7d683dcfb6e1fc2d6798a222159bdcaf432ab75fb37d5c8a37e200ad6ad2ba5efef8438eff2eaa486545d4593817aa9ff3532833c1a15f9acb27 MISC metadata.xml 1158 BLAKE2B 57d083417dd0b186b1d45368f1ffab64d6283535ae6f25adfd6cd85d26f535544f0b89d7f731dbb876ba7acd1973abdd26ac7643c050adc9a433d321ffc9fb57 SHA512 2d272d638d9f9f06eb900736815eb0e401520f3ad86082beea541932626c5758e220f692931772ecafffbd60798f0df38e8c9e8a02b58c03743ed984955edb8b diff --git a/net-misc/connman/connman-1.36-r1.ebuild b/net-misc/connman/connman-1.36-r1.ebuild new file mode 100644 index 000000000000..376b73082b7a --- /dev/null +++ b/net-misc/connman/connman-1.36-r1.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +inherit autotools systemd tmpfiles + +DESCRIPTION="Provides a daemon for managing internet connections" +HOMEPAGE="https://01.org/connman" +SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + +IUSE="${IUSE} bluetooth debug doc examples +ethernet iptables iwd l2tp nftables" +IUSE="${IUSE} ofono openvpn openconnect pptp policykit tools vpnc +wifi wispr networkmanager" + +REQUIRED_USE="|| ( iptables nftables )" +RDEPEND=">=dev-libs/glib-2.16 + >=sys-apps/dbus-1.2.24 + sys-libs/readline:0= + iptables? ( >=net-firewall/iptables-1.4.8 ) + bluetooth? ( net-wireless/bluez ) + iwd? ( net-wireless/iwd ) + l2tp? ( net-dialup/xl2tpd ) + nftables? ( + >=net-libs/libnftnl-1.0.4:0= + >=net-libs/libmnl-1.0.0:0= ) + ofono? ( net-misc/ofono ) + openconnect? ( net-vpn/openconnect ) + openvpn? ( net-vpn/openvpn ) + policykit? ( sys-auth/polkit ) + pptp? ( net-dialup/pptpclient ) + vpnc? ( net-vpn/vpnc ) + wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] ) + wispr? ( net-libs/gnutls )" + +DEPEND="${RDEPEND} + >=sys-kernel/linux-headers-2.6.39 + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${PN}-1.33-polkit-configure-check-fix.patch" +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + --localstatedir=/var \ + --with-systemdunitdir=$(systemd_get_systemunitdir) \ + --with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \ + --enable-client \ + --enable-datafiles \ + --enable-loopback=builtin \ + $(use_enable examples test) \ + $(use_enable ethernet ethernet builtin) \ + $(use_enable wifi wifi builtin) \ + $(use_enable iwd) \ + $(use_enable bluetooth bluetooth builtin) \ + $(use_enable l2tp l2tp builtin) \ + $(use_enable ofono ofono builtin) \ + $(use_enable openconnect openconnect builtin) \ + $(use_enable openvpn openvpn builtin) \ + $(use_enable policykit polkit builtin) \ + $(use_enable pptp pptp builtin) \ + $(use_enable vpnc vpnc builtin) \ + $(use_enable wispr wispr builtin) \ + $(use_enable debug) \ + $(use_enable tools) \ + $(use_enable networkmanager nmcompat) \ + --with-firewall=$(usex iptables "iptables" "nftables" ) \ + --disable-iospm \ + --disable-hh2serial-gps +} + +src_install() { + default + dobin client/connmanctl + + if use doc; then + dodoc doc/*.txt + fi + keepdir /usr/lib/${PN}/scripts + keepdir /var/lib/${PN} + newinitd "${FILESDIR}"/${PN}.initd2 ${PN} + newconfd "${FILESDIR}"/${PN}.confd ${PN} +} + +pkg_postinst() { + tmpfiles_process /usr/lib/tmpfiles.d/connman_resolvconf.conf +} diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest index 518bc605bb5b..a1921a0e7adb 100644 --- a/net-misc/curl/Manifest +++ b/net-misc/curl/Manifest @@ -1,11 +1,8 @@ AUX curl-7.30.0-prefix.patch 880 BLAKE2B 5b7552a8339014221864a585d174b02a96ec7dd7fe8762d331d1981834044f8ec4db64d527a4ded3f5f4cccc86f281576668de092439eb19f5477d5fcf8369cf SHA512 c7cd13b9ccbd12ed01ea121ffece9c23b898a5b34698bae59ae1dd23b1cf2445180b84d80c4a640981f16dba5018df944f405dd5c660addab54ca21e0e673b7f AUX curl-fix-gnutls-nettle.patch 1186 BLAKE2B 5a7ea1ab68e8e314cda5b957335caf84e5b0e9b2b65c1eacfe94349139ff27903d55ae608a71a0389bf9f8bfbda92184c4cc30ca0b96b13b11f0d77cbf4c7b53 SHA512 b88d4d71a1d55626aedea620e94a5b6064141c6ff0d8a64c784705d44d4a00dc789dd0a55a56320ca4c9f2b9914e72285447c9310bb4563b45d7f3430b18a0fa AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54 -DIST curl-7.61.1.tar.bz2 2965173 BLAKE2B 16ef6962f64e18a4b67c3cccff78120084a2660207f512974f9827c53037a95b935a6020620f926eee85339fbc558be5585f2a4c001bd287c4d33795e6a6dab5 SHA512 484d33c0d32109539a95309cdb4404c03c0e7164fdbf7a4724a5b01aa20e2d48fbe6363c7cc53060d4d28050cfa6b43f9ed220ab65d4d389eb00efff5db1bfb5 DIST curl-7.62.0.tar.bz2 3014762 BLAKE2B 0cc9ef5d19004dc5cc69444cac3b2fb4fd82ba470a831b761c147e45826fc26087f4e07da76ee0b6a070f6125a1423927607a257786387326f4c9f4e3953d5f7 SHA512 83ca5c2757745f763316eefdd4c3f0e8a211a7f0db6a708b67ae2133ad41fdf17dd2230f9283a4778c9c866126d407454a090291cd2bf274371d0a214c1c13f5 DIST curl-7.63.0.tar.bz2 3001355 BLAKE2B 7925825f606d7eb474fb73aeec52353d3a3bf8827b34457493003ef2e3c1aed5350d849fdbd5624f148c6bb776aad318f1f49ec1ca57690f5dfb21b12fcbdc16 SHA512 2873ef57b15cf12e508626f4546f6e06450cb87b239be1d26d9b3a22f7533d76eebabb5fa00e7b8c5d7fc9854356997ce164afb069411d079b2b9f0bdb00db25 -EBUILD curl-7.61.1-r1.ebuild 7221 BLAKE2B f62d7c0eaac984bd8f98040eb6c3fe76de792cb19cc3fd5043db3b42c8a65dca81e112aa0117840bf2ecacfef29f87ad64fb3e1d78be11c99c3d435eec2f8916 SHA512 d40b1bb3884e3a4953d6ecd37a078411e252f3a84aae18aa9ed6dcb0ffb2ad5cdfecde841e0543a8ecd780b649ee3120c6047ecaa7468b7503922f72d17fedeb -EBUILD curl-7.61.1.ebuild 7188 BLAKE2B 0c8aa08db582fe8d02a1edaf5227fc7b0fd9784be455cc55125f29d3f1008fae07642a531d91771d3866e5a84c18b1fb5cb7d862648586916234a20d781f2f43 SHA512 ba13389aee609f13643fd6472c16a8cd8f4b6f11aadebc376f98ad7af0a515452ac5d3d73051cfe0d974d67753f67404e8f77a410948824b0324eef1f6a8ae20 -EBUILD curl-7.62.0.ebuild 7210 BLAKE2B 59d3807676e597d4ccd39a261578bd8a33d2bc29c3cd30dca0d359928a8e073f7831191a9f63db9272b3ab993773db986438e55aab4b3a5078c1e61cfc56c03b SHA512 371f4932ff242ce5abd7be2f9cbae1d1a19e74b9822435d989489601d0b3082a6ea5fe954c822c4970cbfe10e7652437bd16bfb3333ef924770782bd79d5516c +EBUILD curl-7.62.0.ebuild 7208 BLAKE2B ef907472ef262984af161c67c766c8d1e31c9601ddd61d678921bebcfe9c98b9f43e65438d28f5276ec6bbce5fdb7843aee06338e3704fd128d8742a36482bf8 SHA512 90cb165e3fe36b5eb9b9755fc0dab27109282a10fdb5092afaf1eb716719040da870a9deca0f8ad1f8f750be4c89f9b46834b18753f9d66d2c70ed39d70e316b EBUILD curl-7.63.0-r1.ebuild 6847 BLAKE2B d52226c50765c986e0edfa883009390af00eae62019ad8bef0e7a17f6db400662a6dbdec4f2d550c0e87ede84f692d64edcf16d310cfa8e2d21dca488283ae3c SHA512 417e746879161b9a6034dbb889184809a7684cabb7c1fe2669b8c639e20fa8130d95e8204c954f43e171140b09876ec98b998a5f41dc7efdd3f7495189d4ce96 MISC metadata.xml 900 BLAKE2B a370dc14334bd729842d0ac979d804d0ff35332dc1fade6e2fbc33649a02db17ef04897c61727d786a4bc3d8acc2a20ddcfe97abdc350b65d9ecfdfe4509f9ef SHA512 ff16407a74d8688f4ed0d7158ea5bd31bc47e828672c874e2f43f4cda1fcd741922c98c5ff5d7f114154b149983e252319f0e812197b4ca7a0979683b5cec8ad diff --git a/net-misc/curl/curl-7.61.1-r1.ebuild b/net-misc/curl/curl-7.61.1-r1.ebuild deleted file mode 100644 index 29e3e4618832..000000000000 --- a/net-misc/curl/curl-7.61.1-r1.ebuild +++ /dev/null @@ -1,247 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit autotools eutils prefix multilib-minimal - -DESCRIPTION="A Client that groks URLs" -HOMEPAGE="https://curl.haxx.se/" -SRC_URI="https://curl.haxx.se/download/${P}.tar.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" -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" - -#lead to lots of false negatives, bug #285669 -RESTRICT="test" - -RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) - brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) - ssl? ( - curl_ssl_axtls? ( - net-libs/axtls:0=[${MULTILIB_USEDEP}] - app-misc/ca-certificates - ) - curl_ssl_gnutls? ( - net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}] - dev-libs/nettle:0=[${MULTILIB_USEDEP}] - app-misc/ca-certificates - ) - curl_ssl_libressl? ( - dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}] - ) - curl_ssl_mbedtls? ( - net-libs/mbedtls:0=[${MULTILIB_USEDEP}] - app-misc/ca-certificates - ) - curl_ssl_openssl? ( - dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}] - ) - curl_ssl_nss? ( - dev-libs/nss:0[${MULTILIB_USEDEP}] - app-misc/ca-certificates - ) - ) - http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] ) - idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] ) - adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] ) - kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) - metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] ) - rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) - ssh? ( net-libs/libssh2[static-libs?,${MULTILIB_USEDEP}] ) - sys-libs/zlib[${MULTILIB_USEDEP}]" - -# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303 -# rtmp? ( -# media-video/rtmpdump -# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] ) -# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] ) -# ) - -# ssl providers to be added: -# fbopenssl $(use_with spnego) - -DEPEND="${RDEPEND} - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] - test? ( - sys-apps/diffutils - dev-lang/perl - )" - -# c-ares must be disabled for threads -# only one ssl provider can be enabled -REQUIRED_USE=" - curl_ssl_winssl? ( elibc_Winnt ) - threads? ( !adns ) - ssl? ( - ^^ ( - curl_ssl_axtls - curl_ssl_gnutls - curl_ssl_libressl - curl_ssl_mbedtls - curl_ssl_nss - curl_ssl_openssl - curl_ssl_winssl - ) - )" - -DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \ - docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE.md ) - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/curl/curlbuild.h -) - -MULTILIB_CHOST_TOOLS=( - /usr/bin/curl-config -) - -src_prepare() { - eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch - eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch - eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch - - sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241 - - eapply_user - eprefixify curl-config.in - eautoreconf - - if [[ ${CHOST} == *-darwin17 ]] ; then - # https://bugs.gentoo.org/show_bug.cgi?id=637252 - sed -i -e '/-Werror=partial-availability/s/Werror/Wno-error/g' \ - configure || die - fi -} - -multilib_src_configure() { - # We make use of the fact that later flags override earlier ones - # So start with all ssl providers off until proven otherwise - # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/) - local myconf=() - myconf+=( --without-axtls --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl ) - myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) - if use ssl ; then - if use curl_ssl_axtls; then - einfo "SSL provided by axtls" - myconf+=( --with-axtls ) - elif use curl_ssl_gnutls; then - einfo "SSL provided by gnutls" - myconf+=( --with-gnutls --with-nettle ) - elif use curl_ssl_libressl; then - einfo "SSL provided by LibreSSL" - myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) - elif use curl_ssl_mbedtls; then - einfo "SSL provided by mbedtls" - myconf+=( --with-mbedtls ) - elif use curl_ssl_nss; then - einfo "SSL provided by nss" - myconf+=( --with-nss ) - elif use curl_ssl_openssl; then - einfo "SSL provided by openssl" - myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) - elif use curl_ssl_winssl; then - einfo "SSL provided by Windows" - myconf+=( --with-winssl ) - else - eerror "We can't be here because of REQUIRED_USE." - fi - else - einfo "SSL disabled" - fi - - # These configuration options are organized alphabetically - # within each category. This should make it easier if we - # ever decide to make any of them contingent on USE flags: - # 1) protocols first. To see them all do - # 'grep SUPPORT_PROTOCOLS configure.ac' - # 2) --enable/disable options second. - # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort - # 3) --with/without options third. - # grep -- --with configure | grep Check | awk '{ print $4 }' | sort - ECONF_SOURCE="${S}" \ - econf \ - --enable-crypto-auth \ - --enable-dict \ - --enable-file \ - --enable-ftp \ - --enable-gopher \ - --enable-http \ - --enable-imap \ - $(use_enable ldap) \ - $(use_enable ldap ldaps) \ - --disable-ntlm-wb \ - --enable-pop3 \ - --enable-rt \ - --enable-rtsp \ - $(use_enable samba smb) \ - $(use_with ssh libssh2) \ - --enable-smtp \ - --enable-telnet \ - --enable-tftp \ - --enable-tls-srp \ - $(use_enable adns ares) \ - --enable-cookies \ - --enable-hidden-symbols \ - $(use_enable ipv6) \ - --enable-largefile \ - --without-libpsl \ - --enable-manual \ - --enable-proxy \ - --disable-sspi \ - $(use_enable static-libs static) \ - $(use_enable threads threaded-resolver) \ - $(use_enable threads pthreads) \ - --disable-versioned-symbols \ - --without-cyassl \ - --without-darwinssl \ - $(use_with idn libidn2) \ - $(use_with kerberos gssapi "${EPREFIX}"/usr) \ - $(use_with metalink libmetalink) \ - $(use_with http2 nghttp2) \ - $(use_with rtmp librtmp) \ - $(use_with brotli) \ - --without-spnego \ - --without-winidn \ - --without-wolfssl \ - --with-zlib \ - "${myconf[@]}" - - if ! multilib_is_native_abi; then - # avoid building the client - sed -i -e '/SUBDIRS/s:src::' Makefile || die - sed -i -e '/SUBDIRS/s:scripts::' Makefile || die - fi - - # Fix up the pkg-config file to be more robust. - # https://github.com/curl/curl/issues/864 - local priv=() libs=() - # We always enable zlib. - libs+=( "-lz" ) - priv+=( "zlib" ) - if use http2; then - libs+=( "-lnghttp2" ) - priv+=( "libnghttp2" ) - fi - if use ssl && use curl_ssl_openssl; then - libs+=( "-lssl" "-lcrypto" ) - priv+=( "openssl" ) - fi - grep -q Requires.private libcurl.pc && die "need to update ebuild" - libs=$(printf '|%s' "${libs[@]}") - sed -i -r \ - -e "/^Libs.private/s:(${libs#|})( |$)::g" \ - libcurl.pc || die - echo "Requires.private: ${priv[*]}" >> libcurl.pc -} - -multilib_src_install_all() { - einstalldocs - prune_libtool_files --all - - rm -rf "${ED}"/etc/ -} diff --git a/net-misc/curl/curl-7.61.1.ebuild b/net-misc/curl/curl-7.61.1.ebuild deleted file mode 100644 index 726cd4a808ba..000000000000 --- a/net-misc/curl/curl-7.61.1.ebuild +++ /dev/null @@ -1,247 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit autotools eutils prefix multilib-minimal - -DESCRIPTION="A Client that groks URLs" -HOMEPAGE="https://curl.haxx.se/" -SRC_URI="https://curl.haxx.se/download/${P}.tar.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" -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" - -#lead to lots of false negatives, bug #285669 -RESTRICT="test" - -RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) - brotli? ( app-arch/brotli:= ) - ssl? ( - curl_ssl_axtls? ( - net-libs/axtls:0=[${MULTILIB_USEDEP}] - app-misc/ca-certificates - ) - curl_ssl_gnutls? ( - net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}] - dev-libs/nettle:0=[${MULTILIB_USEDEP}] - app-misc/ca-certificates - ) - curl_ssl_libressl? ( - dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}] - ) - curl_ssl_mbedtls? ( - net-libs/mbedtls:0=[${MULTILIB_USEDEP}] - app-misc/ca-certificates - ) - curl_ssl_openssl? ( - dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}] - ) - curl_ssl_nss? ( - dev-libs/nss:0[${MULTILIB_USEDEP}] - app-misc/ca-certificates - ) - ) - http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] ) - idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] ) - adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] ) - kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) - metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] ) - rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) - ssh? ( net-libs/libssh2[static-libs?,${MULTILIB_USEDEP}] ) - sys-libs/zlib[${MULTILIB_USEDEP}]" - -# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303 -# rtmp? ( -# media-video/rtmpdump -# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] ) -# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] ) -# ) - -# ssl providers to be added: -# fbopenssl $(use_with spnego) - -DEPEND="${RDEPEND} - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] - test? ( - sys-apps/diffutils - dev-lang/perl - )" - -# c-ares must be disabled for threads -# only one ssl provider can be enabled -REQUIRED_USE=" - curl_ssl_winssl? ( elibc_Winnt ) - threads? ( !adns ) - ssl? ( - ^^ ( - curl_ssl_axtls - curl_ssl_gnutls - curl_ssl_libressl - curl_ssl_mbedtls - curl_ssl_nss - curl_ssl_openssl - curl_ssl_winssl - ) - )" - -DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \ - docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE.md ) - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/curl/curlbuild.h -) - -MULTILIB_CHOST_TOOLS=( - /usr/bin/curl-config -) - -src_prepare() { - eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch - eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch - eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch - - sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241 - - eapply_user - eprefixify curl-config.in - eautoreconf - - if [[ ${CHOST} == *-darwin17 ]] ; then - # https://bugs.gentoo.org/show_bug.cgi?id=637252 - sed -i -e '/-Werror=partial-availability/s/Werror/Wno-error/g' \ - configure || die - fi -} - -multilib_src_configure() { - # We make use of the fact that later flags override earlier ones - # So start with all ssl providers off until proven otherwise - # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/) - local myconf=() - myconf+=( --without-axtls --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl ) - myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) - if use ssl ; then - if use curl_ssl_axtls; then - einfo "SSL provided by axtls" - myconf+=( --with-axtls ) - elif use curl_ssl_gnutls; then - einfo "SSL provided by gnutls" - myconf+=( --with-gnutls --with-nettle ) - elif use curl_ssl_libressl; then - einfo "SSL provided by LibreSSL" - myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) - elif use curl_ssl_mbedtls; then - einfo "SSL provided by mbedtls" - myconf+=( --with-mbedtls ) - elif use curl_ssl_nss; then - einfo "SSL provided by nss" - myconf+=( --with-nss ) - elif use curl_ssl_openssl; then - einfo "SSL provided by openssl" - myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) - elif use curl_ssl_winssl; then - einfo "SSL provided by Windows" - myconf+=( --with-winssl ) - else - eerror "We can't be here because of REQUIRED_USE." - fi - else - einfo "SSL disabled" - fi - - # These configuration options are organized alphabetically - # within each category. This should make it easier if we - # ever decide to make any of them contingent on USE flags: - # 1) protocols first. To see them all do - # 'grep SUPPORT_PROTOCOLS configure.ac' - # 2) --enable/disable options second. - # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort - # 3) --with/without options third. - # grep -- --with configure | grep Check | awk '{ print $4 }' | sort - ECONF_SOURCE="${S}" \ - econf \ - --enable-crypto-auth \ - --enable-dict \ - --enable-file \ - --enable-ftp \ - --enable-gopher \ - --enable-http \ - --enable-imap \ - $(use_enable ldap) \ - $(use_enable ldap ldaps) \ - --disable-ntlm-wb \ - --enable-pop3 \ - --enable-rt \ - --enable-rtsp \ - $(use_enable samba smb) \ - $(use_with ssh libssh2) \ - --enable-smtp \ - --enable-telnet \ - --enable-tftp \ - --enable-tls-srp \ - $(use_enable adns ares) \ - --enable-cookies \ - --enable-hidden-symbols \ - $(use_enable ipv6) \ - --enable-largefile \ - --without-libpsl \ - --enable-manual \ - --enable-proxy \ - --disable-sspi \ - $(use_enable static-libs static) \ - $(use_enable threads threaded-resolver) \ - $(use_enable threads pthreads) \ - --disable-versioned-symbols \ - --without-cyassl \ - --without-darwinssl \ - $(use_with idn libidn2) \ - $(use_with kerberos gssapi "${EPREFIX}"/usr) \ - $(use_with metalink libmetalink) \ - $(use_with http2 nghttp2) \ - $(use_with rtmp librtmp) \ - $(use_with brotli) \ - --without-spnego \ - --without-winidn \ - --without-wolfssl \ - --with-zlib \ - "${myconf[@]}" - - if ! multilib_is_native_abi; then - # avoid building the client - sed -i -e '/SUBDIRS/s:src::' Makefile || die - sed -i -e '/SUBDIRS/s:scripts::' Makefile || die - fi - - # Fix up the pkg-config file to be more robust. - # https://github.com/curl/curl/issues/864 - local priv=() libs=() - # We always enable zlib. - libs+=( "-lz" ) - priv+=( "zlib" ) - if use http2; then - libs+=( "-lnghttp2" ) - priv+=( "libnghttp2" ) - fi - if use ssl && use curl_ssl_openssl; then - libs+=( "-lssl" "-lcrypto" ) - priv+=( "openssl" ) - fi - grep -q Requires.private libcurl.pc && die "need to update ebuild" - libs=$(printf '|%s' "${libs[@]}") - sed -i -r \ - -e "/^Libs.private/s:(${libs#|})( |$)::g" \ - libcurl.pc || die - echo "Requires.private: ${priv[*]}" >> libcurl.pc -} - -multilib_src_install_all() { - einstalldocs - prune_libtool_files --all - - rm -rf "${ED}"/etc/ -} diff --git a/net-misc/curl/curl-7.62.0.ebuild b/net-misc/curl/curl-7.62.0.ebuild index 25fd30f2d3c8..fa9090793302 100644 --- a/net-misc/curl/curl-7.62.0.ebuild +++ b/net-misc/curl/curl-7.62.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2" LICENSE="MIT" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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/gnome-online-miners/Manifest b/net-misc/gnome-online-miners/Manifest index 8fc27ca97f53..6499e8b5dc78 100644 --- a/net-misc/gnome-online-miners/Manifest +++ b/net-misc/gnome-online-miners/Manifest @@ -1,3 +1,3 @@ DIST gnome-online-miners-3.24.0.tar.xz 272572 BLAKE2B 6331e72f65510041cc278670df328ab6ec5336bb76ec1c6681136c6731c70b9d343ef296062da6de302cfea195d1b99c0040e1e016394b2fe3bbbe077915cd76 SHA512 96c6aa99b99553c399ecef754d10a918d8ef3bdf6369a77357241091edc9c2ff7a8350f8a064bb011deddac75b25bdde8006e8d72b6562f9cdcf3b373e693253 -EBUILD gnome-online-miners-3.24.0.ebuild 894 BLAKE2B 7237aa4f222c2da2b888cdfd2809941ed5264114ee54961b11d330bdc576c2f8e9fefb1436dfb12cb59a0497438baa85807c90203d35fdaa07959b79d095239c SHA512 e484cf9af3528388c9dd8ea6f7fcd04311830d2a4715dc6283d8b428427d1b803e0f43169d85eadcd6d5d6cb03420eda8d867d0df717b5831d8056b37863e7f1 +EBUILD gnome-online-miners-3.24.0.ebuild 894 BLAKE2B a6de18d767e2edfccaf829f1c5c422a65fc1ead85f15da115a6e978a53061c5719a40b09f341c5042d31dcd296c21516bb6f29725e274a20d061d9aa1cdeaf47 SHA512 a0f03e3ddae3d889835d0733b79022cb62ea1ae03f863edfab53e8d0904e7cef5628979891cf2d8217c112afd43755d297e0ffba9ee8ee1e4de53364e3547cd1 MISC metadata.xml 312 BLAKE2B 4529eb2ea76ee2c88700e8d551c726424ce4338361eb87c39599d1ee263914d9861cc8f93e1d8e667bdba186c40afbf1376bd9b530edbdab32ec4f961a60f00b SHA512 483189736c04729c1497b3bd6321a1d86241835c22df7c06658fda2af4f06d56f614499bcb8ab7eac76a3619fbaac81cfb430aedf3d4f78592ef3c8fd73746dd diff --git a/net-misc/gnome-online-miners/gnome-online-miners-3.24.0.ebuild b/net-misc/gnome-online-miners/gnome-online-miners-3.24.0.ebuild index 0a5b5e7d07e1..ced494b6a8b7 100644 --- a/net-misc/gnome-online-miners/gnome-online-miners-3.24.0.ebuild +++ b/net-misc/gnome-online-miners/gnome-online-miners-3.24.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -14,7 +14,7 @@ KEYWORDS="amd64 x86" # libgdata[gnome] needed for goa support RDEPEND=" - >=app-misc/tracker-1:0= + >=app-misc/tracker-1:0/100 >=dev-libs/glib-2.35.1:2 >=dev-libs/libgdata-0.15.2:0=[crypt,gnome-online-accounts] media-libs/grilo:0.3 diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest index e025d068d772..bfb732ae98e8 100644 --- a/net-misc/iputils/Manifest +++ b/net-misc/iputils/Manifest @@ -11,6 +11,6 @@ DIST iputils-manpages-20171016_pre.tar.xz 29764 BLAKE2B 47def1413b2cdcfba7f924dd DIST iputils-manpages-20180629.tar.xz 29804 BLAKE2B 15983cc97bc6b6853c193f046687f10be11902f7e1d2dc2eec6c58edd1926f10152108d378858b0d7eb2d2908f038965b05515c4927aedc460282a22307883ad SHA512 1c5b0bab8496a3f3d9b5080029221231a497d9a5e91c61bd0ddd0b63fd51572d052801294aafd08e1dc8ad448b82cdaf48c72f0b08cc143f9c144f3db6848d9a EBUILD iputils-20171016_pre-r1.ebuild 4045 BLAKE2B 8762cc82fd5c71865106bf2e9763fa5150a8228b292e617654279e517e5a3f4bebc50f312133740d4c54d0ef0a75abac2e42775cd9d865d41b5444e75f56769a SHA512 397bd386cfff8a3551af24ac67677de021e56bf75908e6495e9e4b7eeb6bb2435b7c72101b78523da7e502d1a7fac92d5640d45a1da463986f01ec5230273c95 EBUILD iputils-20171016_pre.ebuild 4082 BLAKE2B 8c9aedbe404bd31ddcb466b93eb6272eebba0e3fa18f7a0de285dd7aa007894614a47a9cab018f6c5546a172ca3ae240b7fdcf6196eb3cdd7a6fcfc6d34cd652 SHA512 08f92d29d3baeb0eadac360b5a7f81e550d264fda70945b416d38ae39239e75ef201587d7466d6a9431df1a4be28c62e59d11b685fc811f40f1c755bbae2637d -EBUILD iputils-20180629.ebuild 3962 BLAKE2B f61a9928fcea052f87a1b7bca08aee27364940136a6d647cddca486956899245353905240bcdabcf868694d0d67fd6c77cb31a21535ba312f7e5166fabb90f8c SHA512 3af423242a34a08cab79c9552694fe0269176e2995f01282b5af7027387fbc1df40a3579a87d779c465d756fee38a35cd6ec5fa0030402578a56df20f31f7746 +EBUILD iputils-20180629.ebuild 3961 BLAKE2B ed4722cb1b57f7669d3328d50cc6a1fd50456caef9740fa8fb7c4037c6e1d2aae131cd411c5a958c31b600683606bc11802763fe14e366ccf83288e11d762431 SHA512 f9b57c37b915564c413c7069b35975b002c39319903c42ab50d50ba2f53c9f325c637bc7be45c0a87aaadaee6270375cd778ccbc7fb5933d687f23aa2cc7ee1e EBUILD iputils-99999999.ebuild 3939 BLAKE2B 9b6d7d78854369cba6255685f634ed526bf97d4a195a0bec0271f8f40a63aa671f26168dd33e99bf9c1db8398acee79205a025b04edf7865d67a76fd1190b756 SHA512 22ba0bcb65f8b13800f2a14f901fc0140c02f4d22c2e96624a381b59d3ba9fe5f385cf6e4bb6d3a32659d6b3aa9dc2bfb8f26b67e3c9f50ffe41094cf4712734 MISC metadata.xml 1698 BLAKE2B 0351c77626f66e4a50d83072124088cc7195c4666f6a66f6a981fa66b16b3740da6a08d63da9db0b2a4d02f8a75a04f97142e5b78099525ee8ed4921738d0236 SHA512 f1d211dbe4212072614039c5aea1996270560a24dfa3734af86c4f1f4254cc3abf8440c03d8894b925b71b970e70fb60e79682753655a68b82203cdc401f6ebc diff --git a/net-misc/iputils/iputils-20180629.ebuild b/net-misc/iputils/iputils-20180629.ebuild index 9d6b6740caeb..0da2cb928bdc 100644 --- a/net-misc/iputils/iputils-20180629.ebuild +++ b/net-misc/iputils/iputils-20180629.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # For released versions, we precompile the man/html pages and store @@ -24,7 +24,7 @@ if [[ ${PV} == "99999999" ]] ; then else SRC_URI="https://github.com/iputils/iputils/archive/s${MY_PV}.tar.gz -> ${P}.tar.gz https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${MY_PV}.tar.xz" - KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux" + KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux" fi DESCRIPTION="Network monitoring tools including ping and ping6" diff --git a/net-misc/linuxptp/Manifest b/net-misc/linuxptp/Manifest index 600ed3030d49..8c2d7accd7ed 100644 --- a/net-misc/linuxptp/Manifest +++ b/net-misc/linuxptp/Manifest @@ -1,9 +1,5 @@ -DIST linuxptp-1.5.tgz 139127 BLAKE2B ea5c201cbbb5a59fc2d649c41010f0bff2927a0c067aa2aa2840ee0551366c5c5295f76ac87f2cf078c0d861570e712eec3c0c030b96566d74c7f6294da13e1e SHA512 03ec0c3a283e08f9e62dfa7d059326887db541aa53b5c65e03534079083f39666a441a4303f428f3b972976483e683e603bdc2ec232495ccab46153531124974 -DIST linuxptp-1.6.tgz 144842 BLAKE2B f7b176506081648efaf5f07bbcdb7644f3ca60043f09c3517cc53924082ef1ff8e4e5ffc1b5fa1f3602e1ffce368b00558f21ab7a04530980c53e885615270ab SHA512 f7e237f2afc0a53254cd56c3121c44dd633947eadf3c76bd3cb1e9488281e582d7d80dd33a681f5b4aef336cb3cfefe274783cf3b4a6f6e4bf98488996d81883 -DIST linuxptp-1.7.tgz 145856 BLAKE2B ed044f191cae3ad79b495a5d1ab6d155c1a24e54d2bbf5fb781351d66565925ecf02c112a6b006c4db5b45f3cf10dc68099cc087d2e3fc203f7ffdde993e03c0 SHA512 65cd509d098b9a12af469cab76aea7a1aeeca7b3d1db04d1538ed0979025f65a832b27d46fef9e262cc77e3787830eb33535068740def61dfa0e99569bce714b DIST linuxptp-1.8.tgz 147764 BLAKE2B f0dec589cf4f27c03f901262980f1c471382eefdd00772da0065077bab29ed7c1350d70b1ec4b0c912dd82304220b9c550320b82cf269d99478d40c5a7ed8541 SHA512 8ac52428b7addf1c43769083e660ca0ceb2813994107b8b9c59338e480f1d2e45666ebcc3f59f7b8cf9a02301b55aa54b26cbbbf81622a525a704f2d08fd383e -EBUILD linuxptp-1.5.ebuild 722 BLAKE2B 7ab62f5c59c64d47ee3ddc8c1237b1d149fd0593d5baec6f36d5dc591d41b3f23c8aab6c7853b5e2e0108c14af33ad3d3016a40ac1d735ae4c95066bde2c86d9 SHA512 acdc547f29ec8e618c836c65b21da9192290af4b001926f7720b1a35943e4967695ee16d839cf5f18b194ac8bbeca9346127e0c08806e66d079d349fe574f2d9 -EBUILD linuxptp-1.6.ebuild 722 BLAKE2B 7ab62f5c59c64d47ee3ddc8c1237b1d149fd0593d5baec6f36d5dc591d41b3f23c8aab6c7853b5e2e0108c14af33ad3d3016a40ac1d735ae4c95066bde2c86d9 SHA512 acdc547f29ec8e618c836c65b21da9192290af4b001926f7720b1a35943e4967695ee16d839cf5f18b194ac8bbeca9346127e0c08806e66d079d349fe574f2d9 -EBUILD linuxptp-1.7.ebuild 722 BLAKE2B 5eccc29801c443cf79fb6888fa5f65498bc9709fabedc91cc06c70c5824a215fd8001b384e2567962650edc06232c9876dbacdf58296a7ac91c0fbe167833863 SHA512 436e295ba2ce051d858cd45633a249e78da1e7a9463b2f58fa675d8303891544904f9fdfea6d44839d692695c071bd6547008ab9f5d12e319227b51551eed744 +DIST linuxptp-2.0.tgz 184942 BLAKE2B 79ef9d3c379769a71e652a77f05ab661db444a76a339e72106055cf900de9cabfe303c48760f11701fefe5e641d07b73fc5a250078bedf7faa3ae995ace24da3 SHA512 c33487a803f8cc461f790d9a137d5cf8b35cb6d292bdd2cf7a16aa666359d8c5e24667473be843182bef1e9f8d5c6af8aab8918978f10bf08257dd408bba66d6 EBUILD linuxptp-1.8.ebuild 722 BLAKE2B 5eccc29801c443cf79fb6888fa5f65498bc9709fabedc91cc06c70c5824a215fd8001b384e2567962650edc06232c9876dbacdf58296a7ac91c0fbe167833863 SHA512 436e295ba2ce051d858cd45633a249e78da1e7a9463b2f58fa675d8303891544904f9fdfea6d44839d692695c071bd6547008ab9f5d12e319227b51551eed744 +EBUILD linuxptp-2.0.ebuild 719 BLAKE2B a890aaaf0464f09d1b8b479ee8db7e574b5fbb77fae95caf81944e483ba0e2c8b9bece124460832f29f0a1eb67245fc178b7ff63caba2f7f41f08cd7c2defa75 SHA512 1982e6acbe7f45f64f2ce9a6bb206fad8332922e6a27092704104e36f51107452a98d1bddce4f14906520933cb310aa18ab8e2051ee2d66fa763b1f58eb0043d MISC metadata.xml 445 BLAKE2B abfb043154cd84cb3a40212f54d9be67e89bfda3f83cdb9a8d65d8032b8d1f0a0b8dcfb4fdbaa5ed303dfa65f35715ee714a84026b730c26964a1e06a41b32e2 SHA512 6016bb962e61088156d9f2b78d8dfc0f4b07e6a22016d7d591459b8254ef42798c902a2cdfe183972703d3c1911ab48d7b3c95a0bc1b470a4dcc1a34ea66d232 diff --git a/net-misc/linuxptp/linuxptp-1.5.ebuild b/net-misc/linuxptp/linuxptp-1.5.ebuild deleted file mode 100644 index 558f1ca5c7aa..000000000000 --- a/net-misc/linuxptp/linuxptp-1.5.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit linux-info - -DESCRIPTION="The Linux Precision Time Protocol (PTP) implementation" -HOMEPAGE="http://linuxptp.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/v${PV}/${P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" - -CONFIG_CHECK="PPS NETWORK_PHY_TIMESTAMPING PTP_1588_CLOCK" - -src_compile() { - export EXTRA_CFLAGS=${CFLAGS} - emake prefix=/usr mandir=/usr/share/man -} - -src_install() { - emake \ - prefix="${D}"/usr \ - mandir="${D}"/usr/share/man \ - infodir="${D}"/usr/share/info \ - libdir="${D}"/usr/$(get_libdir) \ - install - - dodoc README.org -} diff --git a/net-misc/linuxptp/linuxptp-1.6.ebuild b/net-misc/linuxptp/linuxptp-1.6.ebuild deleted file mode 100644 index 558f1ca5c7aa..000000000000 --- a/net-misc/linuxptp/linuxptp-1.6.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit linux-info - -DESCRIPTION="The Linux Precision Time Protocol (PTP) implementation" -HOMEPAGE="http://linuxptp.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/v${PV}/${P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" - -CONFIG_CHECK="PPS NETWORK_PHY_TIMESTAMPING PTP_1588_CLOCK" - -src_compile() { - export EXTRA_CFLAGS=${CFLAGS} - emake prefix=/usr mandir=/usr/share/man -} - -src_install() { - emake \ - prefix="${D}"/usr \ - mandir="${D}"/usr/share/man \ - infodir="${D}"/usr/share/info \ - libdir="${D}"/usr/$(get_libdir) \ - install - - dodoc README.org -} diff --git a/net-misc/linuxptp/linuxptp-1.7.ebuild b/net-misc/linuxptp/linuxptp-1.7.ebuild deleted file mode 100644 index 4e1f587b8bbb..000000000000 --- a/net-misc/linuxptp/linuxptp-1.7.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit linux-info - -DESCRIPTION="The Linux Precision Time Protocol (PTP) implementation" -HOMEPAGE="http://linuxptp.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/v${PV}/${P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" - -CONFIG_CHECK="PPS NETWORK_PHY_TIMESTAMPING PTP_1588_CLOCK" - -src_compile() { - export EXTRA_CFLAGS=${CFLAGS} - emake prefix=/usr mandir=/usr/share/man -} - -src_install() { - emake \ - prefix="${D}"/usr \ - mandir="${D}"/usr/share/man \ - infodir="${D}"/usr/share/info \ - libdir="${D}"/usr/$(get_libdir) \ - install - - dodoc README.org -} diff --git a/net-misc/linuxptp/linuxptp-2.0.ebuild b/net-misc/linuxptp/linuxptp-2.0.ebuild new file mode 100644 index 000000000000..c0b5ed6233bc --- /dev/null +++ b/net-misc/linuxptp/linuxptp-2.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit linux-info + +DESCRIPTION="The Linux Precision Time Protocol (PTP) implementation" +HOMEPAGE="http://linuxptp.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/v${PV}/${P}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="" +RDEPEND="${DEPEND}" + +CONFIG_CHECK="PPS NETWORK_PHY_TIMESTAMPING PTP_1588_CLOCK" + +src_compile() { + export EXTRA_CFLAGS=${CFLAGS} + emake prefix=/usr mandir=/usr/share/man +} + +src_install() { + emake \ + prefix="${D}"/usr \ + mandir="${D}"/usr/share/man \ + infodir="${D}"/usr/share/info \ + libdir="${D}"/usr/$(get_libdir) \ + install + + dodoc README.org +} diff --git a/net-misc/mobile-broadband-provider-info/Manifest b/net-misc/mobile-broadband-provider-info/Manifest index e984ac678edf..6091402862a2 100644 --- a/net-misc/mobile-broadband-provider-info/Manifest +++ b/net-misc/mobile-broadband-provider-info/Manifest @@ -1,3 +1,5 @@ DIST mobile-broadband-provider-info-20170310.tar.xz 85016 BLAKE2B a43312e1772fc59205be1bbf7d6f80518ff0edf0719d48e60013c3acada4c05a29043567695896641b32c477ddab2ca6da379e1b7a4436d977ccc68f4e247f09 SHA512 24d8d8bb202f0893bea105420d38156ff8de311eac71e969524961e723ed3d1f9994ec98efbace62dc0ac3859c7a4b316a0728038539b82ca5cf8f8c460a6c6e +DIST mobile-broadband-provider-info-20190116.tar.xz 85904 BLAKE2B e41ca1914c8b9c47f52f5b65cbfef577814269a23c5777fb1caf582cfc1c0c9a5125f51907748de8516b8aa3a8cf3fb044c8521d305161b206cc75f06e791764 SHA512 82cbf2c4523bc941d7cbfb1f552057d8259fcccbf95d02a6d43d315136050928ae5a8cf85f9900196214b803bb087446e28254d148af6b004225518f07aa9d23 EBUILD mobile-broadband-provider-info-20170310.ebuild 462 BLAKE2B fe682e0d76f4fd4a394388b40036b5a9923d0a4fc664218424f50ea0a619e1464789d1f013a87bc63d97528b9f21e803af771af7217c714e88f5e4c2e142226b SHA512 ecec2bcf1de8a1fe7a1cde63cb3905555c6611ce55ef3a78f4c2d2e62a8761dcd9599cf486567859b2eb3b46fa095597df9d42055361dedd362fce9ac16f1da4 +EBUILD mobile-broadband-provider-info-20190116.ebuild 468 BLAKE2B f39f5b1ca28de18d662d669384f916b217c8ad549d2356bdf3cc19f95bc8cdbef4b7b4ad22540dc99e39866b96bcd88044b1eedb3233e96a4819195474f5b756 SHA512 c4cf7ec0658064d7e4cd8212f5ca5fef89bf65271d37431c96ac88d98c6e5b3a548673524d5deb63fe148b3f9d812f50e0ce5ee0a879713364e4407046dca36f MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190116.ebuild b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190116.ebuild new file mode 100644 index 000000000000..e82cab77dff6 --- /dev/null +++ b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190116.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit gnome.org + +DESCRIPTION="Database of mobile broadband service providers" +HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband" + +LICENSE="CC-PD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="test" + +DEPEND=" + test? ( dev-libs/libxml2 ) +" + +DOCS="README" # ChangeLog and NEWS are both dead diff --git a/net-misc/netkit-rsh/Manifest b/net-misc/netkit-rsh/Manifest index 5607bf4d807e..173b6f01c63f 100644 --- a/net-misc/netkit-rsh/Manifest +++ b/net-misc/netkit-rsh/Manifest @@ -7,5 +7,5 @@ AUX rsh.xinetd 279 BLAKE2B db403023417d537fb944c677553f71e782d80dfe08dc5f9388156 DIST netkit-rsh-0.17-patches-3.tar.lzma 13875 BLAKE2B 80470c4a9fdbfebd351217e48ec178c1d2c58e49f454eadd514ed76e3653fde1d21cd19f7a3400762e6fb4d4bb2f9cfefebbf042ef5bf1903d67ebbe17254515 SHA512 0d9c6a8a8d13264b8f2eb6b62e6c65b67cf8b09bd36043acae405c7b2154724733db15d653e4f7ac7d21feebcfa6cd365ca89993fc77eabc5a709d7a6383b187 DIST netkit-rsh-0.17.tar.gz 58268 BLAKE2B 7790a91f95c51f4aa538ad614e65ecba5a565e4761c7d8167f4d175bb8bcc27cb48b569f93064285dad983e602f03bcb816da58b02b54290adcd9cabe73cd88e SHA512 0d8da4a779da137f7b3f158ad010b71f2357c86a2160dbd19331cbf45f86a46110cdfdfd3c4ba2d19ddf3634917bf981eb91bfde02c3cdbc946df8695db75218 DIST rexec-1.5.tar.gz 18469 BLAKE2B cbb694520332a0768b8337e854baf232271a30ac328dcf4b8b16d28dc3710ad58173e135cb9eb9726b07709bcd78ef627cea550c98e00dc86bea7c64e52aa3d1 SHA512 7ed455a921ad71749154bd8e586ac2a624f357b56be17db73b9ed7c1ca1bc19cfb9aee748f79cc649184dfb535ffe5e887643b73a25c3fb6520d4e19fae7333a -EBUILD netkit-rsh-0.17-r10.ebuild 1772 BLAKE2B 027005fc0fb0bc0547538f70cdb8f66cf2141864eebe09ace4464382c7d83036ca35b957e00aa54225a54050564fc90de0f79b58ea997eb07f2c926bc5ac2d03 SHA512 3e287721009f744bc6bac09539a89e8435226d97f5f2a8c98c6acb03cbac0333099f88d1e992edf78c53e897ff3361436c33e6bcc7ec04ab79759510ceb420b0 +EBUILD netkit-rsh-0.17-r10.ebuild 1768 BLAKE2B 22e0f31780f3e5daee3a77742c86d3a5c3989c6506f43705580175228d9ade1000e52e8d26f01695a5b03383d50db43f32cf2865f3f48c54da228a2820769d4b SHA512 8854985ad711abe532094faba715cac44d0f903d66ba9b00071c3046046269436d9a2733edf898cf8330fa1c8d71a20c195919588450277806973666f6d93cbe MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild b/net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild index 98ca83dfefd9..5d743fcc7895 100644 --- a/net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild +++ b/net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="4" @@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz LICENSE="BSD" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux" IUSE="pam" RDEPEND=">=sys-libs/ncurses-5.2 diff --git a/net-misc/networkmanager-strongswan/Manifest b/net-misc/networkmanager-strongswan/Manifest index ed0642b99f61..2aa58754ae99 100644 --- a/net-misc/networkmanager-strongswan/Manifest +++ b/net-misc/networkmanager-strongswan/Manifest @@ -1,3 +1,3 @@ DIST NetworkManager-strongswan-1.4.4.tar.bz2 305677 BLAKE2B 24d99cd3f3844b6ffd47d076153ff8f80a92e575ca7f8da01141be2a48c39a759ee60e17ccdd4928e3c625fa9caae39d8f3cf2c76481adbcdda91fd00ee9e8a2 SHA512 e3e2dd9f5b961255f897ca1912f9deb34ac62628ff40289ff0f8f3900746482f2f32d390c64b88c10f10b8a99388e27099abedb7157d77c173524dc763a32155 -EBUILD networkmanager-strongswan-1.4.4.ebuild 925 BLAKE2B f312879142094352cba562d3026db77ae03092660143b2e80ce0b0471e11b1c40111e78de92a3cfb29a815562f493451be87df8f98df7d5ca3574a808254553b SHA512 e2e4286fa405bde5ee9397d29a786a30afb54d1d1ea16e915d44acd38593d47f331e07a61b4d4dfa9a6035c9bc635895673ba15da8ab33c26edb822d0114a191 +EBUILD networkmanager-strongswan-1.4.4-r1.ebuild 938 BLAKE2B 7d8115c26a8da345f61674c36aa51edba2884d3330325402ab8618e7d8142047b7c27adfb89347ef2dc5dd5c62f5203a1b9dc8ed09900d330caa7364ade52a11 SHA512 3645d9fc3505f0cd0790893b53eaa47fe39b4a4967260483dcdec36bef1d8bfd347dc68cac56e02eb3d5816676e7be3f3c621a1afce47636c44b3340f2249540 MISC metadata.xml 444 BLAKE2B 99927d1d0c6beeab7cd31eb4ac9dcc7afa038b54ac270cfb671fdcd6543e828147a7220854aeccada6823c5b7d32dfc3bd37924366896014c0341908b4b890d7 SHA512 5dc220ebf57644553266caa7e83d4478b6c7c665199b2bd26943afcb5680a0ed7597e4565043a2098fbad20cd9f5f3991877a4c171288f9ed2572923a7913c73 diff --git a/net-misc/networkmanager-strongswan/networkmanager-strongswan-1.4.4-r1.ebuild b/net-misc/networkmanager-strongswan/networkmanager-strongswan-1.4.4-r1.ebuild new file mode 100644 index 000000000000..de93d1d51007 --- /dev/null +++ b/net-misc/networkmanager-strongswan/networkmanager-strongswan-1.4.4-r1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PN="NetworkManager" +MY_P="${P/networkmanager/${MY_PN}}" + +DESCRIPTION="NetworkManager StrongSwan plugin" +HOMEPAGE="https://www.strongswan.org/" +SRC_URI="https://download.strongswan.org/${MY_PN}/${MY_P}.tar.bz2" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+glib" + +RDEPEND=" + app-crypt/libsecret + gnome-extra/nm-applet + net-misc/networkmanager + net-vpn/strongswan[networkmanager] + x11-libs/gtk+:3 +" + +DEPEND=" + ${RDEPEND} + dev-util/intltool +" + +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}/${MY_P}" + +src_configure() { + local myeconfargs=( + # Don't enable all warnings, as some are treated as errors and the compilation will fail + --disable-more-warnings + --disable-static + $(usex glib '' --without-libnm-glib) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + find "${D}" -name '*.la' -delete || die +} diff --git a/net-misc/networkmanager-strongswan/networkmanager-strongswan-1.4.4.ebuild b/net-misc/networkmanager-strongswan/networkmanager-strongswan-1.4.4.ebuild deleted file mode 100644 index 738be2c105f5..000000000000 --- a/net-misc/networkmanager-strongswan/networkmanager-strongswan-1.4.4.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PN="NetworkManager" -MY_P="${P/networkmanager/${MY_PN}}" - -DESCRIPTION="NetworkManager StrongSwan plugin" -HOMEPAGE="https://www.strongswan.org/" -SRC_URI="https://download.strongswan.org/${MY_PN}/${MY_P}.tar.bz2" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+glib" - -RDEPEND="app-crypt/libsecret - gnome-extra/nm-applet - net-misc/networkmanager - net-vpn/strongswan[networkmanager] - x11-libs/gtk+:3" - -DEPEND="${RDEPEND} - dev-util/intltool - virtual/pkgconfig" - -S="${WORKDIR}/${MY_P}" - -src_configure() { - local myeconfargs=( - # Don't enable all warnings, as some are treated as errors and the compilation will fail - --disable-more-warnings - --disable-static - $(usex glib '' --without-libnm-glib) - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - - find "${D}" -name '*.la' -delete || die -} diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest index 4c64fee904c1..e6ecb4cad513 100644 --- a/net-misc/openssh/Manifest +++ b/net-misc/openssh/Manifest @@ -13,6 +13,7 @@ AUX openssh-7.8_p1-X509-no-version.patch 878 BLAKE2B 2ed1a11e4b9066720057e5ae0a8 AUX openssh-7.8_p1-hpn-X509-glue.patch 2786 BLAKE2B ef0651dc65ea1ab22c17e6ba0efe34141bc3af4dafcdbfba5c7fd80107a31fbc7c2671670c57153918bd626f4172e7e16ba22b4f36d67ced1b6e9d7b03c9dbaa SHA512 a205809bded3ac0aba1aec0f27ddc3948414fc3354cf8ec2945fc91effb9a0617ef259475347164c2f7b95de280704be1646725dae183c070efd104c4c515510 AUX openssh-7.8_p1-hpn-glue.patch 3644 BLAKE2B eed002fc87362fa8bf3a86681fdaf8153137b7a9de7ba4f6fe47dbb39031f61773e9546f226f8035ce4391dce62a1487ba1450cd92e02e4d74fc0875ef2ca603 SHA512 f6410be5632e4f04f6ba4517afe279640ddc7050750f036fb3e57ab4318e59b86dc44a983deacd6b6f88c4cd0f78dae523f9dded424dce3600a3b1d7a0964435 AUX openssh-7.8_p1-hpn-sctp-glue.patch 597 BLAKE2B d7ac82653c48467ebdc59e1444eead84d3de8cdd93acda6361cedd0cc1e2969e52610c10075463ade71e4c1bb1fcb243bd34d11d6c21cd4c500b6743dc628770 SHA512 4742112e3d0e7463d9194a5ab068d3b6cae6bc4a9b5755599d49a13db514014c7d406c16c7ff59197917b5c152b2a54d15323d88de942215fced4c628cacf2c0 +AUX openssh-7.9_p1-CVE-2018-20685.patch 478 BLAKE2B 35d01914905289fa1ed2a8ee94c3d631a648fc3a6f5ee4963009a67b5e3d9b865cf0c66696858cb114ba02e1578b44203a0db0a0499e3864a5e7c854e715cb10 SHA512 044926de8e0b26ca5444ab2db4ae454cd66b98c85dbdcff384eb1e6ae900498d6591ff91954e6b9cb6b8efc56f415aa66c30b51699e9236279ba47dc6bf88e55 AUX openssh-7.9_p1-X509-11.6-tests.patch 531 BLAKE2B cfb14747ed4e39d11d7727b779753ddf5f7e94be56d1dbe0a76131d8434dd4453c253467ec1eb7cac49a50f5a3f81c82b804926f46dc79ed09c252397ac9d349 SHA512 7f1322a94aa79c822a8bede36a92fe48dc6b9bf7ceca3068450877b543a1d186031060d642c7d689c02e06ef3e038eae9739deda53c6401439ed20808e82ff10 AUX openssh-7.9_p1-X509-dont-make-piddir-11.6.patch 812 BLAKE2B e09cdf2c2d3cd0ae05ce7938542d8ebaccacd7b40920259798592e89b3b2a0425a207eee6dd71024b20e3f1220a4ecf65e9f35adc624ad9d5f2fa29b5b796860 SHA512 55612fc54a29ed1e0ea7c6e5332f217efb0b415ab4e04cb48f693bc8c48d8aaed0c962f111f939097fc990110ce506f187fe09827871ec0cee320c463523f7de AUX openssh-7.9_p1-X509-dont-make-piddir.patch 812 BLAKE2B 1b4a6def589125f6cf6e63f3be89dfeba4d3d80474df4420b10cbe280e777e4627066b70944313351ca7d54949b7e667192c945bda4a06fccdab780feaff72b7 SHA512 dc07ed8da66a9b29c125375da4b67e9654c4eca5cb3219b19de3f8433e8c593c0ded440c24c80332ffad3b0f25a0baa970a8de6bcecd3d4aa2ba1a6607376a93 @@ -56,5 +57,6 @@ EBUILD openssh-7.5_p1-r4.ebuild 11161 BLAKE2B e6276f34a75fbce06ebefa246786db15af EBUILD openssh-7.7_p1-r9.ebuild 15943 BLAKE2B 459a0f5920b3d5b4da2835e7f3c9f1edd185e48c509e5150a1306dbca3c2f17d0d9d3f41166c4263dd60c0218c11b278a4eaa6f53ae1429710fc749994f70d11 SHA512 3aa9018173cc53de22b1e4693daf4ca2716cd0bc0066f797b6b66926481aaabb3e82942beb305a95523ba64dc9ff95f54232c7538c1d30834f38d88dd94f18a2 EBUILD openssh-7.8_p1.ebuild 15333 BLAKE2B 4452bc6cc03ed9fb8242b15894133e6e224e1ac0818688b02bc17850050bc67c0dd8fefcbba66c96bfedc8fb452bbcde7282062ea372d220a2b1d77fb0b48b20 SHA512 bff6000cd8913a885bcad3ffb60bde7760a24d37a4987afd34f4b38d603c8bc72bfe0d07f8f109c238d11e49bed72ddbcbe26838cd9d69b379dbf7521f12626f EBUILD openssh-7.9_p1-r1.ebuild 15769 BLAKE2B bd4f5f9e1927d59226c3469f22884c835d158f364f6b74946bd4c5fa551e1cb7715ffad9263b51a9319f44fae352b334eb536dd390f58d44fb6878f936e3b41d SHA512 b338b6e3708e4295a3cf5f8bbe1973fc8164bc2eff79e05272bfccc924a2416c10a7d225e5d5da53a2ba3e3e3c960f16db7561ebf3adca335032910b0154f67e +EBUILD openssh-7.9_p1-r2.ebuild 15837 BLAKE2B 0e6156e6229b18255a66b9a8f1d9dbbc27ae49469f9815f07d61912d6cd90bf8a85aae6cdf541912649303c085d6b7033e1f9d12b5ba42be6d111612a86a4072 SHA512 6126eaaf18ccde1f618f927cb086919c5a13bd92c91566c8c9635b96779406a641550a6f510766502057ce1684b06d9b1128b1c40c0b49c1b5b7931b3d7d063a EBUILD openssh-7.9_p1.ebuild 15743 BLAKE2B b6108901b97ede2d349729a80d69e9bb9ea059a36967ee1688113c0d17351ecdc3cded6f5e45abc8bb54dc9e1a40ccc78165edca6405a4148d99910f9f1cde44 SHA512 3787f6b671477ae1fd4eb5b6bbd5dbaf8375d36fcfda33b67de402fcc36396b28b221bc9e763b6c5f1ba8475330ee9c15edcf45134c048c7f8faec8e885e2893 MISC metadata.xml 2212 BLAKE2B 889550b17d2ba8072686ca5f398c64946fc04721fd7093c88fd7c1c5c7e4610fb01964f8e3d78e20cd0e9b9343895439772fee43b5635db893f3fc13ae9437cb SHA512 958845fbdfb4f1d267fdbc3a005c6338da54c6a0715180a1982416a841ab4865c536de5f10bb8493d07830e182786d0c3f2ac710c9168434b3d077a59ed2ddd5 diff --git a/net-misc/openssh/files/openssh-7.9_p1-CVE-2018-20685.patch b/net-misc/openssh/files/openssh-7.9_p1-CVE-2018-20685.patch new file mode 100644 index 000000000000..3fa3e318af50 --- /dev/null +++ b/net-misc/openssh/files/openssh-7.9_p1-CVE-2018-20685.patch @@ -0,0 +1,16 @@ +CVE-2018-20685 + +https://github.com/openssh/openssh-portable/commit/6010c0303a422a9c5fa8860c061bf7105eb7f8b2 + +--- a/scp.c ++++ b/scp.c +@@ -1106,7 +1106,8 @@ sink(int argc, char **argv) + SCREWUP("size out of range"); + size = (off_t)ull; + +- if ((strchr(cp, '/') != NULL) || (strcmp(cp, "..") == 0)) { ++ if (*cp == '\0' || strchr(cp, '/') != NULL || ++ strcmp(cp, ".") == 0 || strcmp(cp, "..") == 0) { + run_err("error: unexpected filename: %s", cp); + exit(1); + } diff --git a/net-misc/openssh/openssh-7.9_p1-r2.ebuild b/net-misc/openssh/openssh-7.9_p1-r2.ebuild new file mode 100644 index 000000000000..0b89a756c78c --- /dev/null +++ b/net-misc/openssh/openssh-7.9_p1-r2.ebuild @@ -0,0 +1,451 @@ +# Copyright 1999-2019 Gentoo Authors +# 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/_} +#HPN_PV="${PV^^}" +HPN_PV="7.8_P1" + +HPN_VER="14.16" +HPN_PATCHES=( + ${PN}-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff + ${PN}-${HPN_PV/./_}-hpn-AES-CTR-${HPN_VER}.diff +) +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.6" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz" + +DESCRIPTION="Port of OpenBSD's free SSH release" +HOMEPAGE="https://www.openssh.com/" +SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz + ${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/${SCTP_PATCH} )} + ${HPN_VER:+hpn? ( $(printf "mirror://sourceforge/hpnssh/HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_}/%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-1.1.0g:0[bindist=] + ) + dev-libs/openssl:0=[static-libs(+)] + ) + libressl? ( dev-libs/libressl:0=[static-libs(+)] ) + ) + >=sys-libs/zlib-1.2.3:=[static-libs(+)]" +RDEPEND=" + !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) + pam? ( 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.9_p1-openssl-1.0.2-compat.patch + eapply "${FILESDIR}"/${PN}-7.9_p1-include-stdlib.patch + eapply "${FILESDIR}"/${PN}-7.8_p1-GSSAPI-dns.patch #165444 integrated into gsskex + eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch + eapply "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch + use X509 || eapply "${FILESDIR}"/${PN}-7.9_p1-CVE-2018-20685.patch + + local PATCHSET_VERSION_MACROS=() + + if use X509 ; then + pushd "${WORKDIR}" || die + eapply "${FILESDIR}/${P}-X509-glue-${X509_VER}.patch" + eapply "${FILESDIR}/${P}-X509-dont-make-piddir-${X509_VER}.patch" + popd || die + + eapply "${WORKDIR}"/${X509_PATCH%.*} + eapply "${FILESDIR}"/${P}-X509-${X509_VER}-tests.patch + + # We need to patch package version or any X.509 sshd will reject our ssh client + # with "userauth_pubkey: could not parse key: string is too large [preauth]" + # error + einfo "Patching package version for X.509 patch set ..." + sed -i \ + -e "s/^AC_INIT(\[OpenSSH\], \[Portable\]/AC_INIT([OpenSSH], [${X509_VER}]/" \ + "${S}"/configure.ac || die "Failed to patch package version for X.509 patch" + + einfo "Patching version.h to expose X.509 patch set ..." + sed -i \ + -e "/^#define SSH_PORTABLE.*/a #define SSH_X509 \"-PKIXSSH-${X509_VER}\"" \ + "${S}"/version.h || die "Failed to sed-in X.509 patch version" + PATCHSET_VERSION_MACROS+=( 'SSH_X509' ) + fi + + if use sctp ; then + eapply "${WORKDIR}"/${SCTP_PATCH%.*} + + einfo "Patching version.h to expose SCTP patch set ..." + sed -i \ + -e "/^#define SSH_PORTABLE/a #define SSH_SCTP \"-sctp-${SCTP_VER}\"" \ + "${S}"/version.h || die "Failed to sed-in SCTP patch version" + PATCHSET_VERSION_MACROS+=( 'SSH_SCTP' ) + + einfo "Disabling know failing test (cfgparse) caused by SCTP patch ..." + sed -i \ + -e "/\t\tcfgparse \\\/d" \ + "${S}"/regress/Makefile || die "Failed to disable known failing test (cfgparse) caused by SCTP patch" + fi + + if use hpn ; then + local hpn_patchdir="${T}/${P}-hpn${HPN_VER}" + mkdir "${hpn_patchdir}" + cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}" + pushd "${hpn_patchdir}" + eapply "${FILESDIR}"/${P}-hpn-glue.patch + use X509 && eapply "${FILESDIR}"/${P}-hpn-X509-glue.patch + use sctp && eapply "${FILESDIR}"/${P}-hpn-sctp-glue.patch + popd + + eapply "${hpn_patchdir}" + eapply "${FILESDIR}/openssh-7.9_p1-hpn-openssl-1.1.patch" + + einfo "Patching Makefile.in for HPN patch set ..." + sed -i \ + -e "/^LIBS=/ s/\$/ -lpthread/" \ + "${S}"/Makefile.in || die "Failed to patch Makefile.in" + + einfo "Patching version.h to expose HPN patch set ..." + sed -i \ + -e "/^#define SSH_PORTABLE/a #define SSH_HPN \"-hpn${HPN_VER//./v}\"" \ + "${S}"/version.h || die "Failed to sed-in HPN patch version" + PATCHSET_VERSION_MACROS+=( 'SSH_HPN' ) + + if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then + einfo "Disabling known non-working MT AES cipher per default ..." + + cat > "${T}"/disable_mtaes.conf <<- EOF + + # HPN's Multi-Threaded AES CTR cipher is currently known to be broken + # and therefore disabled per default. + DisableMTAES yes + EOF + sed -i \ + -e "/^#HPNDisabled.*/r ${T}/disable_mtaes.conf" \ + "${S}"/sshd_config || die "Failed to disabled MT AES ciphers in sshd_config" + + sed -i \ + -e "/AcceptEnv.*_XXX_TEST$/a \\\tDisableMTAES\t\tyes" \ + "${S}"/regress/test-exec.sh || die "Failed to disable MT AES ciphers in test config" + fi + fi + + if use X509 || use sctp || use hpn ; then + einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..." + sed -i \ + -e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \ + "${S}"/sshconnect.c || die "Failed to patch send_client_banner() to use SSH_RELEASE (sshconnect.c)" + + einfo "Patching sshd.c to use SSH_RELEASE in sshd_exchange_identification() ..." + sed -i \ + -e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \ + "${S}"/sshd.c || die "Failed to patch sshd_exchange_identification() to use SSH_RELEASE (sshd.c)" + + einfo "Patching version.h to add our patch sets to SSH_RELEASE ..." + sed -i \ + -e "s/^#define SSH_RELEASE.*/#define SSH_RELEASE SSH_VERSION SSH_PORTABLE ${PATCHSET_VERSION_MACROS[*]}/" \ + "${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)" + fi + + sed -i \ + -e "/#UseLogin no/d" \ + "${S}"/sshd_config || die "Failed to remove removed UseLogin option (sshd_config)" + + [[ -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/putty/Manifest b/net-misc/putty/Manifest index a700d9b7659c..cc861a6b327b 100644 --- a/net-misc/putty/Manifest +++ b/net-misc/putty/Manifest @@ -5,5 +5,5 @@ DIST putty-icons.tar.bz2 4878 BLAKE2B 589f1bace82e3fd202b70bd35661d2ec4ef383363f EBUILD putty-0.68.ebuild 1585 BLAKE2B c5cf6d298348b950e62eaad33054fef6d2740aa148afd3d0b9f1411dfc38162c22919f71829ebb5bdc77a3e758045aad5fa751f8f084dcd8bbdc7f6afee781fc SHA512 2d4188d5cd77f4335990b5e67d516b6cd6b5c34efc1d8253e5c3ac28f03995f24646b29a6de180d9a8957d10d30d76ec60b185cbda5bb889edad83894b1ecfd4 EBUILD putty-0.69.ebuild 1592 BLAKE2B 2bc48bc243ae9583395c8a57f7ff31aec4257eaffab663a49609bc66e60941f4fb55c0dfa093efd494ae7a4fb82ffc766da0f9caa38cab4312fb32a447e6b8e7 SHA512 61137d5b5fbd9ebef967392255d3ec0f1886a3460f4faf031e549880541819c7ca25e5a5c563ead5afee471d1bec25152f9b1ead5de212d833e36a3281034a6e EBUILD putty-0.70.ebuild 1592 BLAKE2B 2bc48bc243ae9583395c8a57f7ff31aec4257eaffab663a49609bc66e60941f4fb55c0dfa093efd494ae7a4fb82ffc766da0f9caa38cab4312fb32a447e6b8e7 SHA512 61137d5b5fbd9ebef967392255d3ec0f1886a3460f4faf031e549880541819c7ca25e5a5c563ead5afee471d1bec25152f9b1ead5de212d833e36a3281034a6e -EBUILD putty-9999.ebuild 1649 BLAKE2B fde9e441a615ccb069937c5e46c5a10d13904dd9bdc0176ad0ee680a372a1b2235145a0deba1617409b24272d2efc21b0d39e300d9d41820d1da484b398c1e28 SHA512 4311266d2c8aa484ff68011017b515f2e2f4d487ae55602c4981ca2d2477b96fb90bdaf406b77c4c4c18953c47a66649b111092c54b7f4ec2a9fae8259836513 +EBUILD putty-9999.ebuild 1706 BLAKE2B e4c1400a23fb600e2baa5c0cbe762e1d7dd106e46c66138b8b6556271df601c501e1a23ed1e8dba429e2dc8e4bc0027e2f003f4f308fa1b4ccc6980df6f502d2 SHA512 7f4f8ed060c3efe04f45b080b1f830d424c9b9cd134a99bcb3b036a201bf67c7b9229827b65e436205ffb03914852d636efad683ebb4524cbd1dafce5bab8578 MISC metadata.xml 803 BLAKE2B 39376a700c0d83be3cf6f3569882e3369273c166b1b910245ba942be8dd3c22f709815847c0f8adc90dcbf9aeb597ea8ed14b957e2133c9bb0176cf32843a0f3 SHA512 d350ca1ff3c8ab8ba1b13e098c6e0f215f31c8c4d673566d2e0befef1404cd3a8dafdf5c7f90ed78d7d06a113b2d9ca92014909257e638982ed7a73797113c1d diff --git a/net-misc/putty/putty-9999.ebuild b/net-misc/putty/putty-9999.ebuild index 5f8b56a4cf89..c677a8a6686d 100644 --- a/net-misc/putty/putty-9999.ebuild +++ b/net-misc/putty/putty-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -6,7 +6,7 @@ inherit autotools eutils gnome2-utils git-r3 toolchain-funcs DESCRIPTION="A Free Telnet/SSH Client" HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/" -EGIT_REPO_URI="git://git.tartarus.org/simon/putty.git" +EGIT_REPO_URI="https://git.tartarus.org/simon/putty.git" SRC_URI="https://dev.gentoo.org/~jer/${PN}-icons.tar.bz2" LICENSE="MIT" @@ -62,6 +62,11 @@ src_compile() { emake -C "${S}"/unix AR=$(tc-getAR) $(usex ipv6 '' COMPAT=-DNO_IPV6) } +src_test() { + emake -C unix cgtest + unix/cgtest || die +} + src_install() { dodoc doc/puttydoc.txt diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest index bb001fb4bd2b..1a7b7e902850 100644 --- a/net-misc/spice-gtk/Manifest +++ b/net-misc/spice-gtk/Manifest @@ -5,5 +5,5 @@ DIST spice-gtk-0.34.tar.bz2 1480566 BLAKE2B 35350cf930d091fa11df1d573f9eff236967 DIST spice-gtk-0.35.tar.bz2 1437231 BLAKE2B f2731a794cf22b491bf858fff44506288af730b37f1c37e16ac3042d662373b4e4021808d5ca72440012fb36a5119ad11858cb8cf872b04376518487faebef49 SHA512 f0914a4a9baf892e39dab7d51aa9f5ab4dbb4ef01f09da158b20756f890745837d0a6c8c1f7897844e695be2ed01f3b1d04ada1cacc958b5cfadb0d4bf7c4729 EBUILD spice-gtk-0.34-r2.ebuild 3752 BLAKE2B e27f8a92b0284f6fa2296f0a5f7cb38d01eec7e7502e6730186094835d9ce3b397f002206a976a861ef9e2ef904b8256d696c6e46783c30875b16781df597875 SHA512 1c756aa20ca07af0bf3796b7e42bf76337a15ac3d5aa794eee24649ff9f503e014e7bfc8ac815b6117f5ceca3c2f8461af94cdb89b8119217ab21dff78bd7b1c EBUILD spice-gtk-0.35.ebuild 3804 BLAKE2B aa969c2458a6b0d1b7343b9d7522adb72035a3d4e1f653e3d41d1a309246957ab2f061e385f4730de0ff2648090f9822476474b06be1dc0aae987f05bac07e02 SHA512 b2a660c9042a1d388a46b9a89ec9e0ea4ad8b209358fbb95bed23f8c735ac3c3c761f7e8e7a262a9fd01a38d1b7c2efdcf99d6de597272072d80095856d6d01e -EBUILD spice-gtk-9999.ebuild 3690 BLAKE2B 21d8b47a79d30bd04c866f34cc108928e35657024dd82ad5ed9745fd68d1167b0af3cdf49c6386e55e2492d44253503b7ec2aea8df473645c1810c4eade83cb4 SHA512 f828c3f844505d214aeef9c05db82c547ae21415e34653dbf2e0d2157aaed5ddb4d8c2d94f1537980feea69b8d9222292cfd7cf7fbabe5a76e6d88b8c0298e39 +EBUILD spice-gtk-9999.ebuild 3713 BLAKE2B e00b824f12cbd92203780159bd9f6d288e906c1b392cc2eb7d14eef0f6a9f05f04fd9d5d5548b2fca5f9865431e2af99c08cacfea30a0b23f059683ee958a91c SHA512 a02cca86b0a157ac3f11d96317d8c1878be2f836989f5e22251dea7234a52f8b7435ebe7749ac7a2b06b339bcbdfece34cf39da0618c0fbd659c35120a54ea3b MISC metadata.xml 1166 BLAKE2B 37cf826a7a49dc48170fb99e05b191964810eacbf8b13db383a37e70faed6a2b4b70acfd724eeffbbe10d97fab27bfec7d56cfb2cbc2537ac4df7612afdbe8d2 SHA512 5229ddeaf19765abee5b0120b066ac2049f77878b1b8886e2b552f2c56d6049df297b227f0bee36bbe6be7041b9d8e1c1d3d868c34b1e39b49a5c0bc16b2c947 diff --git a/net-misc/spice-gtk/spice-gtk-9999.ebuild b/net-misc/spice-gtk/spice-gtk-9999.ebuild index 6e44cc0b2cb8..5e4e4f702c70 100644 --- a/net-misc/spice-gtk/spice-gtk-9999.ebuild +++ b/net-misc/spice-gtk/spice-gtk-9999.ebuild @@ -1,12 +1,13 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 GCONF_DEBUG="no" +WANT_AUTOMAKE="1.12" VALA_MIN_API_VERSION="0.14" VALA_USE_DEPEND="vapigen" -inherit autotools eutils xdg-utils vala readme.gentoo-r1 +inherit autotools eutils git-r3 readme.gentoo-r1 vala xdg-utils DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI" HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/" @@ -138,7 +139,7 @@ src_compile() { src_install() { default - dodoc AUTHORS NEWS README TODO + dodoc AUTHORS NEWS README # Remove .la files if they're not needed use static-libs || prune_libtool_files diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest index 897c3de3f884..5259228db813 100644 --- a/net-misc/stunnel/Manifest +++ b/net-misc/stunnel/Manifest @@ -17,7 +17,7 @@ DIST stunnel-5.49.tar.gz 713560 BLAKE2B c93b6ea7f9e8da2668919101caf30850370f1c7e DIST stunnel-5.50.tar.gz 973685 BLAKE2B e4185fa0c4f15ea118a8f6590bae14a9e1d7ccf1f73b75e46d8c7f04e4ece471c29b0a3715a24568301c5220fe385cbf42295c91ae9b295e3d7ab2b0ffec45a1 SHA512 96029b4f0dc0f04130e847bf47e56e8fdd22f2aaddb5fe0f581a0da6b870049152216795a0a9d9cdb6b93621df0a7d999e968a8c59989d261fd81c5f02cc1bac EBUILD stunnel-5.36.ebuild 2888 BLAKE2B eeeb7cd12318516aabcfe224d531d6061e25d4e51ed0c607a4ff56a1d721eb09cf275759fb47ea3e787fc760155492d97c96f341c2a3e28f4f4ac546c10b4160 SHA512 1257f0dcc4e1bdfb32095577841b866535318aba496d662d34fec13d6acbb45f0f6ed46ef185549e317a8254782f4d73a6827622f62ab27e6b011b3bf306b5bd EBUILD stunnel-5.40.ebuild 2919 BLAKE2B de5cbf748e76f13d9b07591988ae868c0dbc6ac5d619564951c983bcfd71a195f306be41f86e602c2b87a709a8315ca65112082310458945ebb809a1b1925df7 SHA512 affc603a13a074d6b37dfe1c2cdf400814f13209b1d7ab11a48c4c99a3ff6b607b510d6719f47a4a51071422296ecb4c44455ab9792c594880f12b944c1476fa -EBUILD stunnel-5.43.ebuild 2912 BLAKE2B 834bda9e67568a42e3e0c87621e37a31ffbfc098d90f17ca45edb5bb6c5eee4c54e5bd899a0717851af2b225d7fe8ec4153d2c7c1133a62f2ebfa1cfaa14b460 SHA512 49b8e6a4ae5b218655a76695adf3f3e9cff3cf03198e4692083548bd348b272c9ded224ccd13076d955d3c92fab3a5f9735a279cd72a608ed5b15efcfa5da26e +EBUILD stunnel-5.43.ebuild 2908 BLAKE2B a0013d9661c772464743069e4e80ed3713fd8deb39002d1594581601e2f39dbfbe77196c5dcc03f19c66b9d693e5a7a6e4f3ded589976b3b181e9af3471e1951 SHA512 7f1336affe6ff12f4a6eb173a9e0f24a955fcfcfc6ff9650aafe66a4fc0724147473a9ad6056ea4b30489ac795224ee5302c67518c90307e1b69a89dda5bdd96 EBUILD stunnel-5.44.ebuild 2919 BLAKE2B c0c06ad293fcd5f7ccc57040fab9ef8305107c5450535d0a6cb061f0cab39ea1bf5e55d06c6fc297b100c267d852e0926cbcc70b8519caf9cf8869cdb08afa97 SHA512 8545c5e5fd24fcd317c1eeecd1677c833830cb5be4c4df0ff403b995b1f5d06012155d1ade602a669f6f892c66ba195594452c41fe0b61280e50a2996560a064 EBUILD stunnel-5.45.ebuild 2919 BLAKE2B 681bc10896db6846af224e3c96af98bad2889040594f02cee8ec80ebf92f77905c26c3412832abb465112fddf16a39c7e763eecf6054a99f3f83e18066ecdce8 SHA512 bebf0ff0498dc819dd95d603d514720b89ee757f9f0ca39b393862f0a3fbb91e6dde173e079178fa7e18bfd1a5bb6b33bce374dbe70fe49a0e1d07707123f497 EBUILD stunnel-5.46.ebuild 2919 BLAKE2B 681bc10896db6846af224e3c96af98bad2889040594f02cee8ec80ebf92f77905c26c3412832abb465112fddf16a39c7e763eecf6054a99f3f83e18066ecdce8 SHA512 bebf0ff0498dc819dd95d603d514720b89ee757f9f0ca39b393862f0a3fbb91e6dde173e079178fa7e18bfd1a5bb6b33bce374dbe70fe49a0e1d07707123f497 diff --git a/net-misc/stunnel/stunnel-5.43.ebuild b/net-misc/stunnel/stunnel-5.43.ebuild index 278bd5348267..6bb6cf8d3418 100644 --- a/net-misc/stunnel/stunnel-5.43.ebuild +++ b/net-misc/stunnel/stunnel-5.43.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="ipv6 libressl selinux stunnel3 tcpd" DEPEND="tcpd? ( sys-apps/tcp-wrappers ) diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest index 988f838ed244..22cdebfa457f 100644 --- a/net-misc/youtube-dl/Manifest +++ b/net-misc/youtube-dl/Manifest @@ -1,6 +1,4 @@ -DIST youtube-dl-2019.01.02.tar.gz 3079437 BLAKE2B 6eb1610f5638fe64f4d1352ab763014550b99037dde08beb19b94a8d4877cd05f392ce840ec1bba28eee37a7b45b793afb4f68f6d5b234fe7d849501b7fb10f5 SHA512 745a1e9286c225ed0ad3517197304e39655d50ed33df44525579b7fe7038ff2be8fa0872adbc8c35cc738004b0d58c1f30f7af918c7251427da84002cc9ab944 -DIST youtube-dl-2019.01.10.tar.gz 3085961 BLAKE2B 938fe458a22f1c02c5e420ed43bc65247b7992e90d224891e2f5c8fb6410a0fba62dedd035a37b0e8c42a7dadc8082a26c97fb3f192a02df8795c9cfac6c6a42 SHA512 86c86688bf9120b56a0cda54ca4c8fef20f7afeea38a80b44d5aa77958b80ac4605b8de9666668297d0a9244693b17dcdfd85ddacc8990b179bd942c4d7158f2 -EBUILD youtube-dl-2019.01.02.ebuild 3410 BLAKE2B f16485a95281547c0ad2b0f32d1005e7a1500f630d5894dac2f2ab3961de53d92fd535cb7b253ae566a5779e757f5439bdf68d204c9c8a8da8e8c816eda3f72a SHA512 c3745e5375971e638f46dd20389523d648c853aeaa03a36d982814158fd2a0561749e8704998617ef2983905be0f4dbc5b78f06b6faa965e6299487bb55991e0 -EBUILD youtube-dl-2019.01.10.ebuild 3416 BLAKE2B a006e2ef1f88a0867fd931e1bde00c35e211f2c4efde7f5c68348c012ebc22346b46d200a24aa50f86b5e3fdb1e5c9253527c284a949b3c1920f3c8034d3fb94 SHA512 b5f01ad65383548f81ce29a6ed77ba3e450f585a19557c73ea7215df434dcfc8b6f972d057b6b767462a454f6ae7c2162d71fdda8a1d575b0f74952ad655b465 +DIST youtube-dl-2019.01.17.tar.gz 3088912 BLAKE2B 6cd46442d78126b3428135fcb820eb02bb2d567fe41fbfefcd80fc68a9ece0faaf2aa4981e31c619c3be1f789a9539236b1a71e72490c4ee667953837b25f0e5 SHA512 b8e81c2b2ec284033a5a92f49a965375d681d92435bc0402bb891b443f94d1321716a15717fe4e3c1fbc54ec610445282c52c18c046e140dd53731560230bd3f +EBUILD youtube-dl-2019.01.17.ebuild 3410 BLAKE2B f16485a95281547c0ad2b0f32d1005e7a1500f630d5894dac2f2ab3961de53d92fd535cb7b253ae566a5779e757f5439bdf68d204c9c8a8da8e8c816eda3f72a SHA512 c3745e5375971e638f46dd20389523d648c853aeaa03a36d982814158fd2a0561749e8704998617ef2983905be0f4dbc5b78f06b6faa965e6299487bb55991e0 EBUILD youtube-dl-99999999.ebuild 3304 BLAKE2B 62e4cfa266a5c117633a91e9fe83648f42bbbbd60e8764adca0002a03fb55b06caf224fb7997bcc9073847ca7d0055037749fd45f7521757a8e1bf9d4cc7215b SHA512 70686e618298486fc81621671f687cf11a0b56a05041be6016f4e2eed97ea215c21e869f90b5f071111f229f0d3ee49be3b3d395cd8e28900cc985d1d9d8fd31 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27 diff --git a/net-misc/youtube-dl/youtube-dl-2019.01.02.ebuild b/net-misc/youtube-dl/youtube-dl-2019.01.02.ebuild deleted file mode 100644 index c26955b40882..000000000000 --- a/net-misc/youtube-dl/youtube-dl-2019.01.02.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -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 ${PN}.zsh _${PN} - - insinto /usr/share/fish/vendor_completions.d - doins ${PN}.fish - - distutils-r1_python_install_all - - rm -r "${ED}"/usr/etc || die - rm -r "${ED}"/usr/share/doc/youtube_dl || die -} - -pkg_postinst() { - elog "${PN}(1) / https://bugs.gentoo.org/355661 /" - elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :" - elog - elog "${PN} works fine on its own on most sites. However, if you want" - elog "to convert video/audio, you'll need avconf (media-video/libav) or" - elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -" - elog "videos can be retrieved in a higher quality format without sound." - elog "${PN} will detect whether avconv/ffmpeg is present and" - elog "automatically pick the best option." - elog - elog "Videos or video formats streamed via RTMP protocol can only be" - elog "downloaded when rtmpdump (media-video/rtmpdump) is installed." - elog "Downloading MMS and RTSP videos requires either mplayer" - elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed." - elog - elog "If you want ${PN} to embed thumbnails from the metadata into the" - elog "resulting MP4 files, consider installing media-video/atomicparsley" -} diff --git a/net-misc/youtube-dl/youtube-dl-2019.01.10.ebuild b/net-misc/youtube-dl/youtube-dl-2019.01.10.ebuild deleted file mode 100644 index 6ef55f59a57e..000000000000 --- a/net-misc/youtube-dl/youtube-dl-2019.01.10.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -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 ${PN}.zsh _${PN} - - insinto /usr/share/fish/vendor_completions.d - doins ${PN}.fish - - distutils-r1_python_install_all - - rm -r "${ED}"/usr/etc || die - rm -r "${ED}"/usr/share/doc/youtube_dl || die -} - -pkg_postinst() { - elog "${PN}(1) / https://bugs.gentoo.org/355661 /" - elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :" - elog - elog "${PN} works fine on its own on most sites. However, if you want" - elog "to convert video/audio, you'll need avconf (media-video/libav) or" - elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -" - elog "videos can be retrieved in a higher quality format without sound." - elog "${PN} will detect whether avconv/ffmpeg is present and" - elog "automatically pick the best option." - elog - elog "Videos or video formats streamed via RTMP protocol can only be" - elog "downloaded when rtmpdump (media-video/rtmpdump) is installed." - elog "Downloading MMS and RTSP videos requires either mplayer" - elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed." - elog - elog "If you want ${PN} to embed thumbnails from the metadata into the" - elog "resulting MP4 files, consider installing media-video/atomicparsley" -} diff --git a/net-misc/youtube-dl/youtube-dl-2019.01.17.ebuild b/net-misc/youtube-dl/youtube-dl-2019.01.17.ebuild new file mode 100644 index 000000000000..c26955b40882 --- /dev/null +++ b/net-misc/youtube-dl/youtube-dl-2019.01.17.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +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 ${PN}.zsh _${PN} + + insinto /usr/share/fish/vendor_completions.d + doins ${PN}.fish + + distutils-r1_python_install_all + + rm -r "${ED}"/usr/etc || die + rm -r "${ED}"/usr/share/doc/youtube_dl || die +} + +pkg_postinst() { + elog "${PN}(1) / https://bugs.gentoo.org/355661 /" + elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :" + elog + elog "${PN} works fine on its own on most sites. However, if you want" + elog "to convert video/audio, you'll need avconf (media-video/libav) or" + elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -" + elog "videos can be retrieved in a higher quality format without sound." + elog "${PN} will detect whether avconv/ffmpeg is present and" + elog "automatically pick the best option." + elog + elog "Videos or video formats streamed via RTMP protocol can only be" + elog "downloaded when rtmpdump (media-video/rtmpdump) is installed." + elog "Downloading MMS and RTSP videos requires either mplayer" + elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed." + elog + elog "If you want ${PN} to embed thumbnails from the metadata into the" + elog "resulting MP4 files, consider installing media-video/atomicparsley" +} -- cgit v1.2.3