install logio module; include dbi module in config

Package-Manager: portage-2.1.4.4

4 files changed, 97 insertions, 6 deletions

diff --git a/www-apache/mod_log_sql/ChangeLog b/www-apache/mod_log_sql/ChangeLog
index fe56c95e94e5..ae77c7cd1b3e 100644
--- a/www-apache/mod_log_sql/ChangeLog
+++ b/www-apache/mod_log_sql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apache/mod_log_sql
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_log_sql/ChangeLog,v 1.4 2008/01/31 19:09:26 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_log_sql/ChangeLog,v 1.5 2008/03/13 16:11:19 hollow Exp $
+
+*mod_log_sql-1.101-r1 (13 Mar 2008)
+
+  13 Mar 2008; Benedikt Böhm <hollow@gentoo.org>
+  +files/1.101/42_mod_log_sql.conf, +mod_log_sql-1.101-r1.ebuild:
+  install logio module; include dbi module in config
 
   31 Jan 2008; Benedikt Böhm <hollow@gentoo.org> files/42_mod_log_sql.conf,
   mod_log_sql-1.100.ebuild, mod_log_sql-1.101.ebuild:
diff --git a/www-apache/mod_log_sql/Manifest b/www-apache/mod_log_sql/Manifest
index 06cc06e43146..dad5ae267925 100644
--- a/www-apache/mod_log_sql/Manifest
+++ b/www-apache/mod_log_sql/Manifest
@@ -1,17 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 1.101/42_mod_log_sql.conf 938 RMD160 2598c74a9a5e7751e485770cf51a7e23c60f34dd SHA1 1e6183a0d6080ac9a3b1c1e27ebf7b01c72459bf SHA256 b4d652ded6486c93fa524f68243dad635a7e02c600727110d7758e3eb8794cf1
 AUX 42_mod_log_sql.conf 827 RMD160 4f527c84e843aa56f98e172b1ea385557786f288 SHA1 5aa0544981d07c049087d65c4658826755a48791 SHA256 92e35990cdde4d2761730d017f123efe4adc223c375d8ce5f7c3f71111d1494e
 DIST mod_log_sql-1.100.tar.bz2 122507 RMD160 a9e21fd46317d8ee120321b6702a9442a5ba3a3f SHA1 50edb735915a4fb7ea83a5d8e4928667a2a04801 SHA256 e9a49e01ecea00292ddec0a0bc4f33f0200dd7617bea11b0de92f1fd100025fc
 DIST mod_log_sql-1.101.tar.bz2 127500 RMD160 a61746e2a8cb62221a5b08f2ab4790d221971355 SHA1 2b38ede49621ec61e896e1f8aece14970e73c5f3 SHA256 0907579b0466844f7f1886af92a9ea36b4815ec869929ba577c74d32b6d69a5e
 EBUILD mod_log_sql-1.100.ebuild 1378 RMD160 27f81d4aa572d661ee5185457ab55cbb9f82ad6a SHA1 68f6412c61f3d503728d49df11f8621a31248ae2 SHA256 ebe11ef1d415c97f894dbc6f581504d51b17f90c870d5a30d5963878f8bd1092
+EBUILD mod_log_sql-1.101-r1.ebuild 1474 RMD160 4820c6e8379406abec8c86ac1419d2b8f15f7b6e SHA1 174bf8cb8801c9a505da6d05405147b9248c32c3 SHA256 d77c8093610f19b759e9306c93f9f2b353f4e43652759a8285687b6e41da2db4
 EBUILD mod_log_sql-1.101.ebuild 1380 RMD160 54742c4b5ff0a6daac27bca22e425f86078f817a SHA1 aa86cf577653c69c80c14cf7b765f449a860ff73 SHA256 23f098fc6062ba0661df5e029979f84ee398ef0198682a19a166ac5fa99b64c5
-MISC ChangeLog 5832 RMD160 7924bb205ac02a810fa5726f0b953f706ac0b129 SHA1 bec34017dfbc9d852bb2816ce0ba2ddabc54e913 SHA256 0a4c49812c06d94f11e68e1c067c89e708c1366c358abfe924ea8fe14d4e1f14
+MISC ChangeLog 6039 RMD160 c00d5723476505576c31a4ed6b75d03f4a623414 SHA1 6cb10384976ea7102790dff6883ec26c0976bd80 SHA256 88590d0094c99e4f7f04d5f45219eebe7715b078f73cf262b719a9213ce62c7d
 MISC metadata.xml 160 RMD160 a0f6e133e170b7477018d8584c20e8723f6914fa SHA1 a3b9b520ec43ee1f9b1c7b5c5b8745bf84454c03 SHA256 3c312146c4cb5b912d6f56292242ce3a85c629ca98ee7ef0a84ca575708b44fe
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iEYEARECAAYFAkeiHOsACgkQmPFBzbX68WHnWwCfTY5Xmct+GW7OjEGUxiMDzIfk
-87IAnA7u4DENi+cK1eSrOyC9sJuPqQn9
-=qeuD
+iD8DBQFH2VIwmPFBzbX68WERAk2PAKCJt3sWYF+AP2SANW1rQ/YK8m0iFACfXPh2
+wzceWeHawICRDqb3pgxqz9Y=
+=vbEw
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_log_sql/files/1.101/42_mod_log_sql.conf b/www-apache/mod_log_sql/files/1.101/42_mod_log_sql.conf
new file mode 100644
index 000000000000..57bd78d34ae4
--- /dev/null
+++ b/www-apache/mod_log_sql/files/1.101/42_mod_log_sql.conf
@@ -0,0 +1,33 @@
+<IfDefine LOG_SQL>
+LoadModule log_sql_module modules/mod_log_sql.so
+LoadModule log_sql_logio_module modules/mod_log_sql_logio.so
+
+<IfDefine DBI>
+LoadModule log_sql_dbi_module modules/mod_log_sql_dbi.so
+</IfDefine>
+
+<IfDefine !DBI>
+LoadModule log_sql_mysql_module modules/mod_log_sql_mysql.so
+</IfDefine>
+
+<IfDefine SSL>
+LoadModule log_sql_ssl_module modules/mod_log_sql_ssl.so
+</IfDefine>
+
+LogSQLLoginInfo mysql://user:passwd@host/database
+LogSQLDBParam socketfile /var/run/mysqld/mysqld.sock
+
+# LogSQLMassVirtualHosting automatically sets LogSQLCreateTables to 'on'
+#LogSQLCreateTables on
+LogSQLMassVirtualHosting on
+
+LogSQLMachineID machine_id
+LogSQLPreserveFile logs/mod_log_sql_preserve.sql
+
+# See http://www.outoforder.cc/projects/apache/mod_log_sql/docs-2.0/
+# for details about LogSQLTransferLogFormat
+# be compatible with the Combined Log Format (CLF)
+LogSQLTransferLogFormat AbHhmRSsTUuv
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_log_sql/mod_log_sql-1.101-r1.ebuild b/www-apache/mod_log_sql/mod_log_sql-1.101-r1.ebuild
new file mode 100644
index 000000000000..18420c3d51ad
--- /dev/null
+++ b/www-apache/mod_log_sql/mod_log_sql-1.101-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_log_sql/mod_log_sql-1.101-r1.ebuild,v 1.1 2008/03/13 16:11:19 hollow Exp $
+
+inherit apache-module
+
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DESCRIPTION="An Apache module for logging to an SQL (MySQL) database."
+HOMEPAGE="http://www.outoforder.cc/projects/apache/mod_log_sql/"
+SRC_URI="http://www.outoforder.cc/downloads/${PN}/${P}.tar.bz2"
+LICENSE="as-is"
+SLOT="0"
+IUSE="dbi ssl"
+
+DEPEND="virtual/mysql
+		dbi? ( dev-db/libdbi )
+		ssl? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}"
+
+APACHE2_MOD_CONF="1.101/42_${PN}"
+APACHE2_MOD_DEFINE="LOG_SQL"
+
+APACHE2_EXECFILES="
+	.libs/${PN}_dbi.so
+	.libs/${PN}_logio.so
+	.libs/${PN}_mysql.so
+	.libs/${PN}_ssl.so"
+
+DOCFILES="AUTHORS CHANGELOG docs/README docs/manual.html \
+contrib/create_tables.sql contrib/make_combined_log.pl contrib/mysql_import_combined_log.pl"
+
+need_apache
+
+src_compile() {
+	local myconf="--with-apxs=${APXS}"
+	use ssl && myconf="${myconf} --with-ssl-inc=/usr"
+	use ssl || myconf="${myconf} --without-ssl-inc"
+	use dbi && myconf="${myconf} --with-dbi=/usr"
+	use dbi || myconf="${myconf} --without-dbi"
+	econf ${myconf} || die "econf failed"
+	emake || die "emake failed"
+}
+
+pkg_postinst() {
+	use dbi && APACHE2_MOD_DEFINE="${APACHE2_MOD_DEFINE} DBI"
+	apache-module_pkg_postinst
+	einfo "Refer to /usr/share/doc/${PF}/ for scripts"
+	einfo "on how to create logging tables."
+}