rpms/nss/devel 546221.patch,1.2,1.3 nss.spec,1.131,1.132

[Elio Maldonado]

Author: emaldonado

Update of /cvs/pkgs/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30103

Modified Files:
	546221.patch nss.spec 
Log Message:
Removed some left-over fprintf lines from patch

546221.patch:
 nsssysinit.c |   42 ++++++++++++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 12 deletions(-)

Index: 546221.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nss/devel/546221.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- 546221.patch	18 Dec 2009 19:36:22 -0000	1.2
+++ 546221.patch	20 Dec 2009 06:17:58 -0000	1.3
@@ -1,16 +1,16 @@
 diff -up nss-3.12.5/mozilla/security/nss/lib/sysinit/nsssysinit.c.546221 nss-3.12.5/mozilla/security/nss/lib/sysinit/nsssysinit.c
---- nss-3.12.5/mozilla/security/nss/lib/sysinit/nsssysinit.c.546221	2009-12-18 10:48:35.969726219 -0800
-+++ nss-3.12.5/mozilla/security/nss/lib/sysinit/nsssysinit.c	2009-12-18 10:51:05.866851066 -0800
-@@ -54,6 +54,8 @@
- #ifdef XP_UNIX
- #include <sys/stat.h>
- #include <sys/types.h>
-+#include <stdio.h>
-+#include <stdarg.h>
- 
- static int 
- testdir(char *dir)
-@@ -208,8 +210,8 @@ askpw=any timeout=30 ] }  ";
+--- nss-3.12.5/mozilla/security/nss/lib/sysinit/nsssysinit.c.546221	2009-12-19 21:11:06.590930221 -0800
++++ nss-3.12.5/mozilla/security/nss/lib/sysinit/nsssysinit.c	2009-12-19 21:17:29.019931181 -0800
+@@ -37,8 +37,6 @@
+ #include "prio.h"
+ #include "prprf.h"
+ 
+-
+-
+ /*
+  * The following provides a default example for operating systems to set up
+  * and manage applications loading NSS on their OS globally.
+@@ -208,8 +206,8 @@ askpw=any timeout=30 ] }  ";
  static char **
  get_list(char *filename, char *stripped_parameters)
  {
@@ -21,7 +21,7 @@ diff -up nss-3.12.5/mozilla/security/nss
      int isFIPS = getFIPSMode();
      const char *nssflags = isFIPS ? nssDefaultFIPSFlags : nssDefaultFlags;
      int next = 0;
-@@ -219,17 +221,25 @@ get_list(char *filename, char *stripped_
+@@ -219,13 +217,20 @@ get_list(char *filename, char *stripped_
  	return NULL;
      }
  
@@ -44,18 +44,13 @@ diff -up nss-3.12.5/mozilla/security/nss
          "NSS=\"%sflags=internal%s\"",
          userdb, stripped_parameters, nssflags,
          isFIPS ? ",FIPS" : "");
- 
-+/*	fprintf(stderr, "%s\n\n", module_list[next-1]); */
- 	/* now open the user's defined PKCS #11 modules */
- 	/* skip the local user DB entry */
- 	module_list[next++] = PR_smprintf(
-@@ -238,19 +248,35 @@ get_list(char *filename, char *stripped_
+@@ -238,19 +243,32 @@ get_list(char *filename, char *stripped_
  	    "parameters=\"configdir='sql:%s' %s\" "
  	    "NSS=\"flags=internal,moduleDBOnly,defaultModDB,skipFirst\"", 
  		userdb, stripped_parameters);
-+/*	fprintf(stderr, "%s\n\n", module_list[next-1]); */
-    }
- 
+-   }
++	}
++
 +    if (filename && 0 /* This doesn't actually work. If we register
 +			 both this and the sysdb (in either order)
 +			 then only one of them actually shows up */) {
@@ -64,9 +59,8 @@ diff -up nss-3.12.5/mozilla/security/nss
 +	      "module=\"NSS database\" "
 +	      "parameters=\"configdir='sql:%s' tokenDescription='NSS database sql:%s'\" "
 +	      "NSS=\"%sflags=internal\"",filename, filename, nssflags);
-+	    fprintf(stderr, "%s\n\n", module_list[next-1]);
 +    }
-+
+ 
      /* now the system database (always read only) */
 -    module_list[next++] = PR_smprintf(
 -	"library= "
@@ -79,7 +73,6 @@ diff -up nss-3.12.5/mozilla/security/nss
 +	      "module=\"NSS system database\" "
 +	      "parameters=\"configdir='sql:%s' tokenDescription='NSS system database' flags=readonly\" "
 +	      "NSS=\"%sflags=internal,critical\"",sysdb, nssflags);
-+	    fprintf(stderr, "%s\n\n", module_list[next-1]);
 +    }
  
      /* that was the last module */


Index: nss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss/devel/nss.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- nss.spec	18 Dec 2009 19:36:23 -0000	1.131
+++ nss.spec	20 Dec 2009 06:17:58 -0000	1.132
@@ -7,7 +7,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.12.5
-Release:          1%{?dist}.7
+Release:          1%{?dist}.9
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -115,7 +115,7 @@ low level services.
 %patch7 -p0 -b .533125
 %patch8 -p0 -b .sysinit
 %patch9 -p1 -b .540387
-%patch10 -p0 -b .nsssyinit
+%patch10 -p0 -b .545779
 %patch11 -p1 -b .546221
 
 %build
@@ -478,13 +478,16 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
 
 
 %changelog
+* Sat Dec 19 2009 Elio maldonado<emaldona at redhat.com> - 3.12.5-1.9
+- Remove left over trace statements from nsssysinit patching
+
 * Fri Dec 18 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.5-2.7
 - Fix a misconstructed patch
 
 * Thu Dec 17 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.5-1.6
-- Fix nsssysinit to enable applications to use the system database (#546221)
+- Fix nsssysinit to enable apps to use system cert store, patch contributed by David Woodhouse (#546221)
 - Fix spec so sysinit requires coreutils for post install scriplet (#547067)
-- Fix segmentation fault when listing keys or certs in the database (#540387)
+- Fix segmentation fault when listing keys or certs in the database, patch contributed by Kamil Dudka (#540387)
 
 * Thu Dec 10 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.5-1.5
 - Fix nsssysinit to set the default flags on the crypto module (#545779)