From bb9b233e56faade3ca7154e76b4d549bd4717910 Mon Sep 17 00:00:00 2001
From: Mohan Boddu <mboddu@bhujji.com>
Date: Fri, 1 Nov 2019 11:01:08 -0400
Subject: [PATCH] Removing 1613.patch file and from spec

Now its part of koji 1.19.0 release
https://docs.pagure.org/koji/release_notes_1.19/#builder-changes

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
---
 1613.patch | 76 ------------------------------------------------------
 koji.spec  |  3 +--
 2 files changed, 1 insertion(+), 78 deletions(-)
 delete mode 100644 1613.patch

diff --git a/1613.patch b/1613.patch
deleted file mode 100644
index 29eecef..0000000
--- a/1613.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 88e92b61a4a4eacf5ccd14566ecfa473d6719a8f Mon Sep 17 00:00:00 2001
-From: Patrick Uiterwijk <patrick@puiterwijk.org>
-Date: Aug 13 2019 11:35:14 +0000
-Subject: [PATCH 1/2] Allow builder to attempt krb if gssapi is available
-
-
-Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
-
----
-
-diff --git a/builder/kojid b/builder/kojid
-index 142a440..86af4e5 100755
---- a/builder/kojid
-+++ b/builder/kojid
-@@ -69,6 +69,11 @@ except ImportError:  # pragma: no cover
-     krbV = None
- 
- try:
-+    import requests_kerberos
-+except ImportError:  # pragma: no cover
-+    requests_kerberos = None
-+
-+try:
-     import librepo
-     import io
- except ImportError:
-@@ -6264,7 +6269,7 @@ if __name__ == "__main__":
-             quit("Error: Unable to log in. Bad credentials?")
-         except six.moves.xmlrpc_client.ProtocolError:
-             quit("Error: Unable to connect to server %s" % (options.server))
--    elif krbV:
-+    elif krbV or requests_kerberos:
-         krb_principal = options.krb_principal
-         if krb_principal is None:
-             krb_principal = options.host_principal_format % socket.getfqdn()
-
-From 8b76e0d1af3b4e6d1faf04cbc9142c277c2cd613 Mon Sep 17 00:00:00 2001
-From: Tomas Kopecek <tkopecek@redhat.com>
-Date: Aug 13 2019 11:53:16 +0000
-Subject: [PATCH 2/2] fix krbV error handling
-
-
-Fixes: https://pagure.io/koji/issue/1575
-
----
-
-diff --git a/builder/kojid b/builder/kojid
-index 86af4e5..73c2bf7 100755
---- a/builder/kojid
-+++ b/builder/kojid
-@@ -65,11 +65,13 @@ from koji.util import parseStatus, isSuccess, dslice, dslice_ex, to_list
- 
- try:
-     import krbV
-+    Krb5Error = krbV.Krb5Error
- except ImportError:  # pragma: no cover
-     krbV = None
- 
- try:
-     import requests_kerberos
-+    Krb5Error = requests_kerberos.exceptions.RequestException
- except ImportError:  # pragma: no cover
-     requests_kerberos = None
- 
-@@ -6277,8 +6279,8 @@ if __name__ == "__main__":
-             session.krb_login(principal=krb_principal,
-                               keytab=options.keytab,
-                               ccache=options.ccache)
--        except krbV.Krb5Error as e:
--            quit("Kerberos authentication failed: '%s' (%s)" % (e.args[1], e.args[0]))
-+        except Krb5Error as e:
-+            quit("Kerberos authentication failed: %s" % e.args)
-         except socket.error as e:
-             quit("Could not connect to Kerberos authentication service: '%s'" % e.args[1])
-     else:
-
diff --git a/koji.spec b/koji.spec
index 8c21e7e..7959fa4 100644
--- a/koji.spec
+++ b/koji.spec
@@ -87,8 +87,6 @@ URL: https://pagure.io/koji/
 Source0: https://releases.pagure.org/koji/koji-%{version}.tar.bz2
 
 # Patches already upstream
-# Already merged patch to fix kojid kerberos auth
-Patch1: https://pagure.io/koji/pull-request/1613.patch
 
 # Adjust xz params to favor speed
 Patch15: https://pagure.io/koji/pull-request/1576.patch
@@ -702,6 +700,7 @@ fi
 %changelog
 * Fri Nov 01 2019 Mohan Boddu <mboddu@bhujji.com> - 1.19.0-1
 - Rebase to 1.19.0
+- Removing downstream patch 1613
 
 * Wed Oct 09 2019 Patrick Uiterwijk <patrick@puiterwijk.org> - 1.18.1-1
 - Rebase to 1.18.1 for CVE-2019-17109