From nobody Tue Apr 26 18:20:24 2022 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 6A5BF1ABBD43; Tue, 26 Apr 2022 18:20:24 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Knqtc2S7bz3MGq; Tue, 26 Apr 2022 18:20:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650997224; 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=tQbKzcw73yQncnZalW2RHcafsWgTwsPTR72q+D2cVcI=; b=B2EP/ddxrwVsFviQ06vVBYYEd7349IMBeevhamB1kXmCukoMmy/fCKNqehPwSU0UwBCSl6 kccDT8zH/iyt276OLvQ046EvJrRHSsHsaRTxFk4rAtezHO3hZJjEqg7VobiTu1u2BQQCtx Hz4ikCwbYSfyJeZuAoXc/XKMi5cU8IT1E6+4Y8OJE/U3QcPkTL+YlAO55cT6khk1yOe3Cz HIvkyJw+uHVNOvdFbqyBkm+QmK/SHDMTSrztuJWcYENOTBIZctAgrIbxLZIC4+LrUop/iU +2nFOhXxYvukhxUCoUez9fa/T4Ybp2KsVT/Cz6VmtGbfYXI/e8T/14iEPOO3CA== 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 33B081422B; Tue, 26 Apr 2022 18:20:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23QIKOH6009932; Tue, 26 Apr 2022 18:20:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23QIKOnq009931; Tue, 26 Apr 2022 18:20:24 GMT (envelope-from git) Date: Tue, 26 Apr 2022 18:20:24 GMT Message-Id: <202204261820.23QIKOnq009931@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Don Lewis Subject: git: 065c811cfc47 - main - devel/opengrok: Upgrade to version 1.7.31 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: truckman X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 065c811cfc470bd7495c11f895b7ae0bd2bb8dde Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650997224; 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=tQbKzcw73yQncnZalW2RHcafsWgTwsPTR72q+D2cVcI=; b=X2M5B+zsYrruF/p+JF35XUxvUG8WWB+jAoEaJAom7Px920kPnFcoSz+azm954zuDTdYYa9 TH7N2za4nG0kns5nIQbcR6GK7IjEYKWPQeMpuOtuuNCop9VJ6aZoxdOupqFxbMH/V9wU+t B1vFYbqJDenE6ofwbqTe6wfZS6QalysolGRAgYFvUryMDii9ym6kR5nShtn5GR4/bugNdD ol1zDjFnMJqg3AG7Nl0v5X2VA0rAim5g/7NEaDiEE0KNp9xrwfnQMAuARUIwI6rEzAFBVI C7UETmec+TEYy7FTLlvhsa8jEOcJIAUq95y491WsPefCvq2UaaS3hdw3fGUOXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650997224; a=rsa-sha256; cv=none; b=BfsjLnDbTcamYad54CMs/pzgbeGEWuljXp24xp1ZdRCyXtNyQFMxz4j33LiZnjCvRzecEI 5pJUt/kWMWhMLb1ooC7SGi+svQJqxdnvGIUtGh7gektdG+SQWV+Q+QyAo3A1SjLL9jJrOQ t5jxlB5Rquhd3oOdytLWSffZfq9DGQQ/LmI/4j6Ek+xthkoPYof1c1f8F3g0OepDh17cjO Ir+WvgPIFZcIlmjThrJeHJodJwrrrFvedOg45byeHYTJmnxb/Fayb350pQI6TyjF+zyeki KWwQLUKdz0A9bkYcZmBKEVOxl3aA3bhNbZb65r+PgwlKlM31SRC80v5w3Ty1tQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by truckman: URL: https://cgit.FreeBSD.org/ports/commit/?id=065c811cfc470bd7495c11f895b7ae0bd2bb8dde commit 065c811cfc470bd7495c11f895b7ae0bd2bb8dde Author: Don Lewis AuthorDate: 2022-04-26 18:08:39 +0000 Commit: Don Lewis CommitDate: 2022-04-26 18:19:28 +0000 devel/opengrok: Upgrade to version 1.7.31 Upgrade opengrok to the latest upstream version to fix CVE-2021-2322, which was actually fixed upstream in 1.6.7. Convert the wrapper script from /bin/csh to /bin/sh. Jave 11+ is required. PR: 260534 MFH: 2022Q2 Security: 1135e939-62b4-11ec-b8e2-1c1b0d9ea7e6 --- devel/opengrok/Makefile | 90 ++--------- devel/opengrok/distinfo | 6 +- devel/opengrok/files/opengrok.in | 15 +- devel/opengrok/files/pkg-message.in | 18 +++ devel/opengrok/pkg-message | 8 - devel/opengrok/pkg-plist | 291 +++++++++++++++++------------------- 6 files changed, 173 insertions(+), 255 deletions(-) diff --git a/devel/opengrok/Makefile b/devel/opengrok/Makefile index 30ea7fb92641..d1d042ca76ff 100644 --- a/devel/opengrok/Makefile +++ b/devel/opengrok/Makefile @@ -1,5 +1,5 @@ PORTNAME= opengrok -PORTVERSION= 1.3.16 +PORTVERSION= 1.7.31 CATEGORIES= devel java MASTER_SITES= https://github.com/oracle/opengrok/releases/download/${PORTVERSION}/ @@ -8,6 +8,8 @@ COMMENT= Fast and powerful code search and cross-reference engine LICENSE= CDDL ADAIC BSD3CLAUSE EPL ECMA MIT RUBY LICENSE_COMB= multi +LICENSE_NAME_ADAIC= Ada Reference Manual, ISO/IEC 8652:2007(E) Ed. 3 +LICENSE_NAME_ECMA= Ecma International LICENSE_FILE_CDDL= ${WRKSRC}/doc/LICENSE.txt LICENSE_FILE_ADAIC= ${WRKSRC}/doc/LICENSE-adaic.org.txt LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/doc/LICENSE-scala.txt @@ -15,9 +17,7 @@ LICENSE_FILE_EPL= ${WRKSRC}/doc/LICENSE-eclipse.txt LICENSE_FILE_ECMA= ${WRKSRC}/doc/LICENSE-ecma.txt LICENSE_FILE_MIT= ${WRKSRC}/doc/LICENSE-mandoc.txt LICENSE_FILE_RUBY= ${WRKSRC}/doc/LICENSE-ruby.txt -LICENSE_NAME_ADAIC= Ada Reference Manual, ISO/IEC 8652:2007(E) Ed. 3 LICENSE_PERMS_ADAIC= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -LICENSE_NAME_ECMA= Ecma International LICENSE_PERMS_ECMA= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept RUN_DEPENDS= uctags:devel/universal-ctags @@ -25,109 +25,47 @@ RUN_DEPENDS= uctags:devel/universal-ctags USES= cpe CPE_VENDOR= oracle USE_JAVA= yes -JAVA_VERSION= 1.8+ +JAVA_VERSION= 11+ SHAREOWN= www SHAREGRP= www NO_BUILD= yes NO_ARCH= yes -PORTDOCS= README.md logging.properties.template paths.tsv -SUB_FILES= opengrok -SUB_LIST+= LIBFILES="${LIBFILES:S,^,${DATADIR}/lib/,}" \ - JARFILE="${JARFILE}" +PORTDOCS= README.md logging.properties.template +SUB_FILES= opengrok pkg-message +SUB_LIST+= JARFILE="${JARFILE}" PLIST_SUB= T=${WEBAPP_HOME:S|^${LOCALBASE}/||} \ OWNER=${SHAREOWN} GROUP=${SHAREGRP} OPTIONS_DEFINE= DOCS OPTIONS_SINGLE= AS -OPTIONS_SINGLE_AS= GLASSFISH TOMCAT85 TOMCAT9 -OPTIONS_DEFAULT= TOMCAT85 +OPTIONS_SINGLE_AS= GLASSFISH TOMCAT10 +OPTIONS_DEFAULT= TOMCAT10 GLASSFISH_DESC?= Glassfish support GLASSFISH_VARS= WEBAPP_HOME=${LOCALBASE}/glassfish-5.1.0/glassfish -TOMCAT85_VARS= WEBAPP_HOME=${LOCALBASE}/apache-tomcat-8.5 -TOMCAT9_VARS= WEBAPP_HOME=${LOCALBASE}/apache-tomcat-9.0 +TOMCAT10_VARS= WEBAPP_HOME=${LOCALBASE}/apache-tomcat-10.0 GLASSFISH_BUILD_DEPENDS=${WEBAPP_HOME}/modules/glassfish.jar:www/glassfish GLASSFISH_RUN_DEPENDS= ${WEBAPP_HOME}/modules/glassfish.jar:www/glassfish -TOMCAT85_BUILD_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat85 -TOMCAT85_RUN_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat85 -TOMCAT9_BUILD_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat9 -TOMCAT9_RUN_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat9 - -JARFILE= ${DATADIR}/opengrok.jar -LIBFILES= activation-1.1.1.jar \ - ant-1.10.1.jar \ - ant-launcher-1.10.1.jar \ - aopalliance-repackaged-2.6.1.jar \ - bcel-6.4.1.jar \ - classmate-1.3.4.jar \ - commons-compress-1.19.jar \ - commons-lang3-3.9.jar \ - cron-utils-7.0.2.jar \ - hibernate-validator-6.0.17.Final.jar \ - hk2-api-2.6.1.jar \ - hk2-locator-2.6.1.jar \ - hk2-utils-2.6.1.jar \ - jackson-annotations-2.10.1.jar \ - jackson-core-2.10.1.jar \ - jackson-databind-2.10.1.jar \ - jackson-module-jaxb-annotations-2.10.1.jar \ - jakarta.activation-api-1.2.1.jar \ - jakarta.annotation-api-1.3.5.jar \ - jakarta.el-3.0.2.jar \ - jakarta.el-api-3.0.3.jar \ - jakarta.inject-2.6.1.jar \ - jakarta.validation-api-2.0.2.jar \ - jakarta.ws.rs-api-2.1.6.jar \ - jakarta.xml.bind-api-2.3.2.jar \ - javassist-3.25.0-GA.jar \ - jaxb-api-2.3.0.jar \ - jaxb-core-2.3.0.jar \ - jaxb-impl-2.3.0.jar \ - jboss-logging-3.3.2.Final.jar \ - jersey-bean-validation-2.30.1.jar \ - jersey-client-2.30.1.jar \ - jersey-common-2.30.1.jar \ - jersey-entity-filtering-2.30.1.jar \ - jersey-hk2-2.30.1.jar \ - jersey-media-jaxb-2.30.1.jar \ - jersey-media-json-jackson-2.30.1.jar \ - jersey-server-2.30.1.jar \ - lucene-analyzers-common-8.5.2.jar \ - lucene-backward-codecs-8.5.2.jar \ - lucene-core-8.5.2.jar \ - lucene-highlighter-8.5.2.jar \ - lucene-join-8.5.2.jar \ - lucene-memory-8.5.2.jar \ - lucene-queries-8.5.2.jar \ - lucene-queryparser-8.5.2.jar \ - lucene-sandbox-8.5.2.jar \ - lucene-suggest-8.5.2.jar \ - opengrok-1.3.16.jar \ - org.suigeneris.jrcs.diff-0.4.2.jar \ - org.suigeneris.jrcs.rcs-0.4.2.jar \ - osgi-resource-locator-1.0.3.jar \ - slf4j-api-1.7.12.jar +TOMCAT10_BUILD_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat10 +TOMCAT10_RUN_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat10 WEBAPPS_DIR= ${WEBAPP_HOME:S|^${LOCALBASE}/||}/webapps +JARFILE= ${LOCALBASE}/${WEBAPPS_DIR}/opengrok/WEB-INF/lib/opengrok-${PORTVERSION}.jar post-extract: @${MKDIR} ${WRKSRC}/lib/opengrok @${TAR} -xf ${WRKSRC}/lib/source.war -C ${WRKSRC}/lib/opengrok do-install: - @${MKDIR} ${STAGEDIR}${DATADIR}/etc ${STAGEDIR}${DATADIR}/lib \ + @${MKDIR} ${STAGEDIR}${DATADIR}/etc \ ${STAGEDIR}${PREFIX}/${WEBAPPS_DIR}/${PORTNAME} \ ${STAGEDIR}/var/log/opengrok (cd ${WRKSRC}/lib/opengrok && ${COPYTREE_SHARE} . \ ${STAGEDIR}${PREFIX}/${WEBAPPS_DIR}/${PORTNAME}) (cd ${STAGEDIR}${PREFIX}/${WEBAPPS_DIR}/${PORTNAME}/WEB-INF && \ ${MV} web.xml web.xml.sample) - ${INSTALL_DATA} ${LIBFILES:S,^,${WRKSRC}/lib/lib/,} \ - ${STAGEDIR}${DATADIR}/lib/ - ${INSTALL_DATA} ${WRKSRC}/lib/opengrok.jar ${STAGEDIR}${DATADIR}/ - ${INSTALL_DATA} ${WRKSRC}/lib/source.war ${STAGEDIR}${DATADIR}/ ${INSTALL_DATA} ${WRKSRC}/doc/logging.properties ${STAGEDIR}${DATADIR}/etc/logging.properties.sample ${INSTALL_SCRIPT} ${WRKDIR}/opengrok ${STAGEDIR}${PREFIX}/bin diff --git a/devel/opengrok/distinfo b/devel/opengrok/distinfo index 9236162f4957..917a409bbfec 100644 --- a/devel/opengrok/distinfo +++ b/devel/opengrok/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1597089207 -SHA256 (opengrok-1.3.16.tar.gz) = 72496b9d2d731a618507c41d8339282c72d9083d6f36477a4e412a22c7091a7f -SIZE (opengrok-1.3.16.tar.gz) = 55244095 +TIMESTAMP = 1650873302 +SHA256 (opengrok-1.7.31.tar.gz) = dba38e9cf08a3a53bff12d8f5491959e60fedfc2fc3374c335ce352a0b139ae9 +SIZE (opengrok-1.7.31.tar.gz) = 77733534 diff --git a/devel/opengrok/files/opengrok.in b/devel/opengrok/files/opengrok.in index 419ee35b2c97..19c2360ac275 100644 --- a/devel/opengrok/files/opengrok.in +++ b/devel/opengrok/files/opengrok.in @@ -1,13 +1,6 @@ -#!/bin/csh +#!/bin/sh -set JAVA = "%%LOCALBASE%%/bin/java" -set LIBFILES = "%%LIBFILES%%" -setenv JAVA_VERSION "%%JAVA_VERSION%%" +JAVA= "%%LOCALBASE%%/bin/java" +export JAVA_VERSION="%%JAVA_VERSION%%" -if ( "${LIBFILES}" != "" ) then - set CLASSPATH = `echo ${LIBFILES} | sed -E -e 's,[[:space:]]+,:,g'` -else - set CLASSPATH = "" -endif - -exec "${JAVA}" -cp "${CLASSPATH}" -jar %%JARFILE%% -c %%LOCALBASE%%/bin/exctags -w opengrok $* +exec "${JAVA}" -jar %%JARFILE%% -c %%LOCALBASE%%/bin/uctags $* diff --git a/devel/opengrok/files/pkg-message.in b/devel/opengrok/files/pkg-message.in new file mode 100644 index 000000000000..5e86c127bab9 --- /dev/null +++ b/devel/opengrok/files/pkg-message.in @@ -0,0 +1,18 @@ +[ +{ type: install + message: <