From 61229da9e56c25c3e856faeb0d95be2a797772df Mon Sep 17 00:00:00 2001 From: Luca Longinotti Date: Sun, 14 Jan 2007 17:29:26 +0000 Subject: [PATCH] Cleanup. Package-Manager: portage-2.1.2_rc4-r8 --- net-www/mod_log_sql/ChangeLog | 11 +++++- net-www/mod_log_sql/files/42_mod_log_sql.conf | 28 +++++++++++++ net-www/mod_log_sql/mod_log_sql-1.100.ebuild | 39 ++++++++++--------- net-www/mod_log_sql/mod_log_sql-1.101.ebuild | 39 ++++++++++--------- 4 files changed, 77 insertions(+), 40 deletions(-) create mode 100644 net-www/mod_log_sql/files/42_mod_log_sql.conf diff --git a/net-www/mod_log_sql/ChangeLog b/net-www/mod_log_sql/ChangeLog index 51066a503aa3..2355d9dc0585 100644 --- a/net-www/mod_log_sql/ChangeLog +++ b/net-www/mod_log_sql/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-www/mod_log_sql -# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mod_log_sql/ChangeLog,v 1.29 2006/12/12 22:24:06 trapni Exp $ +# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-www/mod_log_sql/ChangeLog,v 1.30 2007/01/14 17:29:26 chtekk Exp $ + + 14 Jan 2007; Luca Longinotti + -files/1.100/42_mod_log_sql.conf, -files/10_mod_log_sql.conf, + +files/42_mod_log_sql.conf, -files/mod_log_sql-1.97-gentoo.patch, + -files/10_mod_log_sql_apache2.conf, mod_log_sql-1.100.ebuild, + mod_log_sql-1.101.ebuild: + Cleanup. *mod_log_sql-1.101 (12 Dec 2006) diff --git a/net-www/mod_log_sql/files/42_mod_log_sql.conf b/net-www/mod_log_sql/files/42_mod_log_sql.conf new file mode 100644 index 000000000000..e9aed14145aa --- /dev/null +++ b/net-www/mod_log_sql/files/42_mod_log_sql.conf @@ -0,0 +1,28 @@ + + LoadModule log_sql_module modules/mod_log_sql.so + LoadModule log_sql_mysql_module modules/mod_log_sql_mysql.so + + + LoadModule log_sql_ssl_module modules/mod_log_sql_ssl.so + + + + + 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 + + LogSQLTransferLogFormat AbHhmRSsTUuv + + 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 index bc3887e0a194..c23ff5196d77 100644 --- a/net-www/mod_log_sql/mod_log_sql-1.100.ebuild +++ b/net-www/mod_log_sql/mod_log_sql-1.100.ebuild @@ -1,25 +1,25 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 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.10 2006/11/23 16:14:58 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/mod_log_sql/mod_log_sql-1.100.ebuild,v 1.11 2007/01/14 17:29:26 chtekk Exp $ -inherit eutils apache-module +inherit apache-module -DESCRIPTION="An Apache module for logging to an SQL (MySQL) database" +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" -KEYWORDS="~amd64 ppc x86" -IUSE="apache2 dbi ssl" +IUSE="dbi ssl" DEPEND="virtual/mysql - dbi? ( >=dev-db/libdbi-0.7.0 ) + dbi? ( dev-db/libdbi ) ssl? ( dev-libs/openssl !apache2? ( net-www/mod_ssl ) )" RDEPEND="${DEPEND}" -APACHE1_MOD_CONF="${PV}/42_${PN}" -APACHE2_MOD_CONF="${PV}/42_${PN}" +APACHE1_MOD_CONF="42_${PN}" +APACHE2_MOD_CONF="42_${PN}" APACHE1_MOD_DEFINE="LOG_SQL" APACHE2_MOD_DEFINE="LOG_SQL" @@ -27,24 +27,25 @@ 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 \ +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() { - 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" + local myconf="" + use apache2 && myconf="--with-apxs=${APXS2}" + use apache2 || myconf="--with-apxs=${APXS1}" + 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() { apache-module_pkg_postinst - einfo "See /usr/share/doc/${PF}/create_tables.sql.gz " - einfo "on how to create logging tables.\n" + einfo "See /usr/share/doc/${PF}/create_tables.sql.gz" + einfo "on how to create logging tables." } diff --git a/net-www/mod_log_sql/mod_log_sql-1.101.ebuild b/net-www/mod_log_sql/mod_log_sql-1.101.ebuild index f0a229fff821..88829275dbf0 100644 --- a/net-www/mod_log_sql/mod_log_sql-1.101.ebuild +++ b/net-www/mod_log_sql/mod_log_sql-1.101.ebuild @@ -1,25 +1,25 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 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.101.ebuild,v 1.1 2006/12/12 22:24:06 trapni Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/mod_log_sql/mod_log_sql-1.101.ebuild,v 1.2 2007/01/14 17:29:26 chtekk Exp $ -inherit eutils apache-module +inherit apache-module -DESCRIPTION="An Apache module for logging to an SQL (MySQL) database" +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" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="apache2 dbi ssl" +IUSE="dbi ssl" DEPEND="virtual/mysql - dbi? ( >=dev-db/libdbi-0.7.0 ) + dbi? ( dev-db/libdbi ) ssl? ( dev-libs/openssl !apache2? ( net-www/mod_ssl ) )" RDEPEND="${DEPEND}" -APACHE1_MOD_CONF="${PV}/42_${PN}" -APACHE2_MOD_CONF="${PV}/42_${PN}" +APACHE1_MOD_CONF="42_${PN}" +APACHE2_MOD_CONF="42_${PN}" APACHE1_MOD_DEFINE="LOG_SQL" APACHE2_MOD_DEFINE="LOG_SQL" @@ -27,24 +27,25 @@ 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 \ +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() { - 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" + local myconf="" + use apache2 && myconf="--with-apxs=${APXS2}" + use apache2 || myconf="--with-apxs=${APXS1}" + 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() { apache-module_pkg_postinst - einfo "See /usr/share/doc/${PF}/create_tables.sql.gz " - einfo "on how to create logging tables.\n" + einfo "See /usr/share/doc/${PF}/create_tables.sql.gz" + einfo "on how to create logging tables." } -- 2.26.2