bumped to 1.100 which uses new apache-module eclass

Package-Manager: portage-2.0.51-r15

8 files changed, 113 insertions, 13 deletions

diff --git a/net-www/mod_log_sql/ChangeLog b/net-www/mod_log_sql/ChangeLog
index 14b639388533..1294ebd2e375 100644
--- a/net-www/mod_log_sql/ChangeLog
+++ b/net-www/mod_log_sql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/mod_log_sql
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_log_sql/ChangeLog,v 1.14 2004/09/03 23:24:08 pvdabeel Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_log_sql/ChangeLog,v 1.15 2005/01/30 14:03:20 hollow Exp $
+
+*mod_log_sql-1.100 (30 Jan 2005)
+
+  30 Jan 2005; Benedikt Boehm <hollow@gentoo.org>
+  +files/1.100/10_mod_log_sql.conf, +mod_log_sql-1.100.ebuild:
+  Added 1.100 using new apache-module eclass
 
   04 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   mod_log_sql-1.97.ebuild, mod_log_sql-1.98.ebuild:
diff --git a/net-www/mod_log_sql/Manifest b/net-www/mod_log_sql/Manifest
index 99bbb3fb8b50..4fdf5bd0e26a 100644
--- a/net-www/mod_log_sql/Manifest
+++ b/net-www/mod_log_sql/Manifest
@@ -1,9 +1,22 @@
-MD5 e133ed42937313bc6e074f03538abe1f ChangeLog 2283
-MD5 5b6dd438f81019e56fa641841c0c13fe metadata.xml 501
-MD5 3a83808571b1262ec0adc91192ee365a mod_log_sql-1.97.ebuild 3097
-MD5 ecb6f521fa1ca539dccf496a5cb2df9e mod_log_sql-1.98.ebuild 2833
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d6be381fc6ef9028b917fd7066b33b83 ChangeLog 2474
+MD5 0d18f0fe5d603b41b988373892caf195 metadata.xml 226
+MD5 fa48395a7a22603bd80cc2338efdeb13 mod_log_sql-1.97.ebuild 3095
+MD5 b27039594dd70548045bc171e11b7337 mod_log_sql-1.98.ebuild 2831
+MD5 d1510bc5044cb5c3949701c332874e60 mod_log_sql-1.100.ebuild 1615
 MD5 b88eebdc5005a5c7150c2a9bf8bef809 files/10_mod_log_sql.conf 1282
 MD5 6b39011ec430408c5df2b067627ac3e1 files/10_mod_log_sql_apache2.conf 1111
 MD5 7a6e57cfb8898c79734fcf40291206cb files/digest-mod_log_sql-1.97 68
 MD5 37cf2cb766664bd12fc8af5c9dd4444f files/digest-mod_log_sql-1.98 68
 MD5 9081e8e239b5a17a817f21f7370afecc files/mod_log_sql-1.97-gentoo.patch 913
+MD5 86f476a1d8473e45132caa3f88a6a5bc files/digest-mod_log_sql-1.100 70
+MD5 120ac88176608bba1188f5b7f3d48804 files/1.100/10_mod_log_sql.conf 1066
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFB/OlBmPFBzbX68WERAh5uAJ4wJarQYIZFPVXv24qD5XecGF242ACdFOVU
+HXXaEPNiD4CK9sdu3HhgSHo=
+=R28i
+-----END PGP SIGNATURE-----
diff --git a/net-www/mod_log_sql/files/1.100/10_mod_log_sql.conf b/net-www/mod_log_sql/files/1.100/10_mod_log_sql.conf
new file mode 100644
index 000000000000..594c1456e7ae
--- /dev/null
+++ b/net-www/mod_log_sql/files/1.100/10_mod_log_sql.conf
@@ -0,0 +1,31 @@
+<IfDefine LOG_SQL>
+        LoadModule log_sql_module        modules/mod_log_sql.so
+	LoadModule log_sql_mysql_module  modules/mod_log_sql_mysql.so
+	<IfModule mod_ssl.c>
+            LoadModule log_sql_ssl_module modules/mod_log_sql_ssl.so
+        </IfModule>
+
+    <IfModule mod_log_sql.c>
+        # LogSQLMassVirtualHosting automatically sets LogSQLCreateTables to 'on'
+        LogSQLMassVirtualHosting on
+        #LogSQLCreateTables on
+
+        LogSQLDBParam user loguser            
+        LogSQLDBParam passwd l0gg3r      
+        LogSQLDBParam host localhost
+        LogSQLDBParam database apachelogs
+        LogSQLDBParam socketfile /var/run/mysqld/mysqld.sock
+        LogSQLCreateTables on
+        LogSQLMachineID machine_id
+
+        LogSQLPreserveFile /var/log/apache/mod_slog_sql_preserve.sql
+
+	# with cookie add a "c"
+	# with SSL add "Qqz"
+	# with mod_usertrack add "I"
+        LogSQLTransferLogFormat AabfHhMmPpRrSsTtUuv
+        <IfModule mod_ssl.c>
+            LogSQLTransferLogFormat AabfHhMmPpRrSsTtUuvQqz
+        </IfModule>
+    </IfModule>
+</IfDefine>
diff --git a/net-www/mod_log_sql/files/digest-mod_log_sql-1.100 b/net-www/mod_log_sql/files/digest-mod_log_sql-1.100
new file mode 100644
index 000000000000..8016a0da91a9
--- /dev/null
+++ b/net-www/mod_log_sql/files/digest-mod_log_sql-1.100
@@ -0,0 +1 @@
+MD5 b54657ad270cffc34dfab12302c53306 mod_log_sql-1.100.tar.bz2 122507
diff --git a/net-www/mod_log_sql/metadata.xml b/net-www/mod_log_sql/metadata.xml
index bcaabdbbd0d3..10510cb8be95 100644
--- a/net-www/mod_log_sql/metadata.xml
+++ b/net-www/mod_log_sql/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>apache</herd>
-<longdescription>
-The Apache HTTP Server Project is an effort to develop and maintain an open-source HTTP server for modern operating systems including UNIX and Windows NT. The goal of this project is to provide a secure, efficient and extensible server that provides HTTP services in sync with the current HTTP standards.
-</longdescription>
+<maintainer>
+  <email>apache-devs@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/net-www/mod_log_sql/mod_log_sql-1.100.ebuild b/net-www/mod_log_sql/mod_log_sql-1.100.ebuild
new file mode 100644
index 000000000000..08ed5d12ae64
--- /dev/null
+++ b/net-www/mod_log_sql/mod_log_sql-1.100.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_log_sql/mod_log_sql-1.100.ebuild,v 1.1 2005/01/30 14:03:20 hollow Exp $
+
+inherit eutils apache-module
+
+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"
+KEYWORDS="~x86 ~ppc"
+IUSE="ssl dbi"
+
+DEPEND=">=dev-db/mysql-3.23.30
+		dbi? ( >=dev-db/libdbi-0.7.0 )
+		ssl? ( dev-libs/openssl !apache2? ( net-www/mod_ssl ) )"
+
+APACHE1_MOD_CONF="${PV}/10_${PN}"
+APACHE2_MOD_CONF="${PV}/10_${PN}"
+
+APACHE1_MOD_DEFINE="LOG_SQL"
+APACHE2_MOD_DEFINE="LOG_SQL"
+
+APACHE1_EXECFILES="${PN}_mysql.so ${PN}_dbi.so ${PN}_ssl.so"
+APACHE2_EXECFILES=".libs/${PN}_mysql.so .libs/${PN}_dbi.so .libs/${PN}_ssl.so"
+
+DOCFILES="AUTHORS CHANGELOG INSTALL TODO docs/README docs/manual.html \
+contrib/create_tables.sql contrib/make_combined_log.pl contrib/mysql_import_combined_log.pl"
+
+need_apache
+
+src_compile() {
+	useq apache2 || myconf="--with-apxs=${APXS1}"
+	useq apache2 && myconf="--with-apxs=${APXS2}"
+	useq ssl && myconf="${myconf} --with-ssl-inc=/usr"
+	useq ssl || myconf="${myconf} --without-ssl-inc"
+	useq dbi && myconf="${myconf} --with-dbi=/usr"
+	useq dbi || myconf="${myconf} --without-dbi"
+	econf ${myconf} || die "econf failed"
+	emake || die "emake failed"
+}
+
+pkg_postinst() {
+	apache-module_pkg_postinst
+	einfo "See /usr/share/doc/${PF}/create_tables.sql.gz "
+	einfo "on how to create logging tables.\n"
+}
diff --git a/net-www/mod_log_sql/mod_log_sql-1.97.ebuild b/net-www/mod_log_sql/mod_log_sql-1.97.ebuild
index cd043ca0e76e..10f7d5ddb1b6 100644
--- a/net-www/mod_log_sql/mod_log_sql-1.97.ebuild
+++ b/net-www/mod_log_sql/mod_log_sql-1.97.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_log_sql/mod_log_sql-1.97.ebuild,v 1.8 2004/09/03 23:24:08 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_log_sql/mod_log_sql-1.97.ebuild,v 1.9 2005/01/30 14:03:20 hollow Exp $
 
 inherit eutils
 
diff --git a/net-www/mod_log_sql/mod_log_sql-1.98.ebuild b/net-www/mod_log_sql/mod_log_sql-1.98.ebuild
index b76345be9748..f55580256f2a 100644
--- a/net-www/mod_log_sql/mod_log_sql-1.98.ebuild
+++ b/net-www/mod_log_sql/mod_log_sql-1.98.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_log_sql/mod_log_sql-1.98.ebuild,v 1.5 2004/09/03 23:24:08 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_log_sql/mod_log_sql-1.98.ebuild,v 1.6 2005/01/30 14:03:20 hollow Exp $
 
 inherit eutils