diff --git a/4.patch b/4.patch new file mode 100644 index 0000000..2b2ff67 --- /dev/null +++ b/4.patch @@ -0,0 +1,51 @@ +From 7007fa293c6b9e2c225745d6591ee318f8d46936 Mon Sep 17 00:00:00 2001 +From: Patrick Uiterwijk +Date: Aug 11 2016 14:22:58 +0000 +Subject: Add krb5 configuration files + + +Signed-off-by: Patrick Uiterwijk + +--- + +diff --git a/Makefile.am b/Makefile.am +index 971b825..0ed368e 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -78,3 +78,9 @@ kojiconf_DATA = $(srcdir)/configs/arm-config \ + $(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 +diff --git a/krb-configs/fedoraproject_org b/krb-configs/fedoraproject_org +new file mode 100644 +index 0000000..4f1342d +--- /dev/null ++++ b/krb-configs/fedoraproject_org +@@ -0,0 +1,7 @@ ++[realms] ++ FEDORAPROJECT.ORG = { ++ kdc = https://id.fedoraproject.org/KdcProxy ++ } ++[domain_realm] ++ .fedoraproject.org = FEDORAPROJECT.ORG ++ fedoraproject.org = FEDORAPROJECT.ORG +diff --git a/krb-configs/stg_fedoraproject_org b/krb-configs/stg_fedoraproject_org +new file mode 100644 +index 0000000..1d7b132 +--- /dev/null ++++ b/krb-configs/stg_fedoraproject_org +@@ -0,0 +1,7 @@ ++[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 + diff --git a/fedora-packager.spec b/fedora-packager.spec index 049b63d..8382a70 100644 --- a/fedora-packager.spec +++ b/fedora-packager.spec @@ -4,16 +4,18 @@ Name: fedora-packager Version: 0.5.10.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tools for setting up a fedora maintainer environment Group: Applications/Productivity License: GPLv2+ URL: https://pagure.io/fedora-packager/ Source0: https://fedorahosted.org/releases/f/e/fedora-packager/fedora-packager-%{version}.tar.bz2 +Patch0: 4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel +BuildRequires: automake Requires: koji bodhi-client packagedb-cli Requires: rpm-build rpmdevtools rpmlint Requires: mock curl openssh-clients @@ -27,6 +29,8 @@ Requires: fedora-cert = %{version}-%{release} # Could be Recommends: it is not a hard dependency anymore since python-yubico # is now used Requires: ykpers +# This is the version in which SNI was fixed +Requires: krb5-workstation >= 1.14.3-4 BuildArch: noarch @@ -50,6 +54,7 @@ Provides fedora-cert and the fedora_cert python library %prep %setup -q +%patch0 -p1 %build %configure @@ -73,6 +78,7 @@ rm -rf $RPM_BUILD_ROOT %{_sbindir}/* %dir %{_sysconfdir}/koji %config(noreplace) %{_sysconfdir}/koji/* +%config(noreplace) %{_sysconfdir}/krb5.conf.d/* %exclude %{_bindir}/fedora-cert %files -n fedora-cert @@ -84,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Oct 25 2016 Patrick Uiterwijk - 0.5.10.7-4 +- Added kerberos configuration + * Tue Jul 19 2016 Fedora Release Engineering - 0.5.10.7-3 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages