diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..3606a430c1c6e5b8dffbe82e436d9419e8da02dc --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.tgz filter=lfs diff=lfs merge=lfs -text diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000000000000000000000000000000000..85b19d46b55a3b92ec969dddf8a1e1e1a88981df --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + url = https://artlfs.openeuler.openatom.cn/src-openEuler/openldap diff --git a/openldap-2.6.5.tgz b/openldap-2.6.5.tgz index 389b462b18d7e0196cc1c06dbb2b6655afa6a04e..679bb4c904c44e6e69dab1a0b8ed593616d6ef9b 100755 Binary files a/openldap-2.6.5.tgz and b/openldap-2.6.5.tgz differ diff --git a/openldap.spec b/openldap.spec index 568b73a0599fce808050fa8745f2871136ed84a6..6066db8e3d3615a14225fd6d607adde6394ac6c1 100644 --- a/openldap.spec +++ b/openldap.spec @@ -1,8 +1,11 @@ +# Disable automatic .la file removal +%global __brp_remove_la_files %nil + %global systemctl_bin /usr/bin/systemctl Name: openldap Version: 2.6.5 -Release: 6 +Release: 7 Summary: LDAP support libraries License: OLDAP-2.8 URL: https://www.openldap.org/ @@ -97,21 +100,21 @@ pushd openldap-%{version} AUTOMAKE=%{_bindir}/true autoreconf -fi -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 +%patch -P0 -p1 +%patch -P1 -p1 +%patch -P2 -p1 +%patch -P3 -p1 +%patch -P4 -p1 +%patch -P5 -p1 -%patch9 -p1 +%patch -P9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 +%patch -P10 -p1 +%patch -P11 -p1 +%patch -P12 -p1 +%patch -P13 -p1 +%patch -P14 -p1 +%patch -P15 -p1 ln -s ../../../contrib/slapd-modules/smbk5pwd/smbk5pwd.c servers/slapd/overlays mv contrib/slapd-modules/smbk5pwd/README contrib/slapd-modules/smbk5pwd/README.smbk5pwd @@ -129,8 +132,8 @@ done popd pushd ltb-project-openldap-ppolicy-check-password-1.1 -%patch7 -p1 -%patch8 -p1 +%patch -P7 -p1 +%patch -P8 -p1 popd %build @@ -256,8 +259,6 @@ rm -f %{buildroot}%{_libdir}/*.la rm -f %{buildroot}%{_localstatedir}/openldap-data/DB_CONFIG.example ln -fs libldap.so "%{buildroot}%{_libdir}/libldap_r.so" -%ldconfig_scriptlets - %pre servers getent group ldap &>/dev/null || groupadd -r -g 55 ldap @@ -355,7 +356,6 @@ make check popd %files -%defattr(-,root,root) %license openldap-%{version}/COPYRIGHT %license openldap-%{version}/LICENSE %dir %{_sysconfdir}/openldap/certs @@ -364,7 +364,6 @@ popd %{_libdir}/lib*.so.* %files servers -%defattr(-,root,root) %config(noreplace) %dir %attr(0750,ldap,ldap) %{_sysconfdir}/openldap/slapd.d %config(noreplace) %{_sysconfdir}/openldap/schema %config(noreplace) %{_sysconfdir}/openldap/check_password.conf @@ -381,17 +380,14 @@ popd %ghost %config(noreplace,missingok) %attr(0640,ldap,ldap) %{_sysconfdir}/openldap/slapd.conf %files clients -%defattr(-,root,root) %{_bindir}/* %files devel -%defattr(-,root,root) %{_libdir}/lib*.so %{_includedir}/* %{_libdir}/pkgconfig/*.pc %files help -%defattr(-,root,root) %{_mandir}/man*/* %doc openldap-%{version}/ANNOUNCEMENT %doc openldap-%{version}/CHANGES @@ -405,6 +401,10 @@ popd %doc ltb-project-openldap-ppolicy-check-password-1.1/README.check_pwd %changelog +* Wed Mar 12 2025 Funda Wang - 2.6.5-7 +- Disable automatic .la file removal +- cleanup spec + * Thu Feb 13 2025 yanglu - 2.6.5-6 - Type:bugfix - ID:NA