From owner-svn-ports-head@FreeBSD.ORG Wed Sep 10 20:58:29 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E86D5FC2; Wed, 10 Sep 2014 20:58:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D2CE8BBA; Wed, 10 Sep 2014 20:58:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8AKwT0l064317; Wed, 10 Sep 2014 20:58:29 GMT (envelope-from ohauer@FreeBSD.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8AKwSfO064311; Wed, 10 Sep 2014 20:58:28 GMT (envelope-from ohauer@FreeBSD.org) Message-Id: <201409102058.s8AKwSfO064311@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ohauer set sender to ohauer@FreeBSD.org using -f From: Olli Hauer Date: Wed, 10 Sep 2014 20:58:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r367890 - in head/www/mod_log_sql2: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Sep 2014 20:58:30 -0000 Author: ohauer Date: Wed Sep 10 20:58:28 2014 New Revision: 367890 URL: http://svnweb.freebsd.org/changeset/ports/367890 QAT: https://qat.redports.org/buildarchive/r367890/ Log: - allow build with apache22/24 - add pkg-message - remove install message from Makefile - remove apache13 fix - add sample module config file instead using apxs to install the LoadModule lines into httpd.conf - install module file into APACHEETCDIR/modules.d Special Thanks to Simon Wright for testing the port! Added: head/www/mod_log_sql2/files/330_mod_log_sql.conf.sample.in (contents, props changed) head/www/mod_log_sql2/files/patch-functions.h (contents, props changed) head/www/mod_log_sql2/files/pkg-message.in (contents, props changed) Deleted: head/www/mod_log_sql2/files/patch-functions13.h Modified: head/www/mod_log_sql2/Makefile head/www/mod_log_sql2/files/patch-Makefile.in head/www/mod_log_sql2/pkg-plist Modified: head/www/mod_log_sql2/Makefile ============================================================================== --- head/www/mod_log_sql2/Makefile Wed Sep 10 20:53:15 2014 (r367889) +++ head/www/mod_log_sql2/Makefile Wed Sep 10 20:58:28 2014 (r367890) @@ -3,7 +3,7 @@ PORTNAME= mod_log_sql PORTVERSION= 1.101 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= www databases MASTER_SITES= http://www.outoforder.cc/downloads/${PORTNAME}/ PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} @@ -11,32 +11,29 @@ PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} MAINTAINER= apache@FreeBSD.org COMMENT= Allows Apache to log to a MySQL database -LATEST_LINK= mod_log_sql2 -GNU_CONFIGURE= yes USES= gmake tar:bzip2 -CONFIGURE_ARGS+= --with-apxs=${APXS} -SSL_PLIST= "" -APACHE2X= "" -PLIST_SUB+= SSL=${SSL_PLIST} APACHE2X=${APACHE2X} - +USE_APACHE= 22+ USE_MYSQL= yes -USE_APACHE= 22 -LIBS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql +GNU_CONFIGURE= yes + +OPTIONS_SUB= yes +OPTIONS_DEFINE= DBI DOCS -.include +DBI_CONFIGURE_WITH= dbi=${LOCALBASE} +DBI_LIB_DEPENDS= libdbi.so:${PORTSDIR}/databases/libdbi -.if defined(WITH_DBI) || exists(${LOCALBASE}/include/dbi/dbi.h) -CONFIGURE_ARGS+= --with-dbi=${LOCALBASE} -LIB_DEPENDS+= libdbi.so:${PORTSDIR}/databases/libdbi -PLIST_SUB+= DBI="" -.else -PLIST_SUB+= DBI="@comment " -.endif - -.if defined(WITHOUT_SSL) -CONFIGURE_ARGS+= --disable-ssl -SSL_PLIST= "@comment " -.endif +DBI_DESC= depend on databases/libdbi +PORTDOCS= manual.html manual.xml + +.include + +APMODCFG= 330_mod_log_sql.conf.sample +SUB_FILES+= ${APMODCFG} pkg-message +SUB_LIST+= APMODCFG=${APMODCFG:C/.sample//} +PLIST_SUB+= APMODCFG=${APMODCFG} + +CONFIGURE_ARGS+=--with-apxs=${APXS} +LIBS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql post-patch: ${REINPLACE_CMD} -e 's|@APXS_STAGE@|-S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR}|' \ @@ -45,4 +42,11 @@ post-patch: pre-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} -.include +post-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d + ${CP} ${WRKDIR}/${APMODCFG} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/*.so + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${STAGEDIR}${DOCSDIR} + +.include Added: head/www/mod_log_sql2/files/330_mod_log_sql.conf.sample.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/mod_log_sql2/files/330_mod_log_sql.conf.sample.in Wed Sep 10 20:58:28 2014 (r367890) @@ -0,0 +1,35 @@ +# www/mod_log_sql2 +# vim: set syntax=apache: + +# ===================================================== +# required module +# ===================================================== +#LoadModule log_sql_module %%APACHEMODDIR%%/mod_log_sql.so +#LoadModule log_sql_mysql_module %%APACHEMODDIR%%/mod_log_sql_mysql.so + +# ===================================================== +# optional modules +# ===================================================== +# +#LoadModule log_sql_ssl_module %%APACHEMODDIR%%/mod_log_sql_ssl.so +# + +## optional if build with DBI +#LoadModule log_sql_dbi %%APACHEMODDIR%%/mod_log_sql_dbi.so + + +## ===================================================== +## sample db connection, see +## %%DOCSDIR%%/manual.html / manual.xml +## ===================================================== +## +### log over IP +## LogSQLLoginInfo mysql://userid:passwd@db.host.name/apachelogs +### log via socket +## LogSQLDBParam socketfile /your/path/to/mysql.sock +## LogSQLCreateTables On +## LogSQLMassVirtualHosting On +## LogSQLTransferLogFormat AbHhmRSsTUuv +## LogSQLRequestIgnore /sample-path/token /server-status +## LogSQLPreserveFile /var/tmp/offline-preserve +## Modified: head/www/mod_log_sql2/files/patch-Makefile.in ============================================================================== --- head/www/mod_log_sql2/files/patch-Makefile.in Wed Sep 10 20:53:15 2014 (r367889) +++ head/www/mod_log_sql2/files/patch-Makefile.in Wed Sep 10 20:58:28 2014 (r367890) @@ -1,5 +1,5 @@ ---- ./Makefile.in.orig 2014-02-28 21:04:39.000000000 +0100 -+++ ./Makefile.in 2014-02-28 21:15:40.000000000 +0100 +--- Makefile.in.orig 2006-11-05 03:47:23 UTC ++++ Makefile.in @@ -20,6 +20,8 @@ EXTRA_DIST = AUTHORS INSTALL TODO LICENSE CHANGELOG \ build-apache13.bat build-apache2.bat \ @@ -9,7 +9,7 @@ coreSOURCES = @PACKAGE_NAME@.c coreTARGET = @PACKAGE_NAME@@APXS_EXTENSION@ coreLDADD = @RT_LIBS@ -@@ -151,21 +153,21 @@ +@@ -151,41 +153,27 @@ @DEFS@ @AP_DEFS@ $(dbiLDADD) $(dbiSOURCES) install: $(TARGETS) install-subdirs @@ -33,12 +33,23 @@ fi; \ if test @WANT_LOGIO_MOD@ -eq 1; then \ - @APXS_BIN@ -n $(logioNAME) -i $(logioTARGET); \ +- fi; \ +- echo "*************************************************************************"; \ +- echo "*** The mod_log_sql modules have been installed."; \ +- echo "*** Please edit your Apache configuration files and"; \ +- echo "*** add the appropriate LoadModule directives per the documentation"; \ +- echo "*** in docs/manual.html"; \ +- echo "*** If you have previously used 1.18 or lower then you must change"; \ +- echo "*** >LoadModule sql_log_module modules/mod_log_sql.so"; \ +- echo "*** to"; \ +- echo "*** >LoadModule log_sql_module modules/mod_log_sql.so"; \ +- echo "*** in your httpd.conf as the internal name of the module has changed."; \ +- echo "*** "; \ +- echo "*** Also read the documentation about using SSL support and new "; \ +- echo "*** configuration directives."; \ +- echo "*************************************************************************"; + @APXS_BIN@ $(APXS_STAGE) -n $(logioNAME) -i $(logioTARGET); \ - fi; \ - echo "*************************************************************************"; \ - echo "*** The mod_log_sql modules have been installed."; \ -@@ -183,9 +185,9 @@ - echo "*************************************************************************"; ++ fi; activate: activate-subdirs - @@APXS_BIN@ -n $(coreNAME) -i -a $(coreTARGET); \ Added: head/www/mod_log_sql2/files/patch-functions.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/mod_log_sql2/files/patch-functions.h Wed Sep 10 20:58:28 2014 (r367890) @@ -0,0 +1,14 @@ +--- functions.h.orig 2004-09-20 02:50:46 UTC ++++ functions.h +@@ -14,7 +14,11 @@ + + static const char *extract_remote_address(request_rec *r, char *a) + { ++#if AP_MODULE_MAGIC_AT_LEAST(20111130,0) ++ return r->useragent_ip; ++#else + return r->connection->remote_ip; ++#endif + } + + static const char *extract_local_address(request_rec *r, char *a) __attribute__((unused)); Added: head/www/mod_log_sql2/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/mod_log_sql2/files/pkg-message.in Wed Sep 10 20:58:28 2014 (r367890) @@ -0,0 +1,6 @@ +============================================================ +* The mod_log_sql modules have been installed. +* +* The module config file was installed as +* %%PREFIX%%/%%APACHEETCDIR%%/modules.d/%%APMODCFG%% +============================================================ Modified: head/www/mod_log_sql2/pkg-plist ============================================================================== --- head/www/mod_log_sql2/pkg-plist Wed Sep 10 20:53:15 2014 (r367889) +++ head/www/mod_log_sql2/pkg-plist Wed Sep 10 20:58:28 2014 (r367890) @@ -1,7 +1,6 @@ +@sample %%APACHEETCDIR%%/modules.d/%%APMODCFG%% %%APACHEMODDIR%%/%%AP_MODULE%% -@exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%F -@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F -%%DBI%%%%APACHEMODDIR%%/mod_log_sql_dbi.so %%APACHEMODDIR%%/mod_log_sql_mysql.so -%%APACHE2X%%%%APACHEMODDIR%%/mod_log_sql_logio.so -%%SSL%%%%APACHEMODDIR%%/mod_log_sql_ssl.so +%%APACHEMODDIR%%/mod_log_sql_logio.so +%%APACHEMODDIR%%/mod_log_sql_ssl.so +%%DBI%%%%APACHEMODDIR%%/mod_log_sql_dbi.so