mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-01 13:58:06 +00:00
openldap: Upgrade 2.5.12 -> 2.5.13
Signed-off-by: Jiaqing Zhao <jiaqing.zhao@linux.intel.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Jiaqing Zhao
Khem Raj
parent
a0570e0c43
commit
8ae057a2e6
|
|
@ -1,32 +0,0 @@
|
|||
From 9e4ccd1e78ceac8de1ab66ee62ee216f1fbd4956 Mon Sep 17 00:00:00 2001
|
||||
From: Yi Zhao <yi.zhao@windriver.com>
|
||||
Date: Thu, 2 Dec 2021 11:38:15 +0800
|
||||
Subject: [PATCH] ldif-filter: fix parallel build failure
|
||||
|
||||
Add slapd-common.o as dependency for ldif-filter to fix the parallel
|
||||
build failure:
|
||||
ld: cannot find slapd-common.o: No such file or directory
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
||||
---
|
||||
tests/progs/Makefile.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/progs/Makefile.in b/tests/progs/Makefile.in
|
||||
index 13f1e8be2..e4f4ccf98 100644
|
||||
--- a/tests/progs/Makefile.in
|
||||
+++ b/tests/progs/Makefile.in
|
||||
@@ -56,7 +56,7 @@ slapd-modify: slapd-modify.o $(OBJS) $(XLIBS)
|
||||
slapd-bind: slapd-bind.o $(OBJS) $(XLIBS)
|
||||
$(LTLINK) -o $@ slapd-bind.o $(OBJS) $(LIBS)
|
||||
|
||||
-ldif-filter: ldif-filter.o $(XLIBS)
|
||||
+ldif-filter: ldif-filter.o $(OBJS) $(XLIBS)
|
||||
$(LTLINK) -o $@ ldif-filter.o $(OBJS) $(LIBS)
|
||||
|
||||
slapd-mtread: slapd-mtread.o $(OBJS) $(XLIBS)
|
||||
--
|
||||
2.25.1
|
||||
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
From 690f69791eb6cd0d7e94b4d73219ee864de27f62 Mon Sep 17 00:00:00 2001
|
||||
From: Yi Zhao <yi.zhao@windriver.com>
|
||||
Date: Mon, 10 Jan 2022 10:13:51 +0800
|
||||
Subject: [PATCH] libraries/Makefile.in: ignore the mkdir errors
|
||||
|
||||
Ignore the mkdir errors to fix the parallel build failure:
|
||||
|
||||
../../build/shtool mkdir -p TOPDIR/tmp-glibc/work/cortexa15t2hf-neon-wrs-linux-gnueabi/openldap/2.5.9-r0/image/usr/lib
|
||||
mkdir: cannot create directory 'TOPDIR/tmp-glibc/work/cortexa15t2hf-neon-wrs-linux-gnueabi/openldap/2.5.9-r0/image/usr/lib': File exists
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
||||
---
|
||||
libraries/Makefile.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libraries/Makefile.in b/libraries/Makefile.in
|
||||
index d9cb2ff..c6b251f 100644
|
||||
--- a/libraries/Makefile.in
|
||||
+++ b/libraries/Makefile.in
|
||||
@@ -24,7 +24,7 @@ PKGCONFIG_DIR=$(DESTDIR)$(libdir)/pkgconfig
|
||||
PKGCONFIG_SRCDIRS=liblber libldap
|
||||
|
||||
install-local:
|
||||
- @$(MKDIR) $(PKGCONFIG_DIR)
|
||||
+ @-$(MKDIR) $(PKGCONFIG_DIR)
|
||||
@for i in $(PKGCONFIG_SRCDIRS); do \
|
||||
$(INSTALL_DATA) $$i/*.pc $(PKGCONFIG_DIR); \
|
||||
done
|
||||
--
|
||||
2.17.1
|
||||
|
||||
|
|
@ -1,54 +0,0 @@
|
|||
From 79381ab335898c9184e22dd25b544adefa9bf6c5 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Mon, 7 Feb 2022 16:26:57 -0800
|
||||
Subject: [PATCH] librewrite: include ldap_pvt_thread.h before redefining
|
||||
calloc
|
||||
|
||||
This helps compiling with musl, where sched.h is included by
|
||||
ldap_pvt_thread.h which provides prototype for calloc() and conflicts
|
||||
|
||||
/usr/include/sched.h:84:7: error: conflicting types for 'ber_memcalloc'
|
||||
| void *calloc(size_t, size_t);
|
||||
| ^1
|
||||
| warning and 1 error generated.
|
||||
| ./rewrite-int.h:44:21: note: expanded from macro 'calloc'
|
||||
| #define calloc(x,y) ber_memcalloc(x,y)
|
||||
| ^
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
libraries/librewrite/rewrite-int.h | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/libraries/librewrite/rewrite-int.h b/libraries/librewrite/rewrite-int.h
|
||||
index 4481dd3..5ec226d 100644
|
||||
--- a/libraries/librewrite/rewrite-int.h
|
||||
+++ b/libraries/librewrite/rewrite-int.h
|
||||
@@ -40,6 +40,11 @@
|
||||
|
||||
#include <rewrite.h>
|
||||
|
||||
+#ifndef NO_THREADS
|
||||
+#define USE_REWRITE_LDAP_PVT_THREADS
|
||||
+#include <ldap_pvt_thread.h>
|
||||
+#endif
|
||||
+
|
||||
#define malloc(x) ber_memalloc(x)
|
||||
#define calloc(x,y) ber_memcalloc(x,y)
|
||||
#define realloc(x,y) ber_memrealloc(x,y)
|
||||
@@ -47,11 +52,6 @@
|
||||
#undef strdup
|
||||
#define strdup(x) ber_strdup(x)
|
||||
|
||||
-#ifndef NO_THREADS
|
||||
-#define USE_REWRITE_LDAP_PVT_THREADS
|
||||
-#include <ldap_pvt_thread.h>
|
||||
-#endif
|
||||
-
|
||||
/*
|
||||
* For details, see RATIONALE.
|
||||
*/
|
||||
--
|
||||
2.35.1
|
||||
|
||||
|
|
@ -18,14 +18,11 @@ SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/$
|
|||
file://initscript \
|
||||
file://slapd.service \
|
||||
file://remove-user-host-pwd-from-version.patch \
|
||||
file://0001-ldif-filter-fix-parallel-build-failure.patch \
|
||||
file://0001-build-top.mk-unset-STRIP_OPTS.patch \
|
||||
file://0001-libraries-Makefile.in-ignore-the-mkdir-errors.patch \
|
||||
file://0001-librewrite-include-ldap_pvt_thread.h-before-redefini.patch \
|
||||
file://0001-configure-Pass-pthread_t-to-pthread_detach.patch \
|
||||
"
|
||||
|
||||
SRC_URI[sha256sum] = "d5086cbfc49597fa7d0670a429a9054552d441b16ee8b2435412797ab0e37b96"
|
||||
SRC_URI[sha256sum] = "ee3c430c4ef7b87c57b622108c7339376d6c27fbbf2767770be3de1df63d008c"
|
||||
|
||||
DEPENDS = "util-linux groff-native"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user