- release 2 (by relup.sh)

[packages/apache-mod_whatkilledus.git] / apache-mod_whatkilledus.spec

diff --git a/apache-mod_whatkilledus.spec b/apache-mod_whatkilledus.spec
index c1433d8d412d38b081df1b22db8157d71060bf59..a402923bec58a0b83692ec0b9eea3e1488338197 100644 (file)
--- a/apache-mod_whatkilledus.spec
+++ b/apache-mod_whatkilledus.spec
@@ -1,59 +1,78 @@
 %define                mod_name        whatkilledus
 %define        apxs            /usr/sbin/apxs
-Summary:       Knows what a thread was handling in case the thread segfaults
-Summary(pl):   Modu³ wiedz±cy, co obs³ugiwa³ w±tek w przypadku naruszenia ochrony pamiêci
+Summary:       Apache module: knows what a thread was handling in case the thread segfaults
+Summary(pl.UTF-8):     Moduł apache wiedzący, co obsługiwał wątek w przypadku naruszenia ochrony pamięci
 Name:          apache-mod_%{mod_name}
-Version:       1.0
-Release:       1
-License:       Apache
-Group:         Networking/Daemons
-Source0:       http://people.apache.org/~trawick/mod_whatkilledus.c
-# Source0-md5: e59c5d56e294a31e5b158ad5e4553001
-URL:           http://people.apache.org/~trawick/exception_hook.html
-BuildRequires: apache-devel >= 2.0.43
+Version:       2.01
+Release:       2
+License:       Apache v2.0
+Group:         Networking/Daemons/HTTP
+Source0:       http://emptyhammock.com/downloads/wku_bt-%{version}.zip
+# Source0-md5: 32bbe148f6cb2b8714166388f94d9129
+Source1:       http://mirrors.ludost.net/gentoo-portage/www-apache/mod_whatkilledus/files/gen_test_char.c
+# Source1-md5: 7c4e734d1afc695a5be53581998f3700
+URL:           http://emptyhammock.com/projects/httpd/diag/
+BuildRequires: %{apxs}
+BuildRequires: apache-devel >= 2.0
 BuildRequires: rpmbuild(macros) >= 1.268
 Requires:      apache(modules-api) = %apache_modules_api
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                _sysconfdir     %(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
 %define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)
-%define                _sysconfdir     %(%{apxs} -q SYSCONFDIR 2>/dev/null)
 
 %description
 Keeps a little bit of state on each active connection, which allows it
 to know what a thread was handling in case the thread segfaults.
 
-%description -l pl
-Modu³ przechowuj±cy wybrane informacje o stanie ka¿dego aktywnego
-po³±czenia, pozwalaj±ce dowiedzieæ siê, co obs³ugiwa³ w±tek w
-sytuacji, kiedy spowodowa³ naruszenie ochrony pamiêci.
+%description -l pl.UTF-8
+Moduł przechowujący wybrane informacje o stanie każdego aktywnego
+połączenia, pozwalające dowiedzieć się, co obsługiwał wątek w
+sytuacji, kiedy spowodował naruszenie ochrony pamięci.
 
 %prep
-%setup -q -c -T
+%setup -q -n wku_bt-%{version}
 
 %build
-%{apxs} -c %{SOURCE0}
+%{apxs} -c mod_%{mod_name}.c diag.c \
+       -DDIAG_HAVE_LIBUNWIND_BACKTRACE=1 \
+%if "%{__lib}" == "lib64"
+       -DDIAG_BITS_64=1 \
+%endif
+       -o mod_%{mod_name}.la
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir},/var/log/httpd}
+install .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
 
-libtool --mode=install install mod_%{mod_name}.la $RPM_BUILD_ROOT%{_pkglibdir}/mod_%{mod_name}.so
+touch $RPM_BUILD_ROOT/var/log/httpd/whatkilledus_log
 
-echo 'LoadModule %{mod_name}_module modules/mod_%{mod_name}.so' \
-       > $RPM_BUILD_ROOT/etc/httpd/httpd.conf/68_mod_%{mod_name}.conf
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/68_mod_%{mod_name}.conf << 'EOF'
+LoadModule %{mod_name}_module modules/mod_%{mod_name}.so
+EnableExceptionHook On
+# WKUObscureInRequest On
+EOF
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 %service -q httpd restart
+touch /var/log/httpd/whatkilledus_log && chown root:http /var/log/httpd/whatkilledus_log && chmod 620 /var/log/httpd/whatkilledus_log
 
 %postun
 if [ "$1" = "0" ]; then
        %service -q httpd restart
 fi
 
+%triggerpostun -- %{name} < 2.00
+sed -i -e 's#^WhatKilledUsLog.*##g' %{_sysconfdir}/68_mod_%{mod_name}.conf
+
 %files
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*mod_*.conf
+%doc CHANGES.txt NOTICE.txt 
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*.so
+# append by webserver
+%attr(620,root,http) %ghost /var/log/httpd/whatkilledus_log