From 0c700c81b1785124e26de618fd494233247d7fcd Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Jan 20 2017 16:38:30 +0000 Subject: 0.2.0 --- diff --git a/.gitignore b/.gitignore index 6124f62..ba68c15 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /robosignatory-0.0.7.tar.gz /robosignatory-0.1.0.tar.gz /robosignatory-0.1.1.tar.gz +/robosignatory-0.2.0.tar.gz diff --git a/0001-Add-support-for-kerberos-koji-authentication.patch b/0001-Add-support-for-kerberos-koji-authentication.patch deleted file mode 100644 index f98369f..0000000 --- a/0001-Add-support-for-kerberos-koji-authentication.patch +++ /dev/null @@ -1,60 +0,0 @@ -From e1def3f2c81c334cf3ffa453bdecfe07ea7e176c Mon Sep 17 00:00:00 2001 -From: Patrick Uiterwijk -Date: Sat, 3 Dec 2016 23:02:26 +0000 -Subject: [PATCH] Add support for kerberos koji authentication - -Signed-off-by: Patrick Uiterwijk ---- - fedmsg.d/example-config.py | 2 +- - robosignatory/tagconsumer.py | 22 ++++++++++++++++------ - 2 files changed, 17 insertions(+), 7 deletions(-) - -diff --git a/fedmsg.d/example-config.py b/fedmsg.d/example-config.py -index 8503005..c6f165c 100644 ---- a/fedmsg.d/example-config.py -+++ b/fedmsg.d/example-config.py -@@ -20,7 +20,7 @@ config = { - 'primary': { - 'url': 'http://koji.fedoraproject.org/kojihub', - 'options': { -- # Only ssl is supported at the moment -+ # Only ssl and kerberos are supported at the moment - 'authmethod': 'ssl', - 'cert': 'robosignatory.cert', - 'serverca': 'servcer-ca.cert', -diff --git a/robosignatory/tagconsumer.py b/robosignatory/tagconsumer.py -index 1e8dc4c..44c0c63 100644 ---- a/robosignatory/tagconsumer.py -+++ b/robosignatory/tagconsumer.py -@@ -33,12 +33,22 @@ class TagSignerConsumer(fedmsg.consumers.FedmsgConsumer): - for instance in self.config['robosignatory.koji_instances']: - instance_info = self.config[ - 'robosignatory.koji_instances'][instance] -- client = koji.ClientSession(instance_info['url'], {}) -- if instance_info['options']['authmethod'] != 'ssl': -- raise Exception('Only SSL authmethod supported') -- client.ssl_login(instance_info['options']['cert'], -- None, -- instance_info['options']['serverca']) -+ client = koji.ClientSession(instance_info['url'], -+ instance_info['options']) -+ -+ if instance_info['options']['authmethod'] == 'ssl': -+ client.ssl_login(instance_info['options']['cert'], -+ None, -+ instance_info['options']['serverca']) -+ elif instance_info['options']['authmethod'] == 'kerberos': -+ kwargs = {} -+ for opt in ('principal', 'keytab', 'ccache'): -+ if opt in instance_info['options']: -+ kwargs[opt] = instance_info['options'][opt] -+ client.krb_login(**kwargs) -+ else: -+ raise Exception('Only SSL and kerberos authmethods supported') -+ - instance_obj = {'client': client, - 'tags': {}} - for tag in instance_info['tags']: --- -2.10.2 - diff --git a/python-robosignatory.spec b/python-robosignatory.spec index 6eae17e..e6fbd04 100644 --- a/python-robosignatory.spec +++ b/python-robosignatory.spec @@ -7,14 +7,13 @@ %global modname robosignatory Name: python-robosignatory -Version: 0.1.1 -Release: 4%{?dist} +Version: 0.2.0 +Release: 1%{?dist} Summary: A fedmsg consumer that automatically signs artifacts License: GPLv2+ URL: https://pagure.io/robosignatory/ Source0: https://pagure.io/releases/robosignatory/robosignatory-%{version}.tar.gz -Patch0: 0001-Add-support-for-kerberos-koji-authentication.patch BuildArch: noarch @@ -42,7 +41,6 @@ RoboSignatory is composed of multiple consumers: %prep %setup -q -n %{modname}-%{version} -%patch0 -p1 # Remove bundled egg-info in case it exists rm -rf %{modname}.egg-info @@ -62,6 +60,9 @@ rm -rf %{modname}.egg-info %{_bindir}/robosignatory-signatomic %changelog +* Fri Jan 20 2017 Ralph Bean - 0.2.0-1 +- new version + * Sun Dec 11 2016 Patrick Uiterwijk - 0.1.1-4 - Testing diff --git a/sources b/sources index ec32eea..132d6e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -46f6ae5bacba87d162abe98c522c7979 robosignatory-0.1.1.tar.gz +SHA512 (robosignatory-0.2.0.tar.gz) = fcc21561ba68e4b880d7db0d373f82136082151e0da7c9bad6985845f1f3deafd851368fba0579409d3e15db7a3d81cc0f9cbb9cc618e477922b48399dacc946