* [Buildroot] [PATCH] package/openldap: bump version to 2.5.16
@ 2023-10-23 15:32 Hmaied Ben Abdellatif
2023-11-01 16:56 ` Thomas Petazzoni via buildroot
0 siblings, 1 reply; 2+ messages in thread
From: Hmaied Ben Abdellatif @ 2023-10-23 15:32 UTC (permalink / raw)
To: buildroot
From 45fa861afacd95367e716e21f3987dbbe865cf74 Mon Sep 17 00:00:00 2001
From: Hmaied Ben Abdellatif <hmaied.benabdellatif@etictelecom.com>
Date: Mon, 23 Oct 2023 16:53:01 +0200
Subject: [PATCH] package/openldap: bump version to 2.5.16
Signed-off-by: Hmaied Ben Abdellatif <hmaied.benabdellatif@etictelecom.com>
---
...fix-bignum.patch => 0001-fix-bignum.patch} | 12 +--
package/openldap/0001-fix_cross_strip.patch | 74 -------------------
...fix-libtool-static-behavior-to-match.patch | 56 --------------
package/openldap/openldap.hash | 6 +-
package/openldap/openldap.mk | 2 +-
5 files changed, 9 insertions(+), 141 deletions(-)
rename package/openldap/{0002-fix-bignum.patch =>
0001-fix-bignum.patch} (79%)
delete mode 100644 package/openldap/0001-fix_cross_strip.patch
delete mode 100644
package/openldap/0004-revert-ITS-3977-fix-libtool-static-behavior-to-match.patch
diff --git a/package/openldap/0002-fix-bignum.patch
b/package/openldap/0001-fix-bignum.patch
similarity index 79%
rename from package/openldap/0002-fix-bignum.patch
rename to package/openldap/0001-fix-bignum.patch
index 159ea8e228..cdef52bae5 100644
--- a/package/openldap/0002-fix-bignum.patch
+++ b/package/openldap/0001-fix-bignum.patch
@@ -1,5 +1,8 @@
configure: correctly detect bignum
+Initially-Signed by "Yann E. MORIN" <yann.morin.1998@free.fr> fixed for
+openldap-2.5.16
+
Building with bignum is currently not possible, since we're checking
ol_with_tls against a value it is never assigned in any case.
@@ -10,7 +13,7 @@ TLS and it is opensl.
So, keep the check for the bignum header, but check against ol_link_tls
which means that openssl is enabled when we find the bignum headers.
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+Signed-off-by: "Hmaied Ben Abdellatif"
<hmaied.benabdellatif@etictelecom.com>
diff -durN openldap-2.4.40.orig/configure openldap-2.4.40/configure
--- openldap-2.4.40.orig/configure 2014-09-19 03:48:49.000000000 +0200
@@ -24,10 +27,9 @@ diff -durN openldap-2.4.40.orig/configure
openldap-2.4.40/configure
ol_with_mp=bignum
$as_echo "#define USE_MP_BIGNUM 1" >>confdefs.h
-diff -durN openldap-2.4.40.orig/configure.in openldap-2.4.40/configure.in
---- openldap-2.4.40.orig/configure.in 2014-09-19 03:48:49.000000000
+0200
-+++ openldap-2.4.40/configure.in 2015-01-25 18:44:37.628676446 +0100
-@@ -2383,7 +2383,7 @@
+--- openldap-2.5.15.orig/configure.ac 2023-10-23 11:03:46.292215101
+0200
++++ openldap-2.5.16/configure.ac 2023-10-23 11:05:07.245355497 +0200
+@@ -2323,7 +2323,7 @@
AC_CHECK_HEADERS(openssl/crypto.h)
if test "$ac_cv_header_openssl_bn_h" = "yes" &&
test "$ac_cv_header_openssl_crypto_h" = "yes" &&
diff --git a/package/openldap/0001-fix_cross_strip.patch
b/package/openldap/0001-fix_cross_strip.patch
deleted file mode 100644
index d9d6f9d505..0000000000
--- a/package/openldap/0001-fix_cross_strip.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Fix stripping when cross-compiling
-
-Probably-Signed-off-by: Dave Bender <bender@benegon.com>
-[yann.morin.1998@free.fr: patch was made by Dave, but he
- forgot his SoB line, so I added it]
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-
-diff -rupN openldap-2.4.40/build/shtool openldap-2.4.40-br/build/shtool
---- openldap-2.4.40/build/shtool 2014-09-18 21:48:49.000000000 -0400
-+++ openldap-2.4.40-br/build/shtool 2015-01-21 13:21:35.689829372 -0500
-@@ -981,7 +981,7 @@ install )
- if [ ".$opt_t" = .yes ]; then
- echo "strip $dsttmp" 1>&2
- fi
-- strip $dsttmp || shtool_exit $?
-+ $STRIP $dsttmp || shtool_exit $?
- fi
- if [ ".$opt_o" != . ]; then
- if [ ".$opt_t" = .yes ]; then
-diff -rupN openldap-2.4.40/build/top.mk openldap-2.4.40-br/build/top.mk
---- openldap-2.4.40/build/top.mk 2014-09-18 21:48:49.000000000 -0400
-+++ openldap-2.4.40-br/build/top.mk 2015-01-21 13:23:41.027810097 -0500
-@@ -59,7 +59,7 @@ INSTALL_PROGRAM = $(INSTALL)
- INSTALL_DATA = $(INSTALL) -m 644
- INSTALL_SCRIPT = $(INSTALL)
-
--STRIP = -s
-+STRIP_OPTS = -s
-
- LINT = lint
- 5LINT = 5lint
-diff -rupN openldap-2.4.40/clients/tools/Makefile.in
openldap-2.4.40-br/clients/tools/Makefile.in
---- openldap-2.4.40/clients/tools/Makefile.in 2014-09-18
21:48:49.000000000 -0400
-+++ openldap-2.4.40-br/clients/tools/Makefile.in 2015-01-21
13:23:35.827727946 -0500
-@@ -120,7 +120,7 @@ install-local: FORCE
- -$(MKDIR) $(DESTDIR)$(bindir)
- @( \
- for prg in $(PROGRAMS); do \
-- $(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 $$prg$(EXEEXT) \
-+ $(LTINSTALL) $(INSTALLFLAGS) $(STRIP_OPTS) -m 755
$$prg$(EXEEXT) \
- $(DESTDIR)$(bindir); \
- done \
- )
-diff -rupN openldap-2.4.40/configure.in openldap-2.4.40-br/configure.in
---- openldap-2.4.40/configure.in 2014-09-18 21:48:49.000000000 -0400
-+++ openldap-2.4.40-br/configure.in 2015-01-16 15:50:48.874816786 -0500
-@@ -668,6 +668,15 @@ if test -z "${AR}"; then
- fi
- fi
-
-+if test -z "${STRIP}"; then
-+ AC_CHECK_PROGS(STRIP,strip,missing)
-+
-+ if test "${STRIP}" = "missing" ; then
-+ AC_MSG_ERROR([Unable to locate strip(1) or suitable
replacement. Check PATH or set STRIP.])
-+ fi
-+fi
-+
-+
- AC_LIBTOOL_WIN32_DLL
- AC_LIBTOOL_DLOPEN
- AC_PROG_LIBTOOL
-diff -rupN openldap-2.4.40/servers/slapd/Makefile.in
openldap-2.4.40-br/servers/slapd/Makefile.in
---- openldap-2.4.40/servers/slapd/Makefile.in 2015-01-16
15:04:52.507473256 -0500
-+++ openldap-2.4.40-br/servers/slapd/Makefile.in 2015-01-16
15:05:02.299627229 -0500
-@@ -378,7 +378,7 @@ install-local-srv: install-slapd install
- install-slapd: FORCE
- -$(MKDIR) $(DESTDIR)$(libexecdir)
- -$(MKDIR) $(DESTDIR)$(localstatedir)/run
-- $(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 \
-+ $(LTINSTALL) $(INSTALLFLAGS) $(STRIP_OPTS) -m 755 \
- slapd$(EXEEXT) $(DESTDIR)$(libexecdir)
- @for i in $(SUBDIRS); do \
- if test -d $$i && test -f $$i/Makefile ; then \
diff --git
a/package/openldap/0004-revert-ITS-3977-fix-libtool-static-behavior-to-match.patch
b/package/openldap/0004-revert-ITS-3977-fix-libtool-static-behavior-to-match.patch
deleted file mode 100644
index 3a901c910d..0000000000
---
a/package/openldap/0004-revert-ITS-3977-fix-libtool-static-behavior-to-match.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 88a0442a0f01076914af80db40571fd52914ffa3 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Thu, 28 Mar 2019 23:52:38 +0100
-Subject: [PATCH] revert ITS#3977, fix libtool -static behavior to match
docs
-
-Revert
-https://github.com/openldap/openldap/commit/7b6a088a2590fdad10286d10050b769e48554e13
-as this patch does not work with our buildroot patches
-
-Fixes:
- -
http://autobuild.buildroot.org/results/ab4f85fd21cacfaef6b0b43a38da6a4a1d32ecb6
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status: Not upstreamable]
----
- build/ltmain.sh | 9 ++-------
- 1 file changed, 2 insertions(+), 7 deletions(-)
-
-diff --git a/build/ltmain.sh b/build/ltmain.sh
-index 1d079b91e..996dc7dad 100755
---- a/build/ltmain.sh
-+++ b/build/ltmain.sh
-@@ -1190,15 +1190,14 @@ EOF
- if test -n "$link_static_flag"; then
- dlopen_self=$dlopen_self_static
- fi
-- prefer_static_libs=yes
- else
- if test -z "$pic_flag" && test -n "$link_static_flag"; then
- dlopen_self=$dlopen_self_static
- fi
-- prefer_static_libs=built
- fi
- build_libtool_libs=no
- build_old_libs=yes
-+ prefer_static_libs=yes
- break
- ;;
- esac
-@@ -2602,12 +2601,8 @@ EOF
- fi
-
- link_static=no # Whether the deplib will be linked statically
-- use_static_libs=$prefer_static_libs
-- if test "$use_static_libs" = built && test "$installed" = yes ; then
-- use_static_libs=no
-- fi
- if test -n "$library_names" &&
-- { test "$use_static_libs" = no || test -z "$old_library"; }; then
-+ { test "$prefer_static_libs" = no || test -z "$old_library"; };
then
- if test "$installed" = no; then
- notinst_deplibs="$notinst_deplibs $lib"
- need_relink=yes
---
-2.14.1
-
diff --git a/package/openldap/openldap.hash b/package/openldap/openldap.hash
index 71092c93d0..5b865d1455 100644
--- a/package/openldap/openldap.hash
+++ b/package/openldap/openldap.hash
@@ -1,7 +1,3 @@
-# From
https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.59.md5
-md5 6036a03b3a67b4a1fe1246e0a2c7265a openldap-2.4.59.tgz
-# From
https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.59.sha1
-sha1 b154d06bbf40fafafb34fffc4b116946d931efef openldap-2.4.59.tgz
# Locally computed
-sha256 99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34
openldap-2.4.59.tgz
+sha512
ed0c3732c096807006a13df7484c889ccc6943ced3e50c0d01034e6c6823c0996ae1fda0348677243934fbe8715a467abc46f01dee87b7571f5392b0570eb04a
openldap-2.5.16.tgz
sha256
310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE
diff --git a/package/openldap/openldap.mk b/package/openldap/openldap.mk
index b5373544ab..9cebff99dc 100644
--- a/package/openldap/openldap.mk
+++ b/package/openldap/openldap.mk
@@ -4,7 +4,7 @@
#
################################################################################
-OPENLDAP_VERSION = 2.4.59
+OPENLDAP_VERSION = 2.5.16
OPENLDAP_SOURCE = openldap-$(OPENLDAP_VERSION).tgz
OPENLDAP_SITE =
https://www.openldap.org/software/download/OpenLDAP/openldap-release
OPENLDAP_LICENSE = OpenLDAP Public License
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [Buildroot] [PATCH] package/openldap: bump version to 2.5.16
2023-10-23 15:32 [Buildroot] [PATCH] package/openldap: bump version to 2.5.16 Hmaied Ben Abdellatif
@ 2023-11-01 16:56 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Petazzoni via buildroot @ 2023-11-01 16:56 UTC (permalink / raw)
To: Hmaied Ben Abdellatif; +Cc: buildroot
Hello Hmaied
On Mon, 23 Oct 2023 17:32:29 +0200
Hmaied Ben Abdellatif <hmaied.benabdellatif@etictelecom.com> wrote:
> From 45fa861afacd95367e716e21f3987dbbe865cf74 Mon Sep 17 00:00:00 2001
> From: Hmaied Ben Abdellatif <hmaied.benabdellatif@etictelecom.com>
> Date: Mon, 23 Oct 2023 16:53:01 +0200
> Subject: [PATCH] package/openldap: bump version to 2.5.16
>
> Signed-off-by: Hmaied Ben Abdellatif <hmaied.benabdellatif@etictelecom.com>
Thanks for your patch. However, it looks like you have done "git
format-patch", and then send the contents of that file with your
regular e-mail client (Thunderbird). Due to this, the patch is badly
line-wrapped, and it cannot be applied.
Could you instead follow the instructions at
https://buildroot.org/downloads/manual/manual.html#submitting-patches
and use "git send-email" to submit your patch? This will ensure it
arrives properly formatted on the mailing list.
> +Initially-Signed by "Yann E. MORIN" <yann.morin.1998@free.fr> fixed for
> +openldap-2.5.16
Don't do this. Instead, keep the Signed-off-by from Yann E. Morin, and
add yours below Yann's Signed-off-by. Of course, this only makes sense
if you did some substantial changes to this patch. If you did only some
minor updates to ensure it applies against the new version of openldap,
adding your Signed-off-by within this patch is not even needed.
Could you fix those two issues and submitted an updated patch?
Thanks a lot!
Thomas Petazzoni
--
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-11-01 16:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-23 15:32 [Buildroot] [PATCH] package/openldap: bump version to 2.5.16 Hmaied Ben Abdellatif
2023-11-01 16:56 ` Thomas Petazzoni via buildroot
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.