From: Pacho Ramos Date: Sat, 9 May 2015 08:48:34 +0000 (+0000) Subject: Support apache 2.4 (#532840) X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a6d52a1b49e836a5890cf53fab556c0b5613fefb;p=gentoo.git Support apache 2.4 (#532840) Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xA188FBD4 --- 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 + +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 mod_log_sql-1.101-r1.ebuild: diff --git a/www-apache/mod_log_sql/Manifest b/www-apache/mod_log_sql/Manifest index b1b78ad6b642..be84f43f17cc 100644 --- a/www-apache/mod_log_sql/Manifest +++ b/www-apache/mod_log_sql/Manifest @@ -3,14 +3,16 @@ Hash: SHA256 AUX 1.101/42_mod_log_sql.conf 938 SHA256 b4d652ded6486c93fa524f68243dad635a7e02c600727110d7758e3eb8794cf1 SHA512 9e3829b974b4d676a3a2e5d98243a8a0f9b9f462722d67d56dba05932aa22aeb9d2581b1833f4701e61ba5c07cd9fdefd8422735582da00b74428912f136ea7e WHIRLPOOL 945aed18d0a8cb276d60e797651092f187c1e8a60f616ab38d70ebd02af14e002efc8d51acec335df7e2ef3ab8045d1335b32eca5888aeb4b91c04d39a317b40 AUX 42_mod_log_sql.conf 827 SHA256 92e35990cdde4d2761730d017f123efe4adc223c375d8ce5f7c3f71111d1494e SHA512 0e43b3c89216fe33886373a4036d3ef5f873e8c99f6fbb640224e606d29a1f220e692fb73e6b54cb87aff502e4642f17245a6771c4e0d6426d0834f564cf2f4f WHIRLPOOL 0c3d96c7297c4cc970c0d68113ea6a617771884aff7f7f6d7d7b7f8d849707eb106497c7efde580b528c34bd162b2e9433b10ca5bba94fbd25d77f8c5412891e +AUX mod_log_sql-1.101-apache-2.4.patch 633 SHA256 9273ab1b5164c0b3f49290f759fb9499e4f66013886aa7b16c271db99242977c SHA512 9ce5fc6183d76a32a073d0778404d1b112a3f44eddb589a80146b82762535cf909f303af41dd0bbd650d70e362e85e4fb361039c4fcdfd1a8af134d6d02a2fd4 WHIRLPOOL be4e82ebcf50f782a564ecffad95c7471ab7b3d4af1c75838afee0e291844bee6f51f4a732ccdac57f04d5075c77f8f3e57ed1a52964b54b40b6586c1e41656a DIST mod_log_sql-1.101.tar.bz2 127500 SHA256 0907579b0466844f7f1886af92a9ea36b4815ec869929ba577c74d32b6d69a5e SHA512 30ea586443cf042e52149012613d80ca0c6631847618366905e90f99bfab235ca6e050fa1dbdb98ef54be6d68b34564781c6efb36ba89f7b51e4f3e00892d91f WHIRLPOOL 1fb6c8725a6321fe565a13121592694750354686e6a3035abb80bc7250d3a2884dd0bea0421f2d02768c196eeb409cb7e600e48dfed0fd7f14146d242666d681 EBUILD mod_log_sql-1.101-r1.ebuild 1476 SHA256 e6c07682ef6ab553a3d30d94ecaf7e56b5ea191cabc0b3db16f5171f3d2fb385 SHA512 f31950b3df3f83d0012d833f553d0b07bebefb253a5f0fdbb140d9accb7b7cfedf4dfdb7144dc86a8f187f4ab560978086685d4cb18b97c9680561f03e252f92 WHIRLPOOL c3121b21c7df1d9db51f77d72142d725683ab85d51a9452531e91c545743af5d3eee730a995f7450e580aa8193a5e17f9a9037fbd1ed38dce19e34783a9d7f93 -MISC ChangeLog 7107 SHA256 685e9bbf0607b4fc875b0f34ee8a4659e700322c0ae6e90835404007f55cc9fd SHA512 5bbccf988898f7688b2ad385f3794719d3a79f040c796e424de54a850a448828b8f38739806cfe9d35d05d4be1a48170679ac3f7ffef76ef468c37a5dcc2b10b WHIRLPOOL ddc63a78033c45f0c5b27667c4f443b51c54856fc709ce8f312a802884d867600be6d3ded40efb87fc3ed67b3a22d8f0bef3fadd5b067139f7f175ab05e72104 +EBUILD mod_log_sql-1.101-r2.ebuild 1630 SHA256 174d110c09783d2f0dd6e48864dab6d8c21a1ad075347af51ffbd301ee5d8524 SHA512 4486776b7540459e864140f11d5eba35b1b2de12f1e3a5394f85aa2199604bcebf036ed6808b52987b3df41542f8836c98d7d77a48e1cdd0c416db40aeae3178 WHIRLPOOL b46c5ac9b4fa265a05f3592c3feb8aa4e7b11af26566a8e690f9f5e72956d34000d6bb08ef33d38b7c7d91d7ad0031beae6e81dfa07d2c6a38917f478c9746c3 +MISC ChangeLog 7296 SHA256 c92b7c0631e985f65e97c7b821899e22df66f5ecaab75d47e07c6e2107315ca5 SHA512 daa9e54c352748222514a78b62c7d90fb733166aa04fd4725e775829afecb767853c02f6abe2741de642f99600418d8cd1c7f378100873bc18a182229e9329b6 WHIRLPOOL e5c439ce9bda9f8cfb503d67357a87dc69144d6eedb3f96fe4d345a767e1ea8bac5f51f0b0af8c1dc459bd9c0a852113ed54c33595201539362336939b672f6b MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlPn0ywACgkQcaHudmEf86qGXwCeLR1n2udDCESN5NPcrZ7eciE+ -UH4An1r7ZALNNyx4pNkha7+51wXaxr6n -=5WVt +iEYEAREIAAYFAlVNyeIACgkQCaWpQKGI+9SoWQCeN40Pz6CJBBE6dahAlbDt5Gb0 +DNMAn0/WpoDmLz/9MY6Tke+Z0NsyL/0m +=Xb/D -----END PGP SIGNATURE----- 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 +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." +}