svn commit: r366082 - in head/www/mod_auth_pgsql2: . files

[Mathieu Arnold]

Author: mat
Date: Mon Aug 25 14:58:09 2014
New Revision: 366082
URL: http://svnweb.freebsd.org/changeset/ports/366082
QAT: https://qat.redports.org/buildarchive/r366082/

Log:
  Fix with apache 2.4.
  
  Sponsored by:	Absolight

Added:
  head/www/mod_auth_pgsql2/files/
  head/www/mod_auth_pgsql2/files/patch-mod_auth_pgsql.c   (contents, props changed)
Modified:
  head/www/mod_auth_pgsql2/Makefile

Modified: head/www/mod_auth_pgsql2/Makefile
==============================================================================
--- head/www/mod_auth_pgsql2/Makefile	Mon Aug 25 14:24:48 2014	(r366081)
+++ head/www/mod_auth_pgsql2/Makefile	Mon Aug 25 14:58:09 2014	(r366082)
@@ -12,7 +12,7 @@ MAINTAINER=	apache at FreeBSD.org
 COMMENT=	Allows users to use PostgreSQL databases for user authentication
 
 USES=		pgsql
-USE_APACHE=	22
+USE_APACHE=	22+
 
 AP_INC?=	${LOCALBASE}/include
 AP_LIB?=	${LOCALBASE}/lib -lpq

Added: head/www/mod_auth_pgsql2/files/patch-mod_auth_pgsql.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/mod_auth_pgsql2/files/patch-mod_auth_pgsql.c	Mon Aug 25 14:58:09 2014	(r366082)
@@ -0,0 +1,16 @@
+--- ./mod_auth_pgsql.c.orig	2006-01-05 15:15:13.000000000 +0100
++++ ./mod_auth_pgsql.c	2014-08-25 16:53:20.000000000 +0200
+@@ -1060,8 +1060,13 @@
+ 		apr_snprintf(sql, MAX_STRING_LEN, ", %s",
+ 					 sec->auth_pg_log_addrs_field);
+ 		strncat(fields, sql, MAX_STRING_LEN - strlen(fields) - 1);
++#if MODULE_MAGIC_NUMBER_MAJOR >= 20111130
++		apr_snprintf(sql, MAX_STRING_LEN, ", '%s'",
++					 r->useragent_ip);
++#else
+ 		apr_snprintf(sql, MAX_STRING_LEN, ", '%s'",
+ 					 r->connection->remote_ip);
++#endif
+ 		strncat(values, sql, MAX_STRING_LEN - strlen(values) - 1);
+ 	}
+ 	if (sec->auth_pg_log_pwd_field) {	/* Password field , clear WARNING */