New upstream release (1.6.2)

Resolves: #1828142

.gitignore

@@ -13,3 +13,4 @@
 /mod_auth_gssapi-1.5.1.tar.gz
 /mod_auth_gssapi-1.6.0.tar.gz
 /mod_auth_gssapi-1.6.1.tar.gz
+/mod_auth_gssapi-1.6.2.tar.gz

Fix-integer-sizes-used-with-ap_set_flag_slot.patch

@@ -1,37 +0,0 @@
-From 73c690ca9bd1d470c603f5e1ee48d2384941ae55 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Tue, 19 Feb 2019 13:55:12 -0500
-Subject: [PATCH] Fix integer sizes used with ap_set_flag_slot()
-
-ap_set_flag_slot() requires a field of type `int`.  Previously we
-passed type `bool` in two places, causing test failures on s390x
-because logging was not correctly configured.
-
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
-(cherry picked from commit f89b876be5619d750e6ab4ea6e730a9a26b1cac4)
----
- src/mod_auth_gssapi.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/mod_auth_gssapi.h b/src/mod_auth_gssapi.h
-index 71404ff..8c0b972 100644
---- a/src/mod_auth_gssapi.h
-+++ b/src/mod_auth_gssapi.h
-@@ -79,7 +79,7 @@ struct mag_config {
-     gid_t deleg_ccache_gid;
-     gss_key_value_set_desc *cred_store;
-     bool deleg_ccache_unique;
--    bool s4u2self;
-+    int s4u2self;
-     char *ccname_envvar;
- #endif
-     struct seal_key *mag_skey;
-@@ -90,7 +90,7 @@ struct mag_config {
-     bool negotiate_once;
-     struct mag_name_attributes *name_attributes;
-     const char *required_na_expr;
--    bool enverrs;
-+    int enverrs;
-     gss_name_t acceptor_name;
-     bool acceptor_name_from_req;
- };

Fix-tests-to-work-with-python3.patch

@@ -1,46 +0,0 @@
-From d2748e79d31f153505f944b09a4790c6231dcd79 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Fri, 21 Dec 2018 11:50:16 -0500
-Subject: [PATCH] Fix tests to work with python3
-
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
-(cherry picked from commit 751eb09e7abf38f49fc525e1616d48a6f951673f)
----
- tests/magtests.py       | 3 ++-
- tests/t_spnego_proxy.py | 2 +-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/tests/magtests.py b/tests/magtests.py
-index 6414503..f14f47a 100755
---- a/tests/magtests.py
-+++ b/tests/magtests.py
-@@ -431,7 +431,7 @@ def kinit_user(testdir, kdcenv):
-                                  stdin=subprocess.PIPE,
-                                  stdout=logfile, stderr=logfile,
-                                  env=testenv, preexec_fn=os.setsid)
--        kinit.communicate('%s\n' % USR_PWD)
-+        kinit.communicate(('%s\n' % USR_PWD).encode("utf8"))
-         kinit.wait()
-         if kinit.returncode != 0:
-             raise ValueError('kinit failed')
-@@ -495,6 +495,7 @@ def test_spnego_auth(testdir, testenv, logfile):
-     else:
-         sys.stderr.write('SPNEGO No Auth: SUCCESS\n')
- 
-+
-     return error_count
- 
- 
-diff --git a/tests/t_spnego_proxy.py b/tests/t_spnego_proxy.py
-index 6219721..c47558b 100755
---- a/tests/t_spnego_proxy.py
-+++ b/tests/t_spnego_proxy.py
-@@ -17,7 +17,7 @@ def getAuthToken(target):
-     ctx = gssapi.SecurityContext(name=name, mech=spnego_mech)
-     token = ctx.step()
- 
--    return 'Negotiate %s' % b64encode(token)
-+    return 'Negotiate %s' % b64encode(token).decode()
- 
- 
- if __name__ == '__main__':

In-tests-show-the-exception-on-failure.patch

@@ -1,42 +0,0 @@
-From 1de81677f1878ea1667b56169fe714d685771b4e Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Fri, 21 Dec 2018 10:50:49 -0500
-Subject: [PATCH] In tests, show the exception on failure
-
-Otherwise, the user might get nothing at all out, depending on what failed.
-
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
-(cherry picked from commit 881f98ee08f6d8d7a2352ab2f3e8e38845cf8039)
----
- tests/magtests.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/tests/magtests.py b/tests/magtests.py
-index 576e88f..6414503 100755
---- a/tests/magtests.py
-+++ b/tests/magtests.py
-@@ -8,6 +8,7 @@ import shutil
- import signal
- import subprocess
- import sys
-+import traceback
- 
- # check that we can import requests (for use in test scripts)
- import requests
-@@ -207,7 +208,6 @@ def setup_test_certs(testdir, testenv, logfile):
-     with open(opensslcnf, 'w+') as f:
-         f.write(text)
- 
--    print(pkinit_key)
-     cmd = subprocess.Popen(["openssl", "genrsa", "-out", pkinit_key,
-                             "2048"], stdout=logfile,
-                            stderr=logfile, env=testenv,
-@@ -718,6 +718,8 @@ if __name__ == '__main__':
-         errs += test_basic_auth_krb5(testdir, testenv, logfile)
- 
-         errs += test_no_negotiate(testdir, testenv, logfile)
-+    except Exception:
-+        traceback.print_exc()
-     finally:
-         for name in processes:
-             logfile.write("Killing %s\n" % name)

mod_auth_gssapi.spec

@@ -1,19 +1,14 @@
 Name:           mod_auth_gssapi
-Version:        1.6.1
+Version:        1.6.2
-Release:        8%{?dist}
+Release:        1%{?dist}
 Summary:        A GSSAPI Authentication module for Apache
 
 License:        MIT
-URL:            https://github.com/modauthgssapi/mod_auth_gssapi
+URL:            https://github.com/gssapi/mod_auth_gssapi
-Source0:        https://github.com/modauthgssapi/%{name}/releases/download/v%{version}/%name-%{version}.tar.gz
+Source0:        https://github.com/gssapi/%{name}/releases/download/v%{version}/%name-%{version}.tar.gz
 
-Patch0: In-tests-show-the-exception-on-failure.patch
+BuildRequires:  httpd-devel, krb5-devel, openssl-devel, gssntlmssp-devel
-Patch1: Fix-tests-to-work-with-python3.patch
+BuildRequires:  autoconf, automake, libtool, bison, flex
-Patch2: Fix-integer-sizes-used-with-ap_set_flag_slot.patch
-Patch3: tests-Test-suite-fixes-for-virtualenv-and-clang.patch
-
-BuildRequires:  httpd-devel, krb5-devel, openssl-devel, autoconf, automake, libtool
-BuildRequires:  gssntlmssp-devel
 BuildRequires:  git
 Requires:       httpd-mmn = %{_httpd_mmn}
 Requires:       krb5-libs >= 1.11.5
@@ -48,6 +43,10 @@ install -m 644 10-auth_gssapi.conf %{buildroot}%{_httpd_modconfdir}
 %{_httpd_moddir}/mod_auth_gssapi.so
 
 %changelog
+* Mon Apr 27 2020 Robbie Harwood <rharwood@redhat.com> - 1.6.2-1
+- New upstream release (1.6.2)
+- Resolves: #1828142
+
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (mod_auth_gssapi-1.6.1.tar.gz) = 56b770124826b3fe33af8b7022a4c16f979c7f25cb40a0f0c6320beb9ecc0add96f1586fddc6998551cefdaef366ab798346f69db823a3bf607ca9dc561c1f60
+SHA512 (mod_auth_gssapi-1.6.2.tar.gz) = b06810788ff0d9f809e88b14184f013ac9871ae13665a9f131f864615d84ac4e26e881d2d584f746c4a3049fa09cfdbe42df22fce9cd962779ebf223b1b78e0a

tests-Test-suite-fixes-for-virtualenv-and-clang.patch

@@ -1,39 +0,0 @@
-From 11c966cc630393e322ef6b88df91d16247bbfc37 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Mon, 11 Mar 2019 14:56:31 -0400
-Subject: [PATCH] [tests] Test suite fixes for virtualenv and clang
-
-- Typo fix - VIRTUAL_ENV in magtests.py
-- testenv object manipulation fix in magtests.py
-- Work around -fstack-clash-protection problems in clang
-
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
-(cherry picked from commit 6aa0a5bfe9d60a50cf36c561268c5d7c1fdb2f0e)
-[rharwood@redhat.com: drop Travis goo]
----
- tests/magtests.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/tests/magtests.py b/tests/magtests.py
-index f14f47a..a4842a0 100755
---- a/tests/magtests.py
-+++ b/tests/magtests.py
-@@ -687,7 +687,7 @@ if __name__ == '__main__':
- 
-         # support virtualenv
-         testenv['PATH'] = os.environ.get('PATH', '')
--        testenv['ViRTUAL_ENV'] = os.environ.get('VIRTUAL_ENV', '')
-+        testenv['VIRTUAL_ENV'] = os.environ.get('VIRTUAL_ENV', '')
- 
-         testenv['DELEGCCACHE'] = os.path.join(testdir, 'httpd',
-                                               USR_NAME + '@' + TESTREALM)
-@@ -716,6 +716,9 @@ if __name__ == '__main__':
-                    'MAG_USER_NAME_2': USR_NAME_2,
-                    'MAG_USER_PASSWORD_2': USR_PWD_2}
-         testenv.update(kdcenv)
-+        testenv['PATH'] = os.environ.get('PATH', '')
-+        testenv['VIRTUAL_ENV'] = os.environ.get('VIRTUAL_ENV', '')
-+
-         errs += test_basic_auth_krb5(testdir, testenv, logfile)
- 
-         errs += test_no_negotiate(testdir, testenv, logfile)