Added patch. closes #50277.

4 files changed, 46 insertions, 7 deletions

diff --git a/net-www/mod_log_sql/ChangeLog b/net-www/mod_log_sql/ChangeLog
index a2b796f461b5..4376125a87e4 100644
--- a/net-www/mod_log_sql/ChangeLog
+++ b/net-www/mod_log_sql/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/mod_log_sql
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_log_sql/ChangeLog,v 1.4 2004/05/03 22:06:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_log_sql/ChangeLog,v 1.5 2004/05/06 20:06:15 zul Exp $
+
+  07 May 2004; Chuck Short <zul@gentoo.org> mod_log_sql-1.97.ebuild,
+  files/mod_log_sql-1.97-gentoo.patch:
+  Added patch so that mod_log_sql can compile properly. Closes #50277.
 
   03 May 2004; Michael Sterrett <mr_bones_@gentoo.org>
   mod_log_sql-1.96.ebuild, mod_log_sql-1.97.ebuild:
diff --git a/net-www/mod_log_sql/Manifest b/net-www/mod_log_sql/Manifest
index 842f66a3be6e..7e840e5b0818 100644
--- a/net-www/mod_log_sql/Manifest
+++ b/net-www/mod_log_sql/Manifest
@@ -1,8 +1,9 @@
-MD5 189a0101fed2b278bc8ef5f1388c9f80 ChangeLog 882
-MD5 5b6dd438f81019e56fa641841c0c13fe metadata.xml 501
 MD5 a5a6dd5d3ef2d2876eb29c8236cd64bb mod_log_sql-1.96.ebuild 3001
-MD5 0bc09fc1e766f2ff3f985b293dd41797 mod_log_sql-1.97.ebuild 3001
-MD5 32dd778c2b656fd5ef91cb63684203b0 files/10_mod_log_sql.conf 1214
-MD5 25f5f7d682fe530634cedbd495a700ba files/10_mod_log_sql_apache2.conf 1044
+MD5 7fa3ca386e8867a798fb3cc93dcd7e77 mod_log_sql-1.97.ebuild 3084
+MD5 834d42de8d4cf59a6d98d77989794293 ChangeLog 1056
+MD5 5b6dd438f81019e56fa641841c0c13fe metadata.xml 501
 MD5 512a290da7324c6b25d5d474918cd338 files/digest-mod_log_sql-1.96 68
 MD5 7a6e57cfb8898c79734fcf40291206cb files/digest-mod_log_sql-1.97 68
+MD5 32dd778c2b656fd5ef91cb63684203b0 files/10_mod_log_sql.conf 1214
+MD5 25f5f7d682fe530634cedbd495a700ba files/10_mod_log_sql_apache2.conf 1044
+MD5 9081e8e239b5a17a817f21f7370afecc files/mod_log_sql-1.97-gentoo.patch 913
diff --git a/net-www/mod_log_sql/files/mod_log_sql-1.97-gentoo.patch b/net-www/mod_log_sql/files/mod_log_sql-1.97-gentoo.patch
new file mode 100644
index 000000000000..036d95c5b3d4
--- /dev/null
+++ b/net-www/mod_log_sql/files/mod_log_sql-1.97-gentoo.patch
@@ -0,0 +1,31 @@
+diff -Naur mod_log_sql-1.97/mod_log_sql.c mod_log_sql-1.97-gentoo/mod_log_sql.c
+--- mod_log_sql-1.97/mod_log_sql.c	2004-04-09 01:09:40.000000000 +0000
++++ mod_log_sql-1.97-gentoo/mod_log_sql.c	2004-05-07 12:09:21.543679240 +0000
+@@ -1,5 +1,13 @@
+ /* $Id: mod_log_sql-1.97-gentoo.patch,v 1.1 2004/05/06 20:06:15 zul Exp $ */
+ 
++#if defined(WITH_APACHE20)
++#	include "apache20.h"
++#elif defined(WITH_APACHE13)
++#	include "apache13.h"
++#else
++#	error Unsupported Apache version
++#endif
++
+ #ifdef HAVE_CONFIG_H
+ /* Undefine these to prevent conflicts between Apache ap_config_auto.h and 
+  * my config.h. Only really needed for Apache < 2.0.48, but it can't hurt.
+@@ -13,13 +21,6 @@
+ #include "config.h"
+ #endif
+ 
+-#if defined(WITH_APACHE20)
+-#	include "apache20.h"
+-#elif defined(WITH_APACHE13)
+-#	include "apache13.h"
+-#else
+-#	error Unsupported Apache version
+-#endif
+ 
+ #if APR_HAVE_UNISTD_H
+ #include <unistd.h>
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 84d515c5658a..95b6eeacbd82 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,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.2 2004/05/03 22:06:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_log_sql/mod_log_sql-1.97.ebuild,v 1.3 2004/05/06 20:06:15 zul Exp $
+
+inherit eutils
 
 DESCRIPTION="An Apache module for logging to an SQL (MySQL) database"
 HOMEPAGE="http://www.outoforder.cc/projects/apache/mod_log_sql/"
@@ -62,6 +64,7 @@ src_compile() {
 	detectapache
 	myconf="--with-apxs=${APXS}"
 
+	epatch ${FILESDIR}/mod_log_sql-1.97-gentoo.patch || die "Patch failed."
 	use ssl && myconf="${myconf} --enable-ssl"
 	./configure ${myconf}
 	emake || die