rpms/mod_nss/devel .cvsignore, 1.2, 1.3 mod_nss-conf.patch, 1.2, 1.3 mod_nss.spec, 1.3, 1.4 sources, 1.2, 1.3 mod_nss-eccinit.patch, 1.1, NONE

[Robert Crittenden (rcritten)]

Author: rcritten

Update of /cvs/extras/rpms/mod_nss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11292

Modified Files:
	.cvsignore mod_nss-conf.patch mod_nss.spec sources 
Removed Files:
	mod_nss-eccinit.patch 
Log Message:
Update to 1.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_nss/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Jul 2006 18:05:12 -0000	1.2
+++ .cvsignore	27 Oct 2006 18:19:19 -0000	1.3
@@ -1 +1 @@
-mod_nss-1.0.3.tar.gz
+mod_nss-1.0.6.tar.gz

mod_nss-conf.patch:

Index: mod_nss-conf.patch
===================================================================
RCS file: /cvs/extras/rpms/mod_nss/devel/mod_nss-conf.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mod_nss-conf.patch	4 Aug 2006 20:11:03 -0000	1.2
+++ mod_nss-conf.patch	27 Oct 2006 18:19:19 -0000	1.3
@@ -1,5 +1,5 @@
---- mod_nss-1.0.3/nss.conf.in.orig	2006-08-04 14:06:50.000000000 -0400
-+++ mod_nss-1.0.3/nss.conf.in	2006-08-04 15:24:34.000000000 -0400
+--- mod_nss-1.0.6/nss.conf.in.orig	2006-10-20 11:08:42.000000000 -0400
++++ mod_nss-1.0.6/nss.conf.in	2006-10-23 15:27:22.000000000 -0400
 @@ -8,14 +8,16 @@
  # consult the online docs. You have been warned.  
  #
@@ -28,7 +28,7 @@
  
  #   Configure the SSL Session Cache. 
  #   NSSSessionCacheSize is the number of entries in the cache.
-@@ -68,16 +70,18 @@
+@@ -68,17 +70,17 @@
  ## SSL Virtual Host Context
  ##
  
@@ -41,18 +41,16 @@
 +#ServerName www.example.com:8443
  #ServerAdmin you at example.com
  
--# mod_nss can log to separate log files, you can choose to do that if you'd like
+ # mod_nss can log to separate log files, you can choose to do that if you'd like
+ # LogLevel is not inherited from httpd.conf.
 -#ErrorLog @apache_prefix@/logs/error_log
 -#TransferLog @apache_prefix@/logs/access_log
-+# Use separate log files for the SSL virtual host; note that LogLevel
-+# is not inherited from httpd.conf.
-+ErrorLog @apache_prefix@/logs/nss_error_log
-+TransferLog @apache_prefix@/logs/nss_access_log
-+LogLevel warn
++ErrorLog @apache_prefix@/logs/error_log
++TransferLog @apache_prefix@/logs/access_log
+ LogLevel warn
  
  #   SSL Engine Switch:
- #   Enable/Disable SSL for this virtual host.
-@@ -111,7 +115,7 @@
+@@ -113,7 +115,7 @@
  #   The NSS security database directory that holds the certificates and
  #   keys. The database consists of 3 files: cert8.db, key3.db and secmod.db.
  #   Provide the directory that these files exist.
@@ -61,7 +59,7 @@
  
  #   Database Prefix:
  #   In order to be able to store multiple NSS databases in one directory
-@@ -175,7 +179,7 @@
+@@ -189,7 +191,7 @@
  <Files ~ "\.(cgi|shtml|phtml|php3?)$">
      NSSOptions +StdEnvVars
  </Files>


Index: mod_nss.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_nss/devel/mod_nss.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mod_nss.spec	11 Sep 2006 13:40:15 -0000	1.3
+++ mod_nss.spec	27 Oct 2006 18:19:19 -0000	1.4
@@ -1,21 +1,20 @@
 Name: mod_nss
-Version: 1.0.3
-Release: 5%{?dist}
+Version: 1.0.6
+Release: 1%{?dist}
 Summary: SSL/TLS module for the Apache HTTP server
 Group: System Environment/Daemons
 License: Apache Software License
 URL: http://directory.fedora.redhat.com/wiki/Mod_nss
 Source: http://directory.fedora.redhat.com/sources/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: nspr-devel >= 4.6, nss-devel >= 3.11
+BuildRequires: nspr-devel >= 4.6.3, nss-devel >= 3.11.3
 BuildRequires: httpd-devel >= 0:2.0.52, apr-devel, apr-util-devel
 BuildRequires: pkgconfig
 Requires: httpd >= 0:2.0.52
-Requires: nspr >= 4.6
-Requires: nss >= 3.11, nss-tools >= 3.11
+Requires: nspr >= 4.6.3
+Requires: nss >= 3.11.3, nss-tools >= 3.11.3
 Patch1: mod_nss-conf.patch
 Patch2: mod_nss-gencert.patch
-Patch3: mod_nss-eccinit.patch
 
 %description
 The mod_nss module provides strong cryptography for the Apache Web
@@ -27,7 +26,6 @@
 %setup -q
 %patch1 -p1 -b .conf
 %patch2 -p1 -b .gencert
-%patch3 -p1 -b .eccinit
 
 # Touch expression parser sources to prevent regenerating it
 touch nss_expr_*.[chyl]
@@ -108,8 +106,8 @@
 %{_sbindir}/gencert
 
 %changelog
-* Mon Sep 11 2006 Rob Crittenden <rcritten at redhat.com> 1.0.3-5
-- Mass rebuild for new toolset.
+* Mon Oct 23 2006 Rob Crittenden <rcritten at redhat.com> 1.0.6-1
+- Update to 1.0.6
 
 * Fri Aug 04 2006 Rob Crittenden <rcritten at redhat.com> 1.0.3-4
 - Include LogLevel warn in nss.conf and use separate log files


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_nss/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Jul 2006 18:05:12 -0000	1.2
+++ sources	27 Oct 2006 18:19:19 -0000	1.3
@@ -1 +1 @@
-feb2d314983a72318cc08e0650501fac  mod_nss-1.0.3.tar.gz
+5e529856b7c05e94c62146ef80eb5e37  mod_nss-1.0.6.tar.gz


--- mod_nss-eccinit.patch DELETED ---