From 9683a6906ada0aa59f891c2cbd7c33a79da652a1 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Tue, 23 Dec 2014 13:20:56 +0000 Subject: Version bump to fix bug #532808. (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x6F48D3DA05C2DADB!) --- www-apache/mod_whatkilledus/ChangeLog | 10 ++++- .../files/10_mod_whatkilledus.conf | 8 ++-- .../mod_whatkilledus-0.0.1-r1.ebuild | 43 ---------------------- .../mod_whatkilledus/mod_whatkilledus-2.01.ebuild | 33 +++++++++++++++++ 4 files changed, 44 insertions(+), 50 deletions(-) delete mode 100644 www-apache/mod_whatkilledus/mod_whatkilledus-0.0.1-r1.ebuild create mode 100644 www-apache/mod_whatkilledus/mod_whatkilledus-2.01.ebuild (limited to 'www-apache') diff --git a/www-apache/mod_whatkilledus/ChangeLog b/www-apache/mod_whatkilledus/ChangeLog index 60338526678b..abe79f9a5b33 100644 --- a/www-apache/mod_whatkilledus/ChangeLog +++ b/www-apache/mod_whatkilledus/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-apache/mod_whatkilledus -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_whatkilledus/ChangeLog,v 1.6 2012/11/27 19:37:08 pacho Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_whatkilledus/ChangeLog,v 1.7 2014/12/23 13:20:56 mjo Exp $ + +*mod_whatkilledus-2.01 (23 Dec 2014) + + 23 Dec 2014; Michael Orlitzky +mod_whatkilledus-2.01.ebuild, + -mod_whatkilledus-0.0.1-r1.ebuild, files/10_mod_whatkilledus.conf: + Version bump to fix bug #532808. 27 Nov 2012; Pacho Ramos metadata.xml: Drop apache herd as discussed in http://www.gossamer- diff --git a/www-apache/mod_whatkilledus/files/10_mod_whatkilledus.conf b/www-apache/mod_whatkilledus/files/10_mod_whatkilledus.conf index fb939003d795..4d99d8af4523 100644 --- a/www-apache/mod_whatkilledus/files/10_mod_whatkilledus.conf +++ b/www-apache/mod_whatkilledus/files/10_mod_whatkilledus.conf @@ -1,7 +1,5 @@ -LoadModule whatkilledus_module modules/mod_whatkilledus.so -EnableExceptionHook On -WhatKilledUsLog /var/log/apache2/whatkilledus_log + LoadModule whatkilledus_module modules/mod_whatkilledus.so + EnableExceptionHook On + WKULogfile /var/log/apache2/whatkilledus.log - -# vim: ts=4 filetype=apache diff --git a/www-apache/mod_whatkilledus/mod_whatkilledus-0.0.1-r1.ebuild b/www-apache/mod_whatkilledus/mod_whatkilledus-0.0.1-r1.ebuild deleted file mode 100644 index d4f53c6cbac8..000000000000 --- a/www-apache/mod_whatkilledus/mod_whatkilledus-0.0.1-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_whatkilledus/mod_whatkilledus-0.0.1-r1.ebuild,v 1.1 2012/06/17 16:24:28 flameeyes Exp $ - -EAPI=4 - -inherit apache-module eutils toolchain-funcs - -KEYWORDS="~amd64 ~x86" - -DESCRIPTION="Apache2 modules to debug segmentation faults in threads" -HOMEPAGE="http://people.apache.org/~trawick/exception_hook.html" -SRC_URI="mirror://gentoo/${P}.c" -LICENSE="Apache-2.0" -SLOT="0" -IUSE="" - -DEPEND="" -RDEPEND="" - -APACHE2_MOD_CONF="10_${PN}" -APACHE2_MOD_DEFINE="WHATKILLEDUS" - -need_apache2_2 - -RDEPEND+=" - www-servers/apache:2[debug]" - -src_unpack() { - mkdir -p "${S}" || die "mkdir S failed" - cp -f "${DISTDIR}/${P}.c" "${S}/${PN}.c" || die "source copy failed" -} - -src_compile() { - $(tc-getCC) \ - $(/usr/bin/apr-1-config --includes) \ - $(/usr/bin/apr-1-config --cppflags) \ - ${CFLAGS} ${LDFLAGS} \ - -o "${S}"/gen_test_char \ - "${FILESDIR}"/gen_test_char.c - "${S}"/gen_test_char > "${S}"/test_char.h - apache-module_src_compile -} diff --git a/www-apache/mod_whatkilledus/mod_whatkilledus-2.01.ebuild b/www-apache/mod_whatkilledus/mod_whatkilledus-2.01.ebuild new file mode 100644 index 000000000000..b2545dc4a655 --- /dev/null +++ b/www-apache/mod_whatkilledus/mod_whatkilledus-2.01.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_whatkilledus/mod_whatkilledus-2.01.ebuild,v 1.1 2014/12/23 13:20:56 mjo Exp $ + +EAPI=5 + +inherit apache-module depend.apache + +DESCRIPTION="Debug segmentation faults in Apache threads" +HOMEPAGE="http://emptyhammock.com/projects/httpd/diag/" +SRC_URI="http://emptyhammock.com/downloads/wku_bt-${PV}.zip" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=">=www-apache/mod_backtrace-2.01 + =www-servers/apache-2*[debug]" +DEPEND="${RDEPEND} + app-arch/unzip" + +APACHE2_MOD_CONF="10_${PN}" +APACHE2_MOD_DEFINE="BACKTRACE WHATKILLEDUS" + +need_apache2 + +S="${WORKDIR}/wku_bt-${PV}" + +src_compile() { + APXS2_ARGS="-c ${PN}.c diag.c -ldl" + apache-module_src_compile +} -- cgit v1.2.3-65-gdbad