rpms/mod_nss/FC-6 .cvsignore, 1.3, 1.4 mod_nss.spec, 1.4, 1.5 sources, 1.3, 1.4

[Robert Crittenden (rcritten)]

Author: rcritten

Update of /cvs/extras/rpms/mod_nss/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13125

Modified Files:
	.cvsignore mod_nss.spec sources 
Log Message:
Patch to properly detect the Apache model and set up NSS appropriately
Patch to punt if a bad password is encountered
Patch to fix crash when password.conf is malformatted
Don't enable ECC support as NSS doesn't have it enabled (3.11.4-0.7)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_nss/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Oct 2006 17:20:55 -0000	1.3
+++ .cvsignore	9 Apr 2007 13:22:24 -0000	1.4
@@ -1 +1,4 @@
 mod_nss-1.0.6.tar.gz
+mod_nss-badpass.patch
+mod_nss-fileformat.patch
+mod_nss-model.patch


Index: mod_nss.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_nss/FC-6/mod_nss.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mod_nss.spec	27 Oct 2006 17:20:55 -0000	1.4
+++ mod_nss.spec	9 Apr 2007 13:22:24 -0000	1.5
@@ -1,6 +1,6 @@
 Name: mod_nss
 Version: 1.0.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: SSL/TLS module for the Apache HTTP server
 Group: System Environment/Daemons
 License: Apache Software License
@@ -15,6 +15,9 @@
 Requires: nss >= 3.11.3, nss-tools >= 3.11.3
 Patch1: mod_nss-conf.patch
 Patch2: mod_nss-gencert.patch
+Patch3: mod_nss-model.patch
+Patch4: mod_nss-badpass.patch
+Patch5: mod_nss-fileformat.patch
 
 %description
 The mod_nss module provides strong cryptography for the Apache Web
@@ -26,6 +29,9 @@
 %setup -q
 %patch1 -p1 -b .conf
 %patch2 -p1 -b .gencert
+%patch3 -p1 -b .model
+%patch4 -p1 -b .badpass
+%patch5 -p1 -b .fileformat
 
 # Touch expression parser sources to prevent regenerating it
 touch nss_expr_*.[chyl]
@@ -48,7 +54,7 @@
     --with-nss-inc=$NSS_INCLUDE_DIR \
     --with-nspr-lib=$NSPR_LIB_DIR \
     --with-nspr-inc=$NSPR_INCLUDE_DIR \
-    --with-apr-config --enable-ecc
+    --with-apr-config
 
 make %{?_smp_mflags} all
 
@@ -106,6 +112,12 @@
 %{_sbindir}/gencert
 
 %changelog
+* Mon Apr  9 2007 Rob Crittenden <rcritten at redhat.com> 1.0.6-2
+- Patch to properly detect the Apache model and set up NSS appropriately
+- Patch to punt if a bad password is encountered
+- Patch to fix crash when password.conf is malformatted
+- Don't enable ECC support as NSS doesn't have it enabled (3.11.4-0.7)
+
 * Mon Oct 23 2006 Rob Crittenden <rcritten at redhat.com> 1.0.6-1
 - Update to 1.0.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_nss/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Oct 2006 17:20:55 -0000	1.3
+++ sources	9 Apr 2007 13:22:24 -0000	1.4
@@ -1 +1,4 @@
 5e529856b7c05e94c62146ef80eb5e37  mod_nss-1.0.6.tar.gz
+44ba2b6d64f5c46f073b4b15373e341d  mod_nss-badpass.patch
+d0de0c696546e826c14cc51071bf6de8  mod_nss-fileformat.patch
+c3a24b444fbb04ffbf52700a6276a21c  mod_nss-model.patch