diff options
| author | Caolán McNamara <cmc@openoffice.org> | 2010-03-02 15:54:30 +0000 |
|---|---|---|
| committer | Caolán McNamara <cmc@openoffice.org> | 2010-03-02 15:54:30 +0000 |
| commit | b2e49190dfb6c94ba520747dc30d41d87ff63e40 (patch) | |
| tree | 55ccc8573fafd6b0cea3b4386e53949737ddd27d /libxmlsec | |
| parent | 194993bb6777a408e7294c51237c92fce223d576 (diff) | |
#i107747# allow building against older libxml2
Diffstat (limited to 'libxmlsec')
| -rw-r--r-- | libxmlsec/makefile.mk | 2 | ||||
| -rw-r--r-- | libxmlsec/xmlsec1-olderlibxml2.patch | 23 |
2 files changed, 25 insertions, 0 deletions
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index 0f5ca35f2771..8b4568fb016e 100644 --- a/libxmlsec/makefile.mk +++ b/libxmlsec/makefile.mk @@ -48,6 +48,7 @@ TARFILE_NAME=$(PRJNAME)-$(XMLSEC1VERSION) #xmlsec1-configure.patch: Set up the build. Straightforward #configuration +#xmlsec1-olderlibxml2.patch: Allow build against older libxml2, for macosx #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 ? @@ -56,6 +57,7 @@ TARFILE_NAME=$(PRJNAME)-$(XMLSEC1VERSION) #xmlsec1-mingw-customkeymanage-addmscrypto.patch builds the custom keymanager on mingw PATCH_FILES=\ xmlsec1-configure.patch \ + xmlsec1-olderlibxml2.patch \ xmlsec1-customkeymanage.patch \ xmlsec1-nssmangleciphers.patch \ xmlsec1-nssdisablecallbacks.patch \ diff --git a/libxmlsec/xmlsec1-olderlibxml2.patch b/libxmlsec/xmlsec1-olderlibxml2.patch new file mode 100644 index 000000000000..b5f3d5747586 --- /dev/null +++ b/libxmlsec/xmlsec1-olderlibxml2.patch @@ -0,0 +1,23 @@ +--- 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) { |