From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- www-apache/mod_auth_tkt/files/10_mod_auth_tkt.conf | 24 +++++++++++++ .../files/mod_auth_tkt-2.1.0-apache-2.4.patch | 40 ++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 www-apache/mod_auth_tkt/files/10_mod_auth_tkt.conf create mode 100644 www-apache/mod_auth_tkt/files/mod_auth_tkt-2.1.0-apache-2.4.patch (limited to 'www-apache/mod_auth_tkt/files') diff --git a/www-apache/mod_auth_tkt/files/10_mod_auth_tkt.conf b/www-apache/mod_auth_tkt/files/10_mod_auth_tkt.conf new file mode 100644 index 000000000000..4fe66cc90b5f --- /dev/null +++ b/www-apache/mod_auth_tkt/files/10_mod_auth_tkt.conf @@ -0,0 +1,24 @@ +# See 'man mod_auth_tkt' for details on the individual directives. + +LoadModule auth_tkt_module modules/mod_auth_tkt.so + +# Shared secret - CHANGE THIS before using! +TKTAuthSecret "672c158d-67b8-42e4-aec7-f1e1abb882bb" + +# Used by sample CGI scripts to locate this config file +SetEnv MOD_AUTH_TKT_CONF "/etc/apache2/modules.d/10_mod_auth_tkt.conf" + +# Protected directory example +# +# AuthType Basic +# require valid-user +# TKTAuthLoginURL https://www.CHANGEME.com/pub/login.cgi +# # If an internet server, you probably want the following on (at least initially) +# TKTAuthIgnoreIP on +# # If you just want *optional* authentication, so that casual users and robots +# # can still access some content, uncomment the following +# # TKTAuthGuestLogin on +# + + +# vim: ts=4 filetype=apache diff --git a/www-apache/mod_auth_tkt/files/mod_auth_tkt-2.1.0-apache-2.4.patch b/www-apache/mod_auth_tkt/files/mod_auth_tkt-2.1.0-apache-2.4.patch new file mode 100644 index 000000000000..1e6ee28f5657 --- /dev/null +++ b/www-apache/mod_auth_tkt/files/mod_auth_tkt-2.1.0-apache-2.4.patch @@ -0,0 +1,40 @@ +Description: Build fix for apache 2.4 + Fix for API changes in apache 2.4. +Author: Ivo De Decker +Forwarded: https://sourceforge.net/mailarchive/forum.php?thread_name=20120518111425.GA9186%40ugent.be&forum_name=modauthtkt-users +Last-Update: 2012-05-17 + +--- libapache2-mod-auth-tkt-2.1.0.orig/src/mod_auth_tkt.c ++++ libapache2-mod-auth-tkt-2.1.0/src/mod_auth_tkt.c +@@ -6,6 +6,7 @@ + #include "http_config.h" + #include "http_log.h" + #include "http_core.h" ++#include "http_request.h" + #include "http_protocol.h" + #include "util_md5.h" + #include "sha2.h" +@@ -798,7 +799,11 @@ ticket_digest(request_rec *r, auth_tkt * + unsigned char *buf2 = apr_palloc(r->pool, sconf->digest_sz + strlen(secret)); + int len = 0; + char *digest = NULL; ++#if AP_MODULE_MAGIC_AT_LEAST(20111130,0) ++ char *remote_ip = conf->ignore_ip > 0 ? "0.0.0.0" : r->connection->client_ip; ++#else + char *remote_ip = conf->ignore_ip > 0 ? "0.0.0.0" : r->connection->remote_ip; ++#endif + unsigned long ip; + struct in_addr ia; + char *d; +@@ -1575,7 +1580,11 @@ static void + auth_tkt_register_hooks (apr_pool_t *p) + { + ap_hook_post_config(auth_tkt_version, NULL, NULL, APR_HOOK_MIDDLE); ++#if AP_MODULE_MAGIC_AT_LEAST(20080403,1) ++ ap_hook_check_authn(auth_tkt_check, NULL, NULL, APR_HOOK_FIRST, AP_AUTH_INTERNAL_PER_CONF); ++#else + ap_hook_check_user_id(auth_tkt_check, NULL, NULL, APR_HOOK_FIRST); ++#endif + } + + /* Declare and populate the main module data structure */ -- cgit v1.2.3