diff --git a/openldap-2.6.5.tgz b/openldap-2.6.7.tgz similarity index 46% rename from openldap-2.6.5.tgz rename to openldap-2.6.7.tgz index 389b462b18d7e0196cc1c06dbb2b6655afa6a04e..c6a8335bd8f6b12ddc4d4f8fe07e736477d0d472 100644 Binary files a/openldap-2.6.5.tgz and b/openldap-2.6.7.tgz differ diff --git a/openldap.spec b/openldap.spec index 638a7b2f52b1cfbb61ac3ae8cec6c7f6cd4d0a73..a64264bd8b1a82294a80038853ee5a0ef1c00d49 100644 --- a/openldap.spec +++ b/openldap.spec @@ -5,7 +5,7 @@ %define anolis_release 1 Name: openldap -Version: 2.6.5 +Version: 2.6.7 Release: %{anolis_release}%{?dist} Summary: LDAP support libraries @@ -32,9 +32,21 @@ Patch7: openldap-add-export-symbols-LDAP_CONNECTIONLESS.patch Patch8: check-password-makefile.patch Patch9: check-password.patch - -BuildRequires: cyrus-sasl-devel gcc glibc-devel groff krb5-devel libtool-ltdl-devel libevent-devel make openssl-devel unixODBC-devel openldap-devel -BuildRequires: perl(ExtUtils::Embed) perl-devel perl-generators perl-interpreter +BuildRequires: cyrus-sasl-devel +BuildRequires: gcc +BuildRequires: glibc-devel +BuildRequires: groff +BuildRequires: krb5-devel +BuildRequires: libtool-ltdl-devel +BuildRequires: libevent-devel +BuildRequires: systemd-devel +BuildRequires: libuuid-devel +BuildRequires: make +BuildRequires: openssl-devel +BuildRequires: perl(ExtUtils::Embed) +BuildRequires: perl-devel +BuildRequires: perl-generators +BuildRequires: perl-interpreter %description OpenLDAP is an open source suite of LDAP (Lightweight Directory Access @@ -117,14 +129,14 @@ programs needed for accessing and modifying OpenLDAP directories. %setup -q -c -a 0 -a 10 pushd openldap-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 +%patch -P 0 -p1 +%patch -P 1 -p1 +%patch -P 2 -p1 +%patch -P 3 -p1 +%patch -P 4 -p1 +%patch -P 5 -p1 +%patch -P 6 -p1 +%patch -P 7 -p1 ln -s ../../../contrib/slapd-modules/smbk5pwd/smbk5pwd.c servers/slapd/overlays mv contrib/slapd-modules/smbk5pwd/README contrib/slapd-modules/smbk5pwd/README.smbk5pwd @@ -140,8 +152,8 @@ done popd pushd openldap-ppolicy-check-password-%{check_password_version} -%patch8 -p1 -%patch9 -p1 +%patch -P 8 -p1 +%patch -P 9 -p1 popd %build @@ -157,25 +169,20 @@ pushd openldap-%{version} --enable-dynacl \ --enable-cleartext \ --enable-crypt \ - --enable-lmpasswd \ - --enable-spasswd \ --enable-modules \ --enable-perl \ - --enable-rewrite \ --enable-rlookups \ --enable-slapi \ --disable-slp \ \ --enable-backends=mod \ - --enable-bdb=yes \ - --enable-hdb=yes \ --enable-mdb=yes \ - --enable-monitor=yes \ - --disable-ndb \ --disable-sql \ --disable-wt \ \ --enable-overlays=mod \ + --with-systemd \ + --with-tls=openssl \ \ --disable-static \ \ @@ -329,6 +336,8 @@ mv %{buildroot}%{_sysconfdir}/openldap/schema/README README.schema # remove files which we don't want packaged rm %{buildroot}%{_libdir}/*.la # because we do not want files in %{_libdir}/openldap/ removed, yet +%{?generate_compatibility_deps} + %pre servers # create ldap user and group getent group ldap &>/dev/null || groupadd -r -g 55 ldap @@ -374,10 +383,15 @@ exit 0 %dir %{_sysconfdir}/openldap/certs %config(noreplace) %{_sysconfdir}/openldap/ldap.conf %dir %{_libexecdir}/openldap/ +%dir %{abidir} %{_libdir}/liblber.so.* +%{abidir}/liblber.dump %{_libdir}/libldap.so.* +%{abidir}/libldap.dump %{_libdir}/libslapi.so.* +%{abidir}/libslapi.dump %{_libdir}/libldap_r.so.* +%{abidir}/libldap_r.dump %{_mandir}/man5/ldif.5* %{_mandir}/man5/ldap.conf.5* @@ -403,6 +417,43 @@ exit 0 %{_unitdir}/slapd.service %{_datadir}/openldap-servers/ %{_libdir}/openldap/* +%dir %{abidir} +%{abidir}/accesslog.dump +%{abidir}/allop.dump +%{abidir}/auditlog.dump +%{abidir}/autoca.dump +%{abidir}/back_asyncmeta.dump +%{abidir}/back_dnssrv.dump +%{abidir}/back_ldap.dump +%{abidir}/back_meta.dump +%{abidir}/back_null.dump +%{abidir}/back_passwd.dump +%{abidir}/back_relay.dump +%{abidir}/back_sock.dump +%{abidir}/check_password.dump +%{abidir}/collect.dump +%{abidir}/constraint.dump +%{abidir}/dds.dump +%{abidir}/deref.dump +%{abidir}/dyngroup.dump +%{abidir}/dynlist.dump +%{abidir}/homedir.dump +%{abidir}/lloadd.dump +%{abidir}/memberof.dump +%{abidir}/otp.dump +%{abidir}/pcache.dump +%{abidir}/ppolicy.dump +%{abidir}/refint.dump +%{abidir}/remoteauth.dump +%{abidir}/retcode.dump +%{abidir}/rwm.dump +%{abidir}/seqmod.dump +%{abidir}/smbk5pwd.dump +%{abidir}/sssvlv.dump +%{abidir}/syncprov.dump +%{abidir}/translucent.dump +%{abidir}/unique.dump +%{abidir}/valsort.dump %{_libexecdir}/openldap/functions %{_libexecdir}/openldap/check-config.sh %{_sbindir}/sl* @@ -415,7 +466,9 @@ exit 0 %ghost %config(noreplace,missingok) %attr(0640,ldap,ldap) %{_sysconfdir}/openldap/slapd.conf %files clients +%dir %{abidir} %{_bindir}/* +%{abidir}/ldapurl-option.list %{_mandir}/man1/* %files devel @@ -434,6 +487,9 @@ exit 0 %changelog +* Tue Jan 30 2024 Funda Wang - 2.6.7-1 +- New version 2.6.7 + * Tue Jul 11 2023 Funda Wang - 2.6.5-1 - New version 2.6.5