openldap: upgrade 2.4.48 -> 2.4.49

-License-Update: Copyright year updated to 2020.

-openldap/kill-icu.patch
Removed since this is included in 2.4.49.

Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Zang Ruochen
2020-02-21 16:37:34 +08:00
committed by Khem Raj
parent 87c2895d2f
commit 4e9f1a2338
2 changed files with 3 additions and 34 deletions
@@ -1,30 +0,0 @@
From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
slapd depends on ICU if it was built first.
Upstream-Status: inappropiate [embedded specific]
---
configure.in | 8 --------
1 file changed, 8 deletions(-)
--- openldap-2.4.23.orig/configure.in
+++ openldap-2.4.23/configure.in
@@ -2045,18 +2045,10 @@ if test $ol_enable_ndb != no ; then
SLAPD_LIBS="$SLAPD_LIBS \$(SLAPD_NDB_LIBS)"
fi
fi
dnl ----------------------------------------------------------------
-dnl International Components for Unicode
-OL_ICU
-if test "$ol_icu" = no ; then
- AC_MSG_WARN([ICU not available])
-else
- ICU_LIBS="$ol_icu"
-fi
-dnl ----------------------------------------------------------------
dnl
dnl Check for Cyrus SASL
dnl
WITH_SASL=no
ol_link_sasl=no
@@ -7,7 +7,7 @@ HOMEPAGE = "http://www.OpenLDAP.org/license.html"
# basically BSD. opensource.org does not record this license # basically BSD. opensource.org does not record this license
# at present (so it is apparently not OSI certified). # at present (so it is apparently not OSI certified).
LICENSE = "OpenLDAP" LICENSE = "OpenLDAP"
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=ad914c35f97b468f421f8ac0f3d821f4 \ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=5391b559d23a2237bdb21e7a62dae7c3 \
file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972 \ file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972 \
" "
SECTION = "libs" SECTION = "libs"
@@ -16,7 +16,6 @@ LDAP_VER = "${@'.'.join(d.getVar('PV').split('.')[0:2])}"
SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/${BP}.tgz \ SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/${BP}.tgz \
file://openldap-m4-pthread.patch \ file://openldap-m4-pthread.patch \
file://kill-icu.patch \
file://openldap-2.4.28-gnutls-gcrypt.patch \ file://openldap-2.4.28-gnutls-gcrypt.patch \
file://use-urandom.patch \ file://use-urandom.patch \
file://initscript \ file://initscript \
@@ -26,8 +25,8 @@ SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/$
file://remove-user-host-pwd-from-version.patch \ file://remove-user-host-pwd-from-version.patch \
" "
SRC_URI[md5sum] = "0729a0711fe096831dedc159e0bbe73f" SRC_URI[md5sum] = "2a47a6bb4319357ea7b032c45283e79e"
SRC_URI[sha256sum] = "d9523ffcab5cd14b709fcf3cb4d04e8bc76bb8970113255f372bc74954c6074d" SRC_URI[sha256sum] = "e3b117944b4180f23befe87d0dcf47f29de775befbc469dcf4ac3dab3311e56e"
DEPENDS = "util-linux groff-native" DEPENDS = "util-linux groff-native"