[meta-oe] [PATCH 1/2] openldap: Remove libgcrypt dependency

[meta-oe] [PATCH 1/2] openldap: Remove libgcrypt dependency

[Jiaqing Zhao]

Since OpenLDAP 2.5.0, it uses nettle instead of gcrypt.

Signed-off-by: Jiaqing Zhao <jiaqing.zhao@linux.intel.com>
---
 .../openldap/openldap-2.4.28-gnutls-gcrypt.patch  | 15 ---------------
 .../recipes-support/openldap/openldap_2.5.9.bb    |  3 +--
 2 files changed, 1 insertion(+), 17 deletions(-)
 delete mode 100644 meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch

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 8cfd0033c..000000000
--- 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 5ac5660cd..958a21b9c 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"
-- 
2.34.1

[meta-oe] [PATCH 2/2] openldap: Upgrade 2.5.9 -> 2.5.11

[Jiaqing Zhao]

Signed-off-by: Jiaqing Zhao <jiaqing.zhao@linux.intel.com>
---
 .../openldap/{openldap_2.5.9.bb => openldap_2.5.11.bb}      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta-oe/recipes-support/openldap/{openldap_2.5.9.bb => openldap_2.5.11.bb} (97%)

diff --git a/meta-oe/recipes-support/openldap/openldap_2.5.9.bb b/meta-oe/recipes-support/openldap/openldap_2.5.11.bb
similarity index 97%
rename from meta-oe/recipes-support/openldap/openldap_2.5.9.bb
rename to meta-oe/recipes-support/openldap/openldap_2.5.11.bb
index 958a21b9c..cc84d8d86 100644
--- a/meta-oe/recipes-support/openldap/openldap_2.5.9.bb
+++ b/meta-oe/recipes-support/openldap/openldap_2.5.11.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "http://www.OpenLDAP.org/license.html"
 # basically BSD.  opensource.org does not record this license
 # at present (so it is apparently not OSI certified).
 LICENSE = "OpenLDAP"
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=5cc6ef74da4ad25d707c4f5903d64975 \
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=beceb5ac7100b6430640c61655b25c1f \
                     file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972 \
                     "
 SECTION = "libs"
@@ -25,8 +25,8 @@ SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/$
     file://0001-librewrite-include-ldap_pvt_thread.h-before-redefini.patch \
 "
 
-SRC_URI[md5sum] = "237fc2d881c27f8dd5d9f396e2865c11"
-SRC_URI[sha256sum] = "c08e12f4ca5803d5d9f9948c70ad3491282cda3c17ec8b655dcbcb2364e6fb9e"
+SRC_URI[md5sum] = "c7205085cd4192cf95d0df6f5afa510a"
+SRC_URI[sha256sum] = "9514b07776d09f2e39aa75857395cd5634dafc209b526adb2abcb6f1c611d7f1"
 
 DEPENDS = "util-linux groff-native"
 
-- 
2.34.1

Re: [oe] [meta-oe] [PATCH 2/2] openldap: Upgrade 2.5.9 -> 2.5.11

[Khem Raj]

On Tue, May 3, 2022 at 2:17 AM Jiaqing Zhao
<jiaqing.zhao@linux.intel.com> wrote:
>
> Signed-off-by: Jiaqing Zhao <jiaqing.zhao@linux.intel.com>
> ---
>  .../openldap/{openldap_2.5.9.bb => openldap_2.5.11.bb}      | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>  rename meta-oe/recipes-support/openldap/{openldap_2.5.9.bb => openldap_2.5.11.bb} (97%)
>
> diff --git a/meta-oe/recipes-support/openldap/openldap_2.5.9.bb b/meta-oe/recipes-support/openldap/openldap_2.5.11.bb
> similarity index 97%
> rename from meta-oe/recipes-support/openldap/openldap_2.5.9.bb
> rename to meta-oe/recipes-support/openldap/openldap_2.5.11.bb
> index 958a21b9c..cc84d8d86 100644
> --- a/meta-oe/recipes-support/openldap/openldap_2.5.9.bb
> +++ b/meta-oe/recipes-support/openldap/openldap_2.5.11.bb
> @@ -7,7 +7,7 @@ HOMEPAGE = "http://www.OpenLDAP.org/license.html"
>  # basically BSD.  opensource.org does not record this license
>  # at present (so it is apparently not OSI certified).
>  LICENSE = "OpenLDAP"
> -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=5cc6ef74da4ad25d707c4f5903d64975 \
> +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=beceb5ac7100b6430640c61655b25c1f \

Describe need for this checksum update under License-update: section
in commit message.

>                      file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972 \
>                      "
>  SECTION = "libs"
> @@ -25,8 +25,8 @@ SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/$
>      file://0001-librewrite-include-ldap_pvt_thread.h-before-redefini.patch \
>  "
>
> -SRC_URI[md5sum] = "237fc2d881c27f8dd5d9f396e2865c11"
> -SRC_URI[sha256sum] = "c08e12f4ca5803d5d9f9948c70ad3491282cda3c17ec8b655dcbcb2364e6fb9e"
> +SRC_URI[md5sum] = "c7205085cd4192cf95d0df6f5afa510a"

you might as well drop md5sum while here. Its no longer needed.

> +SRC_URI[sha256sum] = "9514b07776d09f2e39aa75857395cd5634dafc209b526adb2abcb6f1c611d7f1"
>
>  DEPENDS = "util-linux groff-native"
>
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#96948): https://lists.openembedded.org/g/openembedded-devel/message/96948
> Mute This Topic: https://lists.openembedded.org/mt/90855525/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>