Support apache 2.4 (#532840)

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 87 insertions, 2 deletions

diff --git a/www-apache/mod_log_sql/ChangeLog b/www-apache/mod_log_sql/ChangeLog
index 3323b67dfff3..c2df2e95ec43 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 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_log_sql/ChangeLog,v 1.13 2014/08/10 20:16:44 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_log_sql/ChangeLog,v 1.14 2015/05/09 08:48:33 pacho Exp $
+
+*mod_log_sql-1.101-r2 (09 May 2015)
+
+  09 May 2015; Pacho Ramos <pacho@gentoo.org>
+  +files/mod_log_sql-1.101-apache-2.4.patch, +mod_log_sql-1.101-r2.ebuild:
+  Support apache 2.4 (#532840)
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org>
   mod_log_sql-1.101-r1.ebuild:
diff --git a/www-apache/mod_log_sql/files/mod_log_sql-1.101-apache-2.4.patch b/www-apache/mod_log_sql/files/mod_log_sql-1.101-apache-2.4.patch
new file mode 100644
index 000000000000..afbaf3927b7d
--- /dev/null
+++ b/www-apache/mod_log_sql/files/mod_log_sql-1.101-apache-2.4.patch
@@ -0,0 +1,17 @@
+Description: Fixes compatibility with Apache 2.4 API
+Author: Thomas Goirand <zigo@debian.org>
+Bug-Debian: http://bugs.debian.org/666797
+Forwarded: http://lists.outoforder.cc/pipermail/mod_log_sql/2012-April/000358.html
+Last-Update: 2013-07-10
+
+--- libapache-mod-log-sql-1.100.orig/functions.h
++++ libapache-mod-log-sql-1.100/functions.h
+@@ -14,7 +14,7 @@ static const char *extract_remote_addres
+ 
+ static const char *extract_remote_address(request_rec *r, char *a)
+ {
+-    return r->connection->remote_ip;
++    return r->useragent_ip;
+ }
+ 
+ static const char *extract_local_address(request_rec *r, char *a) __attribute__((unused));
diff --git a/www-apache/mod_log_sql/mod_log_sql-1.101-r2.ebuild b/www-apache/mod_log_sql/mod_log_sql-1.101-r2.ebuild
new file mode 100644
index 000000000000..09393ce360f6
--- /dev/null
+++ b/www-apache/mod_log_sql/mod_log_sql-1.101-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 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-r2.ebuild,v 1.1 2015/05/09 08:48:33 pacho Exp $
+
+EAPI=5
+inherit apache-module eutils
+
+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="Artistic"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="dbi ssl"
+
+DEPEND="virtual/mysql
+	dbi? ( dev-db/libdbi )
+	ssl? ( dev-libs/openssl:0 )"
+RDEPEND="${DEPEND}"
+
+APACHE2_MOD_CONF="1.101/42_${PN}"
+APACHE2_MOD_DEFINE="LOG_SQL"
+
+APACHE2_EXECFILES="
+	.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_apache2_4
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-apache-2.4.patch
+}
+
+src_configure() {
+	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}
+}
+
+src_compile() {
+	emake
+}
+
+src_install() {
+	use dbi && APACHE2_EXECFILES="${APACHE2_EXECFILES} .libs/${PN}_dbi.so"
+	apache-module_src_install
+}
+
+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."
+}