Accepting request 1105260 from Apache:Modules
update to 1.6.5; changed upstream to https://github.com/gssapi/mod_auth_gssapi, as https://github.com/modauthgssapi/mod_auth_gssapi has no releases, no activity and looks fishy (forwarded request 1099032 from ojkastl_buildservice) OBS-URL: https://build.opensuse.org/request/show/1105260 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache2-mod_auth_gssapi?expand=0&rev=4
This commit is contained in:
Ana Guerrero
Git OBS Bridge
commit
3d5c0bfcb7
@ -1,42 +1,19 @@
|
||||
Index: mod_auth_gssapi-1.6.3/tests/magtests.py
|
||||
===================================================================
|
||||
--- mod_auth_gssapi-1.6.3.orig/tests/magtests.py 2020-08-05 18:56:18.944535412 +0200
|
||||
+++ mod_auth_gssapi-1.6.3/tests/magtests.py 2020-11-25 10:34:58.170058037 +0100
|
||||
@@ -413,6 +413,11 @@ def setup_http(testdir, so_dir, wrapenv)
|
||||
distro = "Debian"
|
||||
moddir = "/usr/lib/apache2/modules"
|
||||
if not os.path.exists(moddir):
|
||||
+ distro = "SUSE"
|
||||
+ moddir = "/usr/lib64/apache2"
|
||||
+ if not os.path.exists(moddir):
|
||||
+ moddir = "/usr/lib/apache2"
|
||||
+ if not os.path.exists(moddir):
|
||||
raise ValueError("Could not find Apache module directory!")
|
||||
os.symlink(moddir, os.path.join(httpdir, 'modules'))
|
||||
From 07daec17066ff9871c09bc83045c106266b7e578 Mon Sep 17 00:00:00 2001
|
||||
From: Johannes Kastl <kastl@b1-systems.de>
|
||||
Date: Mon, 17 Jul 2023 07:38:48 +0200
|
||||
Subject: [PATCH] patch tests for openSUSE
|
||||
|
||||
@@ -436,7 +441,7 @@ def setup_http(testdir, so_dir, wrapenv)
|
||||
'MALLOC_PERTURB_': str(random.randint(0, 32767) % 255 + 1)}
|
||||
httpenv.update(wrapenv)
|
||||
Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
|
||||
---
|
||||
tests/httpd.conf | 2 ++
|
||||
tests/magtests.py | 9 +++++++--
|
||||
2 files changed, 9 insertions(+), 2 deletions(-)
|
||||
|
||||
- httpd = "httpd" if distro == "Fedora" else "apache2"
|
||||
+ httpd = "httpd" if (distro == "Fedora") or (distro == "SUSE") else "apache2"
|
||||
httpproc = subprocess.Popen([httpd, '-DFOREGROUND', '-f', config],
|
||||
env=httpenv, preexec_fn=os.setsid)
|
||||
return httpproc
|
||||
@@ -449,7 +454,7 @@ def kinit_user(testdir, kdcenv):
|
||||
testenv.update(kdcenv)
|
||||
|
||||
with (open(testlog, 'a')) as logfile:
|
||||
- kinit = subprocess.Popen(["kinit", USR_NAME],
|
||||
+ kinit = subprocess.Popen(["kinit", "-V", USR_NAME],
|
||||
stdin=subprocess.PIPE,
|
||||
stdout=logfile, stderr=logfile,
|
||||
env=testenv, preexec_fn=os.setsid)
|
||||
Index: mod_auth_gssapi-1.6.3/tests/httpd.conf
|
||||
===================================================================
|
||||
--- mod_auth_gssapi-1.6.3.orig/tests/httpd.conf 2020-08-05 18:56:18.943535397 +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
|
||||
diff --git a/tests/httpd.conf b/tests/httpd.conf
|
||||
index 4672cde..cfa5afd 100644
|
||||
--- a/tests/httpd.conf
|
||||
+++ b/tests/httpd.conf
|
||||
@@ -71,7 +71,9 @@ LoadModule userdir_module modules/mod_userdir.so
|
||||
LoadModule version_module modules/mod_version.so
|
||||
</IfModule>
|
||||
LoadModule vhost_alias_module modules/mod_vhost_alias.so
|
||||
@ -46,3 +23,40 @@ Index: mod_auth_gssapi-1.6.3/tests/httpd.conf
|
||||
LoadModule proxy_module modules/mod_proxy.so
|
||||
LoadModule proxy_http_module modules/mod_proxy_http.so
|
||||
|
||||
diff --git a/tests/magtests.py b/tests/magtests.py
|
||||
index 7316788..e0c7c07 100755
|
||||
--- a/tests/magtests.py
|
||||
+++ b/tests/magtests.py
|
||||
@@ -417,6 +417,11 @@ def setup_http(testdir, so_dir, wrapenv):
|
||||
if not os.path.exists(moddir):
|
||||
distro = "Debian"
|
||||
moddir = "/usr/lib/apache2/modules"
|
||||
+ if not os.path.exists(moddir):
|
||||
+ distro = "SUSE"
|
||||
+ moddir = "/usr/lib64/apache2"
|
||||
+ if not os.path.exists(moddir):
|
||||
+ moddir = "/usr/lib/apache2"
|
||||
if not os.path.exists(moddir):
|
||||
raise ValueError("Could not find Apache module directory!")
|
||||
os.symlink(moddir, os.path.join(httpdir, 'modules'))
|
||||
@@ -443,7 +448,7 @@ def setup_http(testdir, so_dir, wrapenv):
|
||||
'MALLOC_PERTURB_': str(random.randint(0, 32767) % 255 + 1),
|
||||
})
|
||||
|
||||
- httpd = "httpd" if distro == "Fedora" else "apache2"
|
||||
+ httpd = "httpd" if (distro == "Fedora") or (distro == "SUSE") else "apache2"
|
||||
log = open(httpdstdlog, 'a')
|
||||
httpproc = subprocess.Popen([httpd, '-DFOREGROUND', '-f', config],
|
||||
stdout=log, stderr=log,
|
||||
@@ -460,7 +465,7 @@ def kinit_user(testdir, kdcenv):
|
||||
})
|
||||
|
||||
with (open(testlog, 'a')) as logfile:
|
||||
- kinit = subprocess.Popen(["kinit", USR_NAME],
|
||||
+ kinit = subprocess.Popen(["kinit", "-V", USR_NAME],
|
||||
stdin=subprocess.PIPE,
|
||||
stdout=logfile, stderr=logfile,
|
||||
env=testenv, preexec_fn=os.setsid)
|
||||
--
|
||||
2.41.0
|
||||
|
||||
|
||||
@ -1,3 +1,35 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 17 05:16:03 UTC 2023 - Johannes Kastl <kastl@b1-systems.de>
|
||||
|
||||
- update to 1.6.5:
|
||||
* Fix a bad crash bug when the GssapiUseS4U2Proxy option is set
|
||||
but no GssapiCredStore directives are provided at all.
|
||||
- crash bug when s4u2proxy is configured by @simo5 in #272
|
||||
- rebased patch apache2-mod_auth_gssapi-test.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 17 05:11:38 UTC 2023 - Johannes Kastl <kastl@b1-systems.de>
|
||||
|
||||
- change upstream URL to https://github.com/gssapi/mod_auth_gssapi,
|
||||
because https://github.com/modauthgssapi/mod_auth_gssapi has no
|
||||
releases, no activity and looks fishy
|
||||
- upgrade to 1.6.4:
|
||||
* tests: Catch errors during tests setup by @stanislavlevin in
|
||||
#225
|
||||
* tests: Don't override the specific environment by the global
|
||||
one by @stanislavlevin in #227
|
||||
* Emit error in logs if keytab files can't be opened by @simo5 in
|
||||
#229
|
||||
* Add warnings if s4u2proxy options are inconsistent by @simo5 in
|
||||
#232
|
||||
* Move to python3 by default by @frozencemetery in #235
|
||||
* Fix type/token distinction in parser.y by @frozencemetery in
|
||||
#237
|
||||
* Special ccache handling for {HOSTNAME} acceptor by @simo5 in
|
||||
#238
|
||||
* crypto: Handle EVP changes in OpenSSL 3 by @frozencemetery in
|
||||
#256
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 3 08:48:37 UTC 2022 - pgajdos@suse.com
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package apache2-mod_auth_gssapi
|
||||
#
|
||||
# Copyright (c) 2022 SUSE LLC
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
# Copyright (c) 2004, 2005 NOVELL (All rights reserved)
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
@ -23,12 +23,12 @@
|
||||
%define test 0
|
||||
%endif
|
||||
Name: apache2-mod_auth_gssapi
|
||||
Version: 1.6.3
|
||||
Version: 1.6.5
|
||||
Release: 0
|
||||
Summary: GSSAPI Module for Apache
|
||||
License: MIT
|
||||
URL: https://github.com/modauthgssapi/mod_auth_gssapi/
|
||||
Source0: https://github.com/modauthgssapi/mod_auth_gssapi/releases/download/v%{version}/mod_auth_gssapi-%{version}.tar.gz
|
||||
URL: https://github.com/gssapi/mod_auth_gssapi/
|
||||
Source0: https://github.com/gssapi/mod_auth_gssapi/releases/download/v%{version}/mod_auth_gssapi-%{version}.tar.gz
|
||||
# python3 and other testsuite fixes
|
||||
Patch0: apache2-mod_auth_gssapi-test.patch
|
||||
BuildRequires: apache-rpm-macros
|
||||
@ -73,7 +73,7 @@ rm %{buildroot}%{apache_libexecdir}/*.la
|
||||
|
||||
%check
|
||||
%if %{test} == 1
|
||||
sed -i 's/env python/python3/' tests/*.py
|
||||
sed -i 's/env python3/python3/' tests/*.py
|
||||
export PATH="$PATH:%{_sbindir}"
|
||||
make check
|
||||
%endif
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b99091493f1e04867bc559cd2ca16bb51109d8a710360dcd730b96c343cf82c9
|
||||
size 504405
|
||||
3
mod_auth_gssapi-1.6.5.tar.gz
Normal file
3
mod_auth_gssapi-1.6.5.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a4bb89a2704b2a9461fbc9c0397f326b092c358d9d12b6311c2aa63d161f0530
|
||||
size 513260
|
||||
Loading…
Reference in New Issue
Block a user