tatankato/openldap2
SHA256
1
0
Fork 0
forked from jengelh/openldap2
Code Pull Requests Activity

- Bug 1111388 openldap and /var/lib/ldap/DB_CONFIG* (transactional-update)

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=225
This commit is contained in:
Peter Varkoly 2018-11-08 16:36:16 +00:00 committed by Git OBS Bridge
parent c55cbb2217
commit 995ac11ee3
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openldap.conf Normal file
View File

@ -0,0 +1,3 @@
# openldap needs a directory in /var/lib/:
d /var/lib/ldap 0750 ldap ldap -
L /var/lib/ldap/DB_CONFIG - - - - ../../../usr/lib/openldap/

5
openldap2.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Nov 8 15:25:08 UTC 2018 - varkoly@suse.com
- Bug 1111388 openldap and /var/lib/ldap/DB_CONFIG* (transactional-update)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Oct 26 14:58:41 UTC 2018 - Michael Ströder <michael@stroeder.com> Fri Oct 26 14:58:41 UTC 2018 - Michael Ströder <michael@stroeder.com>

12
openldap2.spec
View File

@ -56,6 +56,7 @@ Source14: slapd.service
Source15: SuSEfirewall2.openldap Source15: SuSEfirewall2.openldap
Source16: sysconfig.openldap Source16: sysconfig.openldap
Source17: openldap_update_modules_path.sh Source17: openldap_update_modules_path.sh
Source18: openldap.conf
Patch1: 0001-ITS-8866-slapo-unique-to-return-filter-used-in-diagn.patch Patch1: 0001-ITS-8866-slapo-unique-to-return-filter-used-in-diagn.patch
Patch3: 0003-LDAPI-socket-location.dif Patch3: 0003-LDAPI-socket-location.dif
Patch5: 0005-pie-compile.dif Patch5: 0005-pie-compile.dif
@ -373,6 +374,8 @@ chmod a+x ${RPM_BUILD_ROOT}/%{_libdir}/liblber.so*
chmod a+x ${RPM_BUILD_ROOT}/%{_libdir}/libldap_r.so* chmod a+x ${RPM_BUILD_ROOT}/%{_libdir}/libldap_r.so*
install -m 755 %{SOURCE6} ${RPM_BUILD_ROOT}/usr/sbin/schema2ldif install -m 755 %{SOURCE6} ${RPM_BUILD_ROOT}/usr/sbin/schema2ldif
install -m 755 %{SOURCE17} ${RPM_BUILD_ROOT}/usr/sbin install -m 755 %{SOURCE17} ${RPM_BUILD_ROOT}/usr/sbin
mkdir -p ${RPM_BUILD_ROOT}/usr/lib/tmpfiles.d/
install -m 644 %{SOURCE18} ${RPM_BUILD_ROOT}/usr/lib/tmpfiles.d/
# Install ppolicy check module # Install ppolicy check module
make -C contrib/slapd-modules/ppolicy-check-password STRIP="" "DESTDIR=${RPM_BUILD_ROOT}" "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libexecdir}" install make -C contrib/slapd-modules/ppolicy-check-password STRIP="" "DESTDIR=${RPM_BUILD_ROOT}" "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libexecdir}" install
@ -394,15 +397,15 @@ install -m 644 *.schema ${RPM_BUILD_ROOT}%{_sysconfdir}/openldap/schema
install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/openldap install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/openldap
install -m 644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_sysconfdir}/openldap install -m 644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_sysconfdir}/openldap
install -m 644 %{SOURCE12} ${RPM_BUILD_ROOT}%{_sysconfdir}/openldap install -m 644 %{SOURCE12} ${RPM_BUILD_ROOT}%{_sysconfdir}/openldap
# Install default database optimisations
install -m 644 %{SOURCE3} ${RPM_BUILD_ROOT}/var/lib/ldap/DB_CONFIG
install -m 644 ${RPM_BUILD_ROOT}/etc/openldap/DB_CONFIG.example ${RPM_BUILD_ROOT}/var/lib/ldap/DB_CONFIG.example
install -d ${RPM_BUILD_ROOT}/etc/sysconfig/SuSEfirewall2.d/services/ install -d ${RPM_BUILD_ROOT}/etc/sysconfig/SuSEfirewall2.d/services/
install -m 644 %{SOURCE15} ${RPM_BUILD_ROOT}/etc/sysconfig/SuSEfirewall2.d/services/openldap install -m 644 %{SOURCE15} ${RPM_BUILD_ROOT}/etc/sysconfig/SuSEfirewall2.d/services/openldap
find doc/guide '(' ! -name *.html -a ! -name *.gif -a ! -name *.png -a ! -type d ')' -delete find doc/guide '(' ! -name *.html -a ! -name *.gif -a ! -name *.png -a ! -type d ')' -delete
rm -rf doc/guide/release rm -rf doc/guide/release
%define DOCDIR %{_defaultdocdir}/%{name} %define DOCDIR %{_defaultdocdir}/%{name}
# Install default database optimisation
install -m 644 %{SOURCE3} ${RPM_BUILD_ROOT}/%{DOCDIR}/
install -m 644 ${RPM_BUILD_ROOT}/etc/openldap/DB_CONFIG.example ${RPM_BUILD_ROOT}/%{DOCDIR}/
install -d ${RPM_BUILD_ROOT}/%{DOCDIR}/adminguide \ install -d ${RPM_BUILD_ROOT}/%{DOCDIR}/adminguide \
${RPM_BUILD_ROOT}/%{DOCDIR}/images \ ${RPM_BUILD_ROOT}/%{DOCDIR}/images \
${RPM_BUILD_ROOT}/%{DOCDIR}/drafts ${RPM_BUILD_ROOT}/%{DOCDIR}/drafts
@ -458,6 +461,7 @@ fi
%service_add_post slapd.service %service_add_post slapd.service
%post -n libldap-2_4-2 -p /sbin/ldconfig %post -n libldap-2_4-2 -p /sbin/ldconfig
%tmpfiles_create openldap.conf
%postun -n libldap-2_4-2 -p /sbin/ldconfig %postun -n libldap-2_4-2 -p /sbin/ldconfig
@ -478,7 +482,6 @@ fi
%config %attr(640, root, ldap) %{_sysconfdir}/openldap/slapd.conf.default %config %attr(640, root, ldap) %{_sysconfdir}/openldap/slapd.conf.default
%config %attr(640, root, ldap) %{_sysconfdir}/openldap/slapd.conf.example %config %attr(640, root, ldap) %{_sysconfdir}/openldap/slapd.conf.example
%config(noreplace) %attr(640, ldap, ldap) /var/lib/ldap/DB_CONFIG %config(noreplace) %attr(640, ldap, ldap) /var/lib/ldap/DB_CONFIG
%config /var/lib/ldap/DB_CONFIG.example
%dir %{_libdir}/openldap %dir %{_libdir}/openldap
%dir %{_libexecdir}/openldap %dir %{_libexecdir}/openldap
%dir %{_sysconfdir}/sasl2 %dir %{_sysconfdir}/sasl2
@ -519,6 +522,7 @@ fi
%{_libdir}/slapd %{_libdir}/slapd
%{_libexecdir}/openldap/start %{_libexecdir}/openldap/start
%{_unitdir}/slapd.service %{_unitdir}/slapd.service
/usr/lib/tmpfiles.d/%{name}.conf
%dir %attr(0750, ldap, ldap) /var/lib/ldap %dir %attr(0750, ldap, ldap) /var/lib/ldap
%ghost %attr(0750, ldap, ldap) %{_rundir} %ghost %attr(0750, ldap, ldap) %{_rundir}
%doc %{_mandir}/man8/sl* %doc %{_mandir}/man8/sl*