From nobody Thu Apr 03 19:46:38 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZTC0t5Jk3z5sNCJ; Thu, 03 Apr 2025 19:46:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZTC0t3ybBz3gSt; Thu, 03 Apr 2025 19:46:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743709598; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nzISJ9twY1mC1/tsucaSmKFHw9WDdJmyCBgOjeANNEU=; b=drqqhx8inJ8rs6rOB5KVeJwe2+g9oi/0oBq5Gx09g8GV4lqqAraC6oyub5Gf6FJFStU/KB SX3IJEMsWtFlxxzbcpAsbMNtOab19yV1kPaHJLAXDm+Nb5Mm4Mn7sNd3Hep5V0owKDFxvN AKAmNQZkisd/0CanJpD/H0CcIHSAM5kxBA9P4sc2aKqdjgupbHq3JIPcbN+GAsfFcAltPj Aptfg4zhFfgTK4eXVycvGVl3J/iRwbSdIgmbTEWCbNtkd7IkTPS8fosGtw2XOC7FwtaUgU QoYG2FKY8H1SfTAyzjJyQCcPnJl37ZHObLkKYG595MNyo8bBd8DknI8r1QDtwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743709598; a=rsa-sha256; cv=none; b=Mg1HqK8WuuRQvUcFUHW4sdUOlFbeHbMLUtaLCkh+MKeJ8d/ika6Xa9RfEy6GHbsS8/d00Z fvkiVgqJsnbkgdNOTUsaRpQgNofEr9/NU1Qq/nrKyJATGpsu8D7Whv1HWeNwBiJOazo9MW 87IfwA3S8LBs6jORmzr/bT1wAo7Brwj9JtjMX2mT690qjwPBnx4UBznlQNbZhHOEbpoR6i UlPhNEo750hS+unz49X/GzwmKim02W0RGX14vw4drGuB96qlR9uHLUoEUPuvvS0YNDoJ2q F+sjknh4Jy+jypmDpXtLD4dQFDan0yh8F/wVsv0iMnT1onVwlaubwlIJSuPVNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743709598; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nzISJ9twY1mC1/tsucaSmKFHw9WDdJmyCBgOjeANNEU=; b=vtJQYxRgyCjlyECy8R2VaZzDA+QgVOxQHUdXJnmpbXRqz5boyxN/omZClRTOfro9WQiSSe 2LNZ6HJUjc2thzg0NLdcVJSmp1Hz/D2S/XGksFNu848kUYk9mK2CvO+osBlqEz6mEJKzuu tQgnEav3gFwWPx23M43B0fHOf2WWef4UOPKR21PPhqLAnqYrTP56n7TkzR4+bbDzj8Q6wc oLnolqKLZeDQgpz95ZtIHjDwqxJWR8DtNliJgEaiDw4xf8k090LgSAoN8yh+S9GKjIw/nL jC5Ru0678ADbihCBEB+SR2FTAqW7AwyWwaokuo3LXygzJEOdkUIaFJkfkEHTbA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZTC0t3T1gzqd; Thu, 03 Apr 2025 19:46:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 533JkcTG060856; Thu, 3 Apr 2025 19:46:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 533JkcBB060853; Thu, 3 Apr 2025 19:46:38 GMT (envelope-from git) Date: Thu, 3 Apr 2025 19:46:38 GMT Message-Id: <202504031946.533JkcBB060853@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: cc64095a5bed - main - security/xml-security: upgrade to 3.0.5 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cc64095a5bedc299a36e46d2c6f71c780252a33d Auto-Submitted: auto-generated The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=cc64095a5bedc299a36e46d2c6f71c780252a33d commit cc64095a5bedc299a36e46d2c6f71c780252a33d Author: Thierry Thomas AuthorDate: 2025-04-02 17:32:13 +0000 Commit: Thierry Thomas CommitDate: 2025-04-03 19:46:30 +0000 security/xml-security: upgrade to 3.0.5 Don’t build the jars but use pre-built ones from Maven repository. PR: 285854 Approved by: ale (maintainer) --- security/xml-security/Makefile | 44 +++++++++++------------------ security/xml-security/distinfo | 7 +++-- security/xml-security/files/patch-build.xml | 39 ------------------------- security/xml-security/pkg-descr | 2 ++ 4 files changed, 23 insertions(+), 69 deletions(-) diff --git a/security/xml-security/Makefile b/security/xml-security/Makefile index ff3bebfec278..e46188774d90 100644 --- a/security/xml-security/Makefile +++ b/security/xml-security/Makefile @@ -1,55 +1,43 @@ -PORTNAME= xml-security -DISTVERSION= 1_5_5 -PORTREVISION= 2 +PORTNAME= xmlsec +DISTVERSION= 3.0.5 CATEGORIES= security java -MASTER_SITES= https://archive.apache.org/dist/santuario/java-library/${DISTVERSION}/ -DISTNAME= ${PORTNAME}-src-${DISTVERSION} +MASTER_SITES= https://repo1.maven.org/maven2/org/apache/santuario/xmlsec/${DISTVERSION}/ +DISTFILES= ${PORTNAME}-${PORTVERSION}.jar MAINTAINER= ale@FreeBSD.org COMMENT= Java library for XML Signature and Encryption WWW= https://santuario.apache.org/javaindex.html -BUILD_DEPENDS= ${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging \ - ${JAVALIBDIR}/xalan.jar:textproc/xalan-j -RUN_DEPENDS= ${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging - LICENSE= APACHE20 -USES= cpe java:ant,run zip +RUN_DEPENDS= ${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging + +USES= cpe java:run CPE_PRODUCT= xml_security_for_java CPE_VENDOR= apache -WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} -MAKE_ENV= ANT_INCLUDE_SHARED_JARS=YES -ALL_TARGET= jar +NO_BUILD= yes +NO_ARCH= yes +EXTRACT_ONLY= PORTDOCS= * -PORTEXAMPLES= * PLIST_FILES= %%JAVAJARDIR%%/xmlsec.jar -OPTIONS_DEFINE= DOCS EXAMPLES - -DOCS_ALL_TARGET= javadoc +OPTIONS_DEFINE= DOCS +DOCS_DISTFILES= ${PORTNAME}-${PORTVERSION}-javadoc.jar do-install: @${ECHO} -n ">> Installing JAR as ${JAVAJARDIR}/xmlsec.jar..." - @${INSTALL_DATA} ${WRKSRC}/build/xmlsec-${PORTVERSION}.jar \ + ${INSTALL_DATA} ${DISTDIR}/xmlsec-${PORTVERSION}.jar \ ${STAGEDIR}/${JAVAJARDIR}/xmlsec.jar @${ECHO} " [ DONE ]" do-install-DOCS-on: @${ECHO} -n ">> Installing documentation in ${DOCSDIR}..." - @${MKDIR} ${STAGEDIR}/${DOCSDIR} - @(cd ${WRKSRC}/build/docs/html && ${COPYTREE_SHARE} javadoc \ - ${STAGEDIR}/${DOCSDIR}) - @${ECHO} " [ DONE ]" - -do-install-EXAMPLES-on: - @${ECHO} -n ">> Installing examples in ${EXAMPLESDIR}..." - @${MKDIR} ${STAGEDIR}/${EXAMPLESDIR} - @(cd ${WRKSRC}/samples && ${COPYTREE_SHARE} "javax org" \ - ${STAGEDIR}/${EXAMPLESDIR}) + ${MKDIR} ${STAGEDIR}/${DOCSDIR} + ${INSTALL_DATA} ${DISTDIR}/xmlsec-${PORTVERSION}-javadoc.jar \ + ${STAGEDIR}/${DOCSDIR}/xmlsec-javadoc.jar @${ECHO} " [ DONE ]" .include diff --git a/security/xml-security/distinfo b/security/xml-security/distinfo index ad45101fac37..ce3a96e04bd5 100644 --- a/security/xml-security/distinfo +++ b/security/xml-security/distinfo @@ -1,2 +1,5 @@ -SHA256 (xml-security-src-1_5_5.zip) = 68d0e567134913a1ba9571b587980306522f34d66ff495d065f734c08cc793c0 -SIZE (xml-security-src-1_5_5.zip) = 2437645 +TIMESTAMP = 1743614273 +SHA256 (xmlsec-3.0.5.jar) = ad39c8422c0a90d54377d53e1200d596879e7440ab88db0b1e15fb0410940f11 +SIZE (xmlsec-3.0.5.jar) = 1203552 +SHA256 (xmlsec-3.0.5-javadoc.jar) = b015b9fb50960c1133d197a691634e867df1724e29eefaa73ef7ceb6418424de +SIZE (xmlsec-3.0.5-javadoc.jar) = 3220835 diff --git a/security/xml-security/files/patch-build.xml b/security/xml-security/files/patch-build.xml deleted file mode 100644 index 95fc7b681cbc..000000000000 --- a/security/xml-security/files/patch-build.xml +++ /dev/null @@ -1,39 +0,0 @@ ---- build.xml.orig 2012-02-22 13:02:34.000000000 +0100 -+++ build.xml 2012-02-22 13:05:16.000000000 +0100 -@@ -221,7 +221,7 @@ - -+ includeAntRuntime="yes"> - - - -@@ -667,6 +667,19 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ - - -@@ -719,7 +732,6 @@ - - - -- - - - diff --git a/security/xml-security/pkg-descr b/security/xml-security/pkg-descr index 270781660a8b..60566ed08fc5 100644 --- a/security/xml-security/pkg-descr +++ b/security/xml-security/pkg-descr @@ -6,3 +6,5 @@ The Java library supports the standard Java API JSR-105: XML Digital Signature APIs for creating and validating XML Signatures. A standard Java API for XML Encryption JSR-106: XML Digital Encryption APIs is in progress and is not final, so this API is not yet supported. + +See also https://github.com/apache/santuario-xml-security-java