|
@@ -8,7 +8,7 @@
|
|
Summary: The configuration files, libraries and documentation for OpenLDAP.
|
|
Summary: The configuration files, libraries and documentation for OpenLDAP.
|
|
Summary(ja): OpenLDAP の設定ファイル,ライブラリ,ドキュメント.
|
|
Summary(ja): OpenLDAP の設定ファイル,ライブラリ,ドキュメント.
|
|
Name: openldap
|
|
Name: openldap
|
|
-Version: 2.6.8
|
|
|
|
|
|
+Version: 2.6.10
|
|
Release: 1%{?_dist_release}%{?with_systemd:.systemd}
|
|
Release: 1%{?_dist_release}%{?with_systemd:.systemd}
|
|
Group: system
|
|
Group: system
|
|
Vendor: Project Vine
|
|
Vendor: Project Vine
|
|
@@ -24,8 +24,10 @@ Source10: ldap.sysconfig
|
|
Source11: https://github.com/ltb-project/openldap-ppolicy-check-password/archive/v%{check_password_version}/openldap-ppolicy-check-password-%{check_password_version}.tar.gz
|
|
Source11: https://github.com/ltb-project/openldap-ppolicy-check-password/archive/v%{check_password_version}/openldap-ppolicy-check-password-%{check_password_version}.tar.gz
|
|
Source50: libexec-functions
|
|
Source50: libexec-functions
|
|
Source52: libexec-check-config.sh
|
|
Source52: libexec-check-config.sh
|
|
|
|
+
|
|
Source101: slapd.service
|
|
Source101: slapd.service
|
|
Source102: slapd.tmpfiles
|
|
Source102: slapd.tmpfiles
|
|
|
|
+Source103: openldap.sysusers
|
|
|
|
|
|
# Patches for 2.6
|
|
# Patches for 2.6
|
|
Patch0: openldap-manpages.patch
|
|
Patch0: openldap-manpages.patch
|
|
@@ -44,6 +46,7 @@ Patch6: openldap-switch-to-lt_dlopenadvise-to-get-RTLD_GLOBAL-set.patch
|
|
# System-wide default for CA certs
|
|
# System-wide default for CA certs
|
|
Patch7: openldap-openssl-manpage-defaultCA.patch
|
|
Patch7: openldap-openssl-manpage-defaultCA.patch
|
|
Patch8: openldap-add-export-symbols-LDAP_CONNECTIONLESS.patch
|
|
Patch8: openldap-add-export-symbols-LDAP_CONNECTIONLESS.patch
|
|
|
|
+Patch9: openldap-libldap-avoid-SSL-context-cleanup-during-library-des.patch
|
|
|
|
|
|
# check-password module specific patches
|
|
# check-password module specific patches
|
|
Patch90: check-password-makefile.patch
|
|
Patch90: check-password-makefile.patch
|
|
@@ -226,6 +229,7 @@ pushd openldap-%{version}
|
|
%patch6 -p1
|
|
%patch6 -p1
|
|
%patch7 -p1
|
|
%patch7 -p1
|
|
%patch8 -p1
|
|
%patch8 -p1
|
|
|
|
+%patch9 -p1
|
|
|
|
|
|
# security
|
|
# security
|
|
|
|
|
|
@@ -256,9 +260,11 @@ popd
|
|
%global optflags %(echo %{optflags} | sed -e 's/-Werror=format-security/-Wformat -Wformat-security -Werror=format-security/')
|
|
%global optflags %(echo %{optflags} | sed -e 's/-Werror=format-security/-Wformat -Wformat-security -Werror=format-security/')
|
|
|
|
|
|
%build
|
|
%build
|
|
|
|
+%set_build_flags
|
|
# enable experimental support for LDAP over UDP (LDAP_CONNECTIONLESS)
|
|
# enable experimental support for LDAP over UDP (LDAP_CONNECTIONLESS)
|
|
-export CFLAGS="%{optflags} ${LDFLAGS} -Wl,--as-needed -DLDAP_CONNECTIONLESS"
|
|
|
|
-export LDFLAGS="%{__global_ldflags} -fPIE"
|
|
|
|
|
|
+export CFLAGS="${CFLAGS} ${LDFLAGS} -Wl,--as-needed -Wl,-z,now -DLDAP_CONNECTIONLESS"
|
|
|
|
+# disable legacy hash algorithm
|
|
|
|
+export CFLAGS="${CFLAGS} -DOPENSSL_NO_MD2"
|
|
|
|
|
|
pushd openldap-%{version}
|
|
pushd openldap-%{version}
|
|
%configure \
|
|
%configure \
|
|
@@ -315,7 +321,6 @@ popd
|
|
|
|
|
|
|
|
|
|
%install
|
|
%install
|
|
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
|
|
|
|
mkdir -p %{buildroot}%{_libdir}/
|
|
mkdir -p %{buildroot}%{_libdir}/
|
|
|
|
|
|
pushd openldap-%{version}
|
|
pushd openldap-%{version}
|
|
@@ -375,6 +380,7 @@ install -m 0644 %{SOURCE101} %{buildroot}%{_unitdir}/slapd.service
|
|
# setup autocreation of runtime directories on tmpfs
|
|
# setup autocreation of runtime directories on tmpfs
|
|
mkdir -p %{buildroot}%{_tmpfilesdir}
|
|
mkdir -p %{buildroot}%{_tmpfilesdir}
|
|
install -m 0644 %{SOURCE102} %{buildroot}%{_tmpfilesdir}/slapd.conf
|
|
install -m 0644 %{SOURCE102} %{buildroot}%{_tmpfilesdir}/slapd.conf
|
|
|
|
+install -p -D -m 0644 %{SOURCE103} %{buildroot}%{_sysusersdir}/openldap.conf
|
|
%else
|
|
%else
|
|
# Install an init script for the servers.
|
|
# Install an init script for the servers.
|
|
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
|
|
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
|
|
@@ -413,10 +419,6 @@ chmod 0644 openldap-%{version}/servers/slapd/back-sql/rdbms_depend/timesten/*.sh
|
|
rm -f %{buildroot}%{_libdir}/*.la # because we do not want files in %{_libdir}/openldap/ removed, yet
|
|
rm -f %{buildroot}%{_libdir}/*.la # because we do not want files in %{_libdir}/openldap/ removed, yet
|
|
|
|
|
|
|
|
|
|
-%clean
|
|
|
|
-rm -rf $RPM_BUILD_ROOT
|
|
|
|
-
|
|
|
|
-
|
|
|
|
%pre servers
|
|
%pre servers
|
|
# create ldap user and group
|
|
# create ldap user and group
|
|
getent group ldap &>/dev/null || groupadd -r -g 55 ldap
|
|
getent group ldap &>/dev/null || groupadd -r -g 55 ldap
|
|
@@ -481,7 +483,6 @@ fi
|
|
|
|
|
|
|
|
|
|
%files
|
|
%files
|
|
-%defattr(-,root,root)
|
|
|
|
%license openldap-%{version}/{COPYRIGHT,LICENSE}
|
|
%license openldap-%{version}/{COPYRIGHT,LICENSE}
|
|
%doc openldap-%{version}/{ANNOUNCEMENT,CHANGES,README}
|
|
%doc openldap-%{version}/{ANNOUNCEMENT,CHANGES,README}
|
|
%dir %{_sysconfdir}/openldap
|
|
%dir %{_sysconfdir}/openldap
|
|
@@ -495,7 +496,6 @@ fi
|
|
%{_mandir}/man5/ldap.conf.5*
|
|
%{_mandir}/man5/ldap.conf.5*
|
|
|
|
|
|
%files servers
|
|
%files servers
|
|
-%defattr(-,root,root)
|
|
|
|
%doc openldap-%{version}/contrib/slapd-modules/smbk5pwd/README.smbk5pwd
|
|
%doc openldap-%{version}/contrib/slapd-modules/smbk5pwd/README.smbk5pwd
|
|
%doc openldap-%{version}/doc/guide/admin/*.html
|
|
%doc openldap-%{version}/doc/guide/admin/*.html
|
|
%doc openldap-%{version}/doc/guide/admin/*.png
|
|
%doc openldap-%{version}/doc/guide/admin/*.png
|
|
@@ -510,6 +510,7 @@ fi
|
|
%if %{with systemd}
|
|
%if %{with systemd}
|
|
%{_unitdir}/slapd.service
|
|
%{_unitdir}/slapd.service
|
|
%{_tmpfilesdir}/slapd.conf
|
|
%{_tmpfilesdir}/slapd.conf
|
|
|
|
+%{_sysusersdir}/openldap.conf
|
|
%else
|
|
%else
|
|
%attr(0755,root,root) %config %{_sysconfdir}/rc.d/init.d/ldap
|
|
%attr(0755,root,root) %config %{_sysconfdir}/rc.d/init.d/ldap
|
|
%config(noreplace) %{_sysconfdir}/sysconfig/slapd
|
|
%config(noreplace) %{_sysconfdir}/sysconfig/slapd
|
|
@@ -568,19 +569,16 @@ fi
|
|
|
|
|
|
%if %{with sql}
|
|
%if %{with sql}
|
|
%files servers-sql
|
|
%files servers-sql
|
|
-%defattr(-,root,root)
|
|
|
|
%doc openldap-%{version}/servers/slapd/back-sql/docs/*
|
|
%doc openldap-%{version}/servers/slapd/back-sql/docs/*
|
|
%doc openldap-%{version}/servers/slapd/back-sql/rdbms_depend
|
|
%doc openldap-%{version}/servers/slapd/back-sql/rdbms_depend
|
|
%{_libdir}/openldap/back_sql*
|
|
%{_libdir}/openldap/back_sql*
|
|
%endif
|
|
%endif
|
|
|
|
|
|
%files clients
|
|
%files clients
|
|
-%defattr(-,root,root)
|
|
|
|
%{_bindir}/*
|
|
%{_bindir}/*
|
|
%{_mandir}/man1/*
|
|
%{_mandir}/man1/*
|
|
|
|
|
|
%files devel
|
|
%files devel
|
|
-%defattr(-,root,root)
|
|
|
|
%doc openldap-%{version}/doc/drafts openldap-%{version}/doc/rfc
|
|
%doc openldap-%{version}/doc/drafts openldap-%{version}/doc/rfc
|
|
%{_libdir}/lib*.so
|
|
%{_libdir}/lib*.so
|
|
%{_includedir}/*
|
|
%{_includedir}/*
|
|
@@ -591,22 +589,22 @@ fi
|
|
## to build compat32 for x86_64 architecture support
|
|
## to build compat32 for x86_64 architecture support
|
|
%if %{build_compat32}
|
|
%if %{build_compat32}
|
|
%files -n compat32-%{name}
|
|
%files -n compat32-%{name}
|
|
-%defattr(-,root,root)
|
|
|
|
%{_libdir}/libl*.so.*
|
|
%{_libdir}/libl*.so.*
|
|
|
|
|
|
# %files -n compat32-%{name}-servers-sql
|
|
# %files -n compat32-%{name}-servers-sql
|
|
-# %defattr(-,root,root)
|
|
|
|
# %attr(0755,root,root) %{_libdir}/openldap/back_sql.la
|
|
# %attr(0755,root,root) %{_libdir}/openldap/back_sql.la
|
|
# %attr(0755,root,root) %{_libdir}/openldap/back_sql*.so.*
|
|
# %attr(0755,root,root) %{_libdir}/openldap/back_sql*.so.*
|
|
|
|
|
|
%files -n compat32-%{name}-devel
|
|
%files -n compat32-%{name}-devel
|
|
-%defattr(-,root,root)
|
|
|
|
%{_libdir}/lib*.so
|
|
%{_libdir}/lib*.so
|
|
|
|
|
|
%endif
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Fri Jun 13 2025 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.6.10-1
|
|
|
|
+- new upstream release.
|
|
|
|
+
|
|
* Thu Jun 20 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.6.8-1
|
|
* Thu Jun 20 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.6.8-1
|
|
- new upstream release.
|
|
- new upstream release.
|
|
|
|
|