summaryrefslogtreecommitdiff
path: root/package/openldap
diff options
context:
space:
mode:
Diffstat (limited to 'package/openldap')
-rw-r--r--package/openldap/Makefile12
-rw-r--r--package/openldap/files/slapd.conf4
-rw-r--r--package/openldap/patches/patch-Makefile_in11
-rw-r--r--package/openldap/patches/patch-configure33
-rw-r--r--package/openldap/patches/patch-configure_in31
-rw-r--r--package/openldap/patches/patch-libraries_libldap_tls_o_c67
-rw-r--r--package/openldap/patches/patch-libraries_librewrite_rewrite-int_h21
7 files changed, 8 insertions, 171 deletions
diff --git a/package/openldap/Makefile b/package/openldap/Makefile
index 34c6a6642..ba69f6066 100644
--- a/package/openldap/Makefile
+++ b/package/openldap/Makefile
@@ -4,16 +4,16 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= openldap
-PKG_VERSION:= 2.4.45
+PKG_VERSION:= 2.6.8
PKG_RELEASE:= 1
-PKG_HASH:= cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824
+PKG_HASH:= 48969323e94e3be3b03c6a132942dcba7ef8d545f2ad35401709019f696c3c4e
PKG_DESCR:= ldap client libraries
PKG_SECTION:= libs/misc
-PKG_DEPENDS:= libsasl2 libdb libuuid libncurses libressl
-PKG_BUILDDEP:= cyrus-sasl db util-linux libressl
+PKG_DEPENDS:= libsasl2 libuuid libncurses libopenssl
+PKG_BUILDDEP:= cyrus-sasl util-linux openssl
PKG_NEEDS:= threads c++
PKG_URL:= http://www.openldap.org/
-PKG_SITES:= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
+PKG_SITES:= https://openldap.org/software/download/OpenLDAP/openldap-release/
PKG_LIBNAME:= libopenldap
PKG_OPTS:= dev
@@ -39,7 +39,7 @@ $(eval $(call PKG_template,OPENLDAP_SLAPD,openldap-slapd,${PKG_VERSION}-${PKG_RE
CONFIGURE_ENV+= ac_cv_func_memcmp_working=yes
CONFIGURE_ARGS+= --enable-slapd \
--libexecdir=/usr/sbin \
- --enable-bdb \
+ --disable-bdb \
--disable-hdb \
--disable-relay \
--enable-dynamic \
diff --git a/package/openldap/files/slapd.conf b/package/openldap/files/slapd.conf
index 3a065043b..df18922e5 100644
--- a/package/openldap/files/slapd.conf
+++ b/package/openldap/files/slapd.conf
@@ -13,9 +13,9 @@ argsfile /var/run/slapd.args
# moduleload back_ldap.la
#######################################################################
-# BDB database definitions
+# MDB database definitions
#######################################################################
-database bdb
+database mdb
suffix "o=openadk"
rootdn "cn=admin,o=openadk"
# Cleartext passwords, especially for the rootdn, should
diff --git a/package/openldap/patches/patch-Makefile_in b/package/openldap/patches/patch-Makefile_in
deleted file mode 100644
index c248c3f7e..000000000
--- a/package/openldap/patches/patch-Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- openldap-2.4.23.orig/Makefile.in 2010-04-13 22:22:14.000000000 +0200
-+++ openldap-2.4.23/Makefile.in 2011-03-04 20:59:55.000000000 +0100
-@@ -13,7 +13,7 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
-
--SUBDIRS= include libraries clients servers tests doc
-+SUBDIRS= include libraries clients servers
- CLEANDIRS=
- INSTALLDIRS=
-
diff --git a/package/openldap/patches/patch-configure b/package/openldap/patches/patch-configure
deleted file mode 100644
index 248f06e8a..000000000
--- a/package/openldap/patches/patch-configure
+++ /dev/null
@@ -1,33 +0,0 @@
---- openldap-2.4.42.orig/configure 2015-08-14 17:25:28.000000000 +0200
-+++ openldap-2.4.42/configure 2015-10-22 07:28:53.000000000 +0200
-@@ -22223,29 +22223,10 @@ $as_echo "$as_me: WARNING: Strong authen
- fi
- fi
-
--if test $cross_compiling != yes && test "$ac_cv_mingw32" != yes ; then
-- dev=no
-- if test -r /dev/urandom ; then
-- dev="/dev/urandom";
-- elif test -r /idev/urandom ; then
-- dev="/idev/urandom";
-- elif test -r /dev/srandom ; then
-- dev="/dev/srandom";
-- elif test -r /dev/random ; then
-- dev="/dev/random";
-- elif test -r /idev/random ; then
-- dev="/idev/random";
-- fi
--
-- if test $dev != no ; then
--
- cat >>confdefs.h <<_ACEOF
--#define URANDOM_DEVICE "$dev"
-+#define URANDOM_DEVICE "/dev/urandom"
- _ACEOF
-
-- fi
--fi
--
- ol_link_fetch=no
- if test $ol_with_fetch != no ; then
- ol_LIBS=$LIBS
diff --git a/package/openldap/patches/patch-configure_in b/package/openldap/patches/patch-configure_in
deleted file mode 100644
index 5bd5b2503..000000000
--- a/package/openldap/patches/patch-configure_in
+++ /dev/null
@@ -1,31 +0,0 @@
---- openldap-2.4.42.orig/configure.in 2015-08-14 17:25:28.000000000 +0200
-+++ openldap-2.4.42/configure.in 2015-10-22 07:23:38.000000000 +0200
-@@ -2147,26 +2147,8 @@ else
- fi
- fi
-
--dnl ----------------------------------------------------------------
--dnl Check for entropy sources
--if test $cross_compiling != yes && test "$ac_cv_mingw32" != yes ; then
-- dev=no
-- if test -r /dev/urandom ; then
-- dev="/dev/urandom";
-- elif test -r /idev/urandom ; then
-- dev="/idev/urandom";
-- elif test -r /dev/srandom ; then
-- dev="/dev/srandom";
-- elif test -r /dev/random ; then
-- dev="/dev/random";
-- elif test -r /idev/random ; then
-- dev="/idev/random";
-- fi
--
-- if test $dev != no ; then
-- AC_DEFINE_UNQUOTED(URANDOM_DEVICE,"$dev",[set to urandom device])
-- fi
--fi
-+# set unconditionally to /dev/urandom for Linux cross-compilation
-+AC_DEFINE_UNQUOTED(URANDOM_DEVICE,"/dev/urandom",[set to urandom device])
-
- dnl ----------------------------------------------------------------
- dnl
diff --git a/package/openldap/patches/patch-libraries_libldap_tls_o_c b/package/openldap/patches/patch-libraries_libldap_tls_o_c
deleted file mode 100644
index f620c03f6..000000000
--- a/package/openldap/patches/patch-libraries_libldap_tls_o_c
+++ /dev/null
@@ -1,67 +0,0 @@
-Patch from Macports:
-https://trac.macports.org/ticket/54275
---- openldap-2.4.45.orig/libraries/libldap/tls_o.c 2017-06-01 22:01:07.000000000 +0200
-+++ openldap-2.4.45/libraries/libldap/tls_o.c 2017-10-08 19:45:58.513865858 +0200
-@@ -47,7 +47,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
-
-@@ -157,7 +157,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();
-@@ -205,7 +205,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 );
-@@ -464,7 +464,7 @@ tlso_session_my_dn( tls_session *sess, s
- 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
-@@ -500,7 +500,7 @@ tlso_session_peer_dn( tls_session *sess,
- 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
-@@ -721,7 +721,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)
-@@ -822,7 +822,7 @@ tlso_bio_puts( BIO *b, const char *str )
- return tlso_bio_write( b, str, strlen( str ) );
- }
-
--#if OPENSSL_VERSION_NUMBER >= 0x10100000
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000) && !defined(LIBRESSL_VERSION_NUMBER)
- struct bio_method_st {
- int type;
- const char *name;
diff --git a/package/openldap/patches/patch-libraries_librewrite_rewrite-int_h b/package/openldap/patches/patch-libraries_librewrite_rewrite-int_h
deleted file mode 100644
index a80083bc2..000000000
--- a/package/openldap/patches/patch-libraries_librewrite_rewrite-int_h
+++ /dev/null
@@ -1,21 +0,0 @@
---- openldap-2.4.36.orig/libraries/librewrite/rewrite-int.h 2013-08-16 20:12:59.000000000 +0200
-+++ openldap-2.4.36/libraries/librewrite/rewrite-int.h 2013-11-01 14:30:43.000000000 +0100
-@@ -40,12 +40,18 @@
-
- #include <rewrite.h>
-
-+/*
-+#undef malloc
- #define malloc(x) ber_memalloc(x)
-+#undef calloc
- #define calloc(x,y) ber_memcalloc(x,y)
-+#undef realloc
- #define realloc(x,y) ber_memrealloc(x,y)
-+#undef free
- #define free(x) ber_memfree(x)
- #undef strdup
- #define strdup(x) ber_strdup(x)
-+*/
-
- /* Uncomment to use ldap pvt threads */
- #define USE_REWRITE_LDAP_PVT_THREADS
generated by cgit v1.2.3 (git 2.46.0) at 2025-09-16 01:02:41 +0000