| 1 |
commit: 6001af6dfef17fd3aead79d70d492665b5d5b68a |
| 2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 1 14:29:04 2021 +0000 |
| 4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 1 14:29:04 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6001af6d |
| 7 |
|
| 8 |
net-misc/openssh: remove libressl support |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.2 |
| 11 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
| 12 |
|
| 13 |
net-misc/openssh/openssh-8.4_p1-r3.ebuild | 8 ++------ |
| 14 |
net-misc/openssh/openssh-8.5_p1-r1.ebuild | 10 +++------- |
| 15 |
net-misc/openssh/openssh-8.5_p1.ebuild | 7 ++----- |
| 16 |
net-misc/openssh/openssh-8.6_p1-r1.ebuild | 7 ++----- |
| 17 |
4 files changed, 9 insertions(+), 23 deletions(-) |
| 18 |
|
| 19 |
diff --git a/net-misc/openssh/openssh-8.4_p1-r3.ebuild b/net-misc/openssh/openssh-8.4_p1-r3.ebuild |
| 20 |
index da520e54331..ef43e0aa202 100644 |
| 21 |
--- a/net-misc/openssh/openssh-8.4_p1-r3.ebuild |
| 22 |
+++ b/net-misc/openssh/openssh-8.4_p1-r3.ebuild |
| 23 |
@@ -36,7 +36,7 @@ LICENSE="BSD GPL-2" |
| 24 |
SLOT="0" |
| 25 |
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 26 |
# Probably want to drop ssl defaulting to on in a future version. |
| 27 |
-IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie +scp sctp security-key selinux +ssl static test X X509 xmss" |
| 28 |
+IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit livecd pam +pie +scp sctp security-key selinux +ssl static test X X509 xmss" |
| 29 |
|
| 30 |
RESTRICT="!test? ( test )" |
| 31 |
|
| 32 |
@@ -45,7 +45,7 @@ REQUIRED_USE=" |
| 33 |
pie? ( !static ) |
| 34 |
static? ( !kerberos !pam ) |
| 35 |
X509? ( !sctp !security-key ssl !xmss ) |
| 36 |
- xmss? ( || ( ssl libressl ) ) |
| 37 |
+ xmss? ( ssl ) |
| 38 |
test? ( ssl ) |
| 39 |
" |
| 40 |
|
| 41 |
@@ -61,7 +61,6 @@ LIB_DEPEND=" |
| 42 |
security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] ) |
| 43 |
selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) |
| 44 |
ssl? ( |
| 45 |
- !libressl? ( |
| 46 |
|| ( |
| 47 |
( |
| 48 |
>=dev-libs/openssl-1.0.1:0[bindist=] |
| 49 |
@@ -70,8 +69,6 @@ LIB_DEPEND=" |
| 50 |
>=dev-libs/openssl-1.1.0g:0[bindist=] |
| 51 |
) |
| 52 |
dev-libs/openssl:0=[static-libs(+)] |
| 53 |
- ) |
| 54 |
- libressl? ( dev-libs/libressl:0=[static-libs(+)] ) |
| 55 |
) |
| 56 |
virtual/libcrypt:=[static-libs(+)] |
| 57 |
>=sys-libs/zlib-1.2.3:=[static-libs(+)] |
| 58 |
@@ -191,7 +188,6 @@ src_prepare() { |
| 59 |
cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}" || die |
| 60 |
pushd "${hpn_patchdir}" &>/dev/null || die |
| 61 |
eapply "${FILESDIR}"/${P}-hpn-${HPN_VER}-glue.patch |
| 62 |
- eapply "${FILESDIR}"/${PN}-8.4_p1-hpn-${HPN_VER}-libressl.patch |
| 63 |
use X509 && eapply "${FILESDIR}"/${PN}-8.4_p1-hpn-${HPN_VER}-X509-glue.patch |
| 64 |
use sctp && eapply "${FILESDIR}"/${PN}-8.4_p1-hpn-${HPN_VER}-sctp-glue.patch |
| 65 |
popd &>/dev/null || die |
| 66 |
|
| 67 |
diff --git a/net-misc/openssh/openssh-8.5_p1-r1.ebuild b/net-misc/openssh/openssh-8.5_p1-r1.ebuild |
| 68 |
index 72fe6e947d1..b440e7aa4ae 100644 |
| 69 |
--- a/net-misc/openssh/openssh-8.5_p1-r1.ebuild |
| 70 |
+++ b/net-misc/openssh/openssh-8.5_p1-r1.ebuild |
| 71 |
@@ -35,7 +35,7 @@ LICENSE="BSD GPL-2" |
| 72 |
SLOT="0" |
| 73 |
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 74 |
# Probably want to drop ssl defaulting to on in a future version. |
| 75 |
-IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie +scp sctp security-key selinux +ssl static test X X509 xmss" |
| 76 |
+IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit livecd pam +pie +scp sctp security-key selinux +ssl static test X X509 xmss" |
| 77 |
|
| 78 |
RESTRICT="!test? ( test )" |
| 79 |
|
| 80 |
@@ -44,15 +44,14 @@ REQUIRED_USE=" |
| 81 |
pie? ( !static ) |
| 82 |
static? ( !kerberos !pam ) |
| 83 |
X509? ( !sctp !security-key ssl !xmss ) |
| 84 |
- xmss? ( || ( ssl libressl ) ) |
| 85 |
+ xmss? ( ssl ) |
| 86 |
test? ( ssl ) |
| 87 |
" |
| 88 |
|
| 89 |
LIB_DEPEND=" |
| 90 |
audit? ( sys-process/audit[static-libs(+)] ) |
| 91 |
ldns? ( |
| 92 |
- net-libs/ldns[static-libs(+)] |
| 93 |
- !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) |
| 94 |
+ net-libs/ldns[static-libs(+)] !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) |
| 95 |
bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) |
| 96 |
) |
| 97 |
libedit? ( dev-libs/libedit:=[static-libs(+)] ) |
| 98 |
@@ -60,7 +59,6 @@ LIB_DEPEND=" |
| 99 |
security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] ) |
| 100 |
selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) |
| 101 |
ssl? ( |
| 102 |
- !libressl? ( |
| 103 |
|| ( |
| 104 |
( |
| 105 |
>=dev-libs/openssl-1.0.1:0[bindist=] |
| 106 |
@@ -69,8 +67,6 @@ LIB_DEPEND=" |
| 107 |
>=dev-libs/openssl-1.1.0g:0[bindist=] |
| 108 |
) |
| 109 |
dev-libs/openssl:0=[static-libs(+)] |
| 110 |
- ) |
| 111 |
- libressl? ( dev-libs/libressl:0=[static-libs(+)] ) |
| 112 |
) |
| 113 |
virtual/libcrypt:=[static-libs(+)] |
| 114 |
>=sys-libs/zlib-1.2.3:=[static-libs(+)] |
| 115 |
|
| 116 |
diff --git a/net-misc/openssh/openssh-8.5_p1.ebuild b/net-misc/openssh/openssh-8.5_p1.ebuild |
| 117 |
index f04773b5b3a..1d37aa2af6c 100644 |
| 118 |
--- a/net-misc/openssh/openssh-8.5_p1.ebuild |
| 119 |
+++ b/net-misc/openssh/openssh-8.5_p1.ebuild |
| 120 |
@@ -36,7 +36,7 @@ LICENSE="BSD GPL-2" |
| 121 |
SLOT="0" |
| 122 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 123 |
# Probably want to drop ssl defaulting to on in a future version. |
| 124 |
-IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie +scp sctp security-key selinux +ssl static test X X509 xmss" |
| 125 |
+IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit livecd pam +pie +scp sctp security-key selinux +ssl static test X X509 xmss" |
| 126 |
|
| 127 |
RESTRICT="!test? ( test )" |
| 128 |
|
| 129 |
@@ -45,7 +45,7 @@ REQUIRED_USE=" |
| 130 |
pie? ( !static ) |
| 131 |
static? ( !kerberos !pam ) |
| 132 |
X509? ( !sctp !security-key ssl !xmss ) |
| 133 |
- xmss? ( || ( ssl libressl ) ) |
| 134 |
+ xmss? ( ssl ) |
| 135 |
test? ( ssl ) |
| 136 |
" |
| 137 |
|
| 138 |
@@ -61,7 +61,6 @@ LIB_DEPEND=" |
| 139 |
security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] ) |
| 140 |
selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) |
| 141 |
ssl? ( |
| 142 |
- !libressl? ( |
| 143 |
|| ( |
| 144 |
( |
| 145 |
>=dev-libs/openssl-1.0.1:0[bindist=] |
| 146 |
@@ -70,8 +69,6 @@ LIB_DEPEND=" |
| 147 |
>=dev-libs/openssl-1.1.0g:0[bindist=] |
| 148 |
) |
| 149 |
dev-libs/openssl:0=[static-libs(+)] |
| 150 |
- ) |
| 151 |
- libressl? ( dev-libs/libressl:0=[static-libs(+)] ) |
| 152 |
) |
| 153 |
virtual/libcrypt:=[static-libs(+)] |
| 154 |
>=sys-libs/zlib-1.2.3:=[static-libs(+)] |
| 155 |
|
| 156 |
diff --git a/net-misc/openssh/openssh-8.6_p1-r1.ebuild b/net-misc/openssh/openssh-8.6_p1-r1.ebuild |
| 157 |
index a09b6842fbe..bda61266ca3 100644 |
| 158 |
--- a/net-misc/openssh/openssh-8.6_p1-r1.ebuild |
| 159 |
+++ b/net-misc/openssh/openssh-8.6_p1-r1.ebuild |
| 160 |
@@ -36,7 +36,7 @@ LICENSE="BSD GPL-2" |
| 161 |
SLOT="0" |
| 162 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 163 |
# Probably want to drop ssl defaulting to on in a future version. |
| 164 |
-IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie +scp sctp security-key selinux +ssl static test X X509 xmss" |
| 165 |
+IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit livecd pam +pie +scp sctp security-key selinux +ssl static test X X509 xmss" |
| 166 |
|
| 167 |
RESTRICT="!test? ( test )" |
| 168 |
|
| 169 |
@@ -45,7 +45,7 @@ REQUIRED_USE=" |
| 170 |
pie? ( !static ) |
| 171 |
static? ( !kerberos !pam ) |
| 172 |
X509? ( !sctp !security-key ssl !xmss ) |
| 173 |
- xmss? ( || ( ssl libressl ) ) |
| 174 |
+ xmss? ( ssl ) |
| 175 |
test? ( ssl ) |
| 176 |
" |
| 177 |
|
| 178 |
@@ -64,7 +64,6 @@ LIB_DEPEND=" |
| 179 |
security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] ) |
| 180 |
selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) |
| 181 |
ssl? ( |
| 182 |
- !libressl? ( |
| 183 |
|| ( |
| 184 |
( |
| 185 |
>=dev-libs/openssl-1.0.1:0[bindist=] |
| 186 |
@@ -73,8 +72,6 @@ LIB_DEPEND=" |
| 187 |
>=dev-libs/openssl-1.1.0g:0[bindist=] |
| 188 |
) |
| 189 |
dev-libs/openssl:0=[static-libs(+)] |
| 190 |
- ) |
| 191 |
- libressl? ( dev-libs/libressl:0=[static-libs(+)] ) |
| 192 |
) |
| 193 |
virtual/libcrypt:=[static-libs(+)] |
| 194 |
>=sys-libs/zlib-1.2.3:=[static-libs(+)] |
Archives