Version bump partially addressing bug #532808.

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

6 files changed, 73 insertions, 46 deletions

diff --git a/www-apache/mod_backtrace/ChangeLog b/www-apache/mod_backtrace/ChangeLog
index 568b9c299675..7737563e61a3 100644
--- a/www-apache/mod_backtrace/ChangeLog
+++ b/www-apache/mod_backtrace/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apache/mod_backtrace
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_backtrace/ChangeLog,v 1.6 2012/11/27 19:09:27 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_backtrace/ChangeLog,v 1.7 2014/12/23 13:15:45 mjo Exp $
+
+*mod_backtrace-2.01 (23 Dec 2014)
+
+  23 Dec 2014; Michael Orlitzky <mjo@gentoo.org> +mod_backtrace-2.01.ebuild,
+  -mod_backtrace-0.0.1-r1.ebuild, files/10_mod_backtrace.conf, metadata.xml:
+  Version bump partially addressing bug #532808.
 
   27 Nov 2012; Pacho Ramos <pacho@gentoo.org> -mod_backtrace-0.0.1.ebuild,
   metadata.xml:
diff --git a/www-apache/mod_backtrace/Manifest b/www-apache/mod_backtrace/Manifest
index 266b084c9614..ae414094460f 100644
--- a/www-apache/mod_backtrace/Manifest
+++ b/www-apache/mod_backtrace/Manifest
@@ -1,15 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 10_mod_backtrace.conf 183 SHA256 329771a9d2fb4c82d514f0ecfe40c0593065a8c41be69e8911c099c4a31d1c59 SHA512 1e25e4b770efd51e33355f544c46b96c6411723eed3a286af754d51570e2ee31038ecf2f2cd2de666d7c504c640125e7ff65ef64647747537c5152a52e305d29 WHIRLPOOL dc782e5ff851bdb8100ea90b131b13dbb88268558f67131537fef0b0254581a18896b7b8ff0f9f0ff55c37f3070950abae8166639eb62c93cd9dc96e5b777756
-DIST mod_backtrace-0.0.1.c 5965 SHA256 56fd08206e5b5a2b6258dc2b48e0466010640ddac12dcc153e65c455f294e900 SHA512 29abdb43d534830bd2140c90de2308a18a72f96aedffa3b518cd188586a7f878a4bed5e2cb1dffdddeabc0c49deb614f6812683b9c3224a4488107f6319cfe3c WHIRLPOOL 5b50cddce8cbc522f9255434d3ed4df0e8ab276828a0fd09b6fbf7f87a6abbffa14fe773d020d263fdd9c0ca7226f955902ee74c9f24603c474a5a653f8d76f2
-EBUILD mod_backtrace-0.0.1-r1.ebuild 768 SHA256 c1d71703eaf14634f9012bc5951d66082e12d10f9f9fa20c5d96d148101638db SHA512 d807c82afe37b408009ec4bbfe5868d744951e4ff44dff303039a087f3a78345e398f67f0f3101d05cb6a6d1ec50834bd0d6671d5701c679b57ad40fb25d0c8f WHIRLPOOL 787f0a5d359e48721578a5c703c661eebbff1d6ceea1b3d5a17afff1857d9134c2065f8b87b9e8e97e49bb6ce0e76fa1075f7ee8ab581bf2f952f019661eb44e
-MISC ChangeLog 1137 SHA256 6cf9b978fa6b3d7df36506d89faeb8e7408ed2242b4921baf00db255570268cf SHA512 565f23550a60fc48cc37c05816790524770620f6423110a90dcecc7c2d2115f5d5d39f26200ab066f44abf623d5db47c262c81b562fcb89d74a17eb02c034dc8 WHIRLPOOL 911f13a072486af78c1dbe18d9b020f227114d695e5fb9d78eb8cff6b1ae2deb8bc9c078e88be0bceb13b00318a11e3e8868473852189d7953e1a3bb26429f6e
-MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7
+AUX 10_mod_backtrace.conf 113 SHA256 ceb4a1cf7c4d528a58e6d2807851cf2b31c38ab042fe966d21a5b919981a3d5a SHA512 ed2f22ac750411d46508d9f5e740c9c3c32e2eb43c909c0eea743101f6d4213f7a2d3ccded0efdb5e10a148c407fb9f0213a01c5e741b1ee96dc4e5145642a3e WHIRLPOOL 055dc6aa6c6b04147334c9b47be3bbb92b383b45585bf4286408bed88e837853fd2c11262538b484fefcb9e1ccb1c8c64a81c8be8dbacfb9245dfc0e1646e3ae
+DIST wku_bt-2.01.zip 933169 SHA256 3033a07b284a67e519e3b2d09a255b9cd8ce5902d3d9971d4cf182dec75c7d27 SHA512 c1bde8a26b395fc5fc66cd83c9282a8c519f34d27bef628ec502cec4245a7d446300178c9c94a5c5c0eb817bb8dd146587607760f9c9e780986d6ec53f03fb4c WHIRLPOOL dc2fa4debac883909f084562ffa0d9ab9e7f60a76bd02ee0054a0258444165f6fa63490bfefeaa03fe476ca9abc1ba93e2ad60858ba3ee4611b227b48e49bf1f
+EBUILD mod_backtrace-2.01.ebuild 898 SHA256 e8f8fb890df2380cd4af4794891e7f6a064c9803d0e8362dac80f94ec70f3132 SHA512 e29c7f6cce4bfa047955b609753c68b98101ff6b19e6059619c5d39d994e15710f673ef8b22ea85a8732a4528647bcef96871b43e83941463fdf0ca84c050692 WHIRLPOOL 6b4194d8ac735a3bb7b2fdfd1304fbb1312bc9e2c54059cbfaffa2d663a08fa2a96b626a4225a14ce3fe2c3ac93c1409821c971f9e9c0c6e02797f543f1b3836
+MISC ChangeLog 1374 SHA256 c885c79f9a7184e7da7546ff99372aa87918c563cbc78b8f1af11c949443472f SHA512 8d5dd06e1d75e936586cc436b5868eaa0c78a605f0641425734f9eb3028c62c41e7e623d9b8ec9ee86fb050d6b0db223ac2f1c64b9500915fcddc74c3d586986 WHIRLPOOL fd276e0985b46553d4d3016325718c6386afaa2b63bb96cce611cfb3f95f1bd760099def147b7159055eb4ca5e34cda039e5d3554534187102a6276685a236bc
+MISC metadata.xml 344 SHA256 3232d9d7118f9ff5469bbfb74b044375be6761b02abd29e75bd4feb2b412119b SHA512 e906152151402e756419ca2fba90f0fc14fac7bfca691795afd1691ad3c6330d5048a616343268fdb2d4b4b6b2c6249583490d6cf63bd54147e0c9bc1a6f5066 WHIRLPOOL 53210bb748be2f325089e966d0d07e87a5db1b84772adaf23cd433101f9d35cfa838ea39d4eaecaadb2bbc633116b45e7657b8acb7995e52d093149b0afd0b69
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlC1D+gACgkQCaWpQKGI+9SfjwCfVD3RvvlWDRT8W80toF9fcbkz
-ij4An0N/d57dK3YlRnV+pF8+DLG5Z6JK
-=CN5G
+iQJ8BAEBCABmBQJUmWsFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxNEU5RDcyRDdCMUFGREVGQzBCNDFDMUY2
+RjQ4RDNEQTA1QzJEQURCAAoJEG9I09oFwtrb+CYP/1+PMTJ0KbiQlc7hW14TJhdU
+LuhJxWM+lZmsuwskd0HHprr5D90+NPYgJ6doWPgz95kv2510ATDHcyLCfODL71fC
+zWJbPTSKp29BzcezdcwE7Em7JMGjSCPQSNrGf5xXWM6oZH0HskyrMpH2Nyy/TYUg
+oeMiAfCe2NjlF9as6x+9dhj/5dLgRPJAt9vn66EeZMaPO1WWr9XkHZfgG8iKookN
+XiB07eaDN+klVCvENeH8fyBwxrISn4QE3FtefRt82ttNiZwo4v/y9FsN5xz3UVmI
+ZTiNPNPDw2uBGp2IB/sfHhiQTkEmzOiuK/UDfMDjivxjXh+wZOub1ppwrQx+jKt3
+03qHroQTeR+p/MfXSRa2PBzrtsDZYGQ/zau9V79MupO7D/pIETW9+yszHfD95eXT
+c/+Q3wme3jXyhUedMYoOU8/EYr0aKXI9mM6xoJBKypxXl43HZJOxlZHh8yE65kaK
+38Bg6k+F7HcHp0dvWM7+MdaW37JRtAAMLNDe3oLdFTGZGWJc61eIQ6Jng1BYPrbf
+BRLC+9bStG7NlIXva155rp8GVip5RQvYXK1Ty2Lsk/sfBHFG0ma+HKjhV54RfHJX
+PbR9KqasWVmfDydmYVMn2DaI4KisIwm5lT9kiZUj24HdD8lwl6eFWv+KVAxr0R4+
+Uc0tftJtGm4FUF3S+zmp
+=gvL0
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_backtrace/files/10_mod_backtrace.conf b/www-apache/mod_backtrace/files/10_mod_backtrace.conf
index 8f38ab2e8f86..822efd2667fb 100644
--- a/www-apache/mod_backtrace/files/10_mod_backtrace.conf
+++ b/www-apache/mod_backtrace/files/10_mod_backtrace.conf
@@ -1,8 +1,4 @@
 <IfDefine BACKTRACE>
-LoadModule backtrace_module modules/mod_backtrace.so
-
-EnableExceptionHook On
-BacktraceLog /var/log/apache2/backtrace_log
+  LoadModule backtrace_module modules/mod_backtrace.so
+  EnableExceptionHook On
 </IfDefine>
-
-# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_backtrace/metadata.xml b/www-apache/mod_backtrace/metadata.xml
index 4538a68724a6..e4ed96ad54c9 100644
--- a/www-apache/mod_backtrace/metadata.xml
+++ b/www-apache/mod_backtrace/metadata.xml
@@ -2,4 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+<use>
+  <flag name="unwind">
+    Use <pkg>sys-libs/libunwind</pkg> to provide better resolution of
+    function names.
+  </flag>
+</use>
 </pkgmetadata>
diff --git a/www-apache/mod_backtrace/mod_backtrace-0.0.1-r1.ebuild b/www-apache/mod_backtrace/mod_backtrace-0.0.1-r1.ebuild
deleted file mode 100644
index 2a8081e58572..000000000000
--- a/www-apache/mod_backtrace/mod_backtrace-0.0.1-r1.ebuild
+++ /dev/null
@@ -1,29 +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_backtrace/mod_backtrace-0.0.1-r1.ebuild,v 1.1 2012/10/16 07:19:01 patrick Exp $
-
-EAPI="4"
-
-inherit apache-module eutils confutils
-
-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="www-servers/apache[debug]"
-RDEPEND=""
-
-APACHE2_MOD_CONF="10_${PN}"
-APACHE2_MOD_DEFINE="BACKTRACE"
-
-need_apache2
-
-src_unpack() {
-	mkdir -p "${S}" || die "mkdir S failed"
-	cp -f "${DISTDIR}/${P}.c" "${S}/${PN}.c" || die "source copy failed"
-}
diff --git a/www-apache/mod_backtrace/mod_backtrace-2.01.ebuild b/www-apache/mod_backtrace/mod_backtrace-2.01.ebuild
new file mode 100644
index 000000000000..31fd71df89d2
--- /dev/null
+++ b/www-apache/mod_backtrace/mod_backtrace-2.01.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_backtrace/mod_backtrace-2.01.ebuild,v 1.1 2014/12/23 13:15:45 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="unwind"
+
+RDEPEND="=www-servers/apache-2*[debug]
+	unwind? ( sys-libs/libunwind )"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+APACHE2_MOD_CONF="10_${PN}"
+APACHE2_MOD_DEFINE="BACKTRACE"
+
+need_apache2
+
+S="${WORKDIR}/wku_bt-${PV}"
+
+src_compile() {
+	APXS2_ARGS="-c ${PN}.c diag.c -ldl"
+	if use unwind; then
+		APXS2_ARGS+=" -lunwind -DDIAG_HAVE_LIBUNWIND_BACKTRACE=1"
+	fi
+	apache-module_src_compile
+}