commit: c39f238a2a542775be7c258de23beeef708d97e2
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 22 09:19:07 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> 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 )
