Accepting request 511673 from home:stroeder:branches:network:ldap

added overlay trace to package openldap2-contrib

OBS-URL: https://build.opensuse.org/request/show/511673
OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=183
This commit is contained in:
Michael Ströder 2017-07-20 14:49:37 +00:00 committed by Git OBS Bridge
parent 6bb69eda08
commit cbf9f027df
2 changed files with 9 additions and 3 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Jul 20 14:19:47 UTC 2017 - michael@stroeder.com
- added overlay trace to package openldap2-contrib
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jul 12 18:52:42 UTC 2017 - michael@stroeder.com Wed Jul 12 18:52:42 UTC 2017 - michael@stroeder.com

View File

@ -161,6 +161,7 @@ nops
pw-sha2 generates/validates SHA-2 password hashes pw-sha2 generates/validates SHA-2 password hashes
pw-pbkdf2 generates/validates PBKDF2 password hashes pw-pbkdf2 generates/validates PBKDF2 password hashes
smbk5pwd generates Samba3 password hashes (heimdal krb disabled) smbk5pwd generates Samba3 password hashes (heimdal krb disabled)
trace traces overlay invocation
%package doc %package doc
Summary: OpenLDAP Documentation Summary: OpenLDAP Documentation
@ -296,11 +297,10 @@ export STRIP=""
make depend make depend
make %{?_smp_mflags} make %{?_smp_mflags}
# Build selected contrib overlays # Build selected contrib overlays
for SLAPO_NAME in addpartial allowed allop autogroup lastbind nops denyop cloak noopsrch passwd/sha2 passwd/pbkdf2 for SLAPO_NAME in addpartial allowed allop autogroup lastbind nops denyop cloak noopsrch passwd/sha2 passwd/pbkdf2 trace
do do
make -C contrib/slapd-modules/${SLAPO_NAME} %{?_smp_mflags} "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libdir}" make -C contrib/slapd-modules/${SLAPO_NAME} %{?_smp_mflags} "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libdir}"
done done
# One more level up needed because of passwd/sha2
# slapo-smbk5pwd only for Samba password hashes # slapo-smbk5pwd only for Samba password hashes
make -C contrib/slapd-modules/smbk5pwd %{?_smp_mflags} "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libdir}" DEFS="-DDO_SAMBA" HEIMDAL_LIB="" make -C contrib/slapd-modules/smbk5pwd %{?_smp_mflags} "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libdir}" DEFS="-DDO_SAMBA" HEIMDAL_LIB=""
@ -341,7 +341,7 @@ make STRIP="" "DESTDIR=${RPM_BUILD_ROOT}" "sysconfdir=%{_sysconfdir}/openldap" "
# Additional symbolic link to slapd executable in /usr/sbin/ # Additional symbolic link to slapd executable in /usr/sbin/
ln -s %{_libdir}/slapd ${RPM_BUILD_ROOT}/usr/sbin/slapd ln -s %{_libdir}/slapd ${RPM_BUILD_ROOT}/usr/sbin/slapd
# Install selected contrib overlays # Install selected contrib overlays
for SLAPO_NAME in addpartial allowed allop autogroup lastbind nops denyop cloak noopsrch passwd/sha2 passwd/pbkdf2 for SLAPO_NAME in addpartial allowed allop autogroup lastbind nops denyop cloak noopsrch passwd/sha2 passwd/pbkdf2 trace
do do
make -C contrib/slapd-modules/${SLAPO_NAME} STRIP="" "DESTDIR=${RPM_BUILD_ROOT}" "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libdir}" install make -C contrib/slapd-modules/${SLAPO_NAME} STRIP="" "DESTDIR=${RPM_BUILD_ROOT}" "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libdir}" install
done done
@ -566,6 +566,7 @@ fi
%{_libdir}/openldap/denyop.* %{_libdir}/openldap/denyop.*
%{_libdir}/openldap/cloak.* %{_libdir}/openldap/cloak.*
%{_libdir}/openldap/smbk5pwd.* %{_libdir}/openldap/smbk5pwd.*
%{_libdir}/openldap/trace.*
%files client %files client
%defattr(-,root,root) %defattr(-,root,root)