www/mod_log_sql: Fix PID > 65535

 * PID > 65535 when 'LogSQLCreateTables On' [1]
 * Fix WWW address
 * 2 suffix (for Apache 2) is redundant, remove

PR:		243793 [1]
Submitted by:	Tommy P <tommyhp2 gmail com>

4 files changed, 0 insertions, 121 deletions

diff --git a/www/mod_log_sql2/files/330_mod_log_sql.conf.sample.in b/www/mod_log_sql2/files/330_mod_log_sql.conf.sample.in
deleted file mode 100644
index ba92edca0412..000000000000
--- a/www/mod_log_sql2/files/330_mod_log_sql.conf.sample.in
+++ /dev/null
@@ -1,35 +0,0 @@
-# www/mod_log_sql2
-# vim: set syntax=apache:
-
-# =====================================================
-# required module
-# =====================================================
-#LoadModule log_sql_module %%APACHEMODDIR%%/mod_log_sql.so
-#LoadModule log_sql_mysql_module %%APACHEMODDIR%%/mod_log_sql_mysql.so
-
-# =====================================================
-# optional modules
-# =====================================================
-#<IfModule ssl_module>
-#LoadModule log_sql_ssl_module %%APACHEMODDIR%%/mod_log_sql_ssl.so
-#</IfModule>
-
-## optional if build with DBI
-#LoadModule log_sql_dbi %%APACHEMODDIR%%/mod_log_sql_dbi.so
-
-
-## =====================================================
-## sample db connection, see
-## %%DOCSDIR%%/manual.html / manual.xml
-## =====================================================
-## <IfModule log_sql_module>
-### log over IP
-## LogSQLLoginInfo mysql://userid:passwd@db.host.name/apachelogs
-### log via socket
-## LogSQLDBParam socketfile /your/path/to/mysql.sock
-## LogSQLCreateTables On
-## LogSQLMassVirtualHosting On
-## LogSQLTransferLogFormat AbHhmRSsTUuv
-## LogSQLRequestIgnore /sample-path/token /server-status
-## LogSQLPreserveFile /var/tmp/offline-preserve
-## </IfModule> 
diff --git a/www/mod_log_sql2/files/patch-Makefile.in b/www/mod_log_sql2/files/patch-Makefile.in
deleted file mode 100644
index 070fd43bb5fe..000000000000
--- a/www/mod_log_sql2/files/patch-Makefile.in
+++ /dev/null
@@ -1,62 +0,0 @@
---- Makefile.in.orig	2006-11-05 03:47:23 UTC
-+++ Makefile.in
-@@ -20,6 +20,8 @@
- EXTRA_DIST = AUTHORS INSTALL TODO LICENSE CHANGELOG \
- 	build-apache13.bat build-apache2.bat \
- 
-+APXS_STAGE = @APXS_STAGE@
-+
- coreSOURCES = @PACKAGE_NAME@.c
- coreTARGET = @PACKAGE_NAME@@APXS_EXTENSION@
- coreLDADD = @RT_LIBS@
-@@ -151,41 +153,27 @@
- 		@DEFS@ @AP_DEFS@ $(dbiLDADD) $(dbiSOURCES)
- 
- install: $(TARGETS) install-subdirs
--	@@APXS_BIN@ -n $(coreNAME) -i $(coreTARGET); \
-+	@@APXS_BIN@ $(APXS_STAGE) -n $(coreNAME) -i $(coreTARGET); \
- 	if test @WANT_MYSQL_MOD@ -eq 1; then \
--	    @APXS_BIN@ -n $(mysqlNAME) -i $(mysqlTARGET); \
-+	    @APXS_BIN@ $(APXS_STAGE) -n $(mysqlNAME) -i $(mysqlTARGET); \
-     fi; \
- 	if test @WANT_PGSQL_MOD@ -eq 1; then \
--	    @APXS_BIN@ -n $(pgsqlNAME) -i $(pgsqlTARGET); \
-+	    @APXS_BIN@ $(APXS_STAGE) -n $(pgsqlNAME) -i $(pgsqlTARGET); \
-     fi; \
- 	if test @WANT_DBI_MOD@ -eq 1; then \
--	    @APXS_BIN@ -n $(dbiNAME) -i $(dbiTARGET); \
-+	    @APXS_BIN@ $(APXS_STAGE) -n $(dbiNAME) -i $(dbiTARGET); \
-     fi; \
- 	if test @WANT_SSL_MOD@ -eq 1; then \
--		@APXS_BIN@ -n $(sslNAME) -i $(sslTARGET); \
-+		@APXS_BIN@ $(APXS_STAGE) -n $(sslNAME) -i $(sslTARGET); \
- 	fi; \
- 	if test @WANT_LOGIO_MOD@ -eq 1; then \
--	    @APXS_BIN@ -n $(logioNAME) -i $(logioTARGET); \
--    fi; \
--	echo "*************************************************************************"; \
--	echo "*** The mod_log_sql modules have been installed."; \
--	echo "*** Please edit your Apache configuration files and"; \
--	echo "*** add the appropriate LoadModule directives per the documentation"; \
--	echo "*** in docs/manual.html"; \
--	echo "*** If you have previously used 1.18 or lower then you must change"; \
--	echo "*** >LoadModule sql_log_module modules/mod_log_sql.so"; \
--	echo "***   to"; \
--	echo "*** >LoadModule log_sql_module modules/mod_log_sql.so"; \
--	echo "*** in your httpd.conf as the internal name of the module has changed."; \
--	echo "*** "; \
--	echo "*** Also read the documentation about using SSL support and new "; \
--	echo "*** configuration directives."; \
--	echo "*************************************************************************";
-+	    @APXS_BIN@ $(APXS_STAGE) -n $(logioNAME) -i $(logioTARGET); \
-+    fi;
- 
- activate: activate-subdirs
--	@@APXS_BIN@ -n $(coreNAME) -i -a $(coreTARGET); \
-+	@@APXS_BIN@ $(APXS_STAGE) -n $(coreNAME) -i $(coreTARGET); \
- 	if test @WANT_SSL_MOD@ -eq 1; then \
--		@APXS_BIN@ -n $(sslNAME) -i -a $(sslTARGET); \
-+		@APXS_BIN@ $(APXS_STAGE) -n $(sslNAME) -i $(sslTARGET); \
- 	fi
- 
- clean: clean-subdirs
diff --git a/www/mod_log_sql2/files/patch-functions.h b/www/mod_log_sql2/files/patch-functions.h
deleted file mode 100644
index 6370a7d9887e..000000000000
--- a/www/mod_log_sql2/files/patch-functions.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- functions.h.orig	2004-09-20 02:50:46 UTC
-+++ functions.h
-@@ -14,7 +14,11 @@
- 
- static const char *extract_remote_address(request_rec *r, char *a)
- {
-+#if AP_MODULE_MAGIC_AT_LEAST(20111130,0)
-+    return r->useragent_ip;
-+#else
-     return r->connection->remote_ip;
-+#endif
- }
- 
- static const char *extract_local_address(request_rec *r, char *a) __attribute__((unused));
diff --git a/www/mod_log_sql2/files/pkg-message.in b/www/mod_log_sql2/files/pkg-message.in
deleted file mode 100644
index fb83310af788..000000000000
--- a/www/mod_log_sql2/files/pkg-message.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-{ type: install
-  message: <<EOM
- The mod_log_sql modules have been installed.
-
- The module config file was installed as
-   %%PREFIX%%/%%APACHEETCDIR%%/modules.d/%%APMODCFG%%
-EOM
-}
-]