rpms/krb5
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Include fixes for previous commit

Browse Source 
Resolves: #1433083
This commit is contained in:
Robbie Harwood 2017-04-13 20:00:11 +00:00
parent 3d952fc6c0
commit 291b968871
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
krb5.spec
View File

@ -18,7 +18,7 @@ Summary: The Kerberos network authentication system
Name: krb5 Name: krb5
Version: 1.15.1 Version: 1.15.1
# for prerelease, should be e.g., 0.3.beta2%{?dist} # for prerelease, should be e.g., 0.3.beta2%{?dist}
Release: 5%{?dist} Release: 6%{?dist}
# - Maybe we should explode from the now-available-to-everybody tarball instead? # - Maybe we should explode from the now-available-to-everybody tarball instead?
# http://web.mit.edu/kerberos/dist/krb5/1.13/krb5-1.13.2-signed.tar # http://web.mit.edu/kerberos/dist/krb5/1.13/krb5-1.13.2-signed.tar
# - The sources below are stored in a lookaside cache. Upload with # - The sources below are stored in a lookaside cache. Upload with
@ -511,13 +511,15 @@ rm -- "$RPM_BUILD_ROOT/%{_libdir}/krb5/plugins/preauth/test.so"
%post libs -p /sbin/ldconfig %post libs -p /sbin/ldconfig
%triggerun libs -- krb5-libs %triggerun libs -- krb5-libs
old_ver=$(rpm -q --qf '%%{VERSION}' krb5-libs) # At this point in time, rpm considers both packages "installed" and prints
# everything on the same line instead of something useful
old_ver=$(rpm -q --qf '%%{VERSION}\n' krb5-libs | sort -V | head -n 1 | tr -d '\n')
old_rel=$(rpm -q --qf '%%{RELEASE}' krb5-libs) old_rel=$(rpm -q --qf '%%{RELEASE}\n' krb5-libs | sort -V | head -n 1 | tr -d '\n')
old_rel=${old_rel%%.*} old_rel=${old_rel%%.*}
# add includedir /etc/krb5.conf.d to top of file
if [[ $old_ver < 1.15.1 || ( $old_ver = 1.15.1 && $old_rel < 5 ) ]]; then if [[ $old_ver < 1.15.1 || ( $old_ver = 1.15.1 && $old_rel < 5 ) ]]; then
# add includedir /etc/krb5.conf.d to top of file
if ! grep -q 'includedir /etc/krb5.conf.d' /etc/krb5.conf ; then if ! grep -q 'includedir /etc/krb5.conf.d' /etc/krb5.conf ; then
sed -i '1i # To opt out of the system crypto-policies configuration of krb5, remove the\n# symlink at /etc/krb5.conf.d/crypto-policies which will not be recreated.\nincludedir /etc/krb5.conf.d/\n' /etc/krb5.conf sed -i '1i # To opt out of the system crypto-policies configuration of krb5, remove the\n# symlink at /etc/krb5.conf.d/crypto-policies which will not be recreated.\nincludedir /etc/krb5.conf.d/\n' /etc/krb5.conf
fi fi
@ -728,6 +730,10 @@ exit 0
%{_libdir}/libkadm5srv_mit.so.* %{_libdir}/libkadm5srv_mit.so.*
%changelog %changelog
* Thu Apr 13 2017 Robbie Harwood <rharwood@redhat.com> - 1.15.1-6
- Include fixes for previous commit
- Resolves: #1433083
* Thu Apr 13 2017 Robbie Harwood <rharwood@redhat.com> - 1.15.1-5 * Thu Apr 13 2017 Robbie Harwood <rharwood@redhat.com> - 1.15.1-5
- Automatically add includedir where not present - Automatically add includedir where not present
- Try removing sleep statement to see if it is still needed - Try removing sleep statement to see if it is still needed