diff options
author | Mikle Kolyada <zlogene@gentoo.org> | 2021-05-02 14:20:02 +0300 |
---|---|---|
committer | Mikle Kolyada <zlogene@gentoo.org> | 2021-05-02 14:22:17 +0300 |
commit | 23865857941f753d1d0d3680632ff43ae29c0046 (patch) | |
tree | 0c3dc49b6499fb57130fb69dc57bf72da0e4805d | |
parent | www-client/microsoft-edge-dev: remove old (diff) | |
download | gentoo-23865857941f753d1d0d3680632ff43ae29c0046.tar.gz gentoo-23865857941f753d1d0d3680632ff43ae29c0046.tar.bz2 gentoo-23865857941f753d1d0d3680632ff43ae29c0046.zip |
net-nds/openldap: remove libressl support
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
-rw-r--r-- | net-nds/openldap/files/openldap-2.4.47-libressl.patch | 58 | ||||
-rw-r--r-- | net-nds/openldap/openldap-2.4.57.ebuild | 14 | ||||
-rw-r--r-- | net-nds/openldap/openldap-2.4.58.ebuild | 14 |
3 files changed, 8 insertions, 78 deletions
diff --git a/net-nds/openldap/files/openldap-2.4.47-libressl.patch b/net-nds/openldap/files/openldap-2.4.47-libressl.patch deleted file mode 100644 index 5e5b3e37bf05..000000000000 --- a/net-nds/openldap/files/openldap-2.4.47-libressl.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/libraries/libldap/tls_o.c b/libraries/libldap/tls_o.c -index b0277dfe9..8a3f47a74 100644 ---- a/libraries/libldap/tls_o.c -+++ b/libraries/libldap/tls_o.c -@@ -50,7 +50,7 @@ - #include <ssl.h> - #endif - --#if OPENSSL_VERSION_NUMBER >= 0x10100000 -+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER) - #define ASN1_STRING_data(x) ASN1_STRING_get0_data(x) - #endif - -@@ -200,7 +200,7 @@ tlso_init( void ) - (void) tlso_seed_PRNG( lo->ldo_tls_randfile ); - #endif - --#if OPENSSL_VERSION_NUMBER < 0x10100000 -+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER) - SSL_load_error_strings(); - SSL_library_init(); - OpenSSL_add_all_digests(); -@@ -252,7 +252,7 @@ static void - tlso_ctx_ref( tls_ctx *ctx ) - { - tlso_ctx *c = (tlso_ctx *)ctx; --#if OPENSSL_VERSION_NUMBER < 0x10100000 -+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER) - #define SSL_CTX_up_ref(ctx) CRYPTO_add( &(ctx->references), 1, CRYPTO_LOCK_SSL_CTX ) - #endif - SSL_CTX_up_ref( c ); -@@ -511,7 +511,7 @@ tlso_session_my_dn( tls_session *sess, struct berval *der_dn ) - if (!x) return LDAP_INVALID_CREDENTIALS; - - xn = X509_get_subject_name(x); --#if OPENSSL_VERSION_NUMBER < 0x10100000 -+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER) - der_dn->bv_len = i2d_X509_NAME( xn, NULL ); - der_dn->bv_val = xn->bytes->data; - #else -@@ -547,7 +547,7 @@ tlso_session_peer_dn( tls_session *sess, struct berval *der_dn ) - return LDAP_INVALID_CREDENTIALS; - - xn = X509_get_subject_name(x); --#if OPENSSL_VERSION_NUMBER < 0x10100000 -+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER) - der_dn->bv_len = i2d_X509_NAME( xn, NULL ); - der_dn->bv_val = xn->bytes->data; - #else -@@ -768,7 +768,7 @@ struct tls_data { - Sockbuf_IO_Desc *sbiod; - }; - --#if OPENSSL_VERSION_NUMBER < 0x10100000 -+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER) - #define BIO_set_init(b, x) b->init = x - #define BIO_set_data(b, x) b->ptr = x - #define BIO_clear_flags(b, x) b->flags &= ~(x) diff --git a/net-nds/openldap/openldap-2.4.57.ebuild b/net-nds/openldap/openldap-2.4.57.ebuild index 2db1c4901215..275d24ff2e0b 100644 --- a/net-nds/openldap/openldap-2.4.57.ebuild +++ b/net-nds/openldap/openldap-2.4.57.ebuild @@ -27,7 +27,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x IUSE_DAEMON="crypt samba tcpd experimental minimal" IUSE_BACKEND="+berkdb" IUSE_OVERLAY="overlays perl" -IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 libressl +syslog selinux static-libs test" +IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 +syslog selinux static-libs test" IUSE_CONTRIB="smbkrb5passwd kerberos kinit pbkdf2 sha2" IUSE_CONTRIB="${IUSE_CONTRIB} -cxx" IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}" @@ -50,8 +50,7 @@ for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done COMMON_DEPEND=" ssl? ( !gnutls? ( - !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) + >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] @@ -68,16 +67,14 @@ COMMON_DEPEND=" iodbc? ( dev-db/libiodbc ) ) perl? ( dev-lang/perl:=[-build(-)] ) samba? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= ) berkdb? ( <sys-libs/db-6.0:= || ( ${BDB_PKGS} ) ) smbkrb5passwd? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= kerberos? ( app-crypt/heimdal ) ) kerberos? ( @@ -177,9 +174,6 @@ PATCHES=( # unbundle lmdb "${FILESDIR}"/${PN}-2.4.42-mdb-unbundle.patch - # bug #622464 - "${FILESDIR}"/${PN}-2.4.47-libressl.patch - # fix some compiler warnings "${FILESDIR}"/${PN}-2.4.47-warnings.patch ) diff --git a/net-nds/openldap/openldap-2.4.58.ebuild b/net-nds/openldap/openldap-2.4.58.ebuild index f2095a16dd2a..02f6d9096b6b 100644 --- a/net-nds/openldap/openldap-2.4.58.ebuild +++ b/net-nds/openldap/openldap-2.4.58.ebuild @@ -27,7 +27,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~ IUSE_DAEMON="crypt samba tcpd experimental minimal" IUSE_BACKEND="+berkdb" IUSE_OVERLAY="overlays perl" -IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 libressl +syslog selinux static-libs test" +IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 +syslog selinux static-libs test" IUSE_CONTRIB="smbkrb5passwd kerberos kinit pbkdf2 sha2" IUSE_CONTRIB="${IUSE_CONTRIB} -cxx" IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}" @@ -50,8 +50,7 @@ for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done COMMON_DEPEND=" ssl? ( !gnutls? ( - !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) + >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] @@ -68,16 +67,14 @@ COMMON_DEPEND=" iodbc? ( dev-db/libiodbc ) ) perl? ( dev-lang/perl:=[-build(-)] ) samba? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= ) berkdb? ( <sys-libs/db-6.0:= || ( ${BDB_PKGS} ) ) smbkrb5passwd? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= kerberos? ( app-crypt/heimdal ) ) kerberos? ( @@ -177,9 +174,6 @@ PATCHES=( # unbundle lmdb "${FILESDIR}"/${PN}-2.4.42-mdb-unbundle.patch - # bug #622464 - "${FILESDIR}"/${PN}-2.4.47-libressl.patch - # fix some compiler warnings "${FILESDIR}"/${PN}-2.4.47-warnings.patch ) |