- Update to 1.101

5 files changed, 22 insertions, 21 deletions

diff --git a/www/mod_log_sql2-dtc/Makefile b/www/mod_log_sql2-dtc/Makefile
index 9d3ea932b9cd..512653a2cd14 100644
--- a/www/mod_log_sql2-dtc/Makefile
+++ b/www/mod_log_sql2-dtc/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	mod_log_sql
-PORTVERSION=	1.100
-PORTREVISION=	3
+PORTVERSION=	1.101
 CATEGORIES=	www databases
 MASTER_SITES=	http://www.outoforder.cc/downloads/${PORTNAME}/
 PKGNAMESUFFIX=	-dtc
@@ -14,7 +13,7 @@ PKGNAMESUFFIX=	-dtc
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Allows Apache to log to a MySQL database
 
-MAKE_JOBS_SAFE=  yes
+MAKE_JOBS_SAFE=	yes
 
 LATEST_LINK=	mod_log_sql2-dtc
 GNU_CONFIGURE=	yes
diff --git a/www/mod_log_sql2-dtc/distinfo b/www/mod_log_sql2-dtc/distinfo
index 6a83f1616423..73b80274e0bb 100644
--- a/www/mod_log_sql2-dtc/distinfo
+++ b/www/mod_log_sql2-dtc/distinfo
@@ -1,3 +1,3 @@
-MD5 (mod_log_sql-1.100.tar.bz2) = b54657ad270cffc34dfab12302c53306
-SHA256 (mod_log_sql-1.100.tar.bz2) = e9a49e01ecea00292ddec0a0bc4f33f0200dd7617bea11b0de92f1fd100025fc
-SIZE (mod_log_sql-1.100.tar.bz2) = 122507
+MD5 (mod_log_sql-1.101.tar.bz2) = 16157f311eba364d8ee467078e7cc086
+SHA256 (mod_log_sql-1.101.tar.bz2) = 0907579b0466844f7f1886af92a9ea36b4815ec869929ba577c74d32b6d69a5e
+SIZE (mod_log_sql-1.101.tar.bz2) = 127500
diff --git a/www/mod_log_sql2-dtc/files/patch-functions13.h b/www/mod_log_sql2-dtc/files/patch-functions13.h
index 4fda5d4d58bc..050882bcd7d0 100644
--- a/www/mod_log_sql2-dtc/files/patch-functions13.h
+++ b/www/mod_log_sql2-dtc/files/patch-functions13.h
@@ -1,5 +1,5 @@
---- functions13.h.orig	Fri Apr 16 15:03:25 2004
-+++ functions13.h	Fri Apr 16 15:03:46 2004
+--- ./functions13.h.orig	2004-04-29 18:05:24.000000000 +0000
++++ ./functions13.h	2009-12-27 01:38:18.620401873 +0000
 @@ -37,7 +37,7 @@
  
  static const char *extract_request_duration(request_rec *r, char *a)
diff --git a/www/mod_log_sql2-dtc/files/patch-mod_log_sql.c b/www/mod_log_sql2-dtc/files/patch-mod_log_sql.c
index a503d4de43d9..164d2c81f918 100644
--- a/www/mod_log_sql2-dtc/files/patch-mod_log_sql.c
+++ b/www/mod_log_sql2-dtc/files/patch-mod_log_sql.c
@@ -1,5 +1,5 @@
---- mod_log_sql.c.orig	Thu Feb 16 05:30:51 2006
-+++ mod_log_sql.c	Wed Nov 16 19:35:10 2005
+--- ./mod_log_sql.c.orig	2006-11-07 02:43:23.000000000 +0000
++++ ./mod_log_sql.c	2009-12-27 01:39:36.463108543 +0000
 @@ -37,6 +37,11 @@
  #define DEFAULT_HOUT_TABLE_NAME		"headers_out"
  #define DEFAULT_COOKIE_TABLE_NAME	"cookies"
@@ -22,7 +22,7 @@
  } logsql_state;
  
  
-@@ -638,6 +646,9 @@
+@@ -648,6 +656,9 @@
  	cls->hout_table_name = DEFAULT_HOUT_TABLE_NAME;
  	cls->cookie_table_name = DEFAULT_COOKIE_TABLE_NAME;
  	cls->preserve_file = DEFAULT_PRESERVE_FILE;
@@ -32,7 +32,7 @@
  
  	cls->transfer_ignore_list = apr_array_make(p, 1, sizeof(char *));
  	cls->transfer_accept_list = apr_array_make(p, 1, sizeof(char *));
-@@ -748,6 +759,15 @@
+@@ -759,6 +770,15 @@
  	if (child->cookie_table_name == DEFAULT_COOKIE_TABLE_NAME)
  		child->cookie_table_name = parent->cookie_table_name;
  
@@ -48,7 +48,7 @@
  	DO_MERGE_ARRAY(parent->transfer_ignore_list, child->transfer_ignore_list, subp);
  	DO_MERGE_ARRAY(parent->transfer_accept_list, child->transfer_accept_list, subp);
  	DO_MERGE_ARRAY(parent->remhost_ignore_list, child->remhost_ignore_list, subp);
-@@ -779,6 +799,10 @@
+@@ -790,6 +810,11 @@
  	const char *hout_tablename = cls->hout_table_name;
  	const char *hin_tablename = cls->hin_table_name;
  	const char *cookie_tablename = cls->cookie_table_name;
@@ -56,10 +56,11 @@
 +	const char *scoreboard_subdomain = cls->scoreboard_subdomain;
 +	const char *scoreboard_table_name = cls->scoreboard_table_name;
 +	struct timeval now_time;
- 
- 	/* We handle mass virtual hosting differently.  Dynamically determine the name
- 	 * of the table from the virtual server's name, and flag it for creation.
-@@ -1097,6 +1121,29 @@
++
+     if (global_config.driver == NULL) {
+         return OK;
+     }
+@@ -1110,6 +1135,29 @@
  		if (cookie_query)
  		  	safe_sql_insert(orig, LOGSQL_TABLE_COOKIES,cookie_tablename,cookie_query);
  
@@ -89,11 +90,10 @@
  		return OK;
  	}
  }
-@@ -1157,6 +1204,18 @@
- 	AP_INIT_TAKE1("LogSQLCookieLogTable", set_server_nmv_string_slot,
+@@ -1171,6 +1219,18 @@
  	 (void *)APR_OFFSETOF(logsql_state, cookie_table_name), RSRC_CONF,
  	 "The database table that holds the cookie info")
-+	,
+ 	,
 +	AP_INIT_TAKE1("LogSQLScoreDomain", set_server_nmv_string_slot,
 +	 (void *)APR_OFFSETOF(logsql_state, scoreboard_domain), RSRC_CONF,
 +	 "The domain to set in scoreboard")
@@ -105,6 +105,7 @@
 +	AP_INIT_TAKE1("LogSQLScoreTable", set_server_nmv_string_slot,
 +	 (void *)APR_OFFSETOF(logsql_state, scoreboard_table_name), RSRC_CONF,
 +	 "The scoreboard to log in")
- 	,
++	,
  	/* Log format */
  	AP_INIT_TAKE1("LogSQLTransferLogFormat", set_logformat_slot,
+ 	 NULL, RSRC_CONF,
diff --git a/www/mod_log_sql2-dtc/pkg-plist b/www/mod_log_sql2-dtc/pkg-plist
index b92f8765a7aa..1b4d83f72bb6 100644
--- a/www/mod_log_sql2-dtc/pkg-plist
+++ b/www/mod_log_sql2-dtc/pkg-plist
@@ -2,4 +2,5 @@
 @exec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F
 @unexec /usr/bin/sed -i '' '/LoadModule %%AP_NAME%%_module/d' %D/%%APACHEETCDIR%%/httpd.conf
 %%APACHEMODDIR%%/mod_log_sql_mysql.so
+%%APACHEMODDIR%%/mod_log_sql_logio.so
 %%SSL%%%%APACHEMODDIR%%/mod_log_sql_ssl.so