From 53d51ca286a736513bfb5bc6d085c589c6d22fb96168205b5cac6c43b879eb59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 20 Feb 2025 09:57:37 +0100 Subject: [PATCH] Sync from SUSE:SLFO:Main openldap2 revision 247716da619509b401af6561f8a5bc4b --- gcc14-v2.patch | 25 +++++++++++++++++ openldap-2.6.4.tgz | 3 -- openldap-2.6.4.tgz.asc | 16 ----------- openldap-2.6.8.tgz | 3 ++ openldap-2.6.8.tgz.asc | 16 +++++++++++ openldap2.changes | 64 ++++++++++++++++++++++++++++++++++++++++++ openldap2.conf | 1 + openldap2.spec | 38 +++++++++---------------- 8 files changed, 123 insertions(+), 43 deletions(-) create mode 100644 gcc14-v2.patch delete mode 100644 openldap-2.6.4.tgz delete mode 100644 openldap-2.6.4.tgz.asc create mode 100644 openldap-2.6.8.tgz create mode 100644 openldap-2.6.8.tgz.asc diff --git a/gcc14-v2.patch b/gcc14-v2.patch new file mode 100644 index 0000000..9bd80ab --- /dev/null +++ b/gcc14-v2.patch @@ -0,0 +1,25 @@ +Index: openldap-2.6.7/contrib/slapd-modules/cloak/cloak.c +=================================================================== +--- openldap-2.6.7.orig/contrib/slapd-modules/cloak/cloak.c ++++ openldap-2.6.7/contrib/slapd-modules/cloak/cloak.c +@@ -242,6 +242,7 @@ cloak_search_response_cb( Operation *op, + else + me->e_attrs = a->a_next; + ++ extern void attr_clean(Attribute *); + attr_clean( a ); + } + +Index: openldap-2.6.7/libraries/liblmdb/mdb.c +=================================================================== +--- openldap-2.6.7.orig/libraries/liblmdb/mdb.c ++++ openldap-2.6.7/libraries/liblmdb/mdb.c +@@ -5161,7 +5161,7 @@ mdb_env_close0(MDB_env *env, int excl) + + // No need to call desctructor anymore, as all pid + // values are cleared below. +- env->me_txkey = NULL; ++ memset(&env->me_txkey, 0, sizeof(env->me_txkey)); + + #ifdef _WIN32 + /* Delete our key from the global list */ diff --git a/openldap-2.6.4.tgz b/openldap-2.6.4.tgz deleted file mode 100644 index c00496f..0000000 --- a/openldap-2.6.4.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d51704e50178430c06cf3d8aa174da66badf559747a47d920bb54b2d4aa40991 -size 6478424 diff --git a/openldap-2.6.4.tgz.asc b/openldap-2.6.4.tgz.asc deleted file mode 100644 index 0708890..0000000 --- a/openldap-2.6.4.tgz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEPOJptTmLyLeFZF6Yf2fV/Rzhy84FAmPkFcsACgkQf2fV/Rzh -y84clA/8C30COyp5lKWvqiBIVjQHe8ZSLEWML8j6g7IbYcHm7uLIqADjzlaE0MCI -YV2SfDFjom+OUFkQmzGNmYeyjpBV5yK5n5js0M1zSF2OPoapNoSZtnv0yXIUZ/Ee -M1njsiMYuYWX0KWg4tYVbdLSm2iWH1d5zbGgyAecSQCFHZ/nQnZo+OWbRel06dCz -ewkANAlUIIrsGEkKjKUetFOOuJiwb8r8KeXpYVijig7f/csoo7H78i4Pdmi3QzJ5 -D/TMHKx64ljes1n6ZHtm55lbkiuJTw3t4XnK9NhsKwr9zNlq+qI3ggJyK6xOQiQq -05IjPMVp8kV1u117Xb9SlRwlfR/00jPwTdepuAK9OyxVS3CclS8Gh6Lm8ztwwTee -C+eqwGhZNH7/twfq3TUHfWUl4LyclX02zxvljo3lcb3JIA7JWp8coi2EEeofOIlf -oXKdyR4zA0Iey8LfBuyRC/smZoggdpzr0jIE5Z5Q97hTt4Rm5U4ZDe2GRfUTR82g -Pz+VdBI/aCKlnDHqH912w4Tg62UeJiPfnLuWuCc7A0MNR2LAe7JKASdEaTb6t51N -uzmxPYOlAixvGcjCg38Sc0877FXE1ss3RUnDyx+mCK2phEsWO69SdL4uz5E9Xdve -0VbfO84pmN/+Gj5FfE93rJzTYjjySj80oANiqBAcA7P21pOttRg= -=UfjX ------END PGP SIGNATURE----- diff --git a/openldap-2.6.8.tgz b/openldap-2.6.8.tgz new file mode 100644 index 0000000..7967c4d --- /dev/null +++ b/openldap-2.6.8.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:48969323e94e3be3b03c6a132942dcba7ef8d545f2ad35401709019f696c3c4e +size 6512544 diff --git a/openldap-2.6.8.tgz.asc b/openldap-2.6.8.tgz.asc new file mode 100644 index 0000000..947950d --- /dev/null +++ b/openldap-2.6.8.tgz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEPOJptTmLyLeFZF6Yf2fV/Rzhy84FAmZM/ZwACgkQf2fV/Rzh +y86ZGBAAl9Zlcgdpl5fvnQHx13BlTkRBzwe/55irE4T24QoYUupn69ScDW4HOMdI +sqCAVewc86MNoRaX9ss7Ea9IyTMVOHTTNheeYmUJ3f3ZtmJSfTYoCvtCE3ZeM0zi +QWYiofMirx//KKFqUP1Ewlb9DNInH5jeBLT3gcEd8BGL223WoepwSrpfyAKh3Tiv +6nI+cjosTR2MvcOK6sLpJcXbLlc4Z5vuCeK3nWpdWhmOOZoTWrG7sEly+efGII2b +as4c8BtzhKqegwdAsIbmL1q5wFl70wFzUgHpFMwLeill886ku45P9LJ9Ah3M//fN +r3o0I1mi280xrKrh8lmAFW1NKLJibF3pA7oU3c032dQpZHjDuqMiMKfPZmAg6+5d +KsVfMjC4oLB/Ho2T06ywkMUVVC/kGOfWFS2Z2y9dHWV6Uy8rsxSwMkkib+We4KbP +kYyNvMJ+ZlnKNDNmuutpHPHDIYi42fQFBSUiP7JVy26I3xF9XVy479etxz2tLbrk +ziPXE3ige3u2GtOk0l2OYbPHv5NtyEThHs0c4q/Po/90ZULyoh+PV8cXnZf1Or+k +3Cr9H8xClXCBIRwFt6ISu+4DZVZKx64Sz/cctXqULmvGdBWpdQ1VqR/F3yp9ZgDO +bEbgpAknFjQnTKe0YuOY+Kcs+s7SuU81z+WSWqwOTULurWcWmMU= +=h0Ft +-----END PGP SIGNATURE----- diff --git a/openldap2.changes b/openldap2.changes index 79c6f15..0e0513a 100644 --- a/openldap2.changes +++ b/openldap2.changes @@ -1,3 +1,67 @@ +------------------------------------------------------------------- +Wed Aug 7 11:42:49 UTC 2024 - Filip Kastl + +- Add back two hunks from gcc14.patch as gcc14-v2.patch. Not all + bugs that gcc14.patch fixed were dealt with in the upstream -- + one bug is caused by + 0016-Clear-shared-key-only-in-close-function.patch and one bug + still remains in the upstream. + +------------------------------------------------------------------- +Wed Jul 31 05:11:48 UTC 2024 - Jan Engelhardt + +- Update to relese 2.6.8 + * slapd: ability to log directly to a file bypassing syslog + * back-ndb has been retired + * back-sql and back-perl have been deprecated + * lloadd enhancments: + * Additional load balancing strategies + * Additional options to improve coherence with certain + controls and extended operations + * Ability to log directly to a file bypassing syslog +- Delete gcc14.patch, openldap2-fb9e6a81bbee.patch (merged) +- Drop rcslapd symlink + +------------------------------------------------------------------- +Mon Jul 29 17:06:34 UTC 2024 - Martin Jambor + +- Backported one hunk from upstream commit fb9e6a81bbee as + openldap2-fb9e6a81bbee.patch to fix incompatible pointer type being + passed to a function which is diagnosed as an error by GCC 14. + +------------------------------------------------------------------- +Sat May 25 07:46:05 UTC 2024 - Jan Engelhardt + +- Add gcc14.patch + +------------------------------------------------------------------- +Sat May 11 19:27:08 UTC 2024 - Andreas Stieger + +- update to 2.6.7: + * Added slapo-dynlist option to disable filter support + * Fixed liblber missing newline on long msg + * Fixed libldap exit handling with OpenSSL3 + * Fixed libldap with TLS and multiple ldap URIs + * Fixed libldap OpenSSL cipher suite handling + * Fixed libldap OpenSSL 3.0 and Diffie-Hellman param files + * Fixed lloadd to work when resolv.conf is missing + * Fixed lloadd handling of closing connection + * Fixed lloadd tiers to be correctly linked on startup + * Fixed slapd to honour disclose in matchedDN handling + * Fixed slapd handling of regex testing in ACLs + * Fixed slapd sync replication with glued database + * Fixed slapd-asyncmeta when remote suffix is empty + * Fixed slapo-dynlist so it can't be global + * Fixed slapo-homedir(5) attribute name for olcHomedirArchivePath + +------------------------------------------------------------------- +Fri Nov 3 06:33:07 UTC 2023 - Jan Engelhardt + +- Update to release 2.6.6 + * Fixed libldap handling of TCP KEEPALIVE options + * Fixed slapd callback handling with overlays that do extended + operations + ------------------------------------------------------------------- Tue Sep 5 11:52:49 UTC 2023 - Thorsten Kukuk diff --git a/openldap2.conf b/openldap2.conf index 683a2d0..dd1371d 100644 --- a/openldap2.conf +++ b/openldap2.conf @@ -1,2 +1,3 @@ # openldap needs a directory in /var/lib/: d /var/lib/ldap 0750 ldap ldap - +d /run/slapd 0755 ldap ldap - diff --git a/openldap2.spec b/openldap2.spec index 9e48ae5..8e8bf93 100644 --- a/openldap2.spec +++ b/openldap2.spec @@ -1,7 +1,7 @@ # -# spec file +# spec file for package openldap2 # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,11 +26,11 @@ %endif Name: openldap2%{name_suffix} -Summary: An open source implementation of the Lightweight Directory Access Protocol +Version: 2.6.8 +Release: 0 +Summary: An implementation of the Lightweight Directory Access Protocol License: OLDAP-2.8 Group: Productivity/Networking/LDAP/Servers -Version: 2.6.4 -Release: 0 URL: https://www.openldap.org Source0: https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-%{version}.tgz Source1: https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-%{version}.tgz.asc @@ -56,8 +56,7 @@ Patch3: 0003-LDAPI-socket-location.dif Patch5: 0005-pie-compile.dif Patch8: 0008-In-monitor-backend-do-not-return-Connection0-entries.patch Patch16: 0016-Clear-shared-key-only-in-close-function.patch - -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch17: gcc14-v2.patch BuildRequires: argon2-devel BuildRequires: cyrus-sasl-devel BuildRequires: db-devel @@ -93,7 +92,7 @@ Lightweight Directory Access Protocol v3 (LDAPv3). The server provides several database backends and overlays. %package back-perl -Summary: OpenLDAP Perl Back-End +Summary: OpenLDAP Perl backend Group: Productivity/Networking/LDAP/Servers Requires: openldap2 = %{version} Requires: perl = %{perl_version} @@ -103,7 +102,7 @@ The OpenLDAP Perl back-end allows you to execute Perl code specific to different LDAP operations. %package back-sock -Summary: OpenLDAP Socket Back-End +Summary: OpenLDAP Socket backend Group: Productivity/Networking/LDAP/Servers Requires: openldap2 = %{version} Provides: openldap2:/usr/share/man/man5/slapd-sock.5.gz @@ -113,7 +112,7 @@ The OpenLDAP socket back-end allows you to handle LDAP requests and results with an external process listening on a Unix domain socket. %package back-meta -Summary: OpenLDAP Meta Back-End +Summary: OpenLDAP Meta backend Group: Productivity/Networking/LDAP/Servers Requires: openldap2 = %{version} Provides: openldap2:/usr/share/man/man5/slapd-meta.5.gz @@ -125,7 +124,7 @@ these servers can be presented as belonging to a single Directory Information Tree (DIT). %package back-sql -Summary: OpenLDAP SQL Back-End +Summary: OpenLDAP SQL backend Group: Productivity/Networking/LDAP/Servers Requires: openldap2 = %{version} @@ -186,12 +185,11 @@ OpenLDAP client utilities such as ldapadd, ldapsearch, ldapmodify. %package devel Summary: Libraries, Header Files and Documentation for OpenLDAP -# bug437293 Group: Development/Libraries/C and C++ %ifarch ppc64 +# bug437293 Obsoletes: openldap2-devel-64bit %endif -# Conflicts: openldap-devel Requires: libldap2 = %{version} Recommends: cyrus-sasl-devel @@ -240,12 +238,7 @@ This package provides a C++ library for accessing LDAP (Version 3) Servers %prep -%setup -q -a 9 -n openldap-%{version} -%patch1 -p1 -%patch3 -p1 -%patch5 -p1 -%patch8 -p1 -%patch16 -p1 +%autosetup -a9 -p1 -n openldap-%{version} cp %{SOURCE5} . %build @@ -258,7 +251,7 @@ cd contrib/ldapc++ export CFLAGS="%{optflags} -Wno-format-extra-args -fno-strict-aliasing -DNDEBUG -DSLAP_CONFIG_DELETE -DSLAP_SCHEMA_EXPOSE -DLDAP_COLLECTIVE_ATTRIBUTES -DLDAP_USE_NON_BLOCKING_TLS" export STRIP="" ./configure \ - --prefix=/usr \ + --prefix="%_prefix" \ --sysconfdir=%{_sysconfdir} \ --libdir=%{_libdir} \ --libexecdir=%{_libdir} \ @@ -397,11 +390,8 @@ rm -f %{buildroot}/etc/openldap/schema/README rm -f %{buildroot}/etc/openldap/slapd.ldif* mv servers/slapd/back-sql/rdbms_depend servers/slapd/back-sql/examples -ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcslapd - rm -f %{buildroot}%{_libdir}/openldap/*.a rm -f %{buildroot}/usr/share/man/man5/slapd-dnssrv.5 -rm -f %{buildroot}/usr/share/man/man5/slapd-ndb.5 rm -f %{buildroot}/usr/share/man/man5/slapd-null.5 rm -f %{buildroot}/usr/share/man/man5/slapd-passwd.5 rm -f %{buildroot}/usr/share/man/man5/slapd-shell.5 @@ -461,7 +451,6 @@ ln -fs libldap.so "%{buildroot}%{_libdir}/libldap_r.so" %dir %{_sysconfdir}/openldap/schema %{_fillupdir}/sysconfig.openldap %{_sbindir}/slap* -%{_sbindir}/rcslapd %{_libdir}/openldap/back_ldap* %{_libdir}/openldap/back_mdb* %{_libdir}/openldap/back_relay* @@ -476,6 +465,7 @@ ln -fs libldap.so "%{buildroot}%{_libdir}/libldap_r.so" %{_libdir}/openldap/dynlist* %{_libdir}/openldap/homedir* %{_libdir}/openldap/memberof* +%{_libdir}/openldap/nestgroup* %{_libdir}/openldap/otp* %{_libdir}/openldap/pcache* %{_libdir}/openldap/ppolicy*