Version bump to fix bug #532808.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x6F48D3DA05C2DADB!

diff --git a/www-apache/mod_whatkilledus/ChangeLog b/www-apache/mod_whatkilledus/ChangeLog
index 60338526678b6c6f8928ae976d72700b066ccccb..abe79f9a5b33c2c3679eb632fa0af194e164928b 100644 (file)
--- 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 <mjo@gentoo.org> +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 <pacho@gentoo.org> metadata.xml:
   Drop apache herd as discussed in http://www.gossamer-

diff --git a/www-apache/mod_whatkilledus/Manifest b/www-apache/mod_whatkilledus/Manifest
index 5feb6961b4cb146c42341a6a1bd3a27c9a03372f..6dc9248326fe0c1d2ce56ee23ee22aa2db5d2eb8 100644 (file)
--- a/www-apache/mod_whatkilledus/Manifest
+++ b/www-apache/mod_whatkilledus/Manifest
@@ -1,16 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 10_mod_whatkilledus.conf 197 SHA256 e8ab15aeabb75fc16e31a5c101305a397ddce51f0f7e8c757095482ba0ae8c1a SHA512 5b0ac7db9ebde77e731ab70343e6aac950e4b342447b998ec94c7adff9acc5a6327f303c599ecb0ba251b8fcee9ef26642b98b75c03315a36dea9bc44f3f859e WHIRLPOOL c1b8aa55c5aa560a44d21f8a3b839ed3c98834e8e1c67715b2af42bd1d6da9d42d46b2918af32acfbb04d092121bee0df6719f322de7ab49ede965bce0f119f9
+AUX 10_mod_whatkilledus.conf 169 SHA256 41ce586e0ffda1d02b0b7a57fd7de0c351d5cece85dd2541715bd7feb4a3d412 SHA512 2ee25a68b4a188060cf361591c9946bc36d75aefb43b6e91b42727fe1eace658bbb877c1c181d5e9677aea289154a84135cfdb7c3d501d9dd0f967c160b3bfa4 WHIRLPOOL cc0d476f34f954b92f98621c9c6fd3f0c6edbe6facf652c99e86313bf1e7725f0ef7f03f15974dcabdbe753dc5e21a11970dbc9b3bb19854fea6a1aeb1b1b112
 AUX gen_test_char.c 4220 SHA256 389348d0235fe77be73e8fbf3fcf52c2559b372098f40f62fbc106913533ea86 SHA512 e7455399f909f7ca87b46ced17650a3cd3e33182070764a16ee808caf4025b09218df49060ceca412efe9d845f814e4a57b6ced219e64987e563c48d940265bf WHIRLPOOL 7a1579d082b6eefdbc767bd4332a9ad5b80d749cf9a98519fd5585f1c1424ac4756c65205e93d2cadf13a267346aa604361c76c1c84a151d1bddba2395b305ff
-DIST mod_whatkilledus-0.0.1.c 12244 SHA256 940fed942ed5880ca885fae4fefc5dcb8167cb80c7dc6cfd4a58689714b3d779
-EBUILD mod_whatkilledus-0.0.1-r1.ebuild 1071 SHA256 b2d53f3e4520d2478b23bd19e4dc99dc94a5e7968587f5c280e5c8d28b57ffc8 SHA512 c9152ff05773c3a67db3e8325fbf9ee5c3aa7516533188551a5f8fdf3cf147223afb393af00488c4016592e74bd29fa8906c47c64da86ce2b0f24fa6cae41642 WHIRLPOOL 145c3367bc7b8b22ce04f364c29bd0f628115266370e0545fff786af0e8c99ae2f4913174c371ec6b1b08b17fb74e76addeb40e73bc68c09eb6e9aebb58b6669
-MISC ChangeLog 1210 SHA256 2af2a11bf05aa97a9c7f56d53b7435dde57f85a10d92bff0fb15265fb48f3911 SHA512 9c5b83797a09f4bc1664e155a32408b497e079ee81b93bf4c74eabba2223379aab75983e275ef9f78b0ca6fa009005c678c38e786e98845f4e783f829c324e62 WHIRLPOOL 8cba9421c940411ddd7498d306c8a47f0ecd8cb3d4d947b5aba3413431262557f530735adb2910889f5a1f39b8dc623f156b36c6bebdbb62b5fe5a113eafca04
+DIST wku_bt-2.01.zip 933169 SHA256 3033a07b284a67e519e3b2d09a255b9cd8ce5902d3d9971d4cf182dec75c7d27 SHA512 c1bde8a26b395fc5fc66cd83c9282a8c519f34d27bef628ec502cec4245a7d446300178c9c94a5c5c0eb817bb8dd146587607760f9c9e780986d6ec53f03fb4c WHIRLPOOL dc2fa4debac883909f084562ffa0d9ab9e7f60a76bd02ee0054a0258444165f6fa63490bfefeaa03fe476ca9abc1ba93e2ad60858ba3ee4611b227b48e49bf1f
+EBUILD mod_whatkilledus-2.01.ebuild 827 SHA256 bf4499519767b713415483d1139502b25385c061a8e0456274de6e7b1e391450 SHA512 8f85ee9aff03b59fc57b893bdd5a29e717b58566e7a962bfb77bab5d2551cc97c6263b0c1de7eb7a675ac9a7d38b1e62588797022bea161ed457e0a7eb9b3cd8 WHIRLPOOL dde34bdedd2444ee5cc46063dd27f37a537861fd9c0ef971f23f39bc107d84ffdd38ce8ab009bcc2585011dcc53e4ed896a019b951d0286d3d9d070271b6e117
+MISC ChangeLog 1431 SHA256 6ff152844cdcc9f19263828a9b3da323025208591fcf1a22727b57fc69dd851c SHA512 330955eab8b364e2cbfd8a090a34fa6d0c7306f3e80cf32259275108c52dca56d53cfa45eb74cc22a39fe02937c52fd4f2c89076c253c50e6ed17dee34c89cbe WHIRLPOOL 06bc243093a2b36d4650763f66bd34c862345b301dc4abad21d094c08c1d173ea6f87e6a11281756c44384102b2a4b96e06bc2374ec57416ca2165723f958093
 MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlC1FmUACgkQCaWpQKGI+9RpKQCfa9p715jgm8k2jAPd3bcLp7wR
-DvMAnj+rBjaNEAzeUfj6sj84vz6Z1n5L
-=Ook/
+iQJ8BAEBCABmBQJUmWw5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxNEU5RDcyRDdCMUFGREVGQzBCNDFDMUY2
+RjQ4RDNEQTA1QzJEQURCAAoJEG9I09oFwtrb8GIQAKc45xlyKW5zuL1K8X88TOq9
+NtMZNBAD6dAWRFJeksDgD1Jgnkh1he6xAhp1sbfq5vufsPgPpaM3XwP42LPv1+i5
+1GC3QmqYFx4mR7VRbf+zfUhiGjImWykupxf+XgvH5dGoWAy5niMhqu9X3nnNpd6D
+5WtKBf5jZAgVAsTWYkFahJxoXU0rykGnh09wRPpG/YB+OSumA55VIiUib6ZcvXla
+IeZ6w+KBN9wUxmFq291wos8Eu+x1JNhae9f25btRGwKxmb/pNP+wUTr4Hv7KW4wV
+Fcqn2CStGnpvKNZzfdDAFex/Jhmip7MIoSZdQQtHeF37ufq58/bnP0vKxTXqOwG5
+mQRlPjxZjlSuefZKPRsUyUe2qFZhnR8502sth4qpEAK07rJ455hIsT6iqfS72aHi
+zu01lbKFec34+HV6/ogHw9G383oShQS2q+aWuLzw9nq79CTfy7ZZFL2Ul4VCqY3r
+BesGYDsnAeeH1ceYQK450b7g3cb27suF0gasH1B4RV0Vfw2i4/YQHt1TMMEd7c+v
+Sc5qvV8YY+xfd/jyOPrj9NBESzFJcPqG4Rlc9I3mpnkAEn3LgM/NIJZG9opD/j3l
+HItif2X2nKMR+HDTUboXmkQfwe3UjHffGLbIU/+a/hh31Hozbfuqk7tHGUrexwzm
+eRcTHH6rY7GY72VPSWSi
+=aLlP
 -----END PGP SIGNATURE-----

diff --git a/www-apache/mod_whatkilledus/files/10_mod_whatkilledus.conf b/www-apache/mod_whatkilledus/files/10_mod_whatkilledus.conf
index fb939003d795e3fcc10df59667daa133500e7160..4d99d8af4523467dc09fec3b3c49bf73ed816616 100644 (file)
--- a/www-apache/mod_whatkilledus/files/10_mod_whatkilledus.conf
+++ b/www-apache/mod_whatkilledus/files/10_mod_whatkilledus.conf
@@ -1,7 +1,5 @@
 <IfDefine WHATKILLEDUS>
-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
 </IfDefine>
-
-# 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 (file)
index d4f53c6..0000000
--- 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 (file)
index 0000000..b2545dc
--- /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
+}