Attachment 147185 Details for Bug 193536 – fix build against apache22/24

[patch] fix build against apache22/24

mod_authnz_crowd_apache22-24.diff (text/plain), 4.86 KB, created by Olli Hauer on 2014-09-10 18:47:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olli Hauer

Created: 2014-09-10 18:47:13 UTC

Size: 4.86 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 367876)
>+++ Makefile	(working copy)
>@@ -23,7 +23,7 @@
> GNU_CONFIGURE=	yes
> USE_GNOME=	libxml2
> USE_GCC=	any
>-USE_APACHE=	22
>+USE_APACHE=	22+
> MAKE_JOBS_SAFE= yes
> 
> SUB_FILES=	pkg-message zzz_authnz_crowd.conf
>@@ -39,6 +39,10 @@
> post-patch:
> 	${REINPLACE_CMD} -e 's|@APXS_STAGE@|-S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR}|' \
> 		${WRKSRC}/src/Makefile.am
>+	${REINPLACE_CMD} -e 's|%%APACHEETCDIR%%|${APACHEETCDIR}|g' \
>+		-e 's|%%APACHEINCLUDEDIR%%|${APACHEINCLUDEDIR}|g' \
>+		-e 's|%%APACHEMODDIR%%|${APACHEMODDIR}|g' \
>+		${WRKSRC}/configure.ac
> 
> pre-install:
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
>Index: files/patch-configure.ac
>===================================================================
>--- files/patch-configure.ac	(revision 367876)
>+++ files/patch-configure.ac	(working copy)
>@@ -12,7 +12,7 @@
>  AC_CHECK_LIB([apr-1], [apr_pool_pre_cleanup_register], [], [AC_MSG_ERROR([apr_pool_pre_cleanup_register was not found in libapr-1])])
>  
> -AC_CHECK_FILE([/usr/local/apache2/include/httpd.h], [APACHE_INCLUDE_DIR="/usr/local/apache2/include"], [
>-+AC_CHECK_FILE([/usr/local/include/apache22/httpd.h], [APACHE_INCLUDE_DIR="/usr/local/include/apache22"], [
>++AC_CHECK_FILE([/usr/local/%%APACHEINCLUDEDIR%%/httpd.h], [APACHE_INCLUDE_DIR="/usr/local/%%APACHEINCLUDEDIR%%"], [
>      AC_CHECK_FILE([/usr/include/httpd/httpd.h], [APACHE_INCLUDE_DIR="/usr/include/httpd"], [
>          AC_CHECK_FILE([/usr/include/apache2/httpd.h], [APACHE_INCLUDE_DIR="/usr/include/apache2"], [
>              AC_MSG_ERROR([Could not locate Apache include directory])
>@@ -30,7 +30,7 @@
>  AC_SUBST([SVN_DIR])
>  
> -AC_CHECK_FILE([/usr/libexec/apache2/mod_dav.so], [APACHE_MODULES_DIR="/usr/libexec/apache2"], [
>-+AC_CHECK_FILE([/usr/local/libexec/apache22/mod_dav.so], [APACHE_MODULES_DIR="/usr/local/libexec/apache22"], [
>++AC_CHECK_FILE([/usr/local/%%APACHEMODDIR%%/mod_dav.so], [APACHE_MODULES_DIR="/usr/local/%%APACHEMODDIR%%"], [
>      AC_CHECK_FILE([/usr/lib64/httpd/modules/mod_dav.so], [APACHE_MODULES_DIR="/usr/lib64/httpd/modules"], [
>          AC_CHECK_FILE([/usr/lib/httpd/modules/mod_dav.so], [APACHE_MODULES_DIR="/usr/lib/httpd/modules"], [
>              AC_CHECK_FILE([/usr/lib/apache2/modules/mod_dav.so], [APACHE_MODULES_DIR="/usr/lib/apache2/modules"], [
>@@ -39,7 +39,7 @@
>  AC_SUBST([APACHE_MODULES_DIR])
>  
> -AC_CHECK_FILE([/usr/local/apache2/conf/httpd.conf], [HTTPD_CONF="/usr/local/apache2/conf/httpd.conf"], [
>-+AC_CHECK_FILE([/usr/local/etc/apache22/httpd.conf], [HTTPD_CONF="/usr/local/etc/apache22/httpd.conf"], [
>++AC_CHECK_FILE([/usr/local/%%APACHEETCDIR%%/httpd.conf], [HTTPD_CONF="/usr/local/%%APACHEETCDIR%%/httpd.conf"], [
>      AC_CHECK_FILE([/etc/httpd/conf/httpd.conf], [HTTPD_CONF="/etc/httpd/conf/httpd.conf"], [
>          AC_CHECK_FILE([/etc/apache2/httpd.conf], [HTTPD_CONF="/etc/apache2/httpd.conf"], [
>              AC_MSG_ERROR([Could not locate Apache configuration file])
>Index: files/patch-src__crowd_client.c
>===================================================================
>--- files/patch-src__crowd_client.c	(revision 0)
>+++ files/patch-src__crowd_client.c	(working copy)
>@@ -0,0 +1,34 @@
>+--- src/crowd_client.c.orig	2014-09-10 17:51:19 UTC
>++++ src/crowd_client.c
>+@@ -614,8 +614,13 @@
>+ 
>+ static char *make_session_cache_key(const char *token, const char *forwarded_for, const request_rec *r, const crowd_config *config) {
>+     return log_ralloc(r, apr_psprintf(r->pool, "%s\037%s\037%s\037%s\037%s", token,
>+-        forwarded_for == NULL ? "" : forwarded_for, r->connection->remote_ip, config->crowd_app_name,
>+-        config->crowd_url));
>++        forwarded_for == NULL ? "" : forwarded_for,
>++#if AP_MODULE_MAGIC_AT_LEAST(20111130,0)
>++    	r->useragent_ip,
>++#else
>++	r->connection->remote_ip,
>++#endif
>++	config->crowd_app_name, config->crowd_url));
>+ }
>+ 
>+ /*==========================
>+@@ -747,8 +752,13 @@
>+ 
>+ static const char *get_validation_factors(const request_rec *r, const char *forwarded_for) {
>+     const char *payload_beginning = log_ralloc(r, apr_pstrcat(r->pool,
>+-        "<validation-factors><validation-factor><name>remote_address</name><value>", r->connection->remote_ip,
>+-        "</value></validation-factor>", NULL));
>++        "<validation-factors><validation-factor><name>remote_address</name><value>",
>++#if AP_MODULE_MAGIC_AT_LEAST(20111130,0)
>++    	r->useragent_ip,
>++#else
>++	r->connection->remote_ip,
>++#endif
>++	"</value></validation-factor>", NULL));
>+     if (payload_beginning == NULL) {
>+         return NULL;
>+     }
>
>Property changes on: files/patch-src__crowd_client.c
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 193536: 147185 | 148301