summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-oe/recipes-support/openldap/openldap/install-strip.patch6
-rw-r--r--meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch6
-rw-r--r--meta-oe/recipes-support/openldap/openldap/openldap-CVE-2015-3276.patch7
-rw-r--r--meta-oe/recipes-support/openldap/openldap/openldap-m4-pthread.patch8
-rw-r--r--meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch5
-rw-r--r--meta-oe/recipes-support/openldap/openldap/use-urandom.patch4
6 files changed, 13 insertions, 23 deletions
diff --git a/meta-oe/recipes-support/openldap/openldap/install-strip.patch b/meta-oe/recipes-support/openldap/openldap/install-strip.patch
index 7c675962b6..b59db3939e 100644
--- a/meta-oe/recipes-support/openldap/openldap/install-strip.patch
+++ b/meta-oe/recipes-support/openldap/openldap/install-strip.patch
@@ -4,9 +4,9 @@
4 4
5Upstream-Status: Pending 5Upstream-Status: Pending
6 6
7--- openldap-2.2.24/.pc/install-strip.patch/build/top.mk 2005-01-20 09:00:55.000000000 -0800 7--- a/build/top.mk
8+++ openldap-2.2.24/build/top.mk 2005-04-16 13:48:20.536710376 -0700 8+++ b/build/top.mk
9@@ -116,7 +116,7 @@ 9@@ -121,7 +121,7 @@ LTCOMPILE_MOD = $(LIBTOOL) $(LTONLY_MOD)
10 LTLINK_MOD = $(LIBTOOL) $(LTONLY_MOD) --mode=link \ 10 LTLINK_MOD = $(LIBTOOL) $(LTONLY_MOD) --mode=link \
11 $(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_MOD) 11 $(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_MOD)
12 12
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 86d0767a47..91bcc0435e 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
@@ -4,9 +4,9 @@ Upstream-status: Pending
4 4
5-- 5--
6 6
7--- openldap-2.4.28/configure.in.orig 2012-02-11 22:40:36.004360795 +0000 7--- a/configure.in
8+++ openldap-2.4.28/configure.in 2012-02-11 22:40:13.410986851 +0000 8+++ b/configure.in
9@@ -1214,7 +1214,7 @@ 9@@ -1227,7 +1227,7 @@ if test $ol_link_tls = no ; then
10 ol_with_tls=gnutls 10 ol_with_tls=gnutls
11 ol_link_tls=yes 11 ol_link_tls=yes
12 12
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 ce8b47ae4e..ab5c4de66a 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
@@ -19,11 +19,9 @@ Signed-off-by: Li Wang <li.wang@windriver.com>
19 libraries/libldap/tls_m.c | 27 ++++++++++++++++----------- 19 libraries/libldap/tls_m.c | 27 ++++++++++++++++-----------
20 1 file changed, 16 insertions(+), 11 deletions(-) 20 1 file changed, 16 insertions(+), 11 deletions(-)
21 21
22diff --git a/libraries/libldap/tls_m.c b/libraries/libldap/tls_m.c
23index 9b101f9..e6f3051 100644
24--- a/libraries/libldap/tls_m.c 22--- a/libraries/libldap/tls_m.c
25+++ b/libraries/libldap/tls_m.c 23+++ b/libraries/libldap/tls_m.c
26@@ -621,18 +621,23 @@ nss_parse_ciphers(const char *cipherstr, int cipher_list[ciphernum]) 24@@ -620,18 +620,23 @@ nss_parse_ciphers(const char *cipherstr,
27 */ 25 */
28 if (mask || strength || protocol) { 26 if (mask || strength || protocol) {
29 for (i=0; i<ciphernum; i++) { 27 for (i=0; i<ciphernum; i++) {
@@ -58,6 +56,3 @@ index 9b101f9..e6f3051 100644
58 } 56 }
59 } else { 57 } else {
60 for (i=0; i<ciphernum; i++) { 58 for (i=0; i<ciphernum; i++) {
61--
621.7.9.5
63
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 38c0a5af2f..4d1fda96e4 100644
--- a/meta-oe/recipes-support/openldap/openldap/openldap-m4-pthread.patch
+++ b/meta-oe/recipes-support/openldap/openldap/openldap-m4-pthread.patch
@@ -1,8 +1,8 @@
1Upstream-Status: Pending 1Upstream-Status: Pending
2 2
3--- openldap-2.3.11/build/openldap.m4.orig 2005-11-11 00:11:18.604322590 -0800 3--- a/build/openldap.m4
4+++ openldap-2.3.11/build/openldap.m4 2005-11-11 00:26:21.621145856 -0800 4+++ b/build/openldap.m4
5@@ -788,7 +788,7 @@ AC_DEFUN([OL_PTHREAD_TEST_FUNCTION],[[ 5@@ -651,7 +651,7 @@ AC_DEFUN([OL_PTHREAD_TEST_FUNCTION],[[
6 ]]) 6 ]])
7 7
8 AC_DEFUN([OL_PTHREAD_TEST_PROGRAM], 8 AC_DEFUN([OL_PTHREAD_TEST_PROGRAM],
@@ -11,7 +11,7 @@ Upstream-Status: Pending
11 11
12 int main(argc, argv) 12 int main(argc, argv)
13 int argc; 13 int argc;
14@@ -796,7 +796,7 @@ int main(argc, argv) 14@@ -659,7 +659,7 @@ int main(argc, argv)
15 { 15 {
16 OL_PTHREAD_TEST_FUNCTION 16 OL_PTHREAD_TEST_FUNCTION
17 } 17 }
diff --git a/meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch b/meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch
index 870fc98adf..7a1b5aaad7 100644
--- a/meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch
+++ b/meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch
@@ -12,8 +12,6 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
12 build/mkversion | 8 ++++++-- 12 build/mkversion | 8 ++++++--
13 1 file changed, 6 insertions(+), 2 deletions(-) 13 1 file changed, 6 insertions(+), 2 deletions(-)
14 14
15diff --git a/build/mkversion b/build/mkversion
16index 4e35723..9fa3bee 100755
17--- a/build/mkversion 15--- a/build/mkversion
18+++ b/build/mkversion 16+++ b/build/mkversion
19@@ -53,8 +53,12 @@ APPLICATION=$1 17@@ -53,8 +53,12 @@ APPLICATION=$1
@@ -39,6 +37,3 @@ index 4e35723..9fa3bee 100755
39 "\t$WHOWHERE\n"; 37 "\t$WHOWHERE\n";
40 38
41 __EOF__ 39 __EOF__
42--
432.7.4
44
diff --git a/meta-oe/recipes-support/openldap/openldap/use-urandom.patch b/meta-oe/recipes-support/openldap/openldap/use-urandom.patch
index e7b988fafd..96a03369a7 100644
--- a/meta-oe/recipes-support/openldap/openldap/use-urandom.patch
+++ b/meta-oe/recipes-support/openldap/openldap/use-urandom.patch
@@ -11,7 +11,7 @@ Signed-off-by: Joe Slater <jslater@windriver.com>
11 11
12--- a/configure.in 12--- a/configure.in
13+++ b/configure.in 13+++ b/configure.in
14@@ -2142,8 +2142,8 @@ fi 14@@ -2153,8 +2153,8 @@ fi
15 15
16 dnl ---------------------------------------------------------------- 16 dnl ----------------------------------------------------------------
17 dnl Check for entropy sources 17 dnl Check for entropy sources
@@ -21,7 +21,7 @@ Signed-off-by: Joe Slater <jslater@windriver.com>
21 if test -r /dev/urandom ; then 21 if test -r /dev/urandom ; then
22 dev="/dev/urandom"; 22 dev="/dev/urandom";
23 elif test -r /idev/urandom ; then 23 elif test -r /idev/urandom ; then
24@@ -2156,9 +2156,11 @@ if test $cross_compiling != yes && test 24@@ -2167,9 +2167,11 @@ if test $cross_compiling != yes && test
25 dev="/idev/random"; 25 dev="/idev/random";
26 fi 26 fi
27 27
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-20 22:08:02 +0000