mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-04 02:31:27 +00:00
Code Issues Projects Releases Wiki Activity

openldap: Refresh patches to remove fuzz

Browse Source 
Fixes [patch-fuzz] QA errors

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2021-02-22 09:09:36 -08:00
parent cb3f4cffe9
commit 1fe7e6bdd0
6 changed files with 13 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/openldap/openldap/install-strip.patch
+3 -3
View File
@@ -4,9 +4,9 @@
Upstream-Status: Pending Upstream-Status: Pending
--- openldap-2.2.24/.pc/install-strip.patch/build/top.mk 2005-01-20 09:00:55.000000000 -0800 --- a/build/top.mk
+++ openldap-2.2.24/build/top.mk 2005-04-16 13:48:20.536710376 -0700 +++ b/build/top.mk
@@ -116,7 +116,7 @@ @@ -121,7 +121,7 @@ LTCOMPILE_MOD = $(LIBTOOL) $(LTONLY_MOD)
LTLINK_MOD = $(LIBTOOL) $(LTONLY_MOD) --mode=link \ LTLINK_MOD = $(LIBTOOL) $(LTONLY_MOD) --mode=link \
$(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_MOD) $(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_MOD)
meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch
+3 -3
View File
@@ -4,9 +4,9 @@ Upstream-status: Pending
-- --
--- openldap-2.4.28/configure.in.orig 2012-02-11 22:40:36.004360795 +0000 --- a/configure.in
+++ openldap-2.4.28/configure.in 2012-02-11 22:40:13.410986851 +0000 +++ b/configure.in
@@ -1214,7 +1214,7 @@ @@ -1227,7 +1227,7 @@ if test $ol_link_tls = no ; then
ol_with_tls=gnutls ol_with_tls=gnutls
ol_link_tls=yes ol_link_tls=yes
meta-oe/recipes-support/openldap/openldap/openldap-CVE-2015-3276.patch
+1 -6
View File
@@ -19,11 +19,9 @@ Signed-off-by: Li Wang <li.wang@windriver.com>
libraries/libldap/tls_m.c | 27 ++++++++++++++++----------- libraries/libldap/tls_m.c | 27 ++++++++++++++++-----------
1 file changed, 16 insertions(+), 11 deletions(-) 1 file changed, 16 insertions(+), 11 deletions(-)
diff --git a/libraries/libldap/tls_m.c b/libraries/libldap/tls_m.c
index 9b101f9..e6f3051 100644
--- a/libraries/libldap/tls_m.c --- a/libraries/libldap/tls_m.c
+++ b/libraries/libldap/tls_m.c +++ b/libraries/libldap/tls_m.c
@@ -621,18 +621,23 @@ nss_parse_ciphers(const char *cipherstr, int cipher_list[ciphernum]) @@ -620,18 +620,23 @@ nss_parse_ciphers(const char *cipherstr,
*/ */
if (mask || strength || protocol) { if (mask || strength || protocol) {
for (i=0; i<ciphernum; i++) { for (i=0; i<ciphernum; i++) {
@@ -58,6 +56,3 @@ index 9b101f9..e6f3051 100644
} }
} else { } else {
for (i=0; i<ciphernum; i++) { for (i=0; i<ciphernum; i++) {
--
1.7.9.5
meta-oe/recipes-support/openldap/openldap/openldap-m4-pthread.patch
+4 -4
View File
@@ -1,8 +1,8 @@
Upstream-Status: Pending Upstream-Status: Pending
--- openldap-2.3.11/build/openldap.m4.orig 2005-11-11 00:11:18.604322590 -0800 --- a/build/openldap.m4
+++ openldap-2.3.11/build/openldap.m4 2005-11-11 00:26:21.621145856 -0800 +++ b/build/openldap.m4
@@ -788,7 +788,7 @@ AC_DEFUN([OL_PTHREAD_TEST_FUNCTION],[[ @@ -651,7 +651,7 @@ AC_DEFUN([OL_PTHREAD_TEST_FUNCTION],[[
]]) ]])
AC_DEFUN([OL_PTHREAD_TEST_PROGRAM], AC_DEFUN([OL_PTHREAD_TEST_PROGRAM],
@@ -11,7 +11,7 @@ Upstream-Status: Pending
int main(argc, argv) int main(argc, argv)
int argc; int argc;
@@ -796,7 +796,7 @@ int main(argc, argv) @@ -659,7 +659,7 @@ int main(argc, argv)
{ {
OL_PTHREAD_TEST_FUNCTION OL_PTHREAD_TEST_FUNCTION
} }
meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch
-5
View File
@@ -12,8 +12,6 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
build/mkversion | 8 ++++++-- build/mkversion | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-) 1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/build/mkversion b/build/mkversion
index 4e35723..9fa3bee 100755
--- a/build/mkversion --- a/build/mkversion
+++ b/build/mkversion +++ b/build/mkversion
@@ -53,8 +53,12 @@ APPLICATION=$1 @@ -53,8 +53,12 @@ APPLICATION=$1
@@ -39,6 +37,3 @@ index 4e35723..9fa3bee 100755
"\t$WHOWHERE\n"; "\t$WHOWHERE\n";
__EOF__ __EOF__
--
2.7.4
meta-oe/recipes-support/openldap/openldap/use-urandom.patch
+2 -2
View File
@@ -11,7 +11,7 @@ Signed-off-by: Joe Slater <jslater@windriver.com>
--- a/configure.in --- a/configure.in
+++ b/configure.in +++ b/configure.in
@@ -2142,8 +2142,8 @@ fi @@ -2153,8 +2153,8 @@ fi
dnl ---------------------------------------------------------------- dnl ----------------------------------------------------------------
dnl Check for entropy sources dnl Check for entropy sources
@@ -21,7 +21,7 @@ Signed-off-by: Joe Slater <jslater@windriver.com>
if test -r /dev/urandom ; then if test -r /dev/urandom ; then
dev="/dev/urandom"; dev="/dev/urandom";
elif test -r /idev/urandom ; then elif test -r /idev/urandom ; then
@@ -2156,9 +2156,11 @@ if test $cross_compiling != yes && test @@ -2167,9 +2167,11 @@ if test $cross_compiling != yes && test
dev="/idev/random"; dev="/idev/random";
fi fi