diff --git a/.gitignore b/.gitignore index 390a133..55f1c10 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/mod_auth_gssapi-1.4.0.tar.gz +SOURCES/mod_auth_gssapi-1.5.1.tar.gz diff --git a/.mod_auth_gssapi.metadata b/.mod_auth_gssapi.metadata index 583904e..7e4341b 100644 --- a/.mod_auth_gssapi.metadata +++ b/.mod_auth_gssapi.metadata @@ -1 +1 @@ -27aabcadf9ee1ae9a28b6b36104239f04588ebe4 SOURCES/mod_auth_gssapi-1.4.0.tar.gz +4cea95bd22f676cd49fca290e3dc93eb1ea7182a SOURCES/mod_auth_gssapi-1.5.1.tar.gz diff --git a/SOURCES/0001-report-file-operation-errors-as-warnings.patch b/SOURCES/0001-report-file-operation-errors-as-warnings.patch new file mode 100644 index 0000000..691b0f8 --- /dev/null +++ b/SOURCES/0001-report-file-operation-errors-as-warnings.patch @@ -0,0 +1,60 @@ +From 12ebe14ee6636801c750eb6e982b30635788e4ba Mon Sep 17 00:00:00 2001 +From: Alexander Bokovoy +Date: Fri, 17 Mar 2017 14:17:43 +0200 +Subject: [PATCH] report file operation errors as warnings + +The failures to change permissions and chown the ccache do not prevent +us from continuing to use this ccache. Log messages are confusing to +mod_auth_gssapi users as they leave an impression things are completely +broken. + +Change log level to warning to avoid filling up logs with them on error +log level. + +Signed-off-by: Alexander Bokovoy +Reviewed-by: Simo Sorce +--- + src/environ.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/environ.c b/src/environ.c +index 5c80b35422c278c8b3ca5d21269d987ca1e74618..66fbbe2537f78ebbf90f7d1a4fcb556a74e1e336 100644 +--- a/src/environ.c ++++ b/src/environ.c +@@ -329,7 +329,7 @@ static void mag_set_ccname_envvar(request_rec *req, struct mag_config *cfg, + (finfo.protection != cfg->deleg_ccache_mode)) { + status = apr_file_perms_set(path, cfg->deleg_ccache_mode); + if (status != APR_SUCCESS) +- ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, req, ++ ap_log_rerror(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, 0, req, + "failed to set perms (%o) on file (%s)!", + cfg->deleg_ccache_mode, path); + } +@@ -337,7 +337,7 @@ static void mag_set_ccname_envvar(request_rec *req, struct mag_config *cfg, + (finfo.user != cfg->deleg_ccache_uid)) { + status = lchown(path, cfg->deleg_ccache_uid, -1); + if (status != 0) +- ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, req, ++ ap_log_rerror(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, 0, req, + "failed to set user (%u) on file (%s)!", + cfg->deleg_ccache_uid, path); + } +@@ -345,13 +345,13 @@ static void mag_set_ccname_envvar(request_rec *req, struct mag_config *cfg, + (finfo.group != cfg->deleg_ccache_gid)) { + status = lchown(path, -1, cfg->deleg_ccache_gid); + if (status != 0) +- ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, req, ++ ap_log_rerror(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, 0, req, + "failed to set group (%u) on file (%s)!", + cfg->deleg_ccache_gid, path); + } + } else { + /* set the file cache anyway, but warn */ +- ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, req, ++ ap_log_rerror(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, 0, req, + "KRB5CCNAME file (%s) lookup failed!", path); + } + +-- +1.8.3.1 + diff --git a/SPECS/mod_auth_gssapi.spec b/SPECS/mod_auth_gssapi.spec index d898168..420a6ee 100644 --- a/SPECS/mod_auth_gssapi.spec +++ b/SPECS/mod_auth_gssapi.spec @@ -1,6 +1,6 @@ Name: mod_auth_gssapi -Version: 1.4.0 -Release: 1%{?dist} +Version: 1.5.1 +Release: 2%{?dist} Summary: A GSSAPI Authentication module for Apache Group: System Environment/Daemons @@ -8,6 +8,8 @@ License: MIT URL: https://github.com/modauthgssapi/mod_auth_gssapi Source0: https://github.com/modauthgssapi/%{name}/releases/download/v%{version}/%name-%{version}.tar.gz +Patch01: 0001-report-file-operation-errors-as-warnings.patch + BuildRequires: httpd-devel, krb5-devel, openssl-devel, autoconf, automake, libtool Requires: httpd-mmn = %{_httpd_mmn} Requires: krb5-libs >= 1.11.5 @@ -18,6 +20,7 @@ SPNEGO based HTTP Authentication protocol defined in RFC4559. %prep %setup -q +%patch01 -p1 %build export APXS=%{_httpd_apxs} @@ -43,6 +46,14 @@ install -m 644 10-auth_gssapi.conf %{buildroot}%{_httpd_modconfdir} %{_httpd_moddir}/mod_auth_gssapi.so %changelog +* Mon Mar 27 2017 Simo Sorce - 1.5.1-2 +- Fix log level on some messages +- resolves: #1433362 + +* Thu Mar 9 2017 Simo Sorce - 1.5.1-1 +- Korabl-Sputnik 4 launch (1.5.1) +- resolves: #1403194 + * Tue Jun 21 2016 Simo Sorce 1.4.0-1 - Lunar Reconnaissance Orbiter (2009) release (1.4.0) - resolves: #1346883