aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/openldap/openldap
diff options
context:
space:
mode:
authorchangqing.li@windriver.com <changqing.li@windriver.com>2018-07-02 10:07:58 +0800
committerKhem Raj <raj.khem@gmail.com>2018-07-03 17:42:25 -0700
commit2731baf1ea81e6e6d97a0d6d86aab870c28d9b52 (patch)
treec5fd56aa8524e02724bef94fb26864ba3e680ae2 /meta-oe/recipes-support/openldap/openldap
parentb56fc26fefff498b10236ea6486a5d5624f726cc (diff)
downloadmeta-openembedded-contrib-2731baf1ea81e6e6d97a0d6d86aab870c28d9b52.tar.gz
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>
Diffstat (limited to 'meta-oe/recipes-support/openldap/openldap')
-rw-r--r--meta-oe/recipes-support/openldap/openldap/install-strip.patch3
-rw-r--r--meta-oe/recipes-support/openldap/openldap/kill-icu.patch2
-rw-r--r--meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch2
-rw-r--r--meta-oe/recipes-support/openldap/openldap/openldap-CVE-2015-3276.patch2
-rw-r--r--meta-oe/recipes-support/openldap/openldap/openldap-m4-pthread.patch2
5 files changed, 9 insertions, 2 deletions
diff --git a/meta-oe/recipes-support/openldap/openldap/install-strip.patch b/meta-oe/recipes-support/openldap/openldap/install-strip.patch
index 2992b7030d..7c675962b6 100644
--- a/meta-oe/recipes-support/openldap/openldap/install-strip.patch
+++ b/meta-oe/recipes-support/openldap/openldap/install-strip.patch
@@ -1,6 +1,9 @@
# This patch ensures that the install operations which strip
# programs and libraries (LTINSTALL) work in a cross build
# 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/build/top.mk 2005-04-16 13:48:20.536710376 -0700
@@ -116,7 +116,7 @@
diff --git a/meta-oe/recipes-support/openldap/openldap/kill-icu.patch b/meta-oe/recipes-support/openldap/openldap/kill-icu.patch
index dcf5411372..35e46465a4 100644
--- a/meta-oe/recipes-support/openldap/openldap/kill-icu.patch
+++ b/meta-oe/recipes-support/openldap/openldap/kill-icu.patch
@@ -2,7 +2,7 @@ From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
slapd depends on ICU if it was built first.
-Upstream-status: inappropiate [embedded specific]
+Upstream-Status: inappropiate [embedded specific]
---
configure.in | 8 --------
1 file changed, 8 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
index c7b1552c1c..86d0767a47 100644
--- 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
@@ -1,6 +1,6 @@
From http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-nds/openldap/files/
-Upstream-status: Unknown
+Upstream-status: Pending
--
diff --git a/meta-oe/recipes-support/openldap/openldap/openldap-CVE-2015-3276.patch b/meta-oe/recipes-support/openldap/openldap/openldap-CVE-2015-3276.patch
index de9ca528a2..25e148ed0e 100644
--- a/meta-oe/recipes-support/openldap/openldap/openldap-CVE-2015-3276.patch
+++ b/meta-oe/recipes-support/openldap/openldap/openldap-CVE-2015-3276.patch
@@ -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
unknown vectors.
+Upstream-Status: Pending
+
Signed-off-by: Li Wang <li.wang@windriver.com>
---
libraries/libldap/tls_m.c | 27 ++++++++++++++++-----------
diff --git a/meta-oe/recipes-support/openldap/openldap/openldap-m4-pthread.patch b/meta-oe/recipes-support/openldap/openldap/openldap-m4-pthread.patch
index b669b7254d..38c0a5af2f 100644
--- a/meta-oe/recipes-support/openldap/openldap/openldap-m4-pthread.patch
+++ b/meta-oe/recipes-support/openldap/openldap/openldap-m4-pthread.patch
@@ -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 2005-11-11 00:26:21.621145856 -0800
@@ -788,7 +788,7 @@ AC_DEFUN([OL_PTHREAD_TEST_FUNCTION],[[