From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 636881382C5 for ; Mon, 22 Jan 2018 09:22:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 79A11E0903; Mon, 22 Jan 2018 09:22:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3E133E0903 for ; Mon, 22 Jan 2018 09:22:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BB9B0335C3A for ; Mon, 22 Jan 2018 09:22:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 658341A0 for ; Mon, 22 Jan 2018 09:22:09 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1516612747.c39f238a2a542775be7c258de23beeef708d97e2.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/openssh/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/openssh/openssh-7.5_p1-r3.ebuild net-misc/openssh/openssh-7.5_p1-r4.ebuild net-misc/openssh/openssh-7.6_p1-r1.ebuild net-misc/openssh/openssh-7.6_p1-r2.ebuild net-misc/openssh/openssh-7.6_p1.ebuild X-VCS-Directories: net-misc/openssh/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: c39f238a2a542775be7c258de23beeef708d97e2 X-VCS-Branch: master Date: Mon, 22 Jan 2018 09:22:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f7e30079-d7b4-42d0-bad3-09850e1f5b89 X-Archives-Hash: 5d7020238193082048eb3999f33a5be8 commit: c39f238a2a542775be7c258de23beeef708d97e2 Author: Lars Wendler gentoo org> AuthorDate: Mon Jan 22 09:19:07 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Mon Jan 22 09:19:07 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c39f238a Revert "net-misc/openssh: revbumps for net-libs/ldns dep change" This reverts commit de02520f0c9d660af8a2cd0317648f69177f57c1. .../openssh/{openssh-7.5_p1-r4.ebuild => openssh-7.5_p1-r3.ebuild} | 0 .../openssh/{openssh-7.6_p1-r2.ebuild => openssh-7.6_p1-r1.ebuild} | 6 +++--- .../openssh/{openssh-7.6_p1-r2.ebuild => openssh-7.6_p1.ebuild} | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/net-misc/openssh/openssh-7.5_p1-r4.ebuild b/net-misc/openssh/openssh-7.5_p1-r3.ebuild similarity index 100% rename from net-misc/openssh/openssh-7.5_p1-r4.ebuild rename to net-misc/openssh/openssh-7.5_p1-r3.ebuild diff --git a/net-misc/openssh/openssh-7.6_p1-r2.ebuild b/net-misc/openssh/openssh-7.6_p1-r1.ebuild similarity index 97% copy from net-misc/openssh/openssh-7.6_p1-r2.ebuild copy to net-misc/openssh/openssh-7.6_p1-r1.ebuild index 85aa2df1bc1..6cc76cb2541 100644 --- a/net-misc/openssh/openssh-7.6_p1-r2.ebuild +++ b/net-misc/openssh/openssh-7.6_p1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ inherit user flag-o-matic multilib autotools pam systemd versionator # and _p? releases. PARCH=${P/_} -HPN_PATCH="${PARCH}-hpnssh14v12.tar.xz" +#HPN_PATCH="${PARCH}-hpnssh14v12.tar.xz" SCTP_PATCH="${PN}-7.6_p1-sctp.patch.xz" LDAP_PATCH="${PN}-lpk-7.6p1-0.3.14.patch.xz" X509_VER="11.0" X509_PATCH="${PN}-${PV/_}+x509-${X509_VER}.diff.gz" @@ -27,7 +27,7 @@ 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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" # Probably want to drop ssl defaulting to on in a future version. -IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey +ssl static test X X509" +IUSE="abi_mips_n32 audit bindist debug ${HPN_PATCH:++}hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey +ssl static test X X509" REQUIRED_USE="ldns? ( ssl ) pie? ( !static ) static? ( !kerberos !pam ) diff --git a/net-misc/openssh/openssh-7.6_p1-r2.ebuild b/net-misc/openssh/openssh-7.6_p1.ebuild similarity index 98% rename from net-misc/openssh/openssh-7.6_p1-r2.ebuild rename to net-misc/openssh/openssh-7.6_p1.ebuild index 85aa2df1bc1..490a91163fa 100644 --- a/net-misc/openssh/openssh-7.6_p1-r2.ebuild +++ b/net-misc/openssh/openssh-7.6_p1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -27,7 +27,7 @@ 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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" # Probably want to drop ssl defaulting to on in a future version. -IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey +ssl static test X X509" +IUSE="abi_mips_n32 audit bindist debug ${HPN_PATCH:++}hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey +ssl static test X X509" REQUIRED_USE="ldns? ( ssl ) pie? ( !static ) static? ( !kerberos !pam )