[mod_revocator/f15] Bugzilla Bug #716355 - mod_revocator does not shut down httpd server if expired CRL is fetched Bugzi

[kwright]

commit 66084cf15ef57215f53e2fed8e66ce82055eb1b8
Author: Kevin Wright <kwright at redhat.com>
Date:   Mon Oct 24 17:54:52 2011 -0700

    Bugzilla Bug #716355 - mod_revocator does not shut down httpd server if
    expired CRL is fetched
    Bugzilla Bug #716361 - mod_revocator does not bring down httpd server if
    CRLUpdate fails

 clog                                     |   16 ++++------------
 mod_revocator-32-bit-semaphore-fix.patch |   12 ++++++++++++
 mod_revocator.spec                       |   10 +++++++++-
 3 files changed, 25 insertions(+), 13 deletions(-)
---
diff --git a/clog b/clog
index 52002ba..8930eff 100644
--- a/clog
+++ b/clog
@@ -1,12 +1,4 @@
-Bugzilla Bug #737556 - CRLS are not downloaded when mod_revocator module
-is loaded successfully. And no error was thrown in httpd error_log -
-mharmsen
-Add 'autoreconf -fvi' to build section - mharmsen
-Fix shutting down Apache if CRLUpdateCritical is on and a CRL
-is not available at startup (#654378) - rcritten at redhat.com
-Updated mod_revocator-kill patch. The ownership of the semaphore used to
-control access to crlhelper was not always changed to the Apache user
-(#648546) - rcritten at redhat.com
-Actually apply the patch (#648546) - rcritten at redhat.com
-Fix killing the web server if updatecritical is set (#648546) -
-rcritten at redhat.com
+Bugzilla Bug #716355 - mod_revocator does not shut down httpd server if
+expired CRL is fetched
+Bugzilla Bug #716361 - mod_revocator does not bring down httpd server if
+CRLUpdate fails
diff --git a/mod_revocator-32-bit-semaphore-fix.patch b/mod_revocator-32-bit-semaphore-fix.patch
new file mode 100644
index 0000000..62b9fb5
--- /dev/null
+++ b/mod_revocator-32-bit-semaphore-fix.patch
@@ -0,0 +1,12 @@
+diff -rupN mod_revocator-1.0.3.patched/mod_rev.c mod_revocator-1.0.3/mod_rev.c
+--- mod_revocator-1.0.3.patched/mod_rev.c	2011-10-21 16:21:44.862124000 -0700
++++ mod_revocator-1.0.3/mod_rev.c	2011-10-21 16:23:11.028211000 -0700
+@@ -74,7 +74,7 @@ apr_status_t rev_module_kill(void *data)
+ 
+ static void kill_apache(void) {
+     char buffer[1024];
+-    PR_snprintf(buffer, sizeof(buffer), "%lld %s", 0, "kill");
++    PR_snprintf(buffer, sizeof(buffer), "%ld %s", 0, "kill");
+     write(outfd, buffer, strlen(buffer));
+ }
+ 
diff --git a/mod_revocator.spec b/mod_revocator.spec
index fbbb89b..2e4a911 100644
--- a/mod_revocator.spec
+++ b/mod_revocator.spec
@@ -1,6 +1,6 @@
 Name: mod_revocator
 Version: 1.0.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: CRL retrieval module for the Apache HTTP server
 Group: System Environment/Daemons
 License: ASL 2.0
@@ -17,6 +17,7 @@ Requires: mod_nss >= 1.0.8
 Patch1: mod_revocator-libpath.patch
 Patch2: mod_revocator-kill.patch
 Patch3: mod_revocator-segfault-fix.patch
+Patch4: mod_revocator-32-bit-semaphore-fix.patch
 
 %description
 The mod_revocator module retrieves and installs remote
@@ -27,6 +28,7 @@ Certificate Revocate Lists (CRLs) into an Apache web server.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 autoreconf -fvi
@@ -101,6 +103,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/crlhelper
 
 %changelog
+* Fri Oct 21 2011 Matthew Harmsen <mharmsen at redhat.com> - 1.0.3-7
+- Bugzilla Bug #716355 - mod_revocator does not shut down httpd server if
+  expired CRL is fetched
+- Bugzilla Bug #716361 - mod_revocator does not bring down httpd server if
+  CRLUpdate fails
+
 * Tue Oct 11 2011 Matthew Harmsen <mharmsen at redhat.com> - 1.0.3-6
 - Bugzilla Bug #737556 - CRLS are not downloaded when mod_revocator module
   is loaded successfully. And no error was thrown in httpd error_log -