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

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

Browse Source 
- Fixes for %_libexecdir changing to /usr/libexec
- Spec file cleanups

OBS-URL: https://build.opensuse.org/request/show/812105
OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=260
This commit is contained in:
Michael Ströder 2020-06-07 09:35:33 +00:00 committed by Git OBS Bridge
parent 7341d09271
commit cb00a4da51
2 changed files with 96 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openldap2.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jun 5 11:25:16 UTC 2020 - Callum Farmer <callumjfarmer13@gmail.com>
- Fixes for %_libexecdir changing to /usr/libexec
- Spec file cleanups
------------------------------------------------------------------- -------------------------------------------------------------------
Wed May 6 17:59:58 UTC 2020 - Michael Ströder <michael@stroeder.com> Wed May 6 17:59:58 UTC 2020 - Michael Ströder <michael@stroeder.com>

179
openldap2.spec
View File

@ -276,7 +276,7 @@ export STRIP=""
--prefix=/usr \ --prefix=/usr \
--sysconfdir=%{_sysconfdir} \ --sysconfdir=%{_sysconfdir} \
--libdir=%{_libdir} \ --libdir=%{_libdir} \
--libexecdir=%{_libdir} \ --libexecdir=%{_libexecdir} \
--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=%{_libdir}" make -C contrib/slapd-modules/${SLAPO_NAME} %{?_smp_mflags} "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libexecdir}"
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=%{_libdir}" DEFS="-DDO_SAMBA" HEIMDAL_LIB="" make -C contrib/slapd-modules/smbk5pwd %{?_smp_mflags} "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libexecdir}" 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=%{_libdir}" make -C contrib/slapd-modules/%{name_ppolicy_check_module} %{?_smp_mflags} "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libexecdir}"
%check %check
%if %run_test_suite %if %run_test_suite
@ -345,33 +345,33 @@ make SLAPD_DEBUG=0 test
%endif %endif
%install %install
mkdir -p %{buildroot}/%{_libdir}/openldap mkdir -p %{buildroot}%{_libdir}/openldap
mkdir -p %{buildroot}/usr/lib/openldap mkdir -p %{buildroot}/usr/lib/openldap
mkdir -p %{buildroot}/usr/sbin mkdir -p %{buildroot}/usr/sbin
mkdir -p %{buildroot}/%{_unitdir} mkdir -p %{buildroot}/%{_unitdir}
make STRIP="" DESTDIR="%{buildroot}" "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libdir}" install make STRIP="" DESTDIR="%{buildroot}" "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libexecdir}" install
# Additional symbolic link to slapd executable in /usr/sbin/ # Additional symbolic link to slapd executable in /usr/sbin/
ln -s %{_libdir}/slapd %{buildroot}/usr/sbin/slapd ln -s %{_libdir}/slapd %{buildroot}/usr/sbin/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=%{_libdir}" install make -C contrib/slapd-modules/${SLAPO_NAME} STRIP="" DESTDIR="%{buildroot}" "mandir=%{_mandir}" "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libexecdir}" 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=%{_libdir}" install make -C contrib/slapd-modules/smbk5pwd STRIP="" DESTDIR="%{buildroot}" "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libexecdir}" 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
mkdir -p %{buildroot}/%{_sysconfdir}/sasl2 mkdir -p %{buildroot}%{_sysconfdir}/sasl2
install -m 644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/sasl2/slapd.conf install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sasl2/slapd.conf
install -m 755 -d %{buildroot}/var/lib/ldap install -m 755 -d %{buildroot}/var/lib/ldap
chmod a+x %{buildroot}/%{_libdir}/liblber.so* chmod a+x %{buildroot}%{_libdir}/liblber.so*
chmod a+x %{buildroot}/%{_libdir}/libldap_r.so* chmod a+x %{buildroot}%{_libdir}/libldap_r.so*
install -m 755 %{SOURCE6} %{buildroot}/usr/sbin/schema2ldif install -m 755 %{SOURCE6} %{buildroot}/usr/sbin/schema2ldif
install -m 755 %{SOURCE17} %{buildroot}/usr/sbin install -m 755 %{SOURCE17} %{buildroot}/usr/sbin
mkdir -p %{buildroot}/usr/lib/tmpfiles.d/ mkdir -p %{buildroot}%{_tmpfilesdir}/
install -m 644 %{SOURCE18} %{buildroot}/usr/lib/tmpfiles.d/ install -m 644 %{SOURCE18} %{buildroot}%{_tmpfilesdir}/
install -m 644 %{SOURCE3} %{buildroot}/%{_libexecdir}/openldap/ install -m 644 %{SOURCE3} %{buildroot}/usr/lib/openldap/
# Install ppolicy check module # Install ppolicy check module
make -C contrib/slapd-modules/ppolicy-check-password STRIP="" DESTDIR="%{buildroot}" "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libexecdir}" install make -C contrib/slapd-modules/ppolicy-check-password STRIP="" DESTDIR="%{buildroot}" "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libexecdir}" install
@ -385,43 +385,43 @@ popd
# Install ppolicy check module's manual page # Install ppolicy check module's manual page
install -m 0644 %{S:203}.gz %{buildroot}%{_mandir}/man5/ install -m 0644 %{S:203}.gz %{buildroot}%{_mandir}/man5/
mkdir -p %{buildroot}/%{_fillupdir} mkdir -p %{buildroot}%{_fillupdir}
install -m 644 %{SOURCE16} %{buildroot}/%{_fillupdir}/sysconfig.openldap install -m 644 %{SOURCE16} %{buildroot}%{_fillupdir}/sysconfig.openldap
install -m 644 *.ldif %{buildroot}/%{_sysconfdir}/openldap/schema install -m 644 *.ldif %{buildroot}%{_sysconfdir}/openldap/schema
install -m 644 *.schema %{buildroot}/%{_sysconfdir}/openldap/schema install -m 644 *.schema %{buildroot}%{_sysconfdir}/openldap/schema
# Install default and sample configuration files # Install default and sample configuration files
install -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/openldap install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/openldap
install -m 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/openldap install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/openldap
install -m 644 %{SOURCE12} %{buildroot}/%{_sysconfdir}/openldap install -m 644 %{SOURCE12} %{buildroot}%{_sysconfdir}/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 default database optimisation
install -d %{buildroot}/%{DOCDIR}/adminguide \ install -d %{buildroot}%{DOCDIR}/adminguide \
%{buildroot}/%{DOCDIR}/images \ %{buildroot}%{DOCDIR}/images \
%{buildroot}/%{DOCDIR}/drafts %{buildroot}%{DOCDIR}/drafts
install -m 644 %{buildroot}/etc/openldap/DB_CONFIG.example %{buildroot}/%{DOCDIR}/ install -m 644 %{buildroot}/etc/openldap/DB_CONFIG.example %{buildroot}%{DOCDIR}/
install -m 644 doc/guide/admin/* %{buildroot}/%{DOCDIR}/adminguide install -m 644 doc/guide/admin/* %{buildroot}%{DOCDIR}/adminguide
install -m 644 doc/guide/images/*.gif %{buildroot}/%{DOCDIR}/images install -m 644 doc/guide/images/*.gif %{buildroot}%{DOCDIR}/images
install -m 644 doc/drafts/* %{buildroot}/%{DOCDIR}/drafts install -m 644 doc/drafts/* %{buildroot}%{DOCDIR}/drafts
install -m 644 ANNOUNCEMENT \ install -m 644 ANNOUNCEMENT \
COPYRIGHT \ COPYRIGHT \
README \ README \
CHANGES \ CHANGES \
%{SOURCE5} \ %{SOURCE5} \
%{buildroot}/%{DOCDIR} %{buildroot}%{DOCDIR}
install -m 644 servers/slapd/slapd.ldif \ install -m 644 servers/slapd/slapd.ldif \
%{buildroot}/%{DOCDIR}/slapd.ldif.default %{buildroot}%{DOCDIR}/slapd.ldif.default
rm -f %{buildroot}/etc/openldap/DB_CONFIG.example rm -f %{buildroot}/etc/openldap/DB_CONFIG.example
rm -f %{buildroot}/etc/openldap/schema/README rm -f %{buildroot}/etc/openldap/schema/README
rm -f %{buildroot}/etc/openldap/slapd.ldif* rm -f %{buildroot}/etc/openldap/slapd.ldif*
rm -f %{buildroot}/%{_rundir}/openldap-data/DB_CONFIG.example rm -f %{buildroot}%{_rundir}/openldap-data/DB_CONFIG.example
mv servers/slapd/back-sql/rdbms_depend servers/slapd/back-sql/examples mv servers/slapd/back-sql/rdbms_depend servers/slapd/back-sql/examples
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcslapd ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcslapd
rm -f %{buildroot}/%{_libdir}/openldap/*.a rm -f %{buildroot}%{_libdir}/openldap/*.a
rm -f %{buildroot}/usr/share/man/man5/slapd-dnssrv.5 rm -f %{buildroot}/usr/share/man/man5/slapd-dnssrv.5
rm -f %{buildroot}/usr/share/man/man5/slapd-ndb.5 rm -f %{buildroot}/usr/share/man/man5/slapd-ndb.5
rm -f %{buildroot}/usr/share/man/man5/slapd-null.5 rm -f %{buildroot}/usr/share/man/man5/slapd-null.5
@ -429,14 +429,14 @@ rm -f %{buildroot}/usr/share/man/man5/slapd-passwd.5
rm -f %{buildroot}/usr/share/man/man5/slapd-shell.5 rm -f %{buildroot}/usr/share/man/man5/slapd-shell.5
rm -f %{buildroot}/usr/share/man/man5/slapd-tcl.5 rm -f %{buildroot}/usr/share/man/man5/slapd-tcl.5
# Remove *.la files, libtool does not handle this correct # Remove *.la files, libtool does not handle this correct
rm -f %{buildroot}/%{_libdir}/lib*.la rm -f %{buildroot}%{_libdir}/lib*.la
# Make ldap_r the only copy in the system [rh#1370065]. # Make ldap_r the only copy in the system [rh#1370065].
# libldap.so is only for `gcc/ld -lldap`. Make no libldap-2.4.so.2. # libldap.so is only for `gcc/ld -lldap`. Make no libldap-2.4.so.2.
rm -f "%{buildroot}/%{_libdir}"/libldap-2.4.so* rm -f "%{buildroot}%{_libdir}"/libldap-2.4.so*
ln -fs libldap_r.so "%{buildroot}/%{_libdir}/libldap.so" ln -fs libldap_r.so "%{buildroot}%{_libdir}/libldap.so"
gcc -shared -o "%{buildroot}/%{_libdir}/libldap-2.4.so.2" -Wl,--no-as-needed \ gcc -shared -o "%{buildroot}%{_libdir}/libldap-2.4.so.2" -Wl,--no-as-needed \
-Wl,-soname -Wl,libldap-2.4.so.2 -L "%{buildroot}/%{_libdir}" -lldap_r -Wl,-soname -Wl,libldap-2.4.so.2 -L "%{buildroot}%{_libdir}" -lldap_r
%pre %pre
getent group ldap >/dev/null || /usr/sbin/groupadd -g 70 -o -r ldap getent group ldap >/dev/null || /usr/sbin/groupadd -g 70 -o -r ldap
@ -475,8 +475,9 @@ fi
%config(noreplace) %attr(640, root, ldap) %{_sysconfdir}/openldap/slapd.conf.olctemplate %config(noreplace) %attr(640, root, ldap) %{_sysconfdir}/openldap/slapd.conf.olctemplate
%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) %{_libexecdir}/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 %{_libexecdir}/openldap %dir %{_libexecdir}/openldap
%dir %{_sysconfdir}/sasl2 %dir %{_sysconfdir}/sasl2
%dir %{_sysconfdir}/openldap %dir %{_sysconfdir}/openldap
@ -486,38 +487,38 @@ fi
%{_sbindir}/slap* %{_sbindir}/slap*
%{_sbindir}/rcslapd %{_sbindir}/rcslapd
%{_sbindir}/openldap_update_modules_path.sh %{_sbindir}/openldap_update_modules_path.sh
%{_libdir}/openldap/back_bdb* %{_libexecdir}/openldap/back_bdb*
%{_libdir}/openldap/back_hdb* %{_libexecdir}/openldap/back_hdb*
%{_libdir}/openldap/back_ldap* %{_libexecdir}/openldap/back_ldap*
%{_libdir}/openldap/back_mdb* %{_libexecdir}/openldap/back_mdb*
%{_libdir}/openldap/back_monitor* %{_libexecdir}/openldap/back_monitor*
%{_libdir}/openldap/back_relay* %{_libexecdir}/openldap/back_relay*
%{_libdir}/openldap/accesslog* %{_libexecdir}/openldap/accesslog*
%{_libdir}/openldap/auditlog* %{_libexecdir}/openldap/auditlog*
%{_libdir}/openldap/collect* %{_libexecdir}/openldap/collect*
%{_libdir}/openldap/constraint* %{_libexecdir}/openldap/constraint*
%{_libdir}/openldap/dds* %{_libexecdir}/openldap/dds*
%{_libdir}/openldap/deref* %{_libexecdir}/openldap/deref*
%{_libdir}/openldap/dyngroup* %{_libexecdir}/openldap/dyngroup*
%{_libdir}/openldap/dynlist* %{_libexecdir}/openldap/dynlist*
%{_libdir}/openldap/memberof* %{_libexecdir}/openldap/memberof*
%{_libdir}/openldap/pcache* %{_libexecdir}/openldap/pcache*
%{_libdir}/openldap/ppolicy-2.4.* %{_libexecdir}/openldap/ppolicy-2.4.*
%{_libdir}/openldap/ppolicy.* %{_libexecdir}/openldap/ppolicy.*
%{_libdir}/openldap/refint* %{_libexecdir}/openldap/refint*
%{_libdir}/openldap/retcode* %{_libexecdir}/openldap/retcode*
%{_libdir}/openldap/rwm* %{_libexecdir}/openldap/rwm*
%{_libdir}/openldap/seqmod* %{_libexecdir}/openldap/seqmod*
%{_libdir}/openldap/sssvlv* %{_libexecdir}/openldap/sssvlv*
%{_libdir}/openldap/syncprov* %{_libexecdir}/openldap/syncprov*
%{_libdir}/openldap/translucent* %{_libexecdir}/openldap/translucent*
%{_libdir}/openldap/unique* %{_libexecdir}/openldap/unique*
%{_libdir}/openldap/valsort* %{_libexecdir}/openldap/valsort*
%{_libdir}/slapd %{_libexecdir}/slapd
%{_libexecdir}/openldap/start /usr/lib/openldap/start
%{_unitdir}/slapd.service %{_unitdir}/slapd.service
/usr/lib/tmpfiles.d/%{name}.conf %{_tmpfilesdir}/%{name}.conf
%dir %attr(0750, ldap, ldap) /var/lib/ldap %dir %attr(0750, ldap, ldap) %{_sharedstatedir}/ldap
%ghost %attr(0750, ldap, ldap) %{_rundir} %ghost %attr(0750, ldap, ldap) %{_rundir}
%doc %{_mandir}/man8/sl* %doc %{_mandir}/man8/sl*
%doc %{_mandir}/man5/slapd.* %doc %{_mandir}/man5/slapd.*
@ -541,22 +542,22 @@ fi
%files back-perl %files back-perl
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/openldap/back_perl* %{_libexecdir}/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)
%{_libdir}/openldap/back_sock* %{_libexecdir}/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)
%{_libdir}/openldap/back_meta* %{_libexecdir}/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)
%{_libdir}/openldap/back_sql* %{_libexecdir}/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
@ -577,19 +578,19 @@ fi
%files contrib %files contrib
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/openldap/addpartial.* %{_libexecdir}/openldap/addpartial.*
%{_libdir}/openldap/allowed.* %{_libexecdir}/openldap/allowed.*
%{_libdir}/openldap/allop.* %{_libexecdir}/openldap/allop.*
%{_libdir}/openldap/autogroup.* %{_libexecdir}/openldap/autogroup.*
%{_libdir}/openldap/lastbind.* %{_libexecdir}/openldap/lastbind.*
%{_libdir}/openldap/noopsrch.* %{_libexecdir}/openldap/noopsrch.*
%{_libdir}/openldap/pw-argon2.* %{_libexecdir}/openldap/pw-argon2.*
%{_libdir}/openldap/pw-sha2.* %{_libexecdir}/openldap/pw-sha2.*
%{_libdir}/openldap/pw-pbkdf2.* %{_libexecdir}/openldap/pw-pbkdf2.*
%{_libdir}/openldap/denyop.* %{_libexecdir}/openldap/denyop.*
%{_libdir}/openldap/cloak.* %{_libexecdir}/openldap/cloak.*
%{_libdir}/openldap/smbk5pwd.* %{_libexecdir}/openldap/smbk5pwd.*
%{_libdir}/openldap/trace.* %{_libexecdir}/openldap/trace.*
%doc %{_mandir}/man5/slapd-pw-argon2.* %doc %{_mandir}/man5/slapd-pw-argon2.*
%files client %files client