Accepting request 853757 from Apache:Modules

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/853757
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache2-mod_auth_gssapi?expand=0&rev=2

apache2-mod_auth_gssapi-test.patch

@@ -1,25 +1,8 @@
-Index: mod_auth_gssapi-1.6.1/tests/magtests.py
+Index: mod_auth_gssapi-1.6.3/tests/magtests.py
 ===================================================================
---- mod_auth_gssapi-1.6.1.orig/tests/magtests.py	2017-12-14 22:36:18.444067659 +0100
+--- mod_auth_gssapi-1.6.3.orig/tests/magtests.py	2020-08-05 18:56:18.944535412 +0200
-+++ mod_auth_gssapi-1.6.1/tests/magtests.py	2020-04-09 09:16:04.680455654 +0200
++++ mod_auth_gssapi-1.6.3/tests/magtests.py	2020-11-25 10:34:58.170058037 +0100
-@@ -8,6 +8,7 @@ import shutil
+@@ -413,6 +413,11 @@ def setup_http(testdir, so_dir, wrapenv)
- import signal
- import subprocess
- import sys
-+import time
- 
- # check that we can import requests (for use in test scripts)
- import requests
-@@ -302,7 +303,7 @@ def setup_kdc(testdir, wrapenv):
-     with open(kdcconf, 'w+') as f:
-         f.write(text)
- 
--    kdcenv = {'PATH': '/sbin:/bin:/usr/sbin:/usr/bin',
-+    kdcenv = {'PATH': '/sbin:/bin:/usr/sbin:/usr/bin:/usr/lib/mit/bin:/usr/lib/mit/sbin',
-               'KRB5_CONFIG': krb5conf,
-               'KRB5_KDC_PROFILE': kdcconf,
-               'KRB5_TRACE': os.path.join(testdir, 'krbtrace.log')}
-@@ -391,6 +392,11 @@ def setup_http(testdir, so_dir, wrapenv)
          distro = "Debian"
          moddir = "/usr/lib/apache2/modules"
      if not os.path.exists(moddir):
@@ -31,7 +14,7 @@ Index: mod_auth_gssapi-1.6.1/tests/magtests.py
          raise ValueError("Could not find Apache module directory!")
      os.symlink(moddir, os.path.join(httpdir, 'modules'))
  
-@@ -414,7 +420,7 @@ def setup_http(testdir, so_dir, wrapenv)
+@@ -436,7 +441,7 @@ def setup_http(testdir, so_dir, wrapenv)
                 'MALLOC_PERTURB_': str(random.randint(0, 32767) % 255 + 1)}
      httpenv.update(wrapenv)
  
@@ -40,7 +23,7 @@ Index: mod_auth_gssapi-1.6.1/tests/magtests.py
      httpproc = subprocess.Popen([httpd, '-DFOREGROUND', '-f', config],
                                  env=httpenv, preexec_fn=os.setsid)
      return httpproc
-@@ -427,11 +433,11 @@ def kinit_user(testdir, kdcenv):
+@@ -449,7 +454,7 @@ def kinit_user(testdir, kdcenv):
      testenv.update(kdcenv)
  
      with (open(testlog, 'a')) as logfile:
@@ -49,15 +32,10 @@ Index: mod_auth_gssapi-1.6.1/tests/magtests.py
                                   stdin=subprocess.PIPE,
                                   stdout=logfile, stderr=logfile,
                                   env=testenv, preexec_fn=os.setsid)
--        kinit.communicate('%s\n' % USR_PWD)
+Index: mod_auth_gssapi-1.6.3/tests/httpd.conf
-+        kinit.communicate(input=bytes(USR_PWD, 'utf-8'))
-         kinit.wait()
-         if kinit.returncode != 0:
-             raise ValueError('kinit failed')
-Index: mod_auth_gssapi-1.6.1/tests/httpd.conf
 ===================================================================
---- mod_auth_gssapi-1.6.1.orig/tests/httpd.conf	2017-12-14 22:36:11.396207833 +0100
+--- mod_auth_gssapi-1.6.3.orig/tests/httpd.conf	2020-08-05 18:56:18.943535397 +0200
-+++ mod_auth_gssapi-1.6.1/tests/httpd.conf	2020-04-09 09:15:13.456205265 +0200
++++ mod_auth_gssapi-1.6.3/tests/httpd.conf	2020-11-25 10:31:32.600854885 +0100
 @@ -71,7 +71,9 @@ LoadModule userdir_module modules/mod_us
      LoadModule version_module modules/mod_version.so
  </IfModule>
@@ -68,16 +46,3 @@ Index: mod_auth_gssapi-1.6.1/tests/httpd.conf
  LoadModule proxy_module modules/mod_proxy.so
  LoadModule proxy_http_module modules/mod_proxy_http.so
  
-Index: mod_auth_gssapi-1.6.1/tests/t_spnego_proxy.py
-===================================================================
---- mod_auth_gssapi-1.6.1.orig/tests/t_spnego_proxy.py	2017-12-14 22:36:18.444067659 +0100
-+++ mod_auth_gssapi-1.6.1/tests/t_spnego_proxy.py	2020-04-09 09:15:13.456205265 +0200
-@@ -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('utf-8')
- 
- 
- if __name__ == '__main__':

apache2-mod_auth_gssapi.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Wed Nov 25 12:32:53 UTC 2020 - pgajdos@suse.com
+
+- version update to 1.6.3
+  * add a few options to expose the mechanism used for authentication
+    (when multiple are available) and to control the timeout interval
+    for Basic Auth sessions
+  * CI and other minor fixes, as well as a fix for gss_localname()
+  * see
+    https://github.com/gssapi/mod_auth_gssapi/releases
+- modified patches
+  % apache2-mod_auth_gssapi-test.patch (refreshed)
+
 -------------------------------------------------------------------
 Wed Apr  8 14:44:12 UTC 2020 - pgajdos@suse.com
 

apache2-mod_auth_gssapi.spec

@@ -18,7 +18,7 @@
 
 
 Name:           apache2-mod_auth_gssapi
-Version:        1.6.1
+Version:        1.6.3
 Release:        0
 Summary:        GSSAPI Module for Apache
 License:        MIT
@@ -28,6 +28,8 @@ Source0:        https://github.com/modauthgssapi/mod_auth_gssapi/releases/downlo
 Patch0:         apache2-mod_auth_gssapi-test.patch
 BuildRequires:  apache-rpm-macros
 BuildRequires:  apache2-devel
+BuildRequires:  byacc
+BuildRequires:  flex
 BuildRequires:  krb5-devel
 BuildRequires:  openssl-devel
 Requires:       %{apache_mmn}
@@ -54,6 +56,7 @@ as much as possible agnostic of the actual mechanism used.
 %patch0 -p1
 
 %build
+export APACHE="%{_sbindir}/httpd"
 %configure
 %make_build APXS=%{apache_apxs}
 
@@ -63,6 +66,7 @@ rm %{buildroot}%{apache_libexecdir}/*.la
 
 %check
 sed -i 's/env python/python3/' tests/*.py
+export PATH="$PATH:%{_sbindir}"
 make check
 
 %files

mod_auth_gssapi-1.6.1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a8fd06f4d46b6287796d6ccbe93290d02a9dbd76bc7db75e03d366ad34151854
-size 501237

mod_auth_gssapi-1.6.3.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b99091493f1e04867bc559cd2ca16bb51109d8a710360dcd730b96c343cf82c9
+size 504405