diff --git a/0001-Expose-lorax-s-rootfs-size-argument.patch b/0001-Expose-lorax-s-rootfs-size-argument.patch index bb446cbd..60662980 100644 --- a/0001-Expose-lorax-s-rootfs-size-argument.patch +++ b/0001-Expose-lorax-s-rootfs-size-argument.patch @@ -1,7 +1,7 @@ From e7e6adfb14c7c0bae7c98454975624c71d1ee1c6 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 17 Nov 2016 10:15:03 -0500 -Subject: [PATCH 1/2] Expose lorax's --rootfs-size argument +Subject: [PATCH 1/4] Expose lorax's --rootfs-size argument This is going to be necessary for reworking the Atomic Host ISO, see: https://pagure.io/fedora-lorax-templates/pull-request/6 diff --git a/0002-ostree-installer-Use-dvd-ostree-as-type-in-metadata.patch b/0002-ostree-installer-Use-dvd-ostree-as-type-in-metadata.patch index bf9fbd70..ee3af784 100644 --- a/0002-ostree-installer-Use-dvd-ostree-as-type-in-metadata.patch +++ b/0002-ostree-installer-Use-dvd-ostree-as-type-in-metadata.patch @@ -1,7 +1,7 @@ From ec4fb785e5e68d09b6790963085d33787337ac0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Thu, 6 Oct 2016 13:12:34 +0200 -Subject: [PATCH 2/2] ostree-installer: Use dvd-ostree as type in metadata +Subject: [PATCH 2/4] ostree-installer: Use dvd-ostree as type in metadata MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/0003-Make-KojiWrapper-parse-krb_rdns.patch b/0003-Make-KojiWrapper-parse-krb_rdns.patch new file mode 100644 index 00000000..d760301a --- /dev/null +++ b/0003-Make-KojiWrapper-parse-krb_rdns.patch @@ -0,0 +1,26 @@ +From 364956064eab5e53c7eb4af4ec78888784cfc9d2 Mon Sep 17 00:00:00 2001 +From: Patrick Uiterwijk +Date: Tue, 13 Dec 2016 13:48:58 +0000 +Subject: [PATCH 3/4] Make KojiWrapper parse krb_rdns + +Signed-off-by: Patrick Uiterwijk +--- + pungi/wrappers/kojiwrapper.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pungi/wrappers/kojiwrapper.py b/pungi/wrappers/kojiwrapper.py +index 85a933a..8dcb5aa 100644 +--- a/pungi/wrappers/kojiwrapper.py ++++ b/pungi/wrappers/kojiwrapper.py +@@ -39,7 +39,7 @@ class KojiWrapper(object): + for key in ('krbservice', 'timeout', 'keepalive', + 'max_retries', 'retry_interval', 'anon_retry', + 'offline_retry', 'offline_retry_interval', +- 'debug', 'debug_xmlrpc', ++ 'debug', 'debug_xmlrpc', 'krb_rdns', + 'use_fast_upload'): + value = getattr(self.koji_module.config, key, None) + if value is not None: +-- +2.9.3 + diff --git a/0004-Make-KojiWrapper-support-krb_login-with-keytab.patch b/0004-Make-KojiWrapper-support-krb_login-with-keytab.patch new file mode 100644 index 00000000..b615eb43 --- /dev/null +++ b/0004-Make-KojiWrapper-support-krb_login-with-keytab.patch @@ -0,0 +1,31 @@ +From c17d72c5e1a73dd7c173ba791710d66b92e73e24 Mon Sep 17 00:00:00 2001 +From: Patrick Uiterwijk +Date: Tue, 13 Dec 2016 13:51:48 +0000 +Subject: [PATCH 4/4] Make KojiWrapper support krb_login with keytab + +Using getattr so we also work with versions of koji that do not +read principal and keytab from the config file. + +Signed-off-by: Patrick Uiterwijk +--- + pungi/wrappers/kojiwrapper.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/pungi/wrappers/kojiwrapper.py b/pungi/wrappers/kojiwrapper.py +index 8dcb5aa..0dcac90 100644 +--- a/pungi/wrappers/kojiwrapper.py ++++ b/pungi/wrappers/kojiwrapper.py +@@ -55,7 +55,9 @@ class KojiWrapper(object): + os.path.expanduser(self.koji_module.config.ca), + os.path.expanduser(self.koji_module.config.serverca)) + elif auth_type == 'kerberos': +- self.koji_proxy.krb_login() ++ self.koji_proxy.krb_login( ++ getattr(self.koji_module.config, 'principal', None), ++ getattr(self.koji_module.config, 'keytab', None)) + else: + raise RuntimeError('Unsupported authentication type in Koji') + +-- +2.9.3 + diff --git a/pungi.spec b/pungi.spec index 6476957e..448d5825 100644 --- a/pungi.spec +++ b/pungi.spec @@ -1,6 +1,6 @@ Name: pungi Version: 4.1.11 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Distribution compose tool Group: Development/Tools @@ -9,6 +9,8 @@ URL: https://pagure.io/pungi Source0: https://pagure.io/releases/%{name}/%{name}-%{version}.tar.bz2 Patch0: 0001-Expose-lorax-s-rootfs-size-argument.patch Patch1: 0002-ostree-installer-Use-dvd-ostree-as-type-in-metadata.patch +Patch2: 0003-Make-KojiWrapper-parse-krb_rdns.patch +Patch3: 0004-Make-KojiWrapper-support-krb_login-with-keytab.patch BuildRequires: python-nose, python-mock BuildRequires: python-devel, python-setuptools, python2-productmd @@ -60,6 +62,8 @@ A tool to create anaconda based installation trees/isos of a set of rpms. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build %{__python} setup.py build @@ -92,6 +96,9 @@ cd tests && ./test_compose.sh /var/cache/pungi %changelog +* Wed Dec 14 2016 Lubomír Sedlář - 4.1.11-4 +- Add patches for koji kerberos auth + * Thu Dec 08 2016 Lubomír Sedlář - 4.1.11-3 - Backport patches for ostree installer