diff options
author | Jiaqing Zhao <jiaqing.zhao@linux.intel.com> | 2022-05-05 10:55:52 +0800 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2022-05-17 05:57:10 -0700 |
commit | 6c63579af1bcbdfd92c97d1e268a2d6120a79016 (patch) | |
tree | b6b9b7fbdea23b409248d67c7356721b5b6f4bd7 | |
parent | f2f81539dc348e8d42ec96aea74963e644b5c5d5 (diff) | |
download | meta-openembedded-contrib-6c63579af1bcbdfd92c97d1e268a2d6120a79016.tar.gz |
openldap: Remove libgcrypt dependency
Since OpenLDAP 2.5.0, it uses nettle instead of gcrypt.
Signed-off-by: Jiaqing Zhao <jiaqing.zhao@linux.intel.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit a5512ab27231d33f08a58cab4422c60b080c9067)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch | 15 | ||||
-rw-r--r-- | meta-oe/recipes-support/openldap/openldap_2.5.9.bb | 3 |
2 files changed, 1 insertions, 17 deletions
diff --git a/meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch b/meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch deleted file mode 100644 index 8cfd0033c8..0000000000 --- a/meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch +++ /dev/null @@ -1,15 +0,0 @@ -From http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-nds/openldap/files/ - -Upstream-Status: Pending - ---- a/configure.ac -+++ b/configure.ac -@@ -1263,7 +1263,7 @@ if test $ol_link_tls = no ; then - ol_link_tls=yes - WITH_TLS_TYPE=gnutls - -- TLS_LIBS="-lgnutls" -+ TLS_LIBS="-lgnutls -lgcrypt" - - AC_DEFINE(HAVE_GNUTLS, 1, - [define if you have GNUtls]) diff --git a/meta-oe/recipes-support/openldap/openldap_2.5.9.bb b/meta-oe/recipes-support/openldap/openldap_2.5.9.bb index 5ac5660cdf..958a21b9c1 100644 --- a/meta-oe/recipes-support/openldap/openldap_2.5.9.bb +++ b/meta-oe/recipes-support/openldap/openldap_2.5.9.bb @@ -15,7 +15,6 @@ SECTION = "libs" LDAP_VER = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/${BP}.tgz \ - file://openldap-2.4.28-gnutls-gcrypt.patch \ file://use-urandom.patch \ file://initscript \ file://slapd.service \ @@ -51,7 +50,7 @@ PACKAGECONFIG ??= "asyncmeta gnutls modules \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ " #--with-tls with TLS/SSL support auto|openssl|gnutls [auto] -PACKAGECONFIG[gnutls] = "--with-tls=gnutls,,gnutls libgcrypt" +PACKAGECONFIG[gnutls] = "--with-tls=gnutls,,gnutls" PACKAGECONFIG[openssl] = "--with-tls=openssl,,openssl" PACKAGECONFIG[sasl] = "--with-cyrus-sasl,--without-cyrus-sasl,cyrus-sasl" |