openldap: upgrade 2.4.45 -> 2.4.46

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
changqing.li@windriver.com
2018-07-02 10:07:58 +08:00
committed by Khem Raj
parent b56fc26fef
commit 2731baf1ea
6 changed files with 13 additions and 8 deletions
@@ -1,6 +1,9 @@
# This patch ensures that the install operations which strip # This patch ensures that the install operations which strip
# programs and libraries (LTINSTALL) work in a cross build # programs and libraries (LTINSTALL) work in a cross build
# environment. # environment.
Upstream-Status: Pending
--- openldap-2.2.24/.pc/install-strip.patch/build/top.mk 2005-01-20 09:00:55.000000000 -0800 --- openldap-2.2.24/.pc/install-strip.patch/build/top.mk 2005-01-20 09:00:55.000000000 -0800
+++ openldap-2.2.24/build/top.mk 2005-04-16 13:48:20.536710376 -0700 +++ openldap-2.2.24/build/top.mk 2005-04-16 13:48:20.536710376 -0700
@@ -116,7 +116,7 @@ @@ -116,7 +116,7 @@
@@ -2,7 +2,7 @@ From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
slapd depends on ICU if it was built first. slapd depends on ICU if it was built first.
Upstream-status: inappropiate [embedded specific] Upstream-Status: inappropiate [embedded specific]
--- ---
configure.in | 8 -------- configure.in | 8 --------
1 file changed, 8 deletions(-) 1 file changed, 8 deletions(-)
@@ -1,6 +1,6 @@
From http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-nds/openldap/files/ From http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-nds/openldap/files/
Upstream-status: Unknown Upstream-status: Pending
-- --
@@ -10,6 +10,8 @@ cipher strings, which might cause a weaker than intended cipher to
be used and allow remote attackers to have unspecified impact via be used and allow remote attackers to have unspecified impact via
unknown vectors. unknown vectors.
Upstream-Status: Pending
Signed-off-by: Li Wang <li.wang@windriver.com> Signed-off-by: Li Wang <li.wang@windriver.com>
--- ---
libraries/libldap/tls_m.c | 27 ++++++++++++++++----------- libraries/libldap/tls_m.c | 27 ++++++++++++++++-----------
@@ -1,3 +1,5 @@
Upstream-Status: Pending
--- openldap-2.3.11/build/openldap.m4.orig 2005-11-11 00:11:18.604322590 -0800 --- openldap-2.3.11/build/openldap.m4.orig 2005-11-11 00:11:18.604322590 -0800
+++ openldap-2.3.11/build/openldap.m4 2005-11-11 00:26:21.621145856 -0800 +++ openldap-2.3.11/build/openldap.m4 2005-11-11 00:26:21.621145856 -0800
@@ -788,7 +788,7 @@ AC_DEFUN([OL_PTHREAD_TEST_FUNCTION],[[ @@ -788,7 +788,7 @@ AC_DEFUN([OL_PTHREAD_TEST_FUNCTION],[[
@@ -1,5 +1,3 @@
# OpenLDAP, a license free (see http://www.OpenLDAP.org/license.html)
#
SUMMARY = "OpenLDAP Directory Service" SUMMARY = "OpenLDAP Directory Service"
DESCRIPTION = "OpenLDAP Software is an open source implementation of the Lightweight Directory Access Protocol." DESCRIPTION = "OpenLDAP Software is an open source implementation of the Lightweight Directory Access Protocol."
HOMEPAGE = "http://www.OpenLDAP.org/license.html" HOMEPAGE = "http://www.OpenLDAP.org/license.html"
@@ -9,9 +7,9 @@ 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=25fd3721960f39128cd15a749fd21139 \ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=25b4ead0e45182e7c2914e59ff57009f \
file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972 \ file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972 \
" "
SECTION = "libs" SECTION = "libs"
LDAP_VER = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" LDAP_VER = "${@'.'.join(d.getVar('PV').split('.')[0:2])}"
@@ -27,8 +25,8 @@ SRC_URI = "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${BP}.tgz \
file://openldap-CVE-2015-3276.patch \ file://openldap-CVE-2015-3276.patch \
" "
SRC_URI[md5sum] = "00ff8301277cdfd0af728a6927042a13" SRC_URI[md5sum] = "829016c5a9f45c51adc50073ac6f9fd7"
SRC_URI[sha256sum] = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824" SRC_URI[sha256sum] = "9a90dcb86b99ae790ccab93b7585a31fbcbeec8c94bf0f7ab0ca0a87ea0c4b2d"
DEPENDS = "util-linux groff-native" DEPENDS = "util-linux groff-native"