From 5d9f2f4b1593dbc906b008b3455f8fc6e42a977020b2ce0d9bdcf98f28aa3028 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 3 Nov 2023 06:39:50 +0000 Subject: [PATCH] - Update to release 2.6.6 OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=317 --- openldap-2.6.4.tgz | 3 --- openldap-2.6.4.tgz.asc | 16 ---------------- openldap-2.6.6.tgz | 3 +++ openldap-2.6.6.tgz.asc | 16 ++++++++++++++++ openldap2.changes | 8 ++++++++ openldap2.conf | 1 + openldap2.spec | 15 ++++----------- 7 files changed, 32 insertions(+), 30 deletions(-) delete mode 100644 openldap-2.6.4.tgz delete mode 100644 openldap-2.6.4.tgz.asc create mode 100644 openldap-2.6.6.tgz create mode 100644 openldap-2.6.6.tgz.asc 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.6.tgz b/openldap-2.6.6.tgz new file mode 100644 index 0000000..d16afdf --- /dev/null +++ b/openldap-2.6.6.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:082e998cf542984d43634442dbe11da860759e510907152ea579bdc42fe39ea0 +size 6475109 diff --git a/openldap-2.6.6.tgz.asc b/openldap-2.6.6.tgz.asc new file mode 100644 index 0000000..219804a --- /dev/null +++ b/openldap-2.6.6.tgz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEPOJptTmLyLeFZF6Yf2fV/Rzhy84FAmTIFOsACgkQf2fV/Rzh +y86kChAAknzhDwzYjWsToz2lHav/QeEz+aBeQEhEeDphsY1NmAlW4ft9WMuXBTiI +uznKVoscs+OTa2J53ThowlPxOOJTP6++1MbPRiW6/g0aBOWEj2cYBYS2AB8HTZPt +QkkOZZaqRkwXIX0iAe8eLfrp0Y8fjLKLXKgWSwHm+xWiNnJqcwA2rgiA6XIHiYxQ +E3+C055tmULeesE26W9tcT2SfyFPzDYxpx+f0V1umndsiQwMOg06Vd3EzaM5cRUs +lMBVNlWFgsHT4K7Yv6+4oUZtAaoJuW1bc8AaA7daRZN3+N+vol50PTJ/TO4FcPC3 +6NJxBwZMU536uJFQofnlfM2f5+MpTzqeuFP/ZNas5/ygQac7I4ksgNl9d6YDsShq +cZx+B8hWGnh8f9jeA3N+HVWd8REjgWGRS6Wxj74OV+RaSwPU7YvCOVT7zG61bo6o +2UwcB135xU4kP+X98g+8NC4I5uqQpzh1Szi3frQPWk6oxk+7tuv129ZsZfBL13Vk +JsVJVKO1e7QEIWnsz3/PeVYHwQOCyYBRQOinQI3SARGRgwI8FWfTxFoEFcZQXljP +IC/k92Ae7n8+wKVwsTBw+0n+MvcyFWmlN9ombc5cBvEiVy4O+nSIrjYtr9/yY7wA +XH70tdMCXGwG2ZQQwwuE8Gs/BTalwWvdKe7IVqqxTleBPzErtaQ= +=SSS9 +-----END PGP SIGNATURE----- diff --git a/openldap2.changes b/openldap2.changes index 79c6f15..1dd7b9b 100644 --- a/openldap2.changes +++ b/openldap2.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +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..b685519 100644 --- a/openldap2.spec +++ b/openldap2.spec @@ -26,11 +26,11 @@ %endif Name: openldap2%{name_suffix} +Version: 2.6.6 +Release: 0 Summary: An open source 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,6 @@ 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 BuildRequires: argon2-devel BuildRequires: cyrus-sasl-devel BuildRequires: db-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} \