[rpms/rpkg] 1.70-1: Patch: Switch from krb_login to gssapi_login

[rpms/rpkg] 1.70-1: Patch: Switch from krb_login to gssapi_login

[@ 2026-08-10 21:44 UTC (permalink / raw)]

            A new commit has been pushed.

            Repo   : rpms/rpkg
            Branch : 1.70-1
            Commit : 2e840fbc7e5c1e9f41debda73608668050ff7a27
            Author : Ondřej Nosek <onosek@redhat.com>
            Date   : 2020-05-19T17:47:13+00:00
            Stats  : +100/-1 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/rpkg/c/2e840fbc7e5c1e9f41debda73608668050ff7a27?branch=1.70-1

            Log:
            Patch: Switch from krb_login to gssapi_login

Signed-off-by: Ondřej Nosek <onosek@redhat.com>

---
diff --git a/0003-Switch-from-krb_login-to-gssapi_login.patch b/0003-Switch-from-krb_login-to-gssapi_login.patch
new file mode 100644
index 0000000..4799880
--- /dev/null
+++ b/0003-Switch-from-krb_login-to-gssapi_login.patch
@@ -0,0 +1,95 @@
+From 9df7f1b6741aa1ad08232f31e140d614da869e07 Mon Sep 17 00:00:00 2001
+From: Ondrej Nosek <onosek@redhat.com>
+Date: Tue, 19 May 2020 00:10:01 +0200
+Subject: [PATCH 1/2] Switch from krb_login to gssapi_login
+
+Replaces deprecated method krb_login.
+
+JIRA: RHELCMP-567
+Resolves: rhbz#1830430
+Fixes: #498
+
+Signed-off-by: Ondrej Nosek <onosek@redhat.com>
+---
+ pyrpkg/__init__.py     |  4 +---
+ tests/test_commands.py | 16 ++++++++--------
+ 2 files changed, 9 insertions(+), 11 deletions(-)
+
+diff --git a/pyrpkg/__init__.py b/pyrpkg/__init__.py
+index 7da3de7..5d5d55d 100644
+--- a/pyrpkg/__init__.py
++++ b/pyrpkg/__init__.py
+@@ -301,7 +301,6 @@ class Commands(object):
+             'topurl': 'http://localhost/kojiroot',
+             'use_fast_upload': None,
+             'weburl': 'http://localhost/koji',
+-            'krb_rdns': None,
+             }
+ 
+         # Process the configs in order, global, user, then any option passed
+@@ -323,7 +322,6 @@ class Commands(object):
+             'offline_retry_interval': config.getint,
+             'retry_interval': config.getint,
+             'timeout': config.getint,
+-            'krb_rdns': config.getboolean,
+             }
+ 
+         if config.has_section(build_client_name):
+@@ -376,7 +374,7 @@ class Commands(object):
+ 
+             if self._load_krb_user():
+                 try:
+-                    session.krb_login(proxyuser=self.runas)
++                    session.gssapi_login(proxyuser=self.runas)
+                 except Exception as e:
+                     self.log.error('Kerberos authentication fails: %s', e)
+             else:
+diff --git a/tests/test_commands.py b/tests/test_commands.py
+index 40e64ce..d07508c 100644
+--- a/tests/test_commands.py
++++ b/tests/test_commands.py
+@@ -672,33 +672,33 @@ class TestLoginKojiSession(CommandTestCase):
+         self.session.login.assert_called_once()
+ 
+     @patch('pyrpkg.Commands._load_krb_user', return_value=False)
+-    def test_krb_login_fails_if_no_valid_credential(self, _load_krb_user):
++    def test_gssapi_login_fails_if_no_valid_credential(self, _load_krb_user):
+         self.koji_config['authtype'] = 'kerberos'
+         self.cmd.realms = ['FEDORAPROJECT.ORG']
+ 
+         self.cmd.login_koji_session(self.koji_config, self.session)
+ 
+-        self.session.krb_login.assert_not_called()
++        self.session.gssapi_login.assert_not_called()
+         self.assertEqual(2, self.cmd.log.warning.call_count)
+ 
+     @patch('pyrpkg.Commands._load_krb_user', return_value=True)
+-    def test_krb_login_fails(self, _load_krb_user):
++    def test_gssapi_login_fails(self, _load_krb_user):
+         self.koji_config['authtype'] = 'kerberos'
+-        # Simulate ClientSession.krb_login fails and error is raised.
+-        self.session.krb_login.side_effect = Exception
++        # Simulate ClientSession.gssapi_login fails and error is raised.
++        self.session.gssapi_login.side_effect = Exception
+ 
+         self.cmd.login_koji_session(self.koji_config, self.session)
+ 
+-        self.session.krb_login.assert_called_once_with(proxyuser=None)
++        self.session.gssapi_login.assert_called_once_with(proxyuser=None)
+         self.cmd.log.error.assert_called_once()
+ 
+     @patch('pyrpkg.Commands._load_krb_user', return_value=True)
+-    def test_successful_krb_login(self, _load_krb_user):
++    def test_successful_gssapi_login(self, _load_krb_user):
+         self.koji_config['authtype'] = 'kerberos'
+ 
+         self.cmd.login_koji_session(self.koji_config, self.session)
+ 
+-        self.session.krb_login.assert_called_once_with(proxyuser=None)
++        self.session.gssapi_login.assert_called_once_with(proxyuser=None)
+ 
+ 
+ class TestConstructBuildURL(CommandTestCase):
+-- 
+2.21.3
+

diff --git a/rpkg.spec b/rpkg.spec
index c6b3684..d532239 100644
--- a/rpkg.spec
+++ b/rpkg.spec
@@ -1,6 +1,6 @@
 Name:           rpkg
 Version:        1.60
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        Python library for interacting with rpm+git
 License:        GPLv2+ and LGPLv2
@@ -19,6 +19,7 @@ Source0:        https://pagure.io/releases/rpkg/%{name}-%{version}.tar.gz
 Patch0:         remove-koji-and-rpm-py-installer-from-requires.patch
 Patch1:         0001-Repair-downloading-sources-into-external-directory.patch
 Patch2:         0002-Repair-compatible-formatting-for-Python-2.6.patch
+Patch3:		0003-Switch-from-krb_login-to-gssapi_login.patch
 
 %if 0%{?fedora} || 0%{?rhel} > 7
 # Disable python2 build by default
@@ -270,6 +271,9 @@ nosetests tests
 
 
 %changelog
+* Tue May 19 2020 Ondřej Nosek <onosek@redhat.com> - 1.60-3
+- Patch: Switch from krb_login to gssapi_login
+
 * Mon May 11 2020 Ondřej Nosek <onosek@redhat.com> - 1.60-2
 - Releasing the epel8 version