From owner-svn-ports-all@freebsd.org Fri Jan 19 20:33:27 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B2FADEC67B7; Fri, 19 Jan 2018 20:33:27 +0000 (UTC) (envelope-from girgen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 51786737DA; Fri, 19 Jan 2018 20:33:25 +0000 (UTC) (envelope-from girgen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4AD19126C2; Fri, 19 Jan 2018 20:33:24 +0000 (UTC) (envelope-from girgen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0JKXO3L096570; Fri, 19 Jan 2018 20:33:24 GMT (envelope-from girgen@FreeBSD.org) Received: (from girgen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0JKXNsR096566; Fri, 19 Jan 2018 20:33:23 GMT (envelope-from girgen@FreeBSD.org) Message-Id: <201801192033.w0JKXNsR096566@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: girgen set sender to girgen@FreeBSD.org using -f From: Palle Girgensohn Date: Fri, 19 Jan 2018 20:33:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r459469 - in head/security/apache-xml-security-c: . files X-SVN-Group: ports-head X-SVN-Commit-Author: girgen X-SVN-Commit-Paths: in head/security/apache-xml-security-c: . files X-SVN-Commit-Revision: 459469 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Jan 2018 20:33:28 -0000 Author: girgen Date: Fri Jan 19 20:33:23 2018 New Revision: 459469 URL: https://svnweb.freebsd.org/changeset/ports/459469 Log: Fix build problems with clang Two patches where pulled from upstream repository. Added: head/security/apache-xml-security-c/files/ head/security/apache-xml-security-c/files/patch-xsec_canon_XSECC14n20010315.cpp (contents, props changed) head/security/apache-xml-security-c/files/patch-xsec_enc_OpenSSL_OpenSSLCryptoSymmetricKey.hpp (contents, props changed) head/security/apache-xml-security-c/files/patch-xsec_tools_checksig_InteropResolver.cpp (contents, props changed) Modified: head/security/apache-xml-security-c/Makefile Modified: head/security/apache-xml-security-c/Makefile ============================================================================== --- head/security/apache-xml-security-c/Makefile Fri Jan 19 20:17:58 2018 (r459468) +++ head/security/apache-xml-security-c/Makefile Fri Jan 19 20:33:23 2018 (r459469) @@ -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) Added: head/security/apache-xml-security-c/files/patch-xsec_canon_XSECC14n20010315.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/apache-xml-security-c/files/patch-xsec_canon_XSECC14n20010315.cpp Fri Jan 19 20:33:23 2018 (r459469) @@ -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 Added: head/security/apache-xml-security-c/files/patch-xsec_enc_OpenSSL_OpenSSLCryptoSymmetricKey.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/apache-xml-security-c/files/patch-xsec_enc_OpenSSL_OpenSSLCryptoSymmetricKey.hpp Fri Jan 19 20:33:23 2018 (r459469) @@ -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. + +------------------------------------------------------------------------ Added: head/security/apache-xml-security-c/files/patch-xsec_tools_checksig_InteropResolver.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/apache-xml-security-c/files/patch-xsec_tools_checksig_InteropResolver.cpp Fri Jan 19 20:33:23 2018 (r459469) @@ -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; + + } + + +------------------------------------------------------------------------