Attachment 139357 Details for Bug 185585 – PR_185585.diff.txt

PR_185585.diff.txt

PR_185585.diff.txt (text/plain), 5.28 KB, created by Chris Hutchinson on 2014-01-16 17:25:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Hutchinson

Created: 2014-01-16 17:25:11 UTC

Size: 5.28 KB

patch

obsolete

>Index: mod_log_config-st/Makefile
>===================================================================
>--- mod_log_config-st/Makefile	(revision 339912)
>+++ mod_log_config-st/Makefile	(working copy)
>@@ -2,24 +2,15 @@
> # $FreeBSD$
> 
> PORTNAME=	mod_log_config-st
>-PORTVERSION=	1.0
>-PORTREVISION=	2
>+PORTVERSION=	1.03
>+#PORTREVISION=	2
> CATEGORIES=	www
>-# Original location: http://bitbrook.de/software/mod_log_mysql/mod_log_config.c
>-# Please handle update requests with care!
>-# sheepkiller was hacked and not cleaned over a long periode.
>-# (First notice 2011-03 not cleaned until 2011-07)
>-# Provide distfile now from LOCAL
>-#MASTER_SITES=	http://sheepkiller.nerim.net/ports/${PORTNAME}/
>-MASTER_SITES=	LOCAL/ohauer
>+MASTER_SITES=	http://bsdforge.com/projects/source/apache2/
> DIST_SUBDIR=	apache2
> 
> MAINTAINER=	apache@FreeBSD.org
>-COMMENT=	Modified version of mod_log_config for apache2
>+COMMENT=	A modified version of mod_log_config for apache2
> 
>-EXPIRATION_DATE=	2014-02-08
>-DEPRECATED=	Upstream site gone since 2011-03
>-
> USE_APACHE=	22
> AP_FAST_BUILD=	yes
> SRC_FILE=	mod_log_config.c
>@@ -26,4 +17,7 @@
> SHORTMODNAME=	log_config
> MODULENAME=	mod_log_config-st
> 
>+post-install:
>+	@${CAT} ${PKGMESSAGE}
>+
> .include <bsd.port.mk>
>Index: mod_log_config-st/distinfo
>===================================================================
>--- mod_log_config-st/distinfo	(revision 339912)
>+++ mod_log_config-st/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (apache2/mod_log_config-st-1.0.tar.gz) = e255d9530e1bc4a73a84ea078006fe77e201e821d492302bf4deb89bdbaada0c
>-SIZE (apache2/mod_log_config-st-1.0.tar.gz) = 16748
>+SHA256 (apache2/mod_log_config-st-1.03.tar.gz) = 814e3637fbafdf163eae9d7dfdbd80c4e944caf009654d6dc863566b31024a60
>+SIZE (apache2/mod_log_config-st-1.03.tar.gz) = 16733
>Index: mod_log_config-st/pkg-message
>===================================================================
>--- mod_log_config-st/pkg-message	(revision 339912)
>+++ mod_log_config-st/pkg-message	(working copy)
>@@ -1,7 +1,7 @@
>                      !!!! WARNING !!!!
>      mod_log_config and mod_log_config-st are conflicting.
> 
>-In order to use correctly mod_log_config-st, you have to replace:
>+In order to use mod_log_config-st correctly, you have to replace:
> LoadModule log_config_module  libexec/apache2/mod_log_config.so
> by
> LoadModule log_config_module  libexec/apache2/mod_log_config-st.so
>Index: mod_log_mysql/Makefile
>===================================================================
>--- mod_log_mysql/Makefile	(revision 339912)
>+++ mod_log_mysql/Makefile	(working copy)
>@@ -2,24 +2,15 @@
> # $FreeBSD$
> 
> PORTNAME=	mod_log_mysql
>-PORTVERSION=	1.0
>-PORTREVISION=	3
>+PORTVERSION=	1.04
>+#PORTREVISION=	3
> CATEGORIES=	www
>-# Original location: http://bitbrook.de/software/mod_log_mysql/mod_log_mysql.c
>-# Please handle update requests with care!
>-# sheepkiller was hacked and not cleaned over a long periode.
>-# (First notice 2011-03 not cleaned until 2011-07)
>-# Provide distfile now from LOCAL
>-#MASTER_SITES=	http://sheepkiller.nerim.net/ports/${PORTNAME}/
>-MASTER_SITES=	LOCAL/ohauer
>+MASTER_SITES=	http://bsdforge.com/projects/source/apache2/
> DIST_SUBDIR=	apache2
> 
> MAINTAINER=	apache@FreeBSD.org
> COMMENT=	Allows Apache 2 to log to a MySQL database
> 
>-EXPIRATION_DATE=	2014-02-08
>-DEPRECATED=	Upstream site gone since 2011-03
>-
> RUN_DEPENDS+=	${LOCALBASE}/${APACHEMODDIR}/mod_log_config-st.so:${PORTSDIR}/www/mod_log_config-st
> 
> USE_APACHE=	22
>Index: mod_log_mysql/distinfo
>===================================================================
>--- mod_log_mysql/distinfo	(revision 339912)
>+++ mod_log_mysql/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (apache2/mod_log_mysql-1.0.tar.gz) = 27fdd2c87133d62171a38585807f70009821a3cb13e011d2ceb62fcc1c8ad4bb
>-SIZE (apache2/mod_log_mysql-1.0.tar.gz) = 8046
>+SHA256 (apache2/mod_log_mysql-1.04.tar.gz) = da6cfbd1788b28e7421fcf4963e592bafec3b946ea9f01ac5319708e7ec41d45
>+SIZE (apache2/mod_log_mysql-1.04.tar.gz) =  8010
>Index: mod_log_mysql/files/patch-mod_log_mysql.c
>===================================================================
>--- mod_log_mysql/files/patch-mod_log_mysql.c	(revision 339912)
>+++ mod_log_mysql/files/patch-mod_log_mysql.c	(working copy)
>@@ -1,11 +1,11 @@
>---- mod_log_mysql.c	2003-11-01 12:21:28.000000000 +0200
>-+++ mod_log_mysql.c.new	2010-11-28 17:01:06.000000000 +0200
>-@@ -172,11 +172,13 @@
>+--- mod_log_mysql.c	2014-01-10 13:56:23.777364558 -0800
>++++ mod_log_mysql.c.new	2014-01-10 13:58:54.058985546 -0800
>+@@ -142,11 +142,13 @@
>  {
>    mysql_log *l = param;
>    MYSQL *db;
> +  my_bool do_reconnect = 1;
>-     
>+ 
>    db = apr_palloc(p, sizeof(MYSQL));
>  
>    mysql_init(db);
>Index: mod_log_mysql/pkg-descr
>===================================================================
>--- mod_log_mysql/pkg-descr	(revision 339912)
>+++ mod_log_mysql/pkg-descr	(working copy)
>@@ -4,10 +4,10 @@
> Key features are:
>     * Seamless integration into the standard Apache logging
>       configuration.
>-    * Only one configuration line needed to start logging.
>+    * Only a single configuration line needed to start logging.
>     * Free SQL use.
>     * Multiple databases, database users and/or database servers.
>-    * Connection pooling, only one connection per log target per
>+    * Connection pooling, only one connection per log target, per
>       child process.
>     * Logs data as it is: e.g. times as SQL DATETIME and n/a items
>       as SQL NULL.

Actions: View

Attachments on bug 185585: 139350 | 139351 | 139352 | 139353 | 139354 | 139355 | 139356 | 139357