Fix build problems with clang

Two patches where pulled from upstream repository.

4 files changed, 78 insertions, 1 deletions

diff --git a/security/apache-xml-security-c/Makefile b/security/apache-xml-security-c/Makefile
index 900b14c9d2ee..bfbaccf1e038 100644
--- a/security/apache-xml-security-c/Makefile
+++ b/security/apache-xml-security-c/Makefile
@@ -16,10 +16,12 @@ LIB_DEPENDS+=	libxerces-c.so.3:textproc/xerces-c3
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-xerces=${LOCALBASE}
-USES=		gmake libtool tar:bzip2 ssl
+USES=		cpe gmake libtool tar:bzip2 ssl
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}
 
+CPE_PRODUCT=	xml_security_for_c\+\+
+CPE_VENDOR=	apache
 BROKEN_SSL=	openssl-devel
 BROKEN_SSL_REASON_openssl-devel=	field has incomplete type HMAC_CTX (aka hmac_ctx_st)
 
diff --git a/security/apache-xml-security-c/files/patch-xsec_canon_XSECC14n20010315.cpp b/security/apache-xml-security-c/files/patch-xsec_canon_XSECC14n20010315.cpp
new file mode 100644
index 000000000000..d077c89d10f4
--- /dev/null
+++ b/security/apache-xml-security-c/files/patch-xsec_canon_XSECC14n20010315.cpp
@@ -0,0 +1,22 @@
+Index: xsec/canon/XSECC14n20010315.cpp
+===================================================================
+--- xsec/canon/XSECC14n20010315.cpp	(revision 1821687)
++++ xsec/canon/XSECC14n20010315.cpp	(working copy)
+@@ -1148,7 +1148,7 @@
+ 						// Is this the default?
+ 						if (currentName.sbStrcmp("xmlns") == 0 &&
+ 							(!m_XPathSelection || m_XPathMap.hasNode(tmpAtts->item(i))) &&
+-							!currentValue.sbStrcmp("") == 0)
++							currentValue.sbStrcmp("") != 0)
+ 							xmlnsFound = true;
+ 
+ 						// A namespace node - See if we need to output
+@@ -1297,7 +1297,7 @@
+ 				// Is this the default?
+ 				if (currentName.sbStrcmp("xmlns") == 0 &&
+ 					(!m_XPathSelection || m_XPathMap.hasNode(nsnode)) &&
+-					!currentValue.sbStrcmp("") == 0)
++					currentValue.sbStrcmp("") != 0)
+ 					xmlnsFound = true;
+ 
+ 				// A namespace node - See if we need to output
diff --git a/security/apache-xml-security-c/files/patch-xsec_enc_OpenSSL_OpenSSLCryptoSymmetricKey.hpp b/security/apache-xml-security-c/files/patch-xsec_enc_OpenSSL_OpenSSLCryptoSymmetricKey.hpp
new file mode 100644
index 000000000000..4f6c93c307a2
--- /dev/null
+++ b/security/apache-xml-security-c/files/patch-xsec_enc_OpenSSL_OpenSSLCryptoSymmetricKey.hpp
@@ -0,0 +1,33 @@
+------------------------------------------------------------------------
+r1806743 | scantor | 2017-08-31 01:23:01 +0200 (Thu, 31 Aug 2017) | 1 line
+
+Fix NULL warnings
+
+Index: xsec/enc/OpenSSL/OpenSSLCryptoSymmetricKey.hpp
+===================================================================
+--- xsec/enc/OpenSSL/OpenSSLCryptoSymmetricKey.hpp	(revision 1806742)
++++ xsec/enc/OpenSSL/OpenSSLCryptoSymmetricKey.hpp	(revision 1806743)
+@@ -151,7 +151,7 @@
+                              SymmetricKeyMode mode = MODE_CBC,
+                              const unsigned char * iv = NULL,
+                              const unsigned char* tag = NULL,
+-                             unsigned int taglen = NULL);
++                             unsigned int taglen = 0);
+ 
+     /**
+      * \brief Continue an decrypt operation using this key.
+Index: xsec/enc/XSECCryptoSymmetricKey.hpp
+===================================================================
+--- xsec/enc/XSECCryptoSymmetricKey.hpp	(revision 1806742)
++++ xsec/enc/XSECCryptoSymmetricKey.hpp	(revision 1806743)
+@@ -185,7 +185,7 @@
+ 							 SymmetricKeyMode mode = MODE_CBC,
+ 							 const unsigned char* iv = NULL,
+                              const unsigned char* tag = NULL,
+-                             unsigned int taglen = NULL) = 0;
++                             unsigned int taglen = 0) = 0;
+ 
+ 	/**
+ 	 * \brief Continue a decrypt operation using this key.
+
+------------------------------------------------------------------------
diff --git a/security/apache-xml-security-c/files/patch-xsec_tools_checksig_InteropResolver.cpp b/security/apache-xml-security-c/files/patch-xsec_tools_checksig_InteropResolver.cpp
new file mode 100644
index 000000000000..82f7f3dc336f
--- /dev/null
+++ b/security/apache-xml-security-c/files/patch-xsec_tools_checksig_InteropResolver.cpp
@@ -0,0 +1,20 @@
+------------------------------------------------------------------------
+r1807005 | scantor | 2017-09-01 22:42:20 +0200 (Fri, 01 Sep 2017) | 1 line
+
+Cleanup, reverse double negatives in Xalan code paths
+
+Index: xsec/tools/checksig/InteropResolver.cpp
+===================================================================
+--- xsec/tools/checksig/InteropResolver.cpp	(revision 1807004)
++++ xsec/tools/checksig/InteropResolver.cpp	(revision 1807005)
+@@ -648,7 +648,7 @@
+ 
+ 	}
+ 
+-	return false;
++	return NULL;
+ 
+ }
+ 
+
+------------------------------------------------------------------------