diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2012-03-16 02:00:23 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2012-03-16 02:04:56 +0100 |
| commit | dbf3b4ab772a398ba397ea763deb6003adaf0586 (patch) | |
| tree | 5569b25553ecb4ea6869adf334f3c61051ab5b1c | |
| parent | 45504f9ba8de2a4372193910b2cb9405f1ea896a (diff) | |
"foo"bar -> "foo" bar
| -rw-r--r-- | nss/makefile.mk | 2 | ||||
| -rw-r--r-- | nss/nss-string-concat.patch | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/nss/makefile.mk b/nss/makefile.mk index c75684a1187f..4323887a93eb 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -48,7 +48,7 @@ VER_PATCH=8 TARFILE_NAME=nss-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)-with-nspr-4.8.6 TARFILE_MD5=71474203939fafbe271e1263e61d083e TARFILE_ROOTDIR=nss-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH) -PATCH_FILES=nss.patch nss.aix.patch nss-config.patch nss-linux3.patch nss-clang_os_Linux_x86_s_comments.patch +PATCH_FILES=nss.patch nss.aix.patch nss-config.patch nss-linux3.patch nss-clang_os_Linux_x86_s_comments.patch nss-string-concat.patch .IF "$(OS)"=="MACOSX" PATCH_FILES+=nss_macosx.patch diff --git a/nss/nss-string-concat.patch b/nss/nss-string-concat.patch new file mode 100644 index 000000000000..68f9c4b7e56c --- /dev/null +++ b/nss/nss-string-concat.patch @@ -0,0 +1,11 @@ +--- misc/build/nss-3.12.8/mozilla/security/nss/lib/softoken/secmodt.h.sav 2008-12-17 22:39:05.000000000 +0100 ++++ misc/build/nss-3.12.8/mozilla/security/nss/lib/softoken/secmodt.h 2012-03-16 01:56:47.881621915 +0100 +@@ -338,7 +338,7 @@ typedef PRUint32 PK11AttrFlags; + #define SECMOD_SLOT_FLAGS "slotFlags=[RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512]" + + #define SECMOD_MAKE_NSS_FLAGS(fips,slot) \ +-"Flags=internal,critical"fips" slotparams=("#slot"={"SECMOD_SLOT_FLAGS"})" ++"Flags=internal,critical" fips " slotparams=(" #slot "={" SECMOD_SLOT_FLAGS "})" + + #define SECMOD_INT_NAME "NSS Internal PKCS #11 Module" + #define SECMOD_INT_FLAGS SECMOD_MAKE_NSS_FLAGS("",1) |