rpms/mod_nss/F-9 mod_nss-wouldblock.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 mod_nss.spec, 1.13, 1.14 sources, 1.6, 1.7 mod_nss-fips.patch, 1.2, NONE mod_nss-inherit.patch, 1.1, NONE mod_nss-kill.patch, 1.1, NONE mod_nss-nofork.patch, 1.2, NONE

[Robert Crittenden]

Author: rcritten

Update of /cvs/extras/rpms/mod_nss/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32725

Modified Files:
	.cvsignore mod_nss.spec sources 
Added Files:
	mod_nss-wouldblock.patch 
Removed Files:
	mod_nss-fips.patch mod_nss-inherit.patch mod_nss-kill.patch 
	mod_nss-nofork.patch 
Log Message:
Update to 1.0.8
Add patch that fixes NSPR layer bug


mod_nss-wouldblock.patch:

--- NEW FILE mod_nss-wouldblock.patch ---
--- mod_nss-1.0.3.orig/nss_engine_io.c	2006-04-07 16:17:12.000000000 -0400
+++ mod_nss-1.0.3/nss_engine_io.c	2009-02-17 22:51:44.000000000 -0500
@@ -259,7 +259,8 @@
          */
         if (APR_STATUS_IS_EAGAIN(inctx->rc) || APR_STATUS_IS_EINTR(inctx->rc)
                || (inctx->rc == APR_SUCCESS && APR_BRIGADE_EMPTY(inctx->bb))) {
-            return 0;
+            PR_SetError(PR_WOULD_BLOCK_ERROR, 0);
+            return -1;
         }
 
         if (inctx->rc != APR_SUCCESS) {


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_nss/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	18 Oct 2007 18:57:58 -0000	1.6
+++ .cvsignore	5 Mar 2009 15:38:02 -0000	1.7
@@ -1,2 +1 @@
-mod_nss-1.0.7.tar.gz
-mod_nss-proxy.patch
+mod_nss-1.0.8.tar.gz


Index: mod_nss.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_nss/F-9/mod_nss.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mod_nss.spec	16 Jul 2008 15:54:56 -0000	1.13
+++ mod_nss.spec	5 Mar 2009 15:38:02 -0000	1.14
@@ -1,6 +1,6 @@
 Name: mod_nss
-Version: 1.0.7
-Release: 9%{?dist}
+Version: 1.0.8
+Release: 1%{?dist}
 Summary: SSL/TLS module for the Apache HTTP server
 Group: System Environment/Daemons
 License: Apache Software License
@@ -13,11 +13,7 @@
 Requires: httpd >= 0:2.0.52
 Patch1: mod_nss-conf.patch
 Patch2: mod_nss-gencert.patch
-Patch3: mod_nss-proxy.patch
-Patch4: mod_nss-nofork.patch
-Patch5: mod_nss-fips.patch
-Patch6: mod_nss-inherit.patch
-Patch7: mod_nss-kill.patch
+Patch3: mod_nss-wouldblock.patch
 
 %description
 The mod_nss module provides strong cryptography for the Apache Web
@@ -29,11 +25,7 @@
 %setup -q
 %patch1 -p1 -b .conf
 %patch2 -p1 -b .gencert
-%patch3 -p1 -b .proxy
-%patch4 -p1 -b .nofork
-%patch5 -p1 -b .fips
-%patch6 -p1 -b .inherit
-%patch7 -p1 -b .kill
+%patch3 -p1 -b .wouldblock
 
 # Touch expression parser sources to prevent regenerating it
 touch nss_expr_*.[chyl]
@@ -118,6 +110,10 @@
 %{_sbindir}/gencert
 
 %changelog
+* Mon Mar  2 2009 Rob Crittenden <rcritten at redhat.com> - 1.0.8-1
+- Update to 1.0.8
+- Add patch that fixes NSPR layer bug
+
 * Mon Jul 14 2008 Rob Crittenden <rcritten at redhat.com> - 1.0.7-9
 - Don't force module de-init during the configuration stage (453508)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_nss/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	18 Oct 2007 18:57:58 -0000	1.6
+++ sources	5 Mar 2009 15:38:02 -0000	1.7
@@ -1,2 +1 @@
-71107cbc702bf07c6c79843aa92a0e09  mod_nss-1.0.7.tar.gz
-d822102fe6b4a76beeb81e86c4ce2f80  mod_nss-proxy.patch
+32458d91ce909260a6081cce58004e2f  mod_nss-1.0.8.tar.gz


--- mod_nss-fips.patch DELETED ---


--- mod_nss-inherit.patch DELETED ---


--- mod_nss-kill.patch DELETED ---


--- mod_nss-nofork.patch DELETED ---