PR#139: Remove krb5 config files, and only enable autodiscovery for RHEL6 - fedora-packager

Patrick Uiterwijk • 7 years ago

32cf59a

Makefile.am

file modified

-6

		`@@ -78,9 +78,3 @@`
		`$(srcdir)/configs/s390-config \`
		`$(srcdir)/configs/stg-config`
		`kojiconfdir = $(sysconfdir)/koji`
		`-`
		`- EXTRA_DIST += krb-configs/fedoraproject_org \`
		`- krb-configs/stg_fedoraproject_org`
		`- krb5conf_DATA = $(srcdir)/krb-configs/fedoraproject_org \`
		`- $(srcdir)/krb-configs/stg_fedoraproject_org`
		`- krb5confdir = $(sysconfdir)/krb5.conf.d`

fedora-packager.spec

file modified

+8 -4

		`@@ -4,7 +4,7 @@`

		`Name: fedora-packager`
		`Version: 0.5.10.7`
		`- Release: 1%{?dist}`
		`+ Release: 2%{?dist}`
		`Summary: Tools for setting up a fedora maintainer environment`

		`Group: Applications/Productivity`
		`@@ -22,8 +22,7 @@`
		`Requires: fedpkg >= 1.0`
		`Requires: fedora-cert = %{version}-%{release}`
		`Requires: python-yubico`
		`- # This is the version in which SNI was fixed`
		`- Requires: krb5-workstation >= 1.14.3-4`
		`+ Requires: krb5-workstation`

		`BuildArch: noarch`

		`@@ -58,6 +57,9 @@`
		`make install DESTDIR=$RPM_BUILD_ROOT`
		`install -d $RPM_BUILD_ROOT%{_libexecdir}`

		`+ %post`
		`+ sed -i -e 's/dns_lookup_kdc = false/dns_lookup_kdc = true/' /etc/krb5.conf`
		`+`

		`%clean`
		`rm -rf $RPM_BUILD_ROOT`
		`@@ -70,7 +72,6 @@`
		`%{_sbindir}/*`
		`%dir %{_sysconfdir}/koji`
		`%config(noreplace) %{_sysconfdir}/koji/*`
		`- %config %{_sysconfdir}/krb5.conf.d/*`
		`%exclude %{_bindir}/fedora-cert`

		`%files -n fedora-cert`
		`@@ -81,6 +82,9 @@`


		`%changelog`
		`+ * Tue Oct 25 2016 Patrick Uiterwijk <puiterwijk@redhat.com> - 0.5.10.7-2`
		`+ - Use autodiscovery for krb`
		`+`
		`* Wed Aug 10 2016 Patrick Uiterwijk <puiterwijk@redhat.com> - 0.5.10.7-1`
		`- Add kerberos configuration`

krb-configs/fedoraproject_org

file removed

-7

		`@@ -1,7 +0,0 @@`
		`- [realms]`
		`- FEDORAPROJECT.ORG = {`
		`- kdc = https://id.fedoraproject.org/KdcProxy`
		`- }`
		`- [domain_realm]`
		`- .fedoraproject.org = FEDORAPROJECT.ORG`
		`- fedoraproject.org = FEDORAPROJECT.ORG`

krb-configs/stg_fedoraproject_org

file removed

-7

		`@@ -1,7 +0,0 @@`
		`- [realms]`
		`- STG.FEDORAPROJECT.ORG = {`
		`- kdc = https://id.stg.fedoraproject.org/KdcProxy`
		`- }`
		`- [domain_realm]`
		`- .stg.fedoraproject.org = STG.FEDORAPROJECT.ORG`
		`- stg.fedoraproject.org = STG.FEDORAPROJECT.ORG`