diff options
| author |   Zang Ruochen <zangrc.fnst@cn.fujitsu.com> | 2020-02-21 16:37:34 +0800 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2020-02-21 08:50:36 -0800 |
| commit | 4e9f1a2338caae127f77badac6c0ae81e053c42b (patch) | |
| tree | 981c97365acef15d886aacae25d6570f5bbe7099 /meta-oe/recipes-support/openldap | |
| parent | 87c2895d2fd4b3717cec85bce47e96cff0f3ff47 (diff) | |
| download | meta-openembedded-contrib-4e9f1a2338caae127f77badac6c0ae81e053c42b.tar.gz | |
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>
Diffstat (limited to 'meta-oe/recipes-support/openldap')
| -rw-r--r-- | meta-oe/recipes-support/openldap/openldap/kill-icu.patch | 30 | ||||
| -rw-r--r-- | meta-oe/recipes-support/openldap/openldap_2.4.49.bb (renamed from meta-oe/recipes-support/openldap/openldap_2.4.48.bb) | 7 |
2 files changed, 3 insertions, 34 deletions
diff --git a/meta-oe/recipes-support/openldap/openldap/kill-icu.patch b/meta-oe/recipes-support/openldap/openldap/kill-icu.patch deleted file mode 100644 index 35e46465a4..0000000000 --- a/meta-oe/recipes-support/openldap/openldap/kill-icu.patch +++ /dev/null @@ -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 diff --git a/meta-oe/recipes-support/openldap/openldap_2.4.48.bb b/meta-oe/recipes-support/openldap/openldap_2.4.49.bb index ecc219d35d..670c704e6f 100644 --- a/meta-oe/recipes-support/openldap/openldap_2.4.48.bb +++ b/meta-oe/recipes-support/openldap/openldap_2.4.49.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=ad914c35f97b468f421f8ac0f3d821f4 \ +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=5391b559d23a2237bdb21e7a62dae7c3 \ file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972 \ " 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 \ file://openldap-m4-pthread.patch \ - file://kill-icu.patch \ file://openldap-2.4.28-gnutls-gcrypt.patch \ file://use-urandom.patch \ 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 \ " -SRC_URI[md5sum] = "0729a0711fe096831dedc159e0bbe73f" -SRC_URI[sha256sum] = "d9523ffcab5cd14b709fcf3cb4d04e8bc76bb8970113255f372bc74954c6074d" +SRC_URI[md5sum] = "2a47a6bb4319357ea7b032c45283e79e" +SRC_URI[sha256sum] = "e3b117944b4180f23befe87d0dcf47f29de775befbc469dcf4ac3dab3311e56e" DEPENDS = "util-linux groff-native" |