rpms/nss/devel 546221.patch,1.1,1.2 nss.spec,1.130,1.131
Elio Maldonado
emaldonado at fedoraproject.org
Fri Dec 18 19:36:23 UTC 2009
Author: emaldonado
Update of /cvs/pkgs/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4138
Modified Files:
546221.patch nss.spec
Log Message:
Fix a misconstructed patch for #546221
546221.patch:
nsssysinit.c | 44 +++++++++++++++++++++++++++++++++++---------
1 file changed, 35 insertions(+), 9 deletions(-)
Index: 546221.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nss/devel/546221.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 546221.patch 18 Dec 2009 09:25:16 -0000 1.1
+++ 546221.patch 18 Dec 2009 19:36:22 -0000 1.2
@@ -1,15 +1,7 @@
---- nss-3.12.5/mozilla/security/nss/lib/sysinit/nsssysinit.c.546221 2009-12-17 23:52:17.543895890 -0800
-+++ nss-3.12.5/mozilla/security/nss/lib/sysinit/nsssysinit.c 2009-12-17 23:54:48.488895967 -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.
-@@ -54,6 +52,8 @@
+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>
@@ -18,7 +10,7 @@
static int
testdir(char *dir)
-@@ -208,8 +208,8 @@ askpw=any timeout=30 ] } ";
+@@ -208,8 +210,8 @@ askpw=any timeout=30 ] } ";
static char **
get_list(char *filename, char *stripped_parameters)
{
@@ -29,12 +21,13 @@
int isFIPS = getFIPSMode();
const char *nssflags = isFIPS ? nssDefaultFIPSFlags : nssDefaultFlags;
int next = 0;
-@@ -219,13 +219,20 @@ get_list(char *filename, char *stripped_
+@@ -219,17 +221,25 @@ get_list(char *filename, char *stripped_
return NULL;
}
-+ sysdb = getSystemDB();
- userdb = getUserDB();
+- userdb = getUserDB();
++ userdb = getSystemDB();
++ userdb = getUserDB();
+
+ if (sysdb && !strcmp(filename, sysdb))
+ filename = NULL;
@@ -51,7 +44,45 @@
"NSS=\"%sflags=internal%s\"",
userdb, stripped_parameters, nssflags,
isFIPS ? ",FIPS" : "");
-@@ -251,6 +258,7 @@ get_list(char *filename, char *stripped_
+
++/* 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_
+ "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 */) {
++ module_list[next++] = PR_smprintf(
++ "library= "
++ "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= "
+- "module=\"NSS system database\" "
+- "parameters=\"configdir='sql:%s' tokenDescription='NSS system database' flags=readonly\" "
+- "NSS=\"%sflags=internal,critical\"",filename, nssDefaultFlags);
++ if (sysdb) {
++ module_list[next++] = PR_smprintf(
++ "library= "
++ "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 */
module_list[next] = 0;
PORT_Free(userdb);
Index: nss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss/devel/nss.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -p -r1.130 -r1.131
--- nss.spec 18 Dec 2009 09:26:37 -0000 1.130
+++ nss.spec 18 Dec 2009 19:36:23 -0000 1.131
@@ -7,7 +7,7 @@
Summary: Network Security Services
Name: nss
Version: 3.12.5
-Release: 1%{?dist}.6
+Release: 1%{?dist}.7
License: MPLv1.1 or GPLv2+ or LGPLv2+
URL: http://www.mozilla.org/projects/security/pki/nss/
Group: System Environment/Libraries
@@ -43,9 +43,9 @@ Patch2: nss-nolocalsql.patch
Patch6: nss-enable-pem.patch
Patch7: 533125-ammend.patch
Patch8: nss-sysinit.patch
-Patch9: nsssysinit.patch
-Patch10: 546221.patch
-Patch11: 540387.patch
+Patch9: 540387.patch
+Patch10: nsssysinit.patch
+Patch11: 546221.patch
%description
Network Security Services (NSS) is a set of libraries designed to
@@ -114,9 +114,9 @@ low level services.
%patch6 -p0 -b .libpem
%patch7 -p0 -b .533125
%patch8 -p0 -b .sysinit
-%patch9 -p0 -b .545779
-%patch10 -p1 -b .546221
-%patch11 -p1 -b .540387
+%patch9 -p1 -b .540387
+%patch10 -p0 -b .nsssyinit
+%patch11 -p1 -b .546221
%build
@@ -478,6 +478,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/ns
%changelog
+* 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 spec so sysinit requires coreutils for post install scriplet (#547067)
More information about the scm-commits
mailing list