diff --git a/.checkpackageignore b/.checkpackageignore index c11ece4b4b..0663149d01 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -994,10 +994,8 @@ package/open-plc-utils/0001-Remove-OWNER-and-GROUPS-parameters-to-install.patch package/open2300/0001-fix-makefile.patch Upstream package/openjdk/17.0.9+9/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch Upstream package/openjdk/21.0.1+12/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch Upstream -package/openldap/0001-fix_cross_strip.patch Upstream -package/openldap/0002-fix-bignum.patch Upstream -package/openldap/0003-disable-docs.patch Upstream -package/openldap/0004-revert-ITS-3977-fix-libtool-static-behavior-to-match.patch Upstream +package/openldap/0001-fix-bignum.patch Upstream +package/openldap/0002-disable-docs.patch Upstream package/openntpd/S49ntp Shellcheck Variables package/openocd/0001-configure-enable-build-on-uclinux.patch Upstream package/openpgm/0001-Rename-openpgm-5.2.pc.in.patch Upstream diff --git a/package/openldap/0002-fix-bignum.patch b/package/openldap/0001-fix-bignum.patch similarity index 84% rename from package/openldap/0002-fix-bignum.patch rename to package/openldap/0001-fix-bignum.patch index 159ea8e228..ec38ee3df0 100644 --- a/package/openldap/0002-fix-bignum.patch +++ b/package/openldap/0001-fix-bignum.patch @@ -24,10 +24,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 -[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" - -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/0003-disable-docs.patch b/package/openldap/0002-disable-docs.patch similarity index 100% rename from package/openldap/0003-disable-docs.patch rename to package/openldap/0002-disable-docs.patch 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 -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 -[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..1383c6aef8 100644 --- a/package/openldap/openldap.hash +++ b/package/openldap/openldap.hash @@ -1,7 +1,5 @@ -# 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 +# Verified by locally checking against the SHA3-512 hash available in +# https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.5.16.sha3-512 # Locally computed -sha256 99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34 openldap-2.4.59.tgz +sha256 546ba591822e8bb0e467d40c4d4a30f89d937c3a507fe83a578f582f6a211327 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