[Libreoffice-commits] .: nss/makefile.mk nss/nss-string-concat.patch

[Lubos Lunak]

 nss/makefile.mk             |    2 +-
 nss/nss-string-concat.patch |   11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit dbf3b4ab772a398ba397ea763deb6003adaf0586
Author: Luboš Luňák <l.lu...@suse.cz>
Date:   Fri Mar 16 02:00:23 2012 +0100

    "foo"bar -> "foo" bar

diff --git a/nss/makefile.mk b/nss/makefile.mk
index c75684a..4323887 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 0000000..68f9c4b
--- /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)

_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits