cmcfixes74: merge with DEV300 m80

4f858037 · Caolán McNamara · e1c7b9d3 · 8c29919e · 4f858037 · 4f858037
Kaydet (Commit) 4f858037 authored May 31, 2010 tarafından Caolán McNamara
13 changed files
--- a/cppunit/ldflags.patch
+++ b/cppunit/ldflags.patch
+--- misc/cppunit-1.12.1/src/cppunit/Makefile.am	Wed Feb 20 06:36:38 2008
+++ misc/build/cppunit-1.12.1/src/cppunit/Makefile.am	Mon May  3 17:00:41 2010
+@@ -63,5 +63,6 @@
+ 
+ libcppunit_la_LDFLAGS= \
+  -no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+- -release $(LT_RELEASE)
+ -release $(LT_RELEASE) \
+ @LIBADD_DL@
+ 
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -34,7 +34,7 @@ TARFILE_MD5=bd30e9cf5523cdfc019b94f5e1d7fd19
    # from <https://sourceforge.net/projects/cppunit/files/cppunit/1.12.1/
    #  cppunit-1.12.1.tar.gz/download>

-PATCH_FILES = solarisfinite.patch warnings.patch windows.patch
+PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch
    # solarisfinite.patch: see <https://sourceforge.net/tracker/?func=detail&
    #  aid=2912590&group_id=11795&atid=311795>
    # warnings.patch: see <https://sourceforge.net/tracker/?func=detail&
@@ -97,7 +97,7 @@ OOO_STLPORT_LIBS += -lm
 # execute that program; however, the program would fail to locate the STLport
 # library (another work-around might be to add something like --as-needed around
 # $(LIBSTLPORT)):
-.IF "$(OS)" == "LINUX" || "$(OS)" == "SOLARIS"
+.IF "$(OS)" == "FREEBSD" || "$(OS)" == "LINUX" || "$(OS)" == "SOLARIS"
 .IF "$(LD_LIBRARY_PATH)" == ""
 LD_LIBRARY_PATH := $(SOLARLIBDIR)
    # strictly speaking, this is incorrect if the LD_LIBRARY_PATH environment

--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@ -42,24 +42,25 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE

 # --- Files --------------------------------------------------------

-XMLSEC1VERSION=1.2.12
+XMLSEC1VERSION=1.2.14

 TARFILE_NAME=$(PRJNAME)-$(XMLSEC1VERSION)
-TARFILE_MD5=195d042623bcc2e1668ab8370de6dc2a
+TARFILE_MD5=1f24ab1d39f4a51faf22244c94a6203f

-#xmlsec1-configure.patch: Set up the build. Straightforward
-#configuration
+#xmlsec1-configure.patch: Set up the build. Straightforward configuration
+#xmlsec1-olderlibxml2.patch: Allow build against older libxml2, for macosx
+#xmlsec1-nssdisablecallbacks.patch: Disable use of smime3 so don't need to package it
 #xmlsec1-customkeymanage.patch: Could we do this alternatively outside xmlsec
 #xmlsec1-nssmangleciphers.patch: Dubious, do we still need this ?
-#xmlsec1-nssdisablecallbacks.patch: Dubious, do we still need this ?
 #xmlsec1-noverify.patch: As per readme.txt. 
 #xmlsec1-mingw32.patch: Mingw32 support. 
 #xmlsec1-mingw-customkeymanage-addmscrypto.patch builds the custom keymanager on mingw
 PATCH_FILES=\
   xmlsec1-configure.patch \
+   xmlsec1-olderlibxml2.patch \
+   xmlsec1-nssdisablecallbacks.patch \
   xmlsec1-customkeymanage.patch \
   xmlsec1-nssmangleciphers.patch \
-   xmlsec1-nssdisablecallbacks.patch \
   xmlsec1-noverify.patch \
   xmlsec1-mingw32.patch \
   xmlsec1-mingw-keymgr-mscrypto.patch
@@ -96,7 +97,7 @@ xmlsec_LIBS+=-lstdc++_s
 .ENDIF
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure
-CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --with-mozilla_ver=1.7.5 --enable-mscrypto --build=i586-pc-mingw32 --host=i586-pc-mingw32 CC="$(xmlsec_CC)" CFLAGS="-D_MT" LDFLAGS="-no-undefined -L$(ILIB:s/;/ -L/)" LIBS="$(xmlsec_LIBS)" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) OBJDUMP="$(WRAPCMD) objdump"
+CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --with-mozilla_ver=1.7.5 --enable-mscrypto --disable-crypto-dl --build=i586-pc-mingw32 --host=i586-pc-mingw32 CC="$(xmlsec_CC)" CFLAGS="-D_MT" LDFLAGS="-no-undefined -L$(ILIB:s/;/ -L/)" LIBS="$(xmlsec_LIBS)" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) OBJDUMP="$(WRAPCMD) objdump"

 .IF "$(SYSTEM_MOZILLA)" != "YES"
 CONFIGURE_FLAGS+=--enable-pkgconfig=no
@@ -152,7 +153,7 @@ LDFLAGS:=$(xmlsec_LDFLAGS)
 .ENDIF
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure ADDCFLAGS="$(xmlsec_CFLAGS)" CPPFLAGS="$(xmlsec_CPPFLAGS)"
-CONFIGURE_FLAGS=--with-pic --disable-shared --with-libxslt=no --with-openssl=no --with-gnutls=no LIBXML2LIB="$(LIBXML2LIB)"
+CONFIGURE_FLAGS=--with-pic --disable-shared --disable-crypto-dl --with-libxslt=no --with-openssl=no --with-gnutls=no LIBXML2LIB="$(LIBXML2LIB)"
 # system-mozilla needs pkgconfig to get the information about nss
 # FIXME: This also will enable pkg-config usage for libxml2. It *seems*
 # that the internal headers still are used when they are there but....

--- a/libxmlsec/readme.txt
+++ b/libxmlsec/readme.txt
@@ -22,7 +22,7 @@ for details.

 There is a flag XMLSEC_KEYINFO_FLAGS_X509DATA_DONT_VERIFY_CERTS that can be set
 in a xmlSecKeyInfoCtx (see function xmlSecNssKeyDataX509XmlRead, in file
-src/nss/x509.c), which indicates that one can turn of the validation. However,
+src/nss/x509.c), which indicates that one can turn off the validation. However,
 setting it will cause that the validation key is not found. If the flag is set,
 then the key is not extracted from the certificate store which contains all the
 certificates of the X509Data elements. In other words, the certificates which

--- a/libxmlsec/xmlsec1-configure.patch
+++ b/libxmlsec/xmlsec1-configure.patch
--- a/libxmlsec/xmlsec1-customkeymanage.patch
+++ b/libxmlsec/xmlsec1-customkeymanage.patch
--- a/libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch
+++ b/libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch
--- misc/xmlsec1-1.2.12/src/mscrypto/Makefile.am	2009-06-26 05:53:18.000000000 +0900
-+++ misc/build/xmlsec1-1.2.12/src/mscrypto/Makefile.am	2009-09-30 18:53:05.373000000 +0900
+--- misc/xmlsec1-1.2.14/src/mscrypto/Makefile.am	2009-06-26 05:53:18.000000000 +0900
+++ misc/build/xmlsec1-1.2.14/src/mscrypto/Makefile.am	2009-09-30 18:53:05.373000000 +0900
 @@ -35,6 +35,7 @@
 	csp_oid.h \
 	globals.h \
@@ -8,9 +8,9 @@
 	$(NULL)
 
 if SHAREDLIB_HACK
--- misc/xmlsec1-1.2.12/src/mscrypto/Makefile.in	2009-06-26 05:53:32.000000000 +0900
-+++ misc/build/xmlsec1-1.2.12/src/mscrypto/Makefile.in	2009-09-30 19:00:50.107375000 +0900
-@@ -61,7 +61,8 @@
+--- misc/xmlsec1-1.2.14/src/mscrypto/Makefile.in	2009-06-26 05:53:32.000000000 +0900
+++ misc/build/xmlsec1-1.2.14/src/mscrypto/Makefile.in	2009-09-30 19:00:50.107375000 +0900
+@@ -72,7 +72,8 @@
 am__libxmlsec1_mscrypto_la_SOURCES_DIST = app.c certkeys.c ciphers.c \
 	crypto.c digests.c keysstore.c kt_rsa.c signatures.c symkeys.c \
 	x509.c x509vfy.c csp_calg.h csp_oid.h globals.h xmlsec-mingw.h \
@@ -20,7 +20,7 @@
 am__objects_1 =
 @SHAREDLIB_HACK_TRUE@am__objects_2 =  \
 @SHAREDLIB_HACK_TRUE@	libxmlsec1_mscrypto_la-strings.lo
-@@ -75,7 +76,8 @@
+@@ -86,7 +87,8 @@
 	libxmlsec1_mscrypto_la-signatures.lo \
 	libxmlsec1_mscrypto_la-symkeys.lo \
 	libxmlsec1_mscrypto_la-x509.lo \
@@ -29,8 +29,8 @@
 +	libxmlsec1_mscrypto_la-akmngr.lo $(am__objects_1) \
 	$(am__objects_2)
 libxmlsec1_mscrypto_la_OBJECTS = $(am_libxmlsec1_mscrypto_la_OBJECTS)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-@@ -362,6 +364,7 @@
+ libxmlsec1_mscrypto_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+@@ -338,6 +340,7 @@
 libxmlsec1_mscrypto_la_SOURCES = app.c certkeys.c ciphers.c crypto.c \
 	digests.c keysstore.c kt_rsa.c signatures.c symkeys.c x509.c \
 	x509vfy.c csp_calg.h csp_oid.h globals.h xmlsec-mingw.h \
@@ -38,17 +38,17 @@
 	$(NULL) $(am__append_1)
 libxmlsec1_mscrypto_la_LIBADD = \
 	../libxmlsec1.la \
-@@ -460,6 +463,7 @@
+@@ -441,6 +444,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_mscrypto_la-symkeys.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_mscrypto_la-x509.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_mscrypto_la-x509vfy.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_mscrypto_la-akmngr.Plo@am__quote@
 
 .c.o:
- @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@@ -489,6 +493,13 @@
+ @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@@ -470,6 +474,13 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_mscrypto_la-app.lo `test -f 'app.c' || echo '$(srcdir)/'`app.c
+ @am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_mscrypto_la-app.lo `test -f 'app.c' || echo '$(srcdir)/'`app.c
 
 +libxmlsec1_mscrypto_la-akmngr.lo: akmngr.c
 +@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_mscrypto_la-akmngr.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_mscrypto_la-akmngr.Tpo" -c -o libxmlsec1_mscrypto_la-akmngr.lo `test -f 'akmngr.c' || echo '$(srcdir)/'`akmngr.c; \
@@ -58,5 +58,5 @@
 +@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_mscrypto_la-akmngr.lo `test -f 'akmngr.c' || echo '$(srcdir)/'`akmngr.c
 +
 libxmlsec1_mscrypto_la-certkeys.lo: certkeys.c
- @am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_mscrypto_la-certkeys.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_mscrypto_la-certkeys.Tpo" -c -o libxmlsec1_mscrypto_la-certkeys.lo `test -f 'certkeys.c' || echo '$(srcdir)/'`certkeys.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libxmlsec1_mscrypto_la-certkeys.Tpo" "$(DEPDIR)/libxmlsec1_mscrypto_la-certkeys.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_mscrypto_la-certkeys.Tpo"; exit 1; fi
+ @am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_mscrypto_la-certkeys.lo -MD -MP -MF $(DEPDIR)/libxmlsec1_mscrypto_la-certkeys.Tpo -c -o libxmlsec1_mscrypto_la-certkeys.lo `test -f 'certkeys.c' || echo '$(srcdir)/'`certkeys.c
+ @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libxmlsec1_mscrypto_la-certkeys.Tpo $(DEPDIR)/libxmlsec1_mscrypto_la-certkeys.Plo
--- a/libxmlsec/xmlsec1-mingw32.patch
+++ b/libxmlsec/xmlsec1-mingw32.patch
--- a/libxmlsec/xmlsec1-noverify.patch
+++ b/libxmlsec/xmlsec1-noverify.patch
--- misc/xmlsec1-1.2.12/src/mscrypto/x509vfy.c	2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.12/src/mscrypto/x509vfy.c	2009-09-23 10:01:07.237316078 +0200
-@@ -559,9 +559,16 @@
+--- misc/xmlsec1-1.2.14/src/mscrypto/x509vfy.c	2009-06-25 22:53:18.000000000 +0200
+++ misc/build/xmlsec1-1.2.14/src/mscrypto/x509vfy.c	2009-09-23 10:01:07.237316078 +0200
+@@ -567,9 +567,16 @@
             CertFreeCertificateContext(nextCert);                
         }
 
@@ -20,8 +20,8 @@
     }
 
     return (NULL);
--- misc/xmlsec1-1.2.12/src/nss/x509vfy.c	2009-09-23 10:06:52.989793254 +0200
-+++ misc/build/xmlsec1-1.2.12/src/nss/x509vfy.c	2009-09-23 10:05:03.183042205 +0200
+--- misc/xmlsec1-1.2.14/src/nss/x509vfy.c	2009-09-23 10:06:52.989793254 +0200
+++ misc/build/xmlsec1-1.2.14/src/nss/x509vfy.c	2009-09-23 10:05:03.183042205 +0200
 @@ -191,13 +191,27 @@
 	    continue;
 	}

--- a/libxmlsec/xmlsec1-nssdisablecallbacks.patch
+++ b/libxmlsec/xmlsec1-nssdisablecallbacks.patch
--- misc/xmlsec1-1.2.12.orig/src/nss/crypto.c	2009-09-10 07:06:17.000000000 -0400
-+++ misc/build/xmlsec1-1.2.12/src/nss/crypto.c	2009-09-10 07:08:24.000000000 -0400
+--- misc/xmlsec1-1.2.14.orig/src/nss/crypto.c	2009-09-10 07:06:17.000000000 -0400
+++ misc/build/xmlsec1-1.2.14/src/nss/crypto.c	2009-09-10 07:08:24.000000000 -0400
 @@ -136,6 +136,7 @@
     /**
      * High level routines form xmlsec command line utility

--- a/libxmlsec/xmlsec1-nssmangleciphers.patch
+++ b/libxmlsec/xmlsec1-nssmangleciphers.patch
--- misc/xmlsec1-1.2.12/src/nss/ciphers.c	2009-09-10 05:16:27.000000000 -0400
-+++ misc/build/xmlsec1-1.2.12/src/nss/ciphers.c	2009-09-10 06:59:39.000000000 -0400
+--- misc/xmlsec1-1.2.14/src/nss/ciphers.c	2009-09-10 05:16:27.000000000 -0400
+++ misc/build/xmlsec1-1.2.14/src/nss/ciphers.c	2009-09-10 06:59:39.000000000 -0400
 @@ -11,180 +11,421 @@
 
 #include <string.h>

--- a/libxmlsec/xmlsec1-olderlibxml2.patch
+++ b/libxmlsec/xmlsec1-olderlibxml2.patch
+--- misc/xmlsec1-1.2.14/src/c14n.c	2010-03-02 15:46:05.000000000 +0000
+++ misc/build/xmlsec1-1.2.14/src/c14n.c	2010-03-02 15:50:35.000000000 +0000
+@@ -406,6 +406,20 @@
+     return(0);
+ }
+ 
+#if !defined(LIBXML_VERSION) || LIBXML_VERSION < 20706
+/*
+ * xmlC14NMode:
+ * 
+ * Predefined values for C14N modes
+ *
+ */
+typedef enum {
+    XML_C14N_1_0            = 0,    /* Origianal C14N 1.0 spec */
+    XML_C14N_EXCLUSIVE_1_0  = 1,    /* Exclusive C14N 1.0 spec */
+    XML_C14N_1_1            = 2     /* C14N 1.1 spec */
+} xmlC14NMode;
+#endif
+
+ static int 
+ xmlSecTransformC14NExecute(xmlSecTransformId id, xmlSecNodeSetPtr nodes, xmlChar** nsList, 
+ 			   xmlOutputBufferPtr buf) {
--- a/np_sdk/mozsrc/npunix.c
+++ b/np_sdk/mozsrc/npunix.c
 /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
 *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
 *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
 *
 * The Original Code is mozilla.org code.
 *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
 *
 * Contributor(s):
- * Stephen Mak <smak@sun.com>
- */
+ *   Stephen Mak <smak@sun.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */

 /*
 * npunix.c
@@ -223,8 +239,6 @@ NPN_ForceRedraw(NPP instance)
    CallNPN_ForceRedrawProc(gNetscapeFuncs.forceredraw, instance);
 }

-
-
 /***********************************************************************
 *
 * Wrapper functions : Netscape Navigator -> plugin
@@ -364,7 +378,7 @@ NP_GetMIMEDescription(void)
 *    that the navigator needs.
 */
 NPError
-NP_GetValue(NPP future, NPPVariable variable, void *value)
+NP_GetValue(void* future, NPPVariable variable, void *value)
 {
    return NPP_GetValue(future, variable, value);
 }