From 2f39dde991f1384b1d8ba2cad90d0170550808df6730ff46499157fa5368b379 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 31 Jul 2024 10:02:39 +0200 Subject: [PATCH] openldap 2.6.8 --- gcc14.patch | 91 ------------------------------------ openldap-2.6.7.tgz | 3 -- openldap-2.6.7.tgz.asc | 16 ------- openldap-2.6.8.tgz | 3 ++ openldap-2.6.8.tgz.asc | 16 +++++++ openldap2-fb9e6a81bbee.patch | 28 ----------- openldap2.changes | 14 ++++++ openldap2.spec | 19 ++++---- 8 files changed, 41 insertions(+), 149 deletions(-) delete mode 100644 gcc14.patch delete mode 100644 openldap-2.6.7.tgz delete mode 100644 openldap-2.6.7.tgz.asc create mode 100644 openldap-2.6.8.tgz create mode 100644 openldap-2.6.8.tgz.asc delete mode 100644 openldap2-fb9e6a81bbee.patch diff --git a/gcc14.patch b/gcc14.patch deleted file mode 100644 index 757ee1c..0000000 --- a/gcc14.patch +++ /dev/null @@ -1,91 +0,0 @@ -From: Jan Engelhardt -Date: 2024-05-25 09:45:23.081724037 +0200 - -Codefixes needed for gcc 14: - -mdb.c:5115:31: error: assignment to "pthread_key_t" {aka "unsigned int"} from -"void *" makes integer from pointer without a cast [-Wint-conversion] - -Workarounds for: - -constraint.c:560:43: error: assignment to "constraint **" from incompatible pointer type "void **" [-Wincompatible-pointer-types] - for ( app = &on->on_bi.bi_private; *app; app = &(*app)->ap_next ) -dyngroup.c:114:27: error: assignment to "adpair **" from incompatible pointer type "void **" [-Wincompatible-pointer-types] - for ( app = &on->on_bi.bi_private; *app; app = &(*app)->ap_next ) -valsort.c:204:19: error: assignment to "valsort_info **" from incompatible pointer type "void **" [-Wincompatible-pointer-types] - for ( vip = &on->on_bi.bi_private; *vip; vip = &(*vip)->vi_next ) -cloak.c:245:25: error: implicit declaration of function "attr_clean"; did you mean "entry_clean"? [-Wimplicit-function-declaration] - attr_clean( a ); - ---- - contrib/slapd-modules/cloak/cloak.c | 1 + - libraries/liblmdb/mdb.c | 2 +- - servers/slapd/overlays/constraint.c | 2 +- - servers/slapd/overlays/dyngroup.c | 2 +- - servers/slapd/overlays/valsort.c | 2 +- - 5 files changed, 5 insertions(+), 4 deletions(-) - -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 */ -Index: openldap-2.6.7/servers/slapd/overlays/constraint.c -=================================================================== ---- openldap-2.6.7.orig/servers/slapd/overlays/constraint.c -+++ openldap-2.6.7/servers/slapd/overlays/constraint.c -@@ -557,7 +557,7 @@ done:; - a2->restrict_filter = ap.restrict_filter; - a2->restrict_val = ap.restrict_val; - -- for ( app = &on->on_bi.bi_private; *app; app = &(*app)->ap_next ) -+ for ( app = (constraint **)&on->on_bi.bi_private; *app; app = &(*app)->ap_next ) - /* Get to the end */ ; - - a2->ap_next = *app; -Index: openldap-2.6.7/servers/slapd/overlays/dyngroup.c -=================================================================== ---- openldap-2.6.7.orig/servers/slapd/overlays/dyngroup.c -+++ openldap-2.6.7/servers/slapd/overlays/dyngroup.c -@@ -111,7 +111,7 @@ static int dgroup_cf( ConfigArgs *c ) - */ - a2 = ch_malloc( sizeof(adpair) ); - -- for ( app = &on->on_bi.bi_private; *app; app = &(*app)->ap_next ) -+ for ( app = (adpair **)&on->on_bi.bi_private; *app; app = &(*app)->ap_next ) - /* Get to the end */ ; - - a2->ap_mem = ap.ap_mem; -Index: openldap-2.6.7/servers/slapd/overlays/valsort.c -=================================================================== ---- openldap-2.6.7.orig/servers/slapd/overlays/valsort.c -+++ openldap-2.6.7/servers/slapd/overlays/valsort.c -@@ -201,7 +201,7 @@ valsort_cf_func(ConfigArgs *c) { - return(1); - } - -- for ( vip = &on->on_bi.bi_private; *vip; vip = &(*vip)->vi_next ) -+ for ( vip = (valsort_info **)&on->on_bi.bi_private; *vip; vip = &(*vip)->vi_next ) - /* Get to the end */ ; - - vi = ch_malloc( sizeof(valsort_info) ); diff --git a/openldap-2.6.7.tgz b/openldap-2.6.7.tgz deleted file mode 100644 index 6c5c816..0000000 --- a/openldap-2.6.7.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cd775f625c944ed78a3da18a03b03b08eea73c8aabc97b41bb336e9a10954930 -size 6484944 diff --git a/openldap-2.6.7.tgz.asc b/openldap-2.6.7.tgz.asc deleted file mode 100644 index 150e26f..0000000 --- a/openldap-2.6.7.tgz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEPOJptTmLyLeFZF6Yf2fV/Rzhy84FAmW4AwsACgkQf2fV/Rzh -y84CgQ/9GAtC9/jUMEb+PJYnCKCil07gxl6yxwjzUUy6mQZt59hwqXFRRkG/cqKj -mie25RGVTyCCzaz9TMo8RplrqvVL2CGZrE3NzorCivh5VNWZws61b+c+7aSHu0qd -VSLpn3FMAhOdY3FBqmuPMj1mT0S7iJ5pA181YXYmLhiWlerYl5FyMjmaQddht+OB -ctTG3l/9/BDW5vyTxtBZSnY20h70r1gzKn3x8zQ4kJApJZPEiMsJBne7ywOmezzt -p1SgqExSVedlVig3AGqia+zlCcROJxVXqDSZenISrzXMQzdIc2WmEwo+q5WF4Kwh -aw3w8BVnoO6Jv4B9Ye5fokSTLKJ1hbLFE+f9s1M5lM3+vmtSSl0sU0glDkwe2UFK -ZCeMcsrQTRTsFOFaY/JgAqlD5Q66etVCM6Jobqt2fsdGKnregcu5SGvS0P9rRS/h -JRdkqPbndE05sZZxt8hBE4Sc1GIMeW9usA2GQaATK1xtq9pAWSF4UJ+y2aKxY6vI -sGBRrtJ7zRjrM17k4xGe0kMqP0y4mqKRfm2QYDK/64UplhMgrUzods+NU1NpfHWb -FlCOreubgjMeGl8wUpYTFNTO2GU74AjFnnpqU50v+5tHGqQ3rNq0VXwSifxj1ttK -0w7DXLD4qVA1rjyK3fBTaIfvOFCc6ukhQiFq0cYUOBS3VDhz7lU= -=2j7h ------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-fb9e6a81bbee.patch b/openldap2-fb9e6a81bbee.patch deleted file mode 100644 index e55dd62..0000000 --- a/openldap2-fb9e6a81bbee.patch +++ /dev/null @@ -1,28 +0,0 @@ -From fb9e6a81bbee880549e7ec18f0a74ddddbd2d1ab Mon Sep 17 00:00:00 2001 -From: Stephen Gallagher -Date: Tue, 6 Feb 2024 21:38:24 -0500 -Subject: [PATCH] ITS#10171 - Explicitly cast private values - -Fixes issues with -Werror=incompatible-pointer-types - -Signed-off-by: Stephen Gallagher ---- - servers/slapd/config.c | 2 +- - servers/slapd/overlays/constraint.c | 2 +- - servers/slapd/overlays/dyngroup.c | 2 +- - servers/slapd/overlays/valsort.c | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/servers/slapd/config.c b/servers/slapd/config.c -index 80333f359c..987c862d91 100644 ---- a/servers/slapd/config.c -+++ b/servers/slapd/config.c -@@ -151,7 +151,7 @@ int config_check_vals(ConfigTable *Conf, ConfigArgs *c, int check_only ) { - int rc, arg_user, arg_type, arg_syn, iarg; - unsigned uiarg; - long larg; -- size_t ularg; -+ unsigned long ularg; - ber_len_t barg; - - if(Conf->arg_type == ARG_IGNORED) { diff --git a/openldap2.changes b/openldap2.changes index 2909b6c..1bee5af 100644 --- a/openldap2.changes +++ b/openldap2.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +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) + ------------------------------------------------------------------- Mon Jul 29 17:06:34 UTC 2024 - Martin Jambor diff --git a/openldap2.spec b/openldap2.spec index f4baba5..dbb1f36 100644 --- a/openldap2.spec +++ b/openldap2.spec @@ -26,9 +26,9 @@ %endif Name: openldap2%{name_suffix} -Version: 2.6.7 +Version: 2.6.8 Release: 0 -Summary: An open source implementation of the Lightweight Directory Access Protocol +Summary: An implementation of the Lightweight Directory Access Protocol License: OLDAP-2.8 Group: Productivity/Networking/LDAP/Servers URL: https://www.openldap.org @@ -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 -Patch17: gcc14.patch -Patch18: openldap2-fb9e6a81bbee.patch BuildRequires: argon2-devel BuildRequires: cyrus-sasl-devel BuildRequires: db-devel @@ -93,7 +91,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 +101,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 +111,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 +123,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 +184,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 @@ -396,7 +393,6 @@ 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 @@ -471,6 +467,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*