| 1 |
commit: 23865857941f753d1d0d3680632ff43ae29c0046 |
| 2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 2 11:20:02 2021 +0000 |
| 4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 2 11:22:17 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23865857 |
| 7 |
|
| 8 |
net-nds/openldap: 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 |
.../openldap/files/openldap-2.4.47-libressl.patch | 58 ---------------------- |
| 14 |
net-nds/openldap/openldap-2.4.57.ebuild | 14 ++---- |
| 15 |
net-nds/openldap/openldap-2.4.58.ebuild | 14 ++---- |
| 16 |
3 files changed, 8 insertions(+), 78 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-nds/openldap/files/openldap-2.4.47-libressl.patch b/net-nds/openldap/files/openldap-2.4.47-libressl.patch |
| 19 |
deleted file mode 100644 |
| 20 |
index 5e5b3e37bf0..00000000000 |
| 21 |
--- a/net-nds/openldap/files/openldap-2.4.47-libressl.patch |
| 22 |
+++ /dev/null |
| 23 |
@@ -1,58 +0,0 @@ |
| 24 |
-diff --git a/libraries/libldap/tls_o.c b/libraries/libldap/tls_o.c |
| 25 |
-index b0277dfe9..8a3f47a74 100644 |
| 26 |
---- a/libraries/libldap/tls_o.c |
| 27 |
-+++ b/libraries/libldap/tls_o.c |
| 28 |
-@@ -50,7 +50,7 @@ |
| 29 |
- #include <ssl.h> |
| 30 |
- #endif |
| 31 |
- |
| 32 |
--#if OPENSSL_VERSION_NUMBER >= 0x10100000 |
| 33 |
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER) |
| 34 |
- #define ASN1_STRING_data(x) ASN1_STRING_get0_data(x) |
| 35 |
- #endif |
| 36 |
- |
| 37 |
-@@ -200,7 +200,7 @@ tlso_init( void ) |
| 38 |
- (void) tlso_seed_PRNG( lo->ldo_tls_randfile ); |
| 39 |
- #endif |
| 40 |
- |
| 41 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000 |
| 42 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER) |
| 43 |
- SSL_load_error_strings(); |
| 44 |
- SSL_library_init(); |
| 45 |
- OpenSSL_add_all_digests(); |
| 46 |
-@@ -252,7 +252,7 @@ static void |
| 47 |
- tlso_ctx_ref( tls_ctx *ctx ) |
| 48 |
- { |
| 49 |
- tlso_ctx *c = (tlso_ctx *)ctx; |
| 50 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000 |
| 51 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER) |
| 52 |
- #define SSL_CTX_up_ref(ctx) CRYPTO_add( &(ctx->references), 1, CRYPTO_LOCK_SSL_CTX ) |
| 53 |
- #endif |
| 54 |
- SSL_CTX_up_ref( c ); |
| 55 |
-@@ -511,7 +511,7 @@ tlso_session_my_dn( tls_session *sess, struct berval *der_dn ) |
| 56 |
- if (!x) return LDAP_INVALID_CREDENTIALS; |
| 57 |
- |
| 58 |
- xn = X509_get_subject_name(x); |
| 59 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000 |
| 60 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER) |
| 61 |
- der_dn->bv_len = i2d_X509_NAME( xn, NULL ); |
| 62 |
- der_dn->bv_val = xn->bytes->data; |
| 63 |
- #else |
| 64 |
-@@ -547,7 +547,7 @@ tlso_session_peer_dn( tls_session *sess, struct berval *der_dn ) |
| 65 |
- return LDAP_INVALID_CREDENTIALS; |
| 66 |
- |
| 67 |
- xn = X509_get_subject_name(x); |
| 68 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000 |
| 69 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER) |
| 70 |
- der_dn->bv_len = i2d_X509_NAME( xn, NULL ); |
| 71 |
- der_dn->bv_val = xn->bytes->data; |
| 72 |
- #else |
| 73 |
-@@ -768,7 +768,7 @@ struct tls_data { |
| 74 |
- Sockbuf_IO_Desc *sbiod; |
| 75 |
- }; |
| 76 |
- |
| 77 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000 |
| 78 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER) |
| 79 |
- #define BIO_set_init(b, x) b->init = x |
| 80 |
- #define BIO_set_data(b, x) b->ptr = x |
| 81 |
- #define BIO_clear_flags(b, x) b->flags &= ~(x) |
| 82 |
|
| 83 |
diff --git a/net-nds/openldap/openldap-2.4.57.ebuild b/net-nds/openldap/openldap-2.4.57.ebuild |
| 84 |
index 2db1c490121..275d24ff2e0 100644 |
| 85 |
--- a/net-nds/openldap/openldap-2.4.57.ebuild |
| 86 |
+++ b/net-nds/openldap/openldap-2.4.57.ebuild |
| 87 |
@@ -27,7 +27,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x |
| 88 |
IUSE_DAEMON="crypt samba tcpd experimental minimal" |
| 89 |
IUSE_BACKEND="+berkdb" |
| 90 |
IUSE_OVERLAY="overlays perl" |
| 91 |
-IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 libressl +syslog selinux static-libs test" |
| 92 |
+IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 +syslog selinux static-libs test" |
| 93 |
IUSE_CONTRIB="smbkrb5passwd kerberos kinit pbkdf2 sha2" |
| 94 |
IUSE_CONTRIB="${IUSE_CONTRIB} -cxx" |
| 95 |
IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}" |
| 96 |
@@ -50,8 +50,7 @@ for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done |
| 97 |
COMMON_DEPEND=" |
| 98 |
ssl? ( |
| 99 |
!gnutls? ( |
| 100 |
- !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) |
| 101 |
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) |
| 102 |
+ >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] |
| 103 |
) |
| 104 |
gnutls? ( |
| 105 |
>=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] |
| 106 |
@@ -68,16 +67,14 @@ COMMON_DEPEND=" |
| 107 |
iodbc? ( dev-db/libiodbc ) ) |
| 108 |
perl? ( dev-lang/perl:=[-build(-)] ) |
| 109 |
samba? ( |
| 110 |
- !libressl? ( dev-libs/openssl:0= ) |
| 111 |
- libressl? ( dev-libs/libressl:0= ) |
| 112 |
+ dev-libs/openssl:0= |
| 113 |
) |
| 114 |
berkdb? ( |
| 115 |
<sys-libs/db-6.0:= |
| 116 |
|| ( ${BDB_PKGS} ) |
| 117 |
) |
| 118 |
smbkrb5passwd? ( |
| 119 |
- !libressl? ( dev-libs/openssl:0= ) |
| 120 |
- libressl? ( dev-libs/libressl:0= ) |
| 121 |
+ dev-libs/openssl:0= |
| 122 |
kerberos? ( app-crypt/heimdal ) |
| 123 |
) |
| 124 |
kerberos? ( |
| 125 |
@@ -177,9 +174,6 @@ PATCHES=( |
| 126 |
# unbundle lmdb |
| 127 |
"${FILESDIR}"/${PN}-2.4.42-mdb-unbundle.patch |
| 128 |
|
| 129 |
- # bug #622464 |
| 130 |
- "${FILESDIR}"/${PN}-2.4.47-libressl.patch |
| 131 |
- |
| 132 |
# fix some compiler warnings |
| 133 |
"${FILESDIR}"/${PN}-2.4.47-warnings.patch |
| 134 |
) |
| 135 |
|
| 136 |
diff --git a/net-nds/openldap/openldap-2.4.58.ebuild b/net-nds/openldap/openldap-2.4.58.ebuild |
| 137 |
index f2095a16dd2..02f6d9096b6 100644 |
| 138 |
--- a/net-nds/openldap/openldap-2.4.58.ebuild |
| 139 |
+++ b/net-nds/openldap/openldap-2.4.58.ebuild |
| 140 |
@@ -27,7 +27,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~ |
| 141 |
IUSE_DAEMON="crypt samba tcpd experimental minimal" |
| 142 |
IUSE_BACKEND="+berkdb" |
| 143 |
IUSE_OVERLAY="overlays perl" |
| 144 |
-IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 libressl +syslog selinux static-libs test" |
| 145 |
+IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 +syslog selinux static-libs test" |
| 146 |
IUSE_CONTRIB="smbkrb5passwd kerberos kinit pbkdf2 sha2" |
| 147 |
IUSE_CONTRIB="${IUSE_CONTRIB} -cxx" |
| 148 |
IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}" |
| 149 |
@@ -50,8 +50,7 @@ for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done |
| 150 |
COMMON_DEPEND=" |
| 151 |
ssl? ( |
| 152 |
!gnutls? ( |
| 153 |
- !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) |
| 154 |
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) |
| 155 |
+ >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] |
| 156 |
) |
| 157 |
gnutls? ( |
| 158 |
>=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] |
| 159 |
@@ -68,16 +67,14 @@ COMMON_DEPEND=" |
| 160 |
iodbc? ( dev-db/libiodbc ) ) |
| 161 |
perl? ( dev-lang/perl:=[-build(-)] ) |
| 162 |
samba? ( |
| 163 |
- !libressl? ( dev-libs/openssl:0= ) |
| 164 |
- libressl? ( dev-libs/libressl:0= ) |
| 165 |
+ dev-libs/openssl:0= |
| 166 |
) |
| 167 |
berkdb? ( |
| 168 |
<sys-libs/db-6.0:= |
| 169 |
|| ( ${BDB_PKGS} ) |
| 170 |
) |
| 171 |
smbkrb5passwd? ( |
| 172 |
- !libressl? ( dev-libs/openssl:0= ) |
| 173 |
- libressl? ( dev-libs/libressl:0= ) |
| 174 |
+ dev-libs/openssl:0= |
| 175 |
kerberos? ( app-crypt/heimdal ) |
| 176 |
) |
| 177 |
kerberos? ( |
| 178 |
@@ -177,9 +174,6 @@ PATCHES=( |
| 179 |
# unbundle lmdb |
| 180 |
"${FILESDIR}"/${PN}-2.4.42-mdb-unbundle.patch |
| 181 |
|
| 182 |
- # bug #622464 |
| 183 |
- "${FILESDIR}"/${PN}-2.4.47-libressl.patch |
| 184 |
- |
| 185 |
# fix some compiler warnings |
| 186 |
"${FILESDIR}"/${PN}-2.4.47-warnings.patch |
| 187 |
) |
Archives