| 1 |
commit: 7940a47d9339cce138de8e1fce5cb55e48824b86 |
| 2 |
Author: Quentin Retornaz <gentoo <AT> retornaz <DOT> com> |
| 3 |
AuthorDate: Sun May 2 23:43:36 2021 +0000 |
| 4 |
Commit: Quentin Retornaz <gentoo <AT> retornaz <DOT> com> |
| 5 |
CommitDate: Sun May 2 23:43:36 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=7940a47d |
| 7 |
|
| 8 |
net-misc/openssh: remove libressl USE flag |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.2 |
| 11 |
Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com> |
| 12 |
|
| 13 |
net-misc/openssh/openssh-8.2_p1-r7.ebuild | 19 ++++++++----------- |
| 14 |
net-misc/openssh/openssh-8.3_p1-r5.ebuild | 19 ++++++++----------- |
| 15 |
net-misc/openssh/openssh-8.4_p1-r2.ebuild | 19 ++++++++----------- |
| 16 |
3 files changed, 24 insertions(+), 33 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-misc/openssh/openssh-8.2_p1-r7.ebuild b/net-misc/openssh/openssh-8.2_p1-r7.ebuild |
| 19 |
index b40fb15..8895334 100644 |
| 20 |
--- a/net-misc/openssh/openssh-8.2_p1-r7.ebuild |
| 21 |
+++ b/net-misc/openssh/openssh-8.2_p1-r7.ebuild |
| 22 |
@@ -33,7 +33,7 @@ LICENSE="BSD GPL-2" |
| 23 |
SLOT="0" |
| 24 |
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" |
| 25 |
# Probably want to drop ssl defaulting to on in a future version. |
| 26 |
-IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie sctp security-key selinux +ssl static test X X509 xmss" |
| 27 |
+IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit livecd pam +pie sctp security-key selinux +ssl static test X X509 xmss" |
| 28 |
|
| 29 |
RESTRICT="!test? ( test )" |
| 30 |
|
| 31 |
@@ -42,7 +42,7 @@ REQUIRED_USE=" |
| 32 |
pie? ( !static ) |
| 33 |
static? ( !kerberos !pam ) |
| 34 |
X509? ( !sctp !security-key ssl !xmss ) |
| 35 |
- xmss? ( || ( ssl libressl ) ) |
| 36 |
+ xmss? ( ssl ) |
| 37 |
test? ( ssl ) |
| 38 |
" |
| 39 |
|
| 40 |
@@ -58,17 +58,14 @@ LIB_DEPEND=" |
| 41 |
security-key? ( dev-libs/libfido2:=[static-libs(+)] ) |
| 42 |
selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) |
| 43 |
ssl? ( |
| 44 |
- !libressl? ( |
| 45 |
- || ( |
| 46 |
- ( |
| 47 |
- >=dev-libs/openssl-1.0.1:0[bindist=] |
| 48 |
- <dev-libs/openssl-1.1.0:0[bindist=] |
| 49 |
- ) |
| 50 |
- >=dev-libs/openssl-1.1.0g:0[bindist=] |
| 51 |
+ || ( |
| 52 |
+ ( |
| 53 |
+ >=dev-libs/openssl-1.0.1:0[bindist=] |
| 54 |
+ <dev-libs/openssl-1.1.0:0[bindist=] |
| 55 |
) |
| 56 |
- dev-libs/openssl:0=[static-libs(+)] |
| 57 |
+ >=dev-libs/openssl-1.1.0g:0[bindist=] |
| 58 |
) |
| 59 |
- libressl? ( dev-libs/libressl:0=[static-libs(+)] ) |
| 60 |
+ dev-libs/openssl:0=[static-libs(+)] |
| 61 |
) |
| 62 |
virtual/libcrypt:=[static-libs(+)] |
| 63 |
>=sys-libs/zlib-1.2.3:=[static-libs(+)] |
| 64 |
|
| 65 |
diff --git a/net-misc/openssh/openssh-8.3_p1-r5.ebuild b/net-misc/openssh/openssh-8.3_p1-r5.ebuild |
| 66 |
index 2070568..543622f 100644 |
| 67 |
--- a/net-misc/openssh/openssh-8.3_p1-r5.ebuild |
| 68 |
+++ b/net-misc/openssh/openssh-8.3_p1-r5.ebuild |
| 69 |
@@ -36,7 +36,7 @@ LICENSE="BSD GPL-2" |
| 70 |
SLOT="0" |
| 71 |
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" |
| 72 |
# Probably want to drop ssl defaulting to on in a future version. |
| 73 |
-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" |
| 74 |
+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" |
| 75 |
|
| 76 |
RESTRICT="!test? ( test )" |
| 77 |
|
| 78 |
@@ -45,7 +45,7 @@ REQUIRED_USE=" |
| 79 |
pie? ( !static ) |
| 80 |
static? ( !kerberos !pam ) |
| 81 |
X509? ( !sctp !security-key ssl !xmss ) |
| 82 |
- xmss? ( || ( ssl libressl ) ) |
| 83 |
+ xmss? ( ssl ) |
| 84 |
test? ( ssl ) |
| 85 |
" |
| 86 |
|
| 87 |
@@ -61,17 +61,14 @@ LIB_DEPEND=" |
| 88 |
security-key? ( >=dev-libs/libfido2-1.4.0:=[static-libs(+)] ) |
| 89 |
selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) |
| 90 |
ssl? ( |
| 91 |
- !libressl? ( |
| 92 |
- || ( |
| 93 |
- ( |
| 94 |
- >=dev-libs/openssl-1.0.1:0[bindist=] |
| 95 |
- <dev-libs/openssl-1.1.0:0[bindist=] |
| 96 |
- ) |
| 97 |
- >=dev-libs/openssl-1.1.0g:0[bindist=] |
| 98 |
+ || ( |
| 99 |
+ ( |
| 100 |
+ >=dev-libs/openssl-1.0.1:0[bindist=] |
| 101 |
+ <dev-libs/openssl-1.1.0:0[bindist=] |
| 102 |
) |
| 103 |
- dev-libs/openssl:0=[static-libs(+)] |
| 104 |
+ >=dev-libs/openssl-1.1.0g:0[bindist=] |
| 105 |
) |
| 106 |
- libressl? ( dev-libs/libressl:0=[static-libs(+)] ) |
| 107 |
+ dev-libs/openssl:0=[static-libs(+)] |
| 108 |
) |
| 109 |
virtual/libcrypt:=[static-libs(+)] |
| 110 |
>=sys-libs/zlib-1.2.3:=[static-libs(+)] |
| 111 |
|
| 112 |
diff --git a/net-misc/openssh/openssh-8.4_p1-r2.ebuild b/net-misc/openssh/openssh-8.4_p1-r2.ebuild |
| 113 |
index 8941764..67e9aad 100644 |
| 114 |
--- a/net-misc/openssh/openssh-8.4_p1-r2.ebuild |
| 115 |
+++ b/net-misc/openssh/openssh-8.4_p1-r2.ebuild |
| 116 |
@@ -36,7 +36,7 @@ LICENSE="BSD GPL-2" |
| 117 |
SLOT="0" |
| 118 |
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" |
| 119 |
# Probably want to drop ssl defaulting to on in a future version. |
| 120 |
-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" |
| 121 |
+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" |
| 122 |
|
| 123 |
RESTRICT="!test? ( test )" |
| 124 |
|
| 125 |
@@ -45,7 +45,7 @@ REQUIRED_USE=" |
| 126 |
pie? ( !static ) |
| 127 |
static? ( !kerberos !pam ) |
| 128 |
X509? ( !sctp !security-key ssl !xmss ) |
| 129 |
- xmss? ( || ( ssl libressl ) ) |
| 130 |
+ xmss? ( ssl ) |
| 131 |
test? ( ssl ) |
| 132 |
" |
| 133 |
|
| 134 |
@@ -61,17 +61,14 @@ LIB_DEPEND=" |
| 135 |
security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] ) |
| 136 |
selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) |
| 137 |
ssl? ( |
| 138 |
- !libressl? ( |
| 139 |
- || ( |
| 140 |
- ( |
| 141 |
- >=dev-libs/openssl-1.0.1:0[bindist=] |
| 142 |
- <dev-libs/openssl-1.1.0:0[bindist=] |
| 143 |
- ) |
| 144 |
- >=dev-libs/openssl-1.1.0g:0[bindist=] |
| 145 |
+ || ( |
| 146 |
+ ( |
| 147 |
+ >=dev-libs/openssl-1.0.1:0[bindist=] |
| 148 |
+ <dev-libs/openssl-1.1.0:0[bindist=] |
| 149 |
) |
| 150 |
- dev-libs/openssl:0=[static-libs(+)] |
| 151 |
+ >=dev-libs/openssl-1.1.0g:0[bindist=] |
| 152 |
) |
| 153 |
- libressl? ( dev-libs/libressl:0=[static-libs(+)] ) |
| 154 |
+ dev-libs/openssl:0=[static-libs(+)] |
| 155 |
) |
| 156 |
virtual/libcrypt:=[static-libs(+)] |
| 157 |
>=sys-libs/zlib-1.2.3:=[static-libs(+)] |
Archives