commit: 154c3763c8a212eea567c381bb6ee0ffe5758ca2 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sun May 14 16:19:10 2023 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun May 14 16:19:10 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=154c3763
www-apache/mod_log_sql: treeclean Closes: https://bugs.gentoo.org/778506 Closes: https://bugs.gentoo.org/881205 Signed-off-by: David Seifert <soap <AT> gentoo.org> profiles/package.mask | 5 -- www-apache/mod_log_sql/Manifest | 1 - .../mod_log_sql/files/1.101/42_mod_log_sql.conf | 33 ----------- www-apache/mod_log_sql/files/42_mod_log_sql.conf | 28 ---------- .../files/mod_log_sql-1.101-apache-2.4.patch | 17 ------ www-apache/mod_log_sql/metadata.xml | 5 -- www-apache/mod_log_sql/mod_log_sql-1.101-r3.ebuild | 64 ---------------------- 7 files changed, 153 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 6e5b15f6cb9e..2c426e64811e 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -259,11 +259,6 @@ x11-misc/sprop # See https://github.com/openzfs/zfs/issues/14753. =sys-fs/zfs-kmod-2.1.10 -# Sam James <[email protected]> (2023-04-14) -# Fails with modern C, no upstream activity since 2005. -# Removal on 2023-05-14. Bug #778506, bug #881205. -www-apache/mod_log_sql - # Sam James <[email protected]> (2023-04-13) # Leads to broken terminal output in e.g. vim and openrc and other applications # like joe crashing. diff --git a/www-apache/mod_log_sql/Manifest b/www-apache/mod_log_sql/Manifest deleted file mode 100644 index 89ae093e5fea..000000000000 --- a/www-apache/mod_log_sql/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST mod_log_sql-1.101.tar.bz2 127500 BLAKE2B b82677ba590f900a69506b0a9f5ada92076faa303815655d0d9e24c1f50704c96878ab39b7285836bbb59ecac15db6bfba674c10dfc78bdb0907ff37cf680cf5 SHA512 30ea586443cf042e52149012613d80ca0c6631847618366905e90f99bfab235ca6e050fa1dbdb98ef54be6d68b34564781c6efb36ba89f7b51e4f3e00892d91f diff --git a/www-apache/mod_log_sql/files/1.101/42_mod_log_sql.conf b/www-apache/mod_log_sql/files/1.101/42_mod_log_sql.conf deleted file mode 100644 index 57bd78d34ae4..000000000000 --- a/www-apache/mod_log_sql/files/1.101/42_mod_log_sql.conf +++ /dev/null @@ -1,33 +0,0 @@ -<IfDefine LOG_SQL> -LoadModule log_sql_module modules/mod_log_sql.so -LoadModule log_sql_logio_module modules/mod_log_sql_logio.so - -<IfDefine DBI> -LoadModule log_sql_dbi_module modules/mod_log_sql_dbi.so -</IfDefine> - -<IfDefine !DBI> -LoadModule log_sql_mysql_module modules/mod_log_sql_mysql.so -</IfDefine> - -<IfDefine SSL> -LoadModule log_sql_ssl_module modules/mod_log_sql_ssl.so -</IfDefine> - -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 -</IfDefine> - -# vim: ts=4 filetype=apache diff --git a/www-apache/mod_log_sql/files/42_mod_log_sql.conf b/www-apache/mod_log_sql/files/42_mod_log_sql.conf deleted file mode 100644 index d5ae3813fc56..000000000000 --- a/www-apache/mod_log_sql/files/42_mod_log_sql.conf +++ /dev/null @@ -1,28 +0,0 @@ -<IfDefine LOG_SQL> -LoadModule log_sql_module modules/mod_log_sql.so -LoadModule log_sql_mysql_module modules/mod_log_sql_mysql.so - -<IfDefine SSL> -LoadModule log_sql_ssl_module modules/mod_log_sql_ssl.so -</IfDefine> - -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 -<IfDefine SSL> -LogSQLTransferLogFormat AbHhmRSsTUuv -</IfDefine> -</IfDefine> - -# vim: ts=4 filetype=apache 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 deleted file mode 100644 index afbaf3927b7d..000000000000 --- a/www-apache/mod_log_sql/files/mod_log_sql-1.101-apache-2.4.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: Fixes compatibility with Apache 2.4 API -Author: Thomas Goirand <[email protected]> -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/metadata.xml b/www-apache/mod_log_sql/metadata.xml deleted file mode 100644 index 85e4ed814fa2..000000000000 --- a/www-apache/mod_log_sql/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<!-- maintainer-needed --> -</pkgmetadata> diff --git a/www-apache/mod_log_sql/mod_log_sql-1.101-r3.ebuild b/www-apache/mod_log_sql/mod_log_sql-1.101-r3.ebuild deleted file mode 100644 index 250033863d3d..000000000000 --- a/www-apache/mod_log_sql/mod_log_sql-1.101-r3.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit 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="Artistic" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="dbi ssl" - -DEPEND="dev-db/mysql-connector-c:0= - 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" - -DOCS=( AUTHORS CHANGELOG docs/README contrib/create_tables.sql - contrib/make_combined_log.pl contrib/mysql_import_combined_log.pl ) -HTML_DOCS=( docs/manual.html ) - -PATCHES=( "${FILESDIR}"/${P}-apache-2.4.patch ) - -need_apache2_4 - -pkg_setup() { - _init_apache2 - _init_apache2_late -} - -src_configure() { - local myconf="--with-apxs=${APXS}" - myconf="${myconf} $(usex ssl --with-ssl-inc=/usr --without-ssl-inc)" - myconf="${myconf} $(usex dbi --with-dbi=/usr --without-dbi)" - econf ${myconf} -} - -src_compile() { - emake -} - -src_install() { - use dbi && APACHE2_EXECFILES="${APACHE2_EXECFILES} .libs/${PN}_dbi.so" - apache-module_src_install - einstalldocs -} - -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." -}
