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

Accepting request 812601 from home:gmbr3:branches:Base:System3

Browse Source 
- Revert changes to libexecdir

OBS-URL: https://build.opensuse.org/request/show/812601
OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=262
This commit is contained in:
Michael Ströder 2020-06-08 13:44:06 +00:00 committed by Git OBS Bridge
parent 4cf5ab1af6
commit 19b4b4470b
2 changed files with 58 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openldap2.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Jun 8 12:46:34 UTC 2020 - Callum Farmer <callumjfarmer13@gmail.com>
- Revert changes to libexecdir
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Jun 7 10:20:45 UTC 2020 - Michael Ströder <michael@stroeder.com> Sun Jun 7 10:20:45 UTC 2020 - Michael Ströder <michael@stroeder.com>

107
openldap2.spec
View File

@ -276,7 +276,7 @@ export STRIP=""
--prefix=/usr \ --prefix=/usr \
--sysconfdir=%{_sysconfdir} \ --sysconfdir=%{_sysconfdir} \
--libdir=%{_libdir} \ --libdir=%{_libdir} \
--libexecdir=%{_libexecdir} \ --libexecdir=%{_libdir} \
--localstatedir=%{_rundir} \ --localstatedir=%{_rundir} \
--enable-wrappers=no \ --enable-wrappers=no \
--enable-spasswd \ --enable-spasswd \
@ -311,13 +311,13 @@ make %{?_smp_mflags}
# Build selected contrib overlays # Build selected contrib overlays
for SLAPO_NAME in addpartial allowed allop autogroup lastbind denyop cloak noopsrch passwd/argon2 passwd/sha2 passwd/pbkdf2 trace for SLAPO_NAME in addpartial allowed allop autogroup lastbind denyop cloak noopsrch passwd/argon2 passwd/sha2 passwd/pbkdf2 trace
do do
make -C contrib/slapd-modules/${SLAPO_NAME} %{?_smp_mflags} "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libexecdir}" make -C contrib/slapd-modules/${SLAPO_NAME} %{?_smp_mflags} "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libdir}"
done done
# 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=%{_libexecdir}" 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=""
# Build ppolicy-check-password module # Build ppolicy-check-password module
make -C contrib/slapd-modules/%{name_ppolicy_check_module} %{?_smp_mflags} "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libexecdir}" make -C contrib/slapd-modules/%{name_ppolicy_check_module} %{?_smp_mflags} "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libdir}"
%check %check
%if %run_test_suite %if %run_test_suite
@ -349,16 +349,16 @@ mkdir -p %{buildroot}%{_libdir}/openldap
mkdir -p %{buildroot}/usr/lib/openldap mkdir -p %{buildroot}/usr/lib/openldap
mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_sbindir}
mkdir -p %{buildroot}%{_unitdir} mkdir -p %{buildroot}%{_unitdir}
make STRIP="" DESTDIR="%{buildroot}" "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libexecdir}" install make STRIP="" DESTDIR="%{buildroot}" "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libdir}" install
# Additional symbolic link to slapd executable in /usr/sbin/ # Additional symbolic link to slapd executable in /usr/sbin/
ln -s %{_libexecdir}/slapd %{buildroot}%{_sbindir}/slapd ln -s %{_libdir}/slapd %{buildroot}%{_sbindir}/slapd
# Install selected contrib overlays # Install selected contrib overlays
for SLAPO_NAME in addpartial allowed allop autogroup lastbind denyop cloak noopsrch passwd/argon2 passwd/sha2 passwd/pbkdf2 trace for SLAPO_NAME in addpartial allowed allop autogroup lastbind denyop cloak noopsrch passwd/argon2 passwd/sha2 passwd/pbkdf2 trace
do do
make -C contrib/slapd-modules/${SLAPO_NAME} STRIP="" DESTDIR="%{buildroot}" "mandir=%{_mandir}" "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libexecdir}" install make -C contrib/slapd-modules/${SLAPO_NAME} STRIP="" DESTDIR="%{buildroot}" "mandir=%{_mandir}" "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libdir}" install
done done
# slapo-smbk5pwd only for Samba password hashes # slapo-smbk5pwd only for Samba password hashes
make -C contrib/slapd-modules/smbk5pwd STRIP="" DESTDIR="%{buildroot}" "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libexecdir}" install make -C contrib/slapd-modules/smbk5pwd STRIP="" DESTDIR="%{buildroot}" "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libdir}" install
install -m 755 %{SOURCE13} %{buildroot}/usr/lib/openldap/start install -m 755 %{SOURCE13} %{buildroot}/usr/lib/openldap/start
install -m 644 %{SOURCE14} %{buildroot}%{_unitdir} install -m 644 %{SOURCE14} %{buildroot}%{_unitdir}
mkdir -p %{buildroot}%{_sysconfdir}/openldap/slapd.d mkdir -p %{buildroot}%{_sysconfdir}/openldap/slapd.d
@ -478,7 +478,6 @@ fi
%config(noreplace) %attr(640, ldap, ldap) /usr/lib/openldap/DB_CONFIG %config(noreplace) %attr(640, ldap, ldap) /usr/lib/openldap/DB_CONFIG
%dir %{_libdir}/openldap %dir %{_libdir}/openldap
%dir /usr/lib/openldap %dir /usr/lib/openldap
%dir %{_libexecdir}/openldap
%dir %{_sysconfdir}/sasl2 %dir %{_sysconfdir}/sasl2
%dir %{_sysconfdir}/openldap %dir %{_sysconfdir}/openldap
%dir %attr(0770, ldap, ldap) %{_sysconfdir}/openldap/slapd.d %dir %attr(0770, ldap, ldap) %{_sysconfdir}/openldap/slapd.d
@ -487,34 +486,34 @@ fi
%{_sbindir}/slap* %{_sbindir}/slap*
%{_sbindir}/rcslapd %{_sbindir}/rcslapd
%{_sbindir}/openldap_update_modules_path.sh %{_sbindir}/openldap_update_modules_path.sh
%{_libexecdir}/openldap/back_bdb* %{_libdir}/openldap/back_bdb*
%{_libexecdir}/openldap/back_hdb* %{_libdir}/openldap/back_hdb*
%{_libexecdir}/openldap/back_ldap* %{_libdir}/openldap/back_ldap*
%{_libexecdir}/openldap/back_mdb* %{_libdir}/openldap/back_mdb*
%{_libexecdir}/openldap/back_monitor* %{_libdir}/openldap/back_monitor*
%{_libexecdir}/openldap/back_relay* %{_libdir}/openldap/back_relay*
%{_libexecdir}/openldap/accesslog* %{_libdir}/openldap/accesslog*
%{_libexecdir}/openldap/auditlog* %{_libdir}/openldap/auditlog*
%{_libexecdir}/openldap/collect* %{_libdir}/openldap/collect*
%{_libexecdir}/openldap/constraint* %{_libdir}/openldap/constraint*
%{_libexecdir}/openldap/dds* %{_libdir}/openldap/dds*
%{_libexecdir}/openldap/deref* %{_libdir}/openldap/deref*
%{_libexecdir}/openldap/dyngroup* %{_libdir}/openldap/dyngroup*
%{_libexecdir}/openldap/dynlist* %{_libdir}/openldap/dynlist*
%{_libexecdir}/openldap/memberof* %{_libdir}/openldap/memberof*
%{_libexecdir}/openldap/pcache* %{_libdir}/openldap/pcache*
%{_libexecdir}/openldap/ppolicy-2.4.* %{_libdir}/openldap/ppolicy-2.4.*
%{_libexecdir}/openldap/ppolicy.* %{_libdir}/openldap/ppolicy.*
%{_libexecdir}/openldap/refint* %{_libdir}/openldap/refint*
%{_libexecdir}/openldap/retcode* %{_libdir}/openldap/retcode*
%{_libexecdir}/openldap/rwm* %{_libdir}/openldap/rwm*
%{_libexecdir}/openldap/seqmod* %{_libdir}/openldap/seqmod*
%{_libexecdir}/openldap/sssvlv* %{_libdir}/openldap/sssvlv*
%{_libexecdir}/openldap/syncprov* %{_libdir}/openldap/syncprov*
%{_libexecdir}/openldap/translucent* %{_libdir}/openldap/translucent*
%{_libexecdir}/openldap/unique* %{_libdir}/openldap/unique*
%{_libexecdir}/openldap/valsort* %{_libdir}/openldap/valsort*
%{_libexecdir}/slapd %{_libdir}/slapd
/usr/lib/openldap/start /usr/lib/openldap/start
%{_unitdir}/slapd.service %{_unitdir}/slapd.service
%{_tmpfilesdir}/%{name}.conf %{_tmpfilesdir}/%{name}.conf
@ -542,22 +541,22 @@ fi
%files back-perl %files back-perl
%defattr(-,root,root) %defattr(-,root,root)
%{_libexecdir}/openldap/back_perl* %{_libdir}/openldap/back_perl*
%doc %{_mandir}/man5/slapd-perl.* %doc %{_mandir}/man5/slapd-perl.*
%files back-sock %files back-sock
%defattr(-,root,root) %defattr(-,root,root)
%{_libexecdir}/openldap/back_sock* %{_libdir}/openldap/back_sock*
%doc %{_mandir}/man5/slapd-sock.* %doc %{_mandir}/man5/slapd-sock.*
%files back-meta %files back-meta
%defattr(-,root,root) %defattr(-,root,root)
%{_libexecdir}/openldap/back_meta* %{_libdir}/openldap/back_meta*
%doc %{_mandir}/man5/slapd-meta.* %doc %{_mandir}/man5/slapd-meta.*
%files back-sql %files back-sql
%defattr(-,root,root) %defattr(-,root,root)
%{_libexecdir}/openldap/back_sql* %{_libdir}/openldap/back_sql*
%doc %{_mandir}/man5/slapd-sql.* %doc %{_mandir}/man5/slapd-sql.*
%doc servers/slapd/back-sql/examples %doc servers/slapd/back-sql/examples
%doc servers/slapd/back-sql/docs/bugs %doc servers/slapd/back-sql/docs/bugs
@ -578,19 +577,19 @@ fi
%files contrib %files contrib
%defattr(-,root,root) %defattr(-,root,root)
%{_libexecdir}/openldap/addpartial.* %{_libdir}/openldap/addpartial.*
%{_libexecdir}/openldap/allowed.* %{_libdir}/openldap/allowed.*
%{_libexecdir}/openldap/allop.* %{_libdir}/openldap/allop.*
%{_libexecdir}/openldap/autogroup.* %{_libdir}/openldap/autogroup.*
%{_libexecdir}/openldap/lastbind.* %{_libdir}/openldap/lastbind.*
%{_libexecdir}/openldap/noopsrch.* %{_libdir}/openldap/noopsrch.*
%{_libexecdir}/openldap/pw-argon2.* %{_libdir}/openldap/pw-argon2.*
%{_libexecdir}/openldap/pw-sha2.* %{_libdir}/openldap/pw-sha2.*
%{_libexecdir}/openldap/pw-pbkdf2.* %{_libdir}/openldap/pw-pbkdf2.*
%{_libexecdir}/openldap/denyop.* %{_libdir}/openldap/denyop.*
%{_libexecdir}/openldap/cloak.* %{_libdir}/openldap/cloak.*
%{_libexecdir}/openldap/smbk5pwd.* %{_libdir}/openldap/smbk5pwd.*
%{_libexecdir}/openldap/trace.* %{_libdir}/openldap/trace.*
%doc %{_mandir}/man5/slapd-pw-argon2.* %doc %{_mandir}/man5/slapd-pw-argon2.*
%files client %files client