[packages/openldap] Up to 2.6.10; bdb (and few other things) dropped upstream; builds; packages; not tested; TODO: confi
arekm
arekm at pld-linux.org
Fri Aug 1 23:39:12 CEST 2025
commit e9608724f4c15261fa5241f86bd4c7f12ad07d89
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Fri Aug 1 23:38:58 2025 +0200
Up to 2.6.10; bdb (and few other things) dropped upstream; builds; packages; not tested; TODO: config patch needs update
attr.patch | 11 ++
gcc14.patch | 189 ------------------
openldap-am.patch | 11 +-
openldap-backend_libs.patch | 24 ---
openldap-config.patch | 11 --
openldap-contrib-modules.patch | 13 +-
openldap-db.patch | 18 --
openldap-default_cacert_path.patch | 25 ++-
openldap-fast.patch | 11 --
openldap-format-security.patch | 21 --
openldap-gcc47.patch | 10 -
openldap-install.patch | 19 +-
openldap-ldapi_FHS.patch | 11 --
openldap-ltinstall-mode.patch | 31 ---
openldap-man.patch | 11 --
openldap-nosql.patch | 13 +-
openldap-perl.patch | 43 -----
openldap-pic.patch | 11 --
openldap-pie.patch | 12 --
openldap.spec | 381 ++++++++++---------------------------
20 files changed, 154 insertions(+), 722 deletions(-)
---
diff --git a/openldap.spec b/openldap.spec
index 93a908d..38f3387 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -7,13 +7,6 @@
%bcond_without perl # disable perl backend
%bcond_without sasl # don't build cyrus sasl support
%bcond_without slp # disable SLP support
-%bcond_with system_db # system Berkeley DB
-%bcond_without system_lmdb # system LMDB
-%bcond_with nondist # non-distributable package (DB >= 6.0.20)
-
-# Never change or update Berkeley DB, it's there to isolate OpenLDAP
-# from any future changes to the system-wide Berkeley DB library.
-%define db_version 4.6.21
Summary: Lightweight Directory Access Protocol clients/servers
Summary(es.UTF-8): Clientes y servidor para LDAP
@@ -22,14 +15,13 @@ Summary(pt_BR.UTF-8): Clientes e servidor para LDAP
Summary(ru.UTF-8): Образцы клиентов LDAP
Summary(uk.UTF-8): Зразки клієнтів LDAP
Name: openldap
-Version: 2.4.59
-Release: 10
+Version: 2.6.10
+Release: 0.1
License: OpenLDAP Public License
Group: Networking/Daemons
Source0: https://www.openldap.org/software/download/OpenLDAP/openldap-release/%{name}-%{version}.tgz
-# Source0-md5: 6036a03b3a67b4a1fe1246e0a2c7265a
-Source1: http://download.oracle.com/berkeley-db/db-%{db_version}.tar.gz
-# Source1-md5: 718082e7e35fc48478a2334b0bc4cd11
+# Source0-md5: 6be5e6c43d599e7a422669c70229ca74
+
Source2: ldap.init
Source3: %{name}.sysconfig
Source4: %{name}.conf
@@ -39,30 +31,25 @@ Source7: nssov.tmpfiles
Source100: %{name}-README.evolution
Patch0: %{name}-make_man_link.patch
Patch1: %{name}-config.patch
-Patch2: %{name}-fast.patch
+
Patch3: %{name}-cldap.patch
-Patch4: %{name}-ldapi_FHS.patch
+Patch4: attr.patch
Patch5: %{name}-install.patch
-Patch6: %{name}-backend_libs.patch
-Patch7: %{name}-perl.patch
-Patch8: %{name}-pic.patch
-Patch9: %{name}-ltinstall-mode.patch
+
Patch11: %{name}-ldaprc.patch
Patch12: %{name}-nosql.patch
Patch13: %{name}-ldapc++.patch
-Patch14: %{name}-pie.patch
+
Patch15: %{name}-gethostbyXXXX_r.patch
Patch16: %{name}-contrib-modules.patch
Patch17: %{name}-contrib-krb5.patch
-Patch18: %{name}-format-security.patch
-Patch19: %{name}-gcc47.patch
+
Patch20: %{name}-man.patch
Patch22: %{name}-am.patch
-Patch23: %{name}-db.patch
+
Patch24: %{name}-default_cacert_path.patch
Patch25: %{name}-system-lmdb.patch
Patch26: %{name}-slapd_for_symbols_check.patch
-Patch27: gcc14.patch
# Patch for the evolution library
Patch100: %{name}-ntlm.diff
URL: https://www.openldap.org/
@@ -71,10 +58,6 @@ BuildRequires: automake
%if %{with sasl}
BuildRequires: cyrus-sasl-devel >= 2.1.15
%endif
-%if %{with system_db}
-BuildRequires: db-devel >= 4.4
-%{!?with_nondist:BuildRequires: db-devel < 6.0.20}
-%endif
BuildRequires: gcc >= 5:3.4
BuildRequires: groff
%if %{with krb5}
@@ -328,7 +311,7 @@ responsible for handling the database and client queries.
Install this package if you want to setup an OpenLDAP server.
You will also need some backend for server, so install some
-openldap-backend package. The bdb backend is recommended.
+openldap-backend package.
%description servers -l pl.UTF-8
Ten pakiet zawiera demona slapd odpowiadającego za obsługę bazy danych
@@ -337,8 +320,7 @@ i zapytania klientów.
Aby uruchomić serwer OpenLDAP należy zainstalować ten pakiet.
Potrzebny też jest jakiś backend dla serwera, dlatego należy
-zainstalować odpowiedni pakiet openldap-backend. Zalecany jest backend
-bdb.
+zainstalować odpowiedni pakiet openldap-backend.
%description servers -l pt_BR.UTF-8
O pacote openldap-server contém o servidor slapd que é responsável por
@@ -356,19 +338,6 @@ Instale este pacote se você desejar executar um servidor OpenLDAP.
%description servers -l uk.UTF-8
Сервера (демони), що поставляються з LDAP.
-%package backend-bdb
-Summary: BDB backend to OpenLDAP server
-Summary(pl.UTF-8): Backend BDB do serwera OpenLDAP
-Group: Networking/Daemons
-Requires(post,preun): sed >= 4.0
-Requires: %{name}-servers = %{version}-%{release}
-
-%description backend-bdb
-BDB backend to slapd, the OpenLDAP server.
-
-%description backend-bdb -l pl.UTF-8
-Backend BDB do slapd - serwera OpenLDAP.
-
%package backend-dnssrv
Summary: DNS SRV backend to OpenLDAP server
Summary(pl.UTF-8): Backend DNS SRV do serwera OpenLDAP
@@ -382,19 +351,6 @@ DNS SRV backend to slapd, the OpenLDAP server.
%description backend-dnssrv -l pl.UTF-8
Backend DNS SRV do slapd - serwera OpenLDAP.
-%package backend-hdb
-Summary: HDB (Hierarchical DB) backend to OpenLDAP server
-Summary(pl.UTF-8): Backend HDB (Hierarchical DB) do serwera OpenLDAP
-Group: Networking/Daemons
-Requires(post,preun): sed >= 4.0
-Requires: %{name}-servers = %{version}-%{release}
-
-%description backend-hdb
-HDB (Hierarchical DB) backend to slapd, the OpenLDAP server.
-
-%description backend-hdb -l pl.UTF-8
-Backend HDB (Hierarchical DB) do slapd - serwera OpenLDAP.
-
%package backend-ldap
Summary: LDAP backend to OpenLDAP server
Summary(pl.UTF-8): Backend LDAP do serwera OpenLDAP
@@ -435,19 +391,6 @@ Meta backend to slapd, the OpenLDAP server.
%description backend-meta -l pl.UTF-8
Backend Meta do slapd - serwera OpenLDAP.
-%package backend-monitor
-Summary: Monitor backend to OpenLDAP server
-Summary(pl.UTF-8): Backend Monitor do serwera OpenLDAP
-Group: Networking/Daemons
-Requires(post,preun): sed >= 4.0
-Requires: %{name}-servers = %{version}-%{release}
-
-%description backend-monitor
-Meta backend to slapd, the OpenLDAP server.
-
-%description backend-monitor -l pl.UTF-8
-Backend Meta do slapd - serwera OpenLDAP.
-
%package backend-ndb
Summary: MySQL NDB Cluster backend to OpenLDAP server
Summary(pl.UTF-8): Backend MySQL NDB Cluster do serwera OpenLDAP
@@ -507,19 +450,6 @@ zdefiniowanych w bazie danych działającej w tej samej instancji slapd
na konteksty nazw wirtualnych z modyfikowaniem attributeType i
objectClass w razie potrzeby. Wymaga nakładki rwm.
-%package backend-shell
-Summary: Shell backend to OpenLDAP server
-Summary(pl.UTF-8): Backend Shell do serwera OpenLDAP
-Group: Networking/Daemons
-Requires(post,preun): sed >= 4.0
-Requires: %{name}-servers = %{version}-%{release}
-
-%description backend-shell
-Shell backend to slapd, the OpenLDAP server.
-
-%description backend-shell -l pl.UTF-8
-Backend Shell do slapd - serwera OpenLDAP.
-
%package backend-sock
Summary: Socket backend to OpenLDAP server
Summary(pl.UTF-8): Backend Socket do serwera OpenLDAP
@@ -850,14 +780,14 @@ Requires: %{name}-servers = %{version}-%{release}
%description overlay-translucent
The Translucent Proxy overlay can be used with a backend database such
-as slapd-bdb to create a "translucent proxy". Entries retrieved from a
+to create a "translucent proxy". Entries retrieved from a
remote LDAP server may have some or all attributes overridden, or new
attributes added, by entries in the local database before being
presented to the client.
%description overlay-translucent -l pl.UTF-8
-Nakładka Translucent Proxy może być używana wraz z bazą danych taką
-jak slapd-bdb do stworzenia "przezroczystego proxy". Wpisy otrzymane
+Nakładka Translucent Proxy może być używana wraz z bazą danych
+do stworzenia "przezroczystego proxy". Wpisy otrzymane
ze zdalnego serwera LDAP mogą mieć nadpisane niektóre lub wszystkie
atrybuty, albo dodane nowe atrybuty poprzez wpisy w lokalnej bazie
danych przed przekazaniem do klienta.
@@ -1225,50 +1155,39 @@ Overlay to trace overlay invocation.
Nakładka śledząca wywołania nakładek.
%prep
-%setup -q -c %{!?with_system_db:-a1}
-%{!?with_system_db:%patch -P18 -p0}
-%{!?with_system_db:%{__mv} db-%{db_version} db}
-%{__mv} %{name}-%{version} %{name}
-cd %{name}
+%setup -q
%patch -P0 -p1
-%patch -P1 -p1
-%patch -P2 -p1
+# update
+#%%patch -P1 -p1
+
%patch -P3 -p1
%patch -P4 -p1
%patch -P5 -p1
-%patch -P6 -p1
-%patch -P7 -p1
-%patch -P8 -p1
+
%patch -P9 -p1
+
%patch -P11 -p1
%patch -P12 -p1
%patch -P13 -p1
-%patch -P14 -p1
+
%patch -P15 -p1
%patch -P16 -p1
-%patch -P19 -p1
+
%patch -P20 -p1
%patch -P22 -p1
-%patch -P23 -p1
+
%patch -P24 -p1
%if %{with system_lmdb}
%patch -P25 -p1
%endif
-%patch -P26 -p1
-%patch -P27 -p0
+# test if needed
+#%%patch -P26 -p1
+
%if %{with krb5}
%patch -P17 -p1
%endif
-%if %{with nondist}
-# disable check for compatible DB package (< 6.0.20)
-%{__sed} -i -e 's/0x060014/0xFFFFFF/' build/openldap.m4
-%endif
cd ..
-%if %{without system_db}
-install -d db/build-rpm
-%endif
-
%if %{with exchange}
# Set up a build tree for a static version of libldap with the hooks for the
# non-standard NTLM bind type which is needed to connect to Win2k GC servers
@@ -1283,59 +1202,11 @@ cd evo-%{name}
%endif
%build
-%if %{without system_db}
-cp -f /usr/share/automake/config.sub db/dist
-dbdir=$(pwd)/db-instroot
-cd db/build-rpm
-
-CC="%{__cc}"
-CXX="%{__cxx}"
-CFLAGS="%{rpmcflags}"
-CXXFLAGS="%{rpmcflags} -fno-implicit-templates"
-LDFLAGS="%{rpmcflags} %{rpmldflags}"
-export CC CXX CFLAGS CXXFLAGS LDFLAGS
-%define configuredir ../dist
-%configure \
- --cache-file=%{?configure_cache_file}%{!?configure_cache_file:configure}-db.cache \
- --disable-compat185 \
- --disable-dump185 \
- --disable-java \
- --disable-tcl \
- --disable-cxx \
- --with-pic \
- --disable-static \
- --enable-shared \
- --with-uniquename=_openldap \
- --prefix=${dbdir} \
- --exec-prefix=${dbdir} \
- --bindir=${dbdir}/bin \
- --includedir=${dbdir}/include \
- --libdir=${dbdir}/%{_lib}
-
-%undefine configuredir
-
-%{__make} \
- libdb_base=libslapd_db \
- libso_base=libslapd_db
-%{__make} install \
- libdb_base=libslapd_db \
- libso_base=libslapd_db \
- strip="false"
-ln -sf libslapd_db.so ${dbdir}/%{_lib}/${subdir}/libdb.so
-
-cd ../..
-%endif
-
-cd %{name}
-
-CPPFLAGS="%{!?with_system_db:-I${dbdir}/include -D__lock_getlocker=__lock_getlocker_openldap }-I/usr/include/ncurses"
+CPPFLAGS="-I/usr/include/ncurses"
CFLAGS="%{rpmcflags} $CPPFLAGS -D_REENTRANT -fPIC -D_GNU_SOURCE"
CXXFLAGS="%{rpmcflags} $CPPFLAGS -D_REENTRANT -fPIC"
-LDFLAGS="%{rpmcflags} %{rpmldflags}%{!?with_system_db: -L${dbdir}/%{_lib}}"
+LDFLAGS="%{rpmcflags} %{rpmldflags}"
export CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
-%if %{without system_db}
-export LD_LIBRARY_PATH=${dbdir}/%{_lib}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
-%endif
%{__libtoolize} --install
%{__aclocal}
@@ -1369,13 +1240,10 @@ export SOURCE_DATE_EPOCH=$(stat -c '%Y' CHANGES)
--disable-slp \
%endif
--enable-wrappers \
- --enable-bdb=mod \
--enable-dnssrv=mod \
- --enable-hdb=mod \
--enable-ldap=mod \
--enable-mdb=mod \
--enable-meta=mod \
- --enable-monitor=mod \
%if %{with ndb}
--enable-ndb=mod \
%endif
@@ -1385,7 +1253,6 @@ export SOURCE_DATE_EPOCH=$(stat -c '%Y' CHANGES)
--enable-perl=mod \
%endif
--enable-relay=mod \
- --enable-shell=mod \
--enable-sock=mod \
%if %{with odbc}
--enable-sql=mod \
@@ -1402,7 +1269,7 @@ export SOURCE_DATE_EPOCH=$(stat -c '%Y' CHANGES)
%{__make} -C contrib/slapd-modules
install -d libs
-for d in liblber libldap libldap_r ; do
+for d in liblber libldap; do
ln -sf ../libraries/$d/.libs/$d.la libs/$d.la
ln -sf ../libraries/$d/.libs/$d.so libs/$d.so
done
@@ -1490,28 +1357,12 @@ install -d $RPM_BUILD_ROOT{/etc/{sysconfig,rc.d/init.d},/var/lib/openldap-data}
cp -p %{SOURCE100} $RPM_BUILD_ROOT%{evolution_exchange_prefix}/README.evolution
%endif
-%if %{without system_db}
-dbdir=$(pwd)/db-instroot
-cd db-instroot
-install -p %{_lib}/libslapd_db-*.*.so $RPM_BUILD_ROOT%{_libdir}
-cd bin
-for binary in db_* ; do
- install -p -m755 ${binary} $RPM_BUILD_ROOT%{_sbindir}/slapd_${binary}
-done
-
-cd ../..
-%endif
-
-cd %{name}
-
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
%{__make} -C contrib/slapd-modules install \
DESTDIR=$RPM_BUILD_ROOT
-%{!?with_ndb:%{__rm} $RPM_BUILD_ROOT%{_mandir}/man5/slapd-ndb.5}
-
install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/ldap
cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/ldap
@@ -1524,7 +1375,7 @@ cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/ldap.conf
cp -p %{SOURCE6} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/slapd.conf
cp -p %{SOURCE7} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/nssov.conf
-%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/openldap/*.{default,example}
+%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/openldap/*.default
# Standard schemas should not be changed by users
mv $RPM_BUILD_ROOT%{_sysconfdir}/openldap/schema/* $RPM_BUILD_ROOT%{_datadir}/openldap/schema
@@ -1542,10 +1393,6 @@ echo "# This is a good place to put your schema definitions " > \
DESTDIR=$RPM_BUILD_ROOT
%endif
-%if %{without system_db}
-find $RPM_BUILD_ROOT -name '*.la' | xargs sed -i -e "s|-L${dbdir}/%{_lib}||g"
-%endif
-
# files for -headers subpackage
install -d $RPM_BUILD_ROOT%{_includedir}/%{name}/ac
cp -p include/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}
@@ -1556,15 +1403,6 @@ for I in $RPM_BUILD_ROOT%{_includedir}/*.h; do
%{__rm} $RPM_BUILD_ROOT%{_includedir}/%{name}/$(basename $I)
done
-# check for undefined symbols in slapd modules
-for i in $RPM_BUILD_ROOT%{_libdir}/openldap/*.so ; do
- if LD_PRELOAD=$RPM_BUILD_ROOT%{_libdir}/liblber-2.4.so.2:$RPM_BUILD_ROOT%{_libdir}/libldap_r-2.4.so.2:%{!?with_system_db:$RPM_BUILD_ROOT%{_libdir}/libslapd_db-4.6.so:}$RPM_BUILD_ROOT%{_sbindir}/slapd-shared.so ldd -r $i 2>&1 | grep "undefined symbol"; then
- echo "Undefined symbols found in" $i
- exit 1
- fi
-done
-%{__rm} $RPM_BUILD_ROOT%{_sbindir}/slapd-shared.so
-
# bogus include
%{__sed} -i -e '/^\.so \.\.\/Project/d' $RPM_BUILD_ROOT%{_mandir}/man5/slapo-nops.5
@@ -1593,6 +1431,12 @@ rm -rf $RPM_BUILD_ROOT
# the strict internal deps between modules and
# server package are very important for all this to work.
+%ldap_module_add autoca.la
+%ldap_module_add homedir.la
+%ldap_module_add nestgroup.la
+%ldap_module_add otp.la
+%ldap_module_add remoteauth.la
+
%posttrans servers
%service ldap restart "OpenLDAP server"
@@ -1601,6 +1445,11 @@ if [ "$1" = "0" ] ; then
%service ldap stop
/sbin/chkconfig --del ldap || :
fi
+%ldap_module_remove autoca.la
+%ldap_module_remove homedir.la
+%ldap_module_remove nestgroup.la
+%ldap_module_remove otp.la
+%ldap_module_remove remoteauth.la
%postun servers
if [ "$1" = "0" ]; then
@@ -1627,24 +1476,12 @@ if [ "`/usr/bin/getent passwd slapd | cut -d: -f6`" = "/var/lib/openldap-ldbm" ]
/usr/sbin/usermod -d /var/lib/openldap-data slapd
fi
-%post backend-bdb
-%ldap_module_add back_bdb.la
-
-%preun backend-bdb
-%ldap_module_remove back_bdb.la
-
%post backend-dnssrv
%ldap_module_add back_dnssrv.la
%preun backend-dnssrv
%ldap_module_remove back_dnssrv.la
-%post backend-hdb
-%ldap_module_add back_hdb.la
-
-%preun backend-hdb
-%ldap_module_remove back_hdb.la
-
%post backend-ldap
%ldap_module_add back_ldap.la
@@ -1663,12 +1500,6 @@ fi
%preun backend-meta
%ldap_module_remove back_meta.la
-%post backend-monitor
-%ldap_module_add back_monitor.la
-
-%preun backend-monitor
-%ldap_module_remove back_monitor.la
-
%post backend-ndb
%ldap_module_add back_ndb.la
@@ -1693,12 +1524,6 @@ fi
%preun backend-relay
%ldap_module_remove back_relay.la
-%post backend-shell
-%ldap_module_add back_shell.la
-
-%preun backend-shell
-%ldap_module_remove back_shell.la
-
%post backend-sock
%ldap_module_add back_sock.la
@@ -1955,8 +1780,8 @@ fi
%files
%defattr(644,root,root,755)
-%doc %{name}/{ANNOUNCEMENT,CHANGES,COPYRIGHT,README,LICENSE}
-%doc %{name}/doc/{drafts,rfc}
+%doc {ANNOUNCEMENT,CHANGES,COPYRIGHT,README,LICENSE}
+%doc doc/{drafts,rfc}
%attr(755,root,root) %{_bindir}/ldap*
%dir %{_datadir}/openldap
%{_mandir}/man1/ldap*.1*
@@ -1972,24 +1797,20 @@ fi
%defattr(644,root,root,755)
%dir %{_sysconfdir}/openldap
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/openldap/ldap.conf
-%attr(755,root,root) %{_libdir}/liblber-2.4.so.*.*.*
-%attr(755,root,root) %{_libdir}/libldap-2.4.so.*.*.*
-%attr(755,root,root) %{_libdir}/libldap_r-2.4.so.*.*.*
-%attr(755,root,root) %{_libdir}/libslapi-2.4.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liblber-2.4.so.2
-%attr(755,root,root) %ghost %{_libdir}/libldap-2.4.so.2
-%attr(755,root,root) %ghost %{_libdir}/libldap_r-2.4.so.2
-%attr(755,root,root) %ghost %{_libdir}/libslapi-2.4.so.2
+%attr(755,root,root) %{_libdir}/liblber.so.*.*.*
+%attr(755,root,root) %{_libdir}/libldap.so.*.*.*
+%attr(755,root,root) %{_libdir}/libslapi.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liblber.so.2
+%attr(755,root,root) %ghost %{_libdir}/libldap.so.2
+%attr(755,root,root) %ghost %{_libdir}/libslapi.so.2
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/liblber.so
%attr(755,root,root) %{_libdir}/libldap.so
-%attr(755,root,root) %{_libdir}/libldap_r.so
%attr(755,root,root) %{_libdir}/libslapi.so
%{_libdir}/liblber.la
%{_libdir}/libldap.la
-%{_libdir}/libldap_r.la
%{_libdir}/libslapi.la
%{_includedir}/lber.h
%{_includedir}/lber_types.h
@@ -1998,6 +1819,8 @@ fi
%{_includedir}/ldif.h
%{_includedir}/openldap.h
%{_includedir}/slapi-plugin.h
+%{_pkgconfigdir}/lber.pc
+%{_pkgconfigdir}/ldap.pc
%{_mandir}/man3/ber_*.3*
%{_mandir}/man3/lber-*.3*
%{_mandir}/man3/ld_errno.3*
@@ -2008,7 +1831,6 @@ fi
%defattr(644,root,root,755)
%{_libdir}/liblber.a
%{_libdir}/libldap.a
-%{_libdir}/libldap_r.a
%{_libdir}/libslapi.a
%files headers
@@ -2045,11 +1867,6 @@ fi
%files servers
%defattr(644,root,root,755)
-%if %{without system_db}
-# not used by slapd directly, but by three different backends (bdb,hdb,mdb), so include here
-%doc db/LICENSE
-%attr(755,root,root) %{_libdir}/libslapd_db-4.6.so
-%endif
%attr(755,root,root) %{_sbindir}/slap*
%dir %{_libdir}/openldap
%dir %{_sysconfdir}/openldap/schema
@@ -2061,8 +1878,21 @@ fi
%attr(754,root,root) /etc/rc.d/init.d/ldap
%{systemdtmpfilesdir}/slapd.conf
%attr(770,root,slapd) %{_var}/run/slapd
-%dir %attr(770,root,slapd) %{_localstatedir}/openldap-data
-%attr(660,root,slapd) %{_localstatedir}/openldap-data/*
+#%dir %attr(770,root,slapd) %{_localstatedir}/openldap-data
+#%attr(660,root,slapd) %{_localstatedir}/openldap-data/*
+
+# no external deps
+%{_libdir}/%{name}/autoca.la
+%attr(755,root,root) %{_libdir}/%{name}/autoca.so*
+%{_libdir}/%{name}/homedir.la
+%attr(755,root,root) %{_libdir}/%{name}/homedir.so*
+%{_libdir}/%{name}/nestgroup.la
+%attr(755,root,root) %{_libdir}/%{name}/nestgroup.so*
+%{_libdir}/%{name}/otp.la
+%attr(755,root,root) %{_libdir}/%{name}/otp.so*
+%{_libdir}/%{name}/remoteauth.la
+%attr(755,root,root) %{_libdir}/%{name}/remoteauth.so*
+
%dir %{schemadir}
%{schemadir}/README
%{schemadir}/collective.ldif
@@ -2073,6 +1903,8 @@ fi
%{schemadir}/core.schema
%{schemadir}/cosine.ldif
%{schemadir}/cosine.schema
+%{schemadir}/dsee.ldif
+%{schemadir}/dsee.schema
%{schemadir}/duaconf.ldif
%{schemadir}/duaconf.schema
%{schemadir}/dyngroup.ldif
@@ -2083,41 +1915,41 @@ fi
%{schemadir}/java.schema
%{schemadir}/misc.ldif
%{schemadir}/misc.schema
+%{schemadir}/msuser.ldif
+%{schemadir}/msuser.schema
+%{schemadir}/namedobject.ldif
+%{schemadir}/namedobject.schema
%{schemadir}/nis.ldif
%{schemadir}/nis.schema
%{schemadir}/openldap.ldif
%{schemadir}/openldap.schema
%{schemadir}/pmi.ldif
%{schemadir}/pmi.schema
-%{schemadir}/ppolicy.ldif
-%{schemadir}/ppolicy.schema
%{_mandir}/man5/slapd.*.5*
+%{_mandir}/man5/slapd-asyncmeta.5*
%{_mandir}/man5/slapd-config.5*
%{_mandir}/man5/slapd-ldif.5*
+%{_mandir}/man5/slapd-monitor.5*
%{_mandir}/man5/slapd-null.5*
+%{_mandir}/man5/slapd-wt.5*
+%{_mandir}/man5/slapo-autoca.5*
+%{_mandir}/man5/slapo-deref.5*
+%{_mandir}/man5/slapo-homedir.5*
+%{_mandir}/man5/slapo-nestgroup.5*
+%{_mandir}/man5/slapo-otp.5*
+%{_mandir}/man5/slapo-remoteauth.5*
+%{_mandir}/man5/slappw-argon2.5*
%{_mandir}/man8/slap*.8*
-%files backend-bdb
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/openldap/back_bdb*.so*
-%{_libdir}/openldap/back_bdb.la
-%{_mandir}/man5/slapd-bdb.5*
-
%files backend-dnssrv
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/openldap/back_dnssrv*.so*
%{_libdir}/openldap/back_dnssrv.la
%{_mandir}/man5/slapd-dnssrv.5*
-%files backend-hdb
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/openldap/back_hdb*.so*
-%{_libdir}/openldap/back_hdb.la
-%{_mandir}/man5/slapd-hdb.5*
-
%files backend-ldap
%defattr(644,root,root,755)
-%doc %{name}/servers/slapd/back-ldap/TODO.proxy
+%doc servers/slapd/back-ldap/TODO.proxy
%attr(755,root,root) %{_libdir}/openldap/back_ldap*.so*
%{_libdir}/openldap/back_ldap.la
%{_mandir}/man5/slapd-ldap.5*
@@ -2136,17 +1968,10 @@ fi
%{_libdir}/openldap/back_meta.la
%{_mandir}/man5/slapd-meta.5*
-%files backend-monitor
-%defattr(644,root,root,755)
-%doc %{name}/servers/slapd/back-monitor/README
-%attr(755,root,root) %{_libdir}/openldap/back_monitor*.so*
-%{_libdir}/openldap/back_monitor.la
-%{_mandir}/man5/slapd-monitor.5*
-
%if %{with ndb}
%files backend-ndb
%defattr(644,root,root,755)
-%doc %{name}/servers/slapd/back-ndb/README
+%doc servers/slapd/back-ndb/README
%attr(755,root,root) %{_libdir}/openldap/back_ndb*.so*
%{_libdir}/openldap/back_ndb.la
%{_mandir}/man5/slapd-ndb.5*
@@ -2161,8 +1986,8 @@ fi
%if %{with perl}
%files backend-perl
%defattr(644,root,root,755)
-%doc %{name}/servers/slapd/back-perl/*.pm
-%doc %{name}/servers/slapd/back-perl/README
+%doc servers/slapd/back-perl/*.pm
+%doc servers/slapd/back-perl/README
%attr(755,root,root) %{_libdir}/openldap/back_perl*.so*
%{_libdir}/openldap/back_perl.la
%{_mandir}/man5/slapd-perl.5*
@@ -2170,17 +1995,11 @@ fi
%files backend-relay
%defattr(644,root,root,755)
-%doc %{name}/servers/slapd/back-relay/README
+%doc servers/slapd/back-relay/README
%attr(755,root,root) %{_libdir}/openldap/back_relay*.so*
%{_libdir}/openldap/back_relay.la
%{_mandir}/man5/slapd-relay.5*
-%files backend-shell
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/openldap/back_shell*.so*
-%{_libdir}/openldap/back_shell.la
-%{_mandir}/man5/slapd-shell.5*
-
%files backend-sock
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/openldap/back_sock*.so*
@@ -2191,8 +2010,8 @@ fi
%if %{with odbc}
%files backend-sql
%defattr(644,root,root,755)
-%doc %{name}/servers/slapd/back-sql/docs/*
-%doc %{name}/servers/slapd/back-sql/rdbms_depend
+%doc servers/slapd/back-sql/docs/*
+%doc servers/slapd/back-sql/rdbms_depend
%attr(755,root,root) %{_libdir}/openldap/back_sql*.so*
%{_libdir}/openldap/back_sql.la
%{_mandir}/man5/slapd-sql.5*
@@ -2320,26 +2139,26 @@ fi
%files overlay-addpartial
%defattr(644,root,root,755)
-%doc %{name}/contrib/slapd-modules/addpartial/README
+%doc contrib/slapd-modules/addpartial/README
%attr(755,root,root) %{_libdir}/openldap/addpartial-overlay*.so*
%{_libdir}/openldap/addpartial-overlay.la
%files overlay-allop
%defattr(644,root,root,755)
-%doc %{name}/contrib/slapd-modules/allop/README
+%doc contrib/slapd-modules/allop/README
%attr(755,root,root) %{_libdir}/openldap/allop*.so*
%{_libdir}/openldap/allop.la
%{_mandir}/man5/slapo-allop.5*
%files overlay-allowed
%defattr(644,root,root,755)
-%doc %{name}/contrib/slapd-modules/allowed/README
+%doc contrib/slapd-modules/allowed/README
%attr(755,root,root) %{_libdir}/openldap/allowed*.so*
%{_libdir}/openldap/allowed.la
%files overlay-autogroup
%defattr(644,root,root,755)
-%doc %{name}/contrib/slapd-modules/autogroup/README
+%doc contrib/slapd-modules/autogroup/README
%attr(755,root,root) %{_libdir}/openldap/autogroup*.so*
%{_libdir}/openldap/autogroup.la
%{_mandir}/man5/slapo-autogroup.5*
@@ -2357,7 +2176,7 @@ fi
%files overlay-dsaschema
%defattr(644,root,root,755)
-%doc %{name}/contrib/slapd-modules/dsaschema/README
+%doc contrib/slapd-modules/dsaschema/README
%attr(755,root,root) %{_libdir}/openldap/dsaschema*.so*
%{_libdir}/openldap/dsaschema.la
@@ -2369,7 +2188,7 @@ fi
%if %{with krb5}
%files overlay-kinit
%defattr(644,root,root,755)
-%doc %{name}/contrib/slapd-modules/kinit/README
+%doc contrib/slapd-modules/kinit/README
%attr(755,root,root) %{_libdir}/openldap/kinit*.so*
%{_libdir}/openldap/kinit.la
%endif
@@ -2399,7 +2218,7 @@ fi
%files overlay-nssov
%defattr(644,root,root,755)
-%doc %{name}/contrib/slapd-modules/nssov/README
+%doc contrib/slapd-modules/nssov/README
%attr(755,root,root) %{_libdir}/openldap/nssov*.so*
%{_libdir}/openldap/nssov.la
%{schemadir}/ldapns.schema
@@ -2409,13 +2228,13 @@ fi
%files overlay-proxyOld
%defattr(644,root,root,755)
-%doc %{name}/contrib/slapd-modules/proxyOld/README
+%doc contrib/slapd-modules/proxyOld/README
%attr(755,root,root) %{_libdir}/openldap/proxyOld*.so*
%{_libdir}/openldap/proxyOld.la
%files overlay-samba4
%defattr(644,root,root,755)
-%doc %{name}/contrib/slapd-modules/samba4/README
+%doc contrib/slapd-modules/samba4/README
%attr(755,root,root) %{_libdir}/openldap/pguid*.so*
%attr(755,root,root) %{_libdir}/openldap/rdnval*.so*
%attr(755,root,root) %{_libdir}/openldap/vernum*.so*
@@ -2425,7 +2244,7 @@ fi
%files overlay-smbk5pwd
%defattr(644,root,root,755)
-%doc %{name}/contrib/slapd-modules/smbk5pwd/README
+%doc contrib/slapd-modules/smbk5pwd/README
%attr(755,root,root) %{_libdir}/openldap/smbk5pwd*.so*
%{_libdir}/openldap/smbk5pwd.la
diff --git a/attr.patch b/attr.patch
new file mode 100644
index 0000000..3c9f5cc
--- /dev/null
+++ b/attr.patch
@@ -0,0 +1,11 @@
+--- openldap-2.6.10/contrib/slapd-modules/cloak/cloak.c~ 2025-05-22 19:56:21.000000000 +0200
++++ openldap-2.6.10/contrib/slapd-modules/cloak/cloak.c 2025-08-01 20:31:29.314886502 +0200
+@@ -32,6 +32,8 @@
+ #include "slap.h"
+ #include "slap-config.h"
+
++extern void attr_clean( Attribute *a );
++
+ enum { CLOAK_ATTR = 1 };
+
+ typedef struct cloak_info_t {
diff --git a/gcc14.patch b/gcc14.patch
deleted file mode 100644
index 6eb90ad..0000000
--- a/gcc14.patch
+++ /dev/null
@@ -1,189 +0,0 @@
---- build/openldap.m4.orig 2024-06-11 18:11:39.136234376 +0200
-+++ build/openldap.m4 2024-06-11 18:16:17.264961945 +0200
-@@ -378,7 +378,7 @@
- #ifndef NULL
- #define NULL ((void *)0)
- #endif
--main()
-+int main()
- {
- #if DB_VERSION_MAJOR > 1
- char *version;
-@@ -427,7 +427,7 @@
- #ifndef NULL
- #define NULL ((void *)0)
- #endif
--main()
-+int main()
- {
- int rc;
- u_int32_t flags = DB_CREATE |
-@@ -596,6 +596,7 @@
- AC_DEFUN([OL_PTHREAD_TEST_INCLUDES], [[
- /* pthread test headers */
- #include <pthread.h>
-+#include <unistd.h>
- #if HAVE_PTHREADS < 7
- #include <errno.h>
- #endif
-@@ -785,7 +786,7 @@
- #include <sys/types.h>
- #include <regex.h>
- static char *pattern, *string;
--main()
-+int main()
- {
- int rc;
- regex_t re;
-@@ -812,7 +813,7 @@
- [AC_CACHE_CHECK([if toupper() requires islower()],ol_cv_c_upper_lower,[
- AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <ctype.h>
--main()
-+int main()
- {
- if ('C' == toupper('C'))
- exit(0);
-@@ -867,7 +868,7 @@
- ]])],[ol_cv_nonposix_strerror_r=yes],[ol_cv_nonposix_strerror_r=no])
- else
- AC_RUN_IFELSE([AC_LANG_SOURCE([[
-- main() {
-+ int main() {
- char buf[100];
- buf[0] = 0;
- strerror_r( 1, buf, sizeof buf );
---- configure.in.orig 2024-06-11 18:19:43.515745310 +0200
-+++ configure.in 2024-06-11 19:01:41.263778364 +0200
-@@ -1466,10 +1466,8 @@
- dnl save the flags
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[
- #include <pthread.h>
--#ifndef NULL
--#define NULL (void*)0
--#endif
--]], [[pthread_detach(NULL);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no])
-+pthread_t tid;
-+]], [[pthread_detach(tid);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no])
- ])
-
- if test $ol_cv_func_pthread_detach = no ; then
---- libraries/libldap/tls2.c.orig 2021-06-03 20:40:31.000000000 +0200
-+++ libraries/libldap/tls2.c 2024-06-11 19:32:22.899386215 +0200
-@@ -315,6 +315,9 @@
- return tls_imp->ti_session_upflags( sb, ssl, rc );
- }
-
-+int
-+ldap_pvt_tls_check_hostname( LDAP *ld, void *s, const char *name_in );
-+
- /*
- * Call this to do a TLS connect on a sockbuf. ctx_arg can be
- * a SSL_CTX * or NULL, in which case the default ctx is used.
---- servers/slapd/bconfig.c.orig 2021-06-03 20:40:31.000000000 +0200
-+++ servers/slapd/bconfig.c 2024-06-11 19:57:56.599820406 +0200
-@@ -4493,7 +4493,7 @@
- build_new_dn( &e->e_nname, &parent->ce_entry->e_nname, nnewrdn, NULL );
-
- /* Replace attr */
-- rc = ldap_bv2rdn( &e->e_name, &rDN, &text, LDAP_DN_FORMAT_LDAP );
-+ rc = ldap_bv2rdn( &e->e_name, &rDN, (char**)&text, LDAP_DN_FORMAT_LDAP );
- if ( rc ) {
- return rc;
- }
-@@ -6511,7 +6511,7 @@
- attr_merge_normalize_one(e, slap_schema.si_ad_objectClass,
- extra->co_name, NULL );
-
-- rc = ldap_bv2rdn( rdn, &rDN, &text, LDAP_DN_FORMAT_LDAP );
-+ rc = ldap_bv2rdn( rdn, &rDN, (char**)&text, LDAP_DN_FORMAT_LDAP );
- if ( rc ) {
- goto fail;
- }
---- servers/slapd/back-ldap/bind.c.orig 2024-06-11 20:21:22.088814143 +0200
-+++ servers/slapd/back-ldap/bind.c 2024-06-11 20:21:29.615264209 +0200
-@@ -659,6 +659,9 @@
- }
- #endif /* HAVE_TLS */
-
-+void
-+slap_client_keepalive(LDAP *ld, slap_keepalive *sk);
-+
- static int
- ldap_back_prepare_conn( ldapconn_t *lc, Operation *op, SlapReply *rs, ldap_back_send_t sendok )
- {
---- servers/slapd/back-meta/conn.c.orig 2021-06-03 20:40:31.000000000 +0200
-+++ servers/slapd/back-meta/conn.c 2024-06-11 20:23:17.468831054 +0200
-@@ -227,6 +227,9 @@
- * End of debug stuff
- */
-
-+void
-+slap_client_keepalive(LDAP *ld, slap_keepalive *sk);
-+
- /*
- * metaconn_alloc
- *
---- servers/slapd/back-perl/init.c.orig 2024-06-11 19:03:49.770324239 +0200
-+++ servers/slapd/back-perl/init.c 2024-06-11 20:43:59.509020588 +0200
-@@ -23,7 +23,7 @@
- extern char **environ;
- #endif
-
--XSINIT_t perl_back_xs_init LDAP_P((PERL_BACK_XS_INIT_PARAMS));
-+void perl_back_xs_init LDAP_P((PERL_BACK_XS_INIT_PARAMS));
- EXT void boot_DynaLoader LDAP_P((PERL_BACK_BOOT_DYNALOADER_PARAMS));
-
- PerlInterpreter *PERL_INTERPRETER = NULL;
-@@ -159,7 +159,7 @@
- }
-
-
--XSINIT_t
-+void
- perl_back_xs_init(PERL_BACK_XS_INIT_PARAMS)
- {
- char *file = __FILE__;
---- contrib/slapd-modules/cloak/cloak.c.orig 2021-06-03 20:40:31.000000000 +0200
-+++ contrib/slapd-modules/cloak/cloak.c 2024-06-11 21:09:45.246800806 +0200
-@@ -176,6 +176,9 @@
- return rc;
- }
-
-+void
-+attr_clean( Attribute *a );
-+
- static int
- cloak_search_response_cb( Operation *op, SlapReply *rs )
- {
---- contrib/slapd-modules/smbk5pwd/smbk5pwd.c.orig 2024-06-11 23:10:06.234996195 +0200
-+++ contrib/slapd-modules/smbk5pwd/smbk5pwd.c 2024-06-11 23:12:05.181693035 +0200
-@@ -928,6 +928,17 @@
- return rc;
- }
-
-+kadm5_ret_t
-+kadm5_s_init_with_password_ctx (
-+ krb5_context /*context*/,
-+ const char */*client_name*/,
-+ const char */*password*/,
-+ const char */*service_name*/,
-+ kadm5_config_params */*realm_params*/,
-+ unsigned long /*struct_version*/,
-+ unsigned long /*api_version*/,
-+ void **/*server_handle*/);
-+
- static int
- smbk5pwd_modules_init( smbk5pwd_t *pi )
- {
---- servers/slapd/config.c.orig 2021-06-03 20:40:31.000000000 +0200
-+++ servers/slapd/config.c 2024-06-13 00:03:34.605728087 +0200
-@@ -133,7 +133,7 @@
- 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/openldap-am.patch b/openldap-am.patch
index dbaed7e..bda316a 100644
--- a/openldap-am.patch
+++ b/openldap-am.patch
@@ -1,12 +1,11 @@
---- openldap-2.4.59/contrib/ldapc++/configure.in.orig 2022-02-16 06:21:28.859182292 +0100
-+++ openldap-2.4.59/contrib/ldapc++/configure.in 2022-02-16 06:23:16.645762156 +0100
+--- openldap-2.6.10/contrib/ldapc++/configure.ac~ 2025-05-22 19:56:21.000000000 +0200
++++ openldap-2.6.10/contrib/ldapc++/configure.ac 2025-08-01 22:36:38.103964979 +0200
@@ -10,13 +10,13 @@ Restrictions apply, see COPYRIGHT and LI
- AC_REVISION([$Id: 9e53b7243116521c824456d5fb2d4d3c358c0d76 $])
- AC_INIT(ldapcpplib, [] , [http://www.openldap.org/its/] )
+ AC_REVISION([$Id: 2301b679cf9abbd19de02c85ece6e712e070107a $])
+ AC_INIT([ldapcpplib],[ ],[http://www.openldap.org/its/ ])
AC_CONFIG_SRCDIR(src/LDAPConnection.h)
-AM_INIT_AUTOMAKE(foreign)
--AM_CONFIG_HEADER(src/config.h)
-+AC_CONFIG_HEADERS(src/config.h)
+ AC_CONFIG_HEADERS([src/config.h])
eval `$ac_aux_dir/version.sh`
if test -z "$OL_CPP_API_RELEASE"; then
diff --git a/openldap-backend_libs.patch b/openldap-backend_libs.patch
deleted file mode 100644
index 974f6e7..0000000
--- a/openldap-backend_libs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nur openldap-2.3.34.orig/servers/slapd/back-bdb/Makefile.in openldap-2.3.34.backend_libs/servers/slapd/back-bdb/Makefile.in
---- openldap-2.3.34.orig/servers/slapd/back-bdb/Makefile.in 2007-01-02 21:43:59.000000000 +0000
-+++ openldap-2.3.34.backend_libs/servers/slapd/back-bdb/Makefile.in 2007-05-16 20:06:52.000000000 +0000
-@@ -39,7 +39,7 @@
-
- shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
- NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC at _LDAP_LIBS)
--UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC at _LDAP_LIBS)
-+UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC at _LDAP_LIBS) $(LDBM_LIBS)
-
- LIBBASE = back_bdb
-
-diff -Nur openldap-2.3.34.orig/servers/slapd/back-perl/Makefile.in openldap-2.3.34.backend_libs/servers/slapd/back-perl/Makefile.in
---- openldap-2.3.34.orig/servers/slapd/back-perl/Makefile.in 2007-01-02 21:44:06.000000000 +0000
-+++ openldap-2.3.34.backend_libs/servers/slapd/back-perl/Makefile.in 2007-05-16 20:06:52.000000000 +0000
-@@ -32,7 +32,7 @@
-
- shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
- NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC at _LDAP_LIBS)
--UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC at _LDAP_LIBS)
-+UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC at _LDAP_LIBS) @MOD_PERL_LDFLAGS@
-
- LIBBASE = back_perl
-
diff --git a/openldap-config.patch b/openldap-config.patch
index eb68a4e..f60be5b 100644
--- a/openldap-config.patch
+++ b/openldap-config.patch
@@ -90,14 +90,3 @@
+#replica host=ldap-1.example.com:389 starttls=critical
+# bindmethod=sasl saslmech=GSSAPI
+# authcId=host/ldap-master.example.com at EXAMPLE.COM
---- openldap-2.2.6/build/top.mk.orig 2004-01-01 19:16:25.000000000 +0100
-+++ openldap-2.2.6/build/top.mk 2004-02-28 15:43:38.579652400 +0100
-@@ -37,7 +37,7 @@
- libexecdir = @libexecdir@
- localstatedir = @localstatedir@
- mandir = @mandir@
--moduledir = @libexecdir@$(ldap_subdir)
-+moduledir = @libdir@$(ldap_subdir)
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@$(ldap_subdir)
diff --git a/openldap-contrib-modules.patch b/openldap-contrib-modules.patch
index dbc0ba9..b5cf7bf 100644
--- a/openldap-contrib-modules.patch
+++ b/openldap-contrib-modules.patch
@@ -1,16 +1,15 @@
-diff -urN openldap-2.4.25/configure.in openldap-2.4.25-contrib/configure.in
---- openldap-2.4.25/configure.in 2011-03-24 02:18:25.000000000 +0100
-+++ openldap-2.4.25-contrib/configure.in 2011-03-28 17:59:14.569152000 +0200
-@@ -3188,6 +3188,28 @@
- [servers/slapd/shell-backends/Makefile:build/top.mk:servers/slapd/shell-backends/Makefile.in:build/srv.mk]
- [servers/slapd/slapi/Makefile:build/top.mk:servers/slapd/slapi/Makefile.in:build/lib.mk:build/lib-shared.mk]
+--- openldap-2.6.10/configure.ac~ 2025-05-22 19:56:21.000000000 +0200
++++ openldap-2.6.10/configure.ac 2025-08-01 19:15:12.997716322 +0200
+@@ -3278,6 +3278,28 @@ AC_CONFIG_FILES([Makefile:build/top.mk:M
[servers/slapd/overlays/Makefile:build/top.mk:servers/slapd/overlays/Makefile.in:build/lib.mk]
+ [servers/slapd/pwmods/Makefile:build/top.mk:servers/slapd/pwmods/Makefile.in:build/lib.mk]
+ [servers/lloadd/Makefile:build/top.mk:servers/lloadd/Makefile.in:$BALANCER_MAKE]
+[contrib/slapd-modules/Makefile:build/top.mk:contrib/slapd-modules/Makefile.in:build/dir.mk]
+[contrib/slapd-modules/acl/Makefile:build/top.mk:contrib/slapd-modules/acl/Makefile.in:build/mod.mk]
+[contrib/slapd-modules/addpartial/Makefile:build/top.mk:contrib/slapd-modules/addpartial/Makefile.in:build/mod.mk]
+[contrib/slapd-modules/allop/Makefile:build/top.mk:contrib/slapd-modules/allop/Makefile.in:build/mod.mk:build/man.mk]
+[contrib/slapd-modules/allowed/Makefile:build/top.mk:contrib/slapd-modules/allowed/Makefile.in:build/mod.mk]
-+[contrib/slapd-modules/autogroup/Makefile:build/top.mk:contrib/slapd-modules/autogroup/Makefile.in:build/mod.mk]
++[contrib/slapd-modules/autogroup/Makefile:build/top.mk:contrib/slapd-modules/autogroup/Makefile.in:build/mod.mk:build/man.mk]
+[contrib/slapd-modules/cloak/Makefile:build/top.mk:contrib/slapd-modules/cloak/Makefile.in:build/mod.mk:build/man.mk]
+[contrib/slapd-modules/comp_match/Makefile:build/top.mk:contrib/slapd-modules/comp_match/Makefile.in:build/mod.mk]
+[contrib/slapd-modules/denyop/Makefile:build/top.mk:contrib/slapd-modules/denyop/Makefile.in:build/mod.mk]
diff --git a/openldap-db.patch b/openldap-db.patch
deleted file mode 100644
index 3e3a78b..0000000
--- a/openldap-db.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- openldap-2.4.37/build/openldap.m4.orig 2013-11-01 20:06:42.762133271 +0100
-+++ openldap-2.4.37/build/openldap.m4 2013-11-01 20:41:25.152045898 +0100
-@@ -357,7 +357,14 @@
- AC_DEFUN([OL_BERKELEY_DB_LINK],
- [ol_cv_lib_db=no
-
--if test $ol_cv_bdb_major = 5 ; then
-+if test $ol_cv_bdb_major = 6 ; then
-+ OL_BERKELEY_DB_TRY(ol_cv_db_db_6_dot_m,[-ldb-6.$ol_cv_bdb_minor])
-+ OL_BERKELEY_DB_TRY(ol_cv_db_db6m,[-ldb6$ol_cv_bdb_minor])
-+ OL_BERKELEY_DB_TRY(ol_cv_db_db_6m,[-ldb-6$ol_cv_bdb_minor])
-+ OL_BERKELEY_DB_TRY(ol_cv_db_db_6_m,[-ldb-6-$ol_cv_bdb_minor])
-+ OL_BERKELEY_DB_TRY(ol_cv_db_db_6,[-ldb-6])
-+ OL_BERKELEY_DB_TRY(ol_cv_db_db6,[-ldb6])
-+elif test $ol_cv_bdb_major = 5 ; then
- OL_BERKELEY_DB_TRY(ol_cv_db_db_5_dot_m,[-ldb-5.$ol_cv_bdb_minor])
- OL_BERKELEY_DB_TRY(ol_cv_db_db5m,[-ldb5$ol_cv_bdb_minor])
- OL_BERKELEY_DB_TRY(ol_cv_db_db_5m,[-ldb-5$ol_cv_bdb_minor])
diff --git a/openldap-default_cacert_path.patch b/openldap-default_cacert_path.patch
index 813d790..7301cd2 100644
--- a/openldap-default_cacert_path.patch
+++ b/openldap-default_cacert_path.patch
@@ -1,13 +1,12 @@
-diff -ruNp openldap-2.4.45.orig/libraries/libldap/tls_o.c openldap-2.4.45/libraries/libldap/tls_o.c
---- openldap-2.4.45.orig/libraries/libldap/tls_o.c 2017-06-01 22:01:07.000000000 +0200
-+++ openldap-2.4.45/libraries/libldap/tls_o.c 2017-09-03 20:23:39.222111712 +0200
-@@ -275,7 +275,8 @@ tlso_ctx_init( struct ldapoptions *lo, s
- }
- } else {
- if ( !SSL_CTX_load_verify_locations( ctx,
-- lt->lt_cacertfile, lt->lt_cacertdir ) )
-+ lt->lt_cacertfile, lt->lt_cacertdir ) ||
-+ !SSL_CTX_set_default_verify_paths( ctx ) )
- {
- Debug( LDAP_DEBUG_ANY, "TLS: "
- "could not load verify locations (file:`%s',dir:`%s').\n",
+--- openldap-2.6.10/libraries/libldap/tls_o.c~ 2025-05-22 19:56:21.000000000 +0200
++++ openldap-2.6.10/libraries/libldap/tls_o.c 2025-08-01 19:20:17.006534542 +0200
+@@ -485,7 +485,8 @@ tlso_ctx_init( struct ldapoptions *lo, s
+ }
+ /* Start with the first dir in path */
+ if ( !SSL_CTX_load_verify_locations( ctx,
+- lt->lt_cacertfile, dirs[0] ) )
++ lt->lt_cacertfile, dirs[0] ) ||
++ !SSL_CTX_set_default_verify_paths( ctx ) )
+ {
+ Debug2( LDAP_DEBUG_ANY, "TLS: "
+ "could not load verify locations (file:`%s',dir:`%s').\n",
diff --git a/openldap-fast.patch b/openldap-fast.patch
deleted file mode 100644
index e6a94e7..0000000
--- a/openldap-fast.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urNp -x '*.orig' openldap-2.4.49.org/build/openldap.m4 openldap-2.4.49/build/openldap.m4
---- openldap-2.4.49.org/build/openldap.m4 2020-01-30 18:58:35.000000000 +0100
-+++ openldap-2.4.49/build/openldap.m4 2021-05-07 23:04:39.855526618 +0200
-@@ -599,6 +599,7 @@ AC_DEFUN([OL_PTHREAD_TEST_INCLUDES], [[
- static void *task(p)
- void *p;
- {
-+ sleep(30);
- return (void *) (p == NULL);
- }
- ]])
diff --git a/openldap-format-security.patch b/openldap-format-security.patch
deleted file mode 100644
index bf67125..0000000
--- a/openldap-format-security.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- db-4.6.21/repmgr/repmgr_net.c.orig 2012-10-18 12:52:44.099497404 +0200
-+++ db-4.6.21/repmgr/repmgr_net.c 2012-10-18 13:01:34.266824983 +0200
-@@ -981,7 +981,7 @@
- }
-
- ret = net_errno;
-- __db_err(dbenv, ret, why);
-+ __db_err(dbenv, ret, "%s", why);
- clean: if (s != INVALID_SOCKET)
- (void)closesocket(s);
- return (ret);
---- db-4.6.21/crypto/aes_method.c.orig 2012-10-18 13:41:47.465441979 +0200
-+++ db-4.6.21/crypto/aes_method.c 2012-10-18 13:42:30.641467820 +0200
-@@ -263,6 +263,6 @@
- errstr = "AES error unrecognized";
- break;
- }
-- __db_errx(dbenv, errstr);
-+ __db_errx(dbenv, "%s", errstr);
- return;
- }
diff --git a/openldap-gcc47.patch b/openldap-gcc47.patch
deleted file mode 100644
index db6ffc1..0000000
--- a/openldap-gcc47.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- openldap-2.4.33/contrib/ldapc++/src/SaslInteractionHandler.cpp~ 2012-10-29 11:59:49.357558346 +0100
-+++ openldap-2.4.33/contrib/ldapc++/src/SaslInteractionHandler.cpp 2012-10-29 12:03:57.609899390 +0100
-@@ -8,6 +8,7 @@
- #include <iomanip>
- #include <limits>
- #include <cstdio>
-+#include <unistd.h>
- #include "config.h"
-
- #ifdef HAVE_TERMIOS_H
diff --git a/openldap-install.patch b/openldap-install.patch
index 8174bcd..2f03000 100644
--- a/openldap-install.patch
+++ b/openldap-install.patch
@@ -1,11 +1,11 @@
--- openldap-2.4.35/servers/slapd/Makefile.in~ 2013-04-03 18:01:39.000000000 +0300
+++ openldap-2.4.35/servers/slapd/Makefile.in 2013-04-03 18:02:55.360948577 +0300
-@@ -373,7 +373,7 @@
- install-dbc-no:
+@@ -370,7 +370,7 @@ veryclean-local-srv: FORCE
+ done
install-local-srv: install-slapd install-tools \
-- install-conf install-dbc-maybe install-schema install-tools
-+ install-conf install-dbc-maybe install-schema
+- install-conf install-schema install-tools
++ install-conf install-schema
install-slapd: FORCE
-$(MKDIR) $(DESTDIR)$(libexecdir)
@@ -20,3 +20,14 @@
+ fi ; \
done
+--- openldap-2.2.6/build/top.mk.orig 2004-01-01 19:16:25.000000000 +0100
++++ openldap-2.2.6/build/top.mk 2004-02-28 15:43:38.579652400 +0100
+@@ -37,7 +37,7 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-moduledir = @libexecdir@$(ldap_subdir)
++moduledir = @libdir@$(ldap_subdir)
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@$(ldap_subdir)
diff --git a/openldap-ldapi_FHS.patch b/openldap-ldapi_FHS.patch
deleted file mode 100644
index eb03511..0000000
--- a/openldap-ldapi_FHS.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- openldap-2.2.6/include/ldap_defaults.h.orig 2004-02-28 15:44:29.478914536 +0100
-+++ openldap-2.2.6/include/ldap_defaults.h 2004-02-28 15:47:15.816627360 +0100
-@@ -39,7 +39,7 @@
- #define LDAP_ENV_PREFIX "LDAP"
-
- /* default ldapi:// socket */
--#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"
-+#define LDAPI_SOCK "/var/run/ldapi"
-
- /*
- * SLAPD DEFINITIONS
diff --git a/openldap-ltinstall-mode.patch b/openldap-ltinstall-mode.patch
deleted file mode 100644
index 551572f..0000000
--- a/openldap-ltinstall-mode.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- openldap-2.2.8/libraries/liblber/Makefile.in.orig Thu Jan 1 19:16:29 2004
-+++ openldap-2.2.8/libraries/liblber/Makefile.in Fri Apr 2 12:06:22 2004
-@@ -47,6 +47,6 @@
-
- install-local: FORCE
- -$(MKDIR) $(DESTDIR)$(libdir)
-- $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir)
-+ $(LTINSTALL) $(INSTALLFLAGS) $(LIBRARY) $(DESTDIR)$(libdir)
- $(LTFINISH) $(DESTDIR)$(libdir)
-
---- openldap-2.2.8/libraries/libldap/Makefile.in.orig Thu Jan 1 19:16:29 2004
-+++ openldap-2.2.8/libraries/libldap/Makefile.in Fri Apr 2 12:06:38 2004
-@@ -59,7 +59,7 @@
-
- install-local: $(CFFILES) FORCE
- -$(MKDIR) $(DESTDIR)$(libdir)
-- $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir)
-+ $(LTINSTALL) $(INSTALLFLAGS) $(LIBRARY) $(DESTDIR)$(libdir)
- $(LTFINISH) $(DESTDIR)$(libdir)
- -$(MKDIR) $(DESTDIR)$(sysconfdir)
- @for i in $(CFFILES); do \
---- openldap-2.2.8/libraries/libldap_r/Makefile.in.orig Thu Jan 1 19:16:30 2004
-+++ openldap-2.2.8/libraries/libldap_r/Makefile.in Fri Apr 2 12:06:50 2004
-@@ -77,6 +77,6 @@
-
- install-local: $(CFFILES) FORCE
- -$(MKDIR) $(DESTDIR)$(libdir)
-- $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir)
-+ $(LTINSTALL) $(INSTALLFLAGS) $(LIBRARY) $(DESTDIR)$(libdir)
- $(LTFINISH) $(DESTDIR)$(libdir)
-
diff --git a/openldap-man.patch b/openldap-man.patch
index 067b02d..3775afe 100644
--- a/openldap-man.patch
+++ b/openldap-man.patch
@@ -6,14 +6,3 @@
XDEFS = $(MODULES_CPPFLAGS)
+
+MANSECT = 5
---- openldap-2.4.45/configure.in.orig 2017-07-25 20:09:59.361200332 +0200
-+++ openldap-2.4.45/configure.in 2017-07-25 20:29:01.057853963 +0200
-@@ -3221,7 +3221,7 @@
- [contrib/slapd-modules/addpartial/Makefile:build/top.mk:contrib/slapd-modules/addpartial/Makefile.in:build/mod.mk]
- [contrib/slapd-modules/allop/Makefile:build/top.mk:contrib/slapd-modules/allop/Makefile.in:build/mod.mk:build/man.mk]
- [contrib/slapd-modules/allowed/Makefile:build/top.mk:contrib/slapd-modules/allowed/Makefile.in:build/mod.mk]
--[contrib/slapd-modules/autogroup/Makefile:build/top.mk:contrib/slapd-modules/autogroup/Makefile.in:build/mod.mk]
-+[contrib/slapd-modules/autogroup/Makefile:build/top.mk:contrib/slapd-modules/autogroup/Makefile.in:build/mod.mk:build/man.mk]
- [contrib/slapd-modules/cloak/Makefile:build/top.mk:contrib/slapd-modules/cloak/Makefile.in:build/mod.mk:build/man.mk]
- [contrib/slapd-modules/comp_match/Makefile:build/top.mk:contrib/slapd-modules/comp_match/Makefile.in:build/mod.mk]
- [contrib/slapd-modules/denyop/Makefile:build/top.mk:contrib/slapd-modules/denyop/Makefile.in:build/mod.mk]
diff --git a/openldap-nosql.patch b/openldap-nosql.patch
index cdb81f8..f30a4ab 100644
--- a/openldap-nosql.patch
+++ b/openldap-nosql.patch
@@ -1,14 +1,11 @@
-Don't link directly with perl or sql libraries -- they're pulled in by
-demand-loaded backends.
-
---- openldap-2.4.49/build/top.mk.orig 2020-02-26 19:49:38.964606730 +0100
-+++ openldap-2.4.49/build/top.mk 2020-02-26 19:57:31.642046017 +0100
-@@ -200,7 +200,7 @@
+--- openldap-2.6.10/build/top.mk~ 2025-05-22 19:56:21.000000000 +0200
++++ openldap-2.6.10/build/top.mk 2025-08-01 19:12:55.028807892 +0200
+@@ -206,7 +206,7 @@ SLAPD_SQL_LDFLAGS = @SLAPD_SQL_LDFLAGS@
SLAPD_SQL_INCLUDES = @SLAPD_SQL_INCLUDES@
SLAPD_SQL_LIBS = @SLAPD_SQL_LIBS@
-SLAPD_LIBS = @SLAPD_LIBS@ @SLAPD_PERL_LDFLAGS@ @SLAPD_SQL_LDFLAGS@ @SLAPD_SQL_LIBS@ @SLAPD_SLP_LIBS@ @SLAPD_GMP_LIBS@
-+SLAPD_LIBS = @SLAPD_LIBS@ @SLAPD_SLP_LIBS@ @SLAPD_GMP_LIBS@
++SLAPD_LIBS = @SLAPD_LIBS@ @SLAPD_PERL_LDFLAGS@ @SLAPD_SLP_LIBS@ @SLAPD_GMP_LIBS@
+ LLOADD_LIBS = @BALANCER_LIBS@ $(LEVENT_LIBS)
# Our Defaults
- CC = $(AC_CC)
diff --git a/openldap-perl.patch b/openldap-perl.patch
deleted file mode 100644
index e63f839..0000000
--- a/openldap-perl.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -urNp -x '*.orig' openldap-2.4.49.org/servers/slapd/back-perl/init.c openldap-2.4.49/servers/slapd/back-perl/init.c
---- openldap-2.4.49.org/servers/slapd/back-perl/init.c 2020-01-30 18:58:35.000000000 +0100
-+++ openldap-2.4.49/servers/slapd/back-perl/init.c 2021-05-07 23:04:45.762194508 +0200
-@@ -23,7 +23,7 @@
- extern char **environ;
- #endif
-
--static void perl_back_xs_init LDAP_P((PERL_BACK_XS_INIT_PARAMS));
-+XSINIT_t perl_back_xs_init LDAP_P((PERL_BACK_XS_INIT_PARAMS));
- EXT void boot_DynaLoader LDAP_P((PERL_BACK_BOOT_DYNALOADER_PARAMS));
-
- PerlInterpreter *PERL_INTERPRETER = NULL;
-@@ -159,7 +159,7 @@ perl_back_db_open(
- }
-
-
--static void
-+XSINIT_t
- perl_back_xs_init(PERL_BACK_XS_INIT_PARAMS)
- {
- char *file = __FILE__;
-diff -urNp -x '*.orig' openldap-2.4.49.org/servers/slapd/back-perl/perl_back.h openldap-2.4.49/servers/slapd/back-perl/perl_back.h
---- openldap-2.4.49.org/servers/slapd/back-perl/perl_back.h 2020-01-30 18:58:35.000000000 +0100
-+++ openldap-2.4.49/servers/slapd/back-perl/perl_back.h 2021-05-07 23:04:45.762194508 +0200
-@@ -36,6 +36,9 @@ LDAP_BEGIN_DECL
- #if defined(pTHX_) || (PERL_REVISION > 5 || (PERL_REVISION == 5 && PERL_VERSION >= 6))
- #define PERL_IS_5_6
- #endif
-+#if ( PERL_REVISION > 5 || (PERL_REVISION == 5 && PERL_VERSION >= 8 ))
-+#define PERL_IS_5_8
-+#endif
-
- #define EVAL_BUF_SIZE 500
-
-@@ -52,7 +55,7 @@ extern ldap_pvt_thread_mutex_t perl_int
- # define ERRSV GvSV(errgv)
- #endif
-
--#if defined( HAVE_WIN32_ASPERL ) || defined( USE_ITHREADS )
-+#if defined( HAVE_WIN32_ASPERL ) || defined( USE_ITHREADS ) || defined( PERL_IS_5_8 )
- /* pTHX is needed often now */
- # define PERL_INTERPRETER my_perl
- # define PERL_BACK_XS_INIT_PARAMS pTHX
diff --git a/openldap-pic.patch b/openldap-pic.patch
deleted file mode 100644
index d22c5ef..0000000
--- a/openldap-pic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- openldap-2.2.6/libraries/librewrite/Makefile.in.orig 2004-01-01 18:16:32.000000000 +0000
-+++ openldap-2.2.6/libraries/librewrite/Makefile.in 2004-03-02 16:02:19.000000000 +0000
-@@ -23,6 +23,8 @@
- OBJS = config.o context.o info.o ldapmap.o map.o params.o rule.o \
- session.o subst.o var.o xmap.o
-
-+XDEFS = -fPIC
-+
- LDAP_INCDIR= ../../include
- LDAP_LIBDIR= ../../libraries
-
diff --git a/openldap-pie.patch b/openldap-pie.patch
deleted file mode 100644
index 4032517..0000000
--- a/openldap-pie.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNp -x '*.orig' openldap-2.4.49.org/servers/slapd/Makefile.in openldap-2.4.49/servers/slapd/Makefile.in
---- openldap-2.4.49.org/servers/slapd/Makefile.in 2021-05-07 23:04:52.388862462 +0200
-+++ openldap-2.4.49/servers/slapd/Makefile.in 2021-05-07 23:04:52.822195877 +0200
-@@ -263,7 +263,7 @@ slapi/libslapi.la: FORCE
- (cd slapi; $(MAKE) $(MFLAGS) all)
-
- slapd: $(SLAPD_DEPENDS) @LIBSLAPI@
-- $(LTLINK) -o $@ $(SLAPD_OBJECTS) $(LIBS) \
-+ $(LTLINK) -pie -Wl,-z,defs -o $@ $(SLAPD_OBJECTS) $(LIBS) \
- $(WRAP_LIBS)
- $(RM) $(SLAPTOOLS)
- for i in $(SLAPTOOLS); do \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openldap.git/commitdiff/e9608724f4c15261fa5241f86bd4c7f12ad07d89
More information about the pld-cvs-commit
mailing list