From nobody Fri Dec 17 07:42:41 2021 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 65E6D19069C3; Fri, 17 Dec 2021 07:42:42 +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 4JFgtp0LWtz3NRS; Fri, 17 Dec 2021 07:42:42 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 E051617E62; Fri, 17 Dec 2021 07:42:41 +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 1BH7gfk1063257; Fri, 17 Dec 2021 07:42:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BH7gf5X063256; Fri, 17 Dec 2021 07:42:41 GMT (envelope-from git) Date: Fri, 17 Dec 2021 07:42:41 GMT Message-Id: <202112170742.1BH7gf5X063256@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexander Leidinger Subject: git: 94d2bb62d559 - main - security/bastillion: update to 3.11.01 (log4j 2.16) 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: netchild X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 94d2bb62d559d10849f6e0f24f937c6d76825737 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639726962; 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=YBCxD+RbOVjZWuTKUbEvpM4NQs9652bRAqDx+9G2wzU=; b=a8KDOwkSMqbDfLhz7+qnvjn/moZy+RA1fblkGlWmXobYNaLdVKFElMfaZeZD9W2dGrUmpr 0LMV3TPHxE6DjemeMRC4IsiYvE4ehuAD+SsXU9NUrWKK3gUpWR2R0dOD4lwplgYSIXnDYk Y9QnZLmCog54c2a5n8MU+UF4WsXDZLSWmN7GT9lYc85cBm5n6J/9p8ekGDypWtd0MbMmh5 OzDVYIMxZQKx6ITm9orB0hxZbX53ah1l7plHtO+np8wb8aQec2kvBBsLkwuc4+3pfyEaGr 2swD+uMMqx32Q21XKP/7gj3sB39kN3X92yJy+ss3v0uhCd4m5D8Do+la1L2LSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639726962; a=rsa-sha256; cv=none; b=jI8h49r91O8cXoFhKnMXhJg5XIkzXgMMMvWT4mlLpe1/4LMplUhnvCgBgiZfXPDsU+Ykfi 5Tz2QEwKQTqicr51RdBraepOLUSoadtYXyccQkuPVPYT1FuFeg2eXVcbVTgP7k3KMmY9gT XbUxkI3NHJA7ioO124qBBvqg+GIyuYg/igYDeEll+vIFMA+dkaRcYVSzrDwmN8NP67H1ft Oafp8Hfd4wu1glQ7b5RcgU9jmj8uk2RJA1ZalxxK88Og/rsA0/Q8lnXKvDG9VyXlUhW3Ct CNUw/sw6m4oMKaqxHlPLhL8vTdxlciYDIq9e6dacfNrDAn+dAsSm0dGmwiwhPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by netchild: URL: https://cgit.FreeBSD.org/ports/commit/?id=94d2bb62d559d10849f6e0f24f937c6d76825737 commit 94d2bb62d559d10849f6e0f24f937c6d76825737 Author: Alexander Leidinger AuthorDate: 2021-12-17 07:39:58 +0000 Commit: Alexander Leidinger CommitDate: 2021-12-17 07:42:37 +0000 security/bastillion: update to 3.11.01 (log4j 2.16) Revert my previous log4j fix (disable JNDI lookups via env variable), the update to 3.11.01 contains the fixed log4j 2.16. --- security/bastillion/Makefile | 4 ++-- security/bastillion/distinfo | 6 +++--- security/bastillion/files/bastillion.in | 3 --- security/bastillion/pkg-plist | 24 ++++++++++++------------ 4 files changed, 17 insertions(+), 20 deletions(-) diff --git a/security/bastillion/Makefile b/security/bastillion/Makefile index 30c08e8154f2..a32b87e39179 100644 --- a/security/bastillion/Makefile +++ b/security/bastillion/Makefile @@ -2,10 +2,10 @@ PORTNAME= bastillion DISTVERSIONPREFIX= jetty-v -DISTVERSION= 3.10_00 +DISTVERSION= 3.11_01 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ ${PORTNAME}-upgrade-3.08.00.jar -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= security www java MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${PORTVERSION}/ diff --git a/security/bastillion/distinfo b/security/bastillion/distinfo index 8ae00e3c37a0..565346732d6c 100644 --- a/security/bastillion/distinfo +++ b/security/bastillion/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1590304775 -SHA256 (bastillion-jetty-v3.10_00.tar.gz) = 7ab85fa9d642163ff7c566f012d96a3f5e6dc8437efe9d80b856d1cc8037f013 -SIZE (bastillion-jetty-v3.10_00.tar.gz) = 19633616 +TIMESTAMP = 1639726206 +SHA256 (bastillion-jetty-v3.11_01.tar.gz) = 7ffec5373b6698ebedfa1228b6f0caea482e313cb2bdb9758b5607765c4626b9 +SIZE (bastillion-jetty-v3.11_01.tar.gz) = 19785024 SHA256 (bastillion-upgrade-3.08.00.jar) = 8d18adc90d258b9a9de5e5865c9f632c563d0557ad9458b9f1082ede15ed074b SIZE (bastillion-upgrade-3.08.00.jar) = 3557485 diff --git a/security/bastillion/files/bastillion.in b/security/bastillion/files/bastillion.in index fed1b9cedefc..4a2818ed7c2e 100644 --- a/security/bastillion/files/bastillion.in +++ b/security/bastillion/files/bastillion.in @@ -43,8 +43,5 @@ else fi export JAVA_HOME -LOG4J_FORMAT_MSG_NO_LOOKUPS=true -export LOG4J_FORMAT_MSG_NO_LOOKUPS - run_rc_command "$1" diff --git a/security/bastillion/pkg-plist b/security/bastillion/pkg-plist index fdb1ff2e1246..1e08cfe1b98e 100644 --- a/security/bastillion/pkg-plist +++ b/security/bastillion/pkg-plist @@ -74,27 +74,27 @@ jetty_bastillion/bastillion/WEB-INF/classes/jaas.conf jetty_bastillion/bastillion/WEB-INF/classes/log4j2.xml jetty_bastillion/bastillion/WEB-INF/jetty-env.xml jetty_bastillion/bastillion/WEB-INF/lib/attoparser-2.0.5.RELEASE.jar -jetty_bastillion/bastillion/WEB-INF/lib/commons-codec-1.14.jar +jetty_bastillion/bastillion/WEB-INF/lib/commons-codec-1.15.jar jetty_bastillion/bastillion/WEB-INF/lib/commons-configuration-1.10.jar -jetty_bastillion/bastillion/WEB-INF/lib/commons-dbcp2-2.7.0.jar +jetty_bastillion/bastillion/WEB-INF/lib/commons-dbcp2-2.8.0.jar jetty_bastillion/bastillion/WEB-INF/lib/commons-fileupload-1.4.jar jetty_bastillion/bastillion/WEB-INF/lib/commons-io-2.2.jar jetty_bastillion/bastillion/WEB-INF/lib/commons-lang-2.6.jar -jetty_bastillion/bastillion/WEB-INF/lib/commons-lang3-3.10.jar +jetty_bastillion/bastillion/WEB-INF/lib/commons-lang3-3.12.0.jar jetty_bastillion/bastillion/WEB-INF/lib/commons-logging-1.2.jar -jetty_bastillion/bastillion/WEB-INF/lib/commons-pool2-2.7.0.jar -jetty_bastillion/bastillion/WEB-INF/lib/core-3.4.0.jar +jetty_bastillion/bastillion/WEB-INF/lib/commons-pool2-2.8.1.jar +jetty_bastillion/bastillion/WEB-INF/lib/core-3.4.1.jar jetty_bastillion/bastillion/WEB-INF/lib/gson-2.8.6.jar jetty_bastillion/bastillion/WEB-INF/lib/h2-1.4.200.jar jetty_bastillion/bastillion/WEB-INF/lib/javassist-3.20.0-GA.jar jetty_bastillion/bastillion/WEB-INF/lib/jsch-0.1.55.jar -jetty_bastillion/bastillion/WEB-INF/lib/lmvc-1.06.00.jar -jetty_bastillion/bastillion/WEB-INF/lib/log4j-api-2.13.3.jar -jetty_bastillion/bastillion/WEB-INF/lib/log4j-core-2.13.3.jar -jetty_bastillion/bastillion/WEB-INF/lib/log4j-slf4j-impl-2.13.3.jar -jetty_bastillion/bastillion/WEB-INF/lib/ognl-3.1.12.jar -jetty_bastillion/bastillion/WEB-INF/lib/slf4j-api-1.7.30.jar -jetty_bastillion/bastillion/WEB-INF/lib/thymeleaf-3.0.11.RELEASE.jar +jetty_bastillion/bastillion/WEB-INF/lib/lmvc-1.08.00.jar +jetty_bastillion/bastillion/WEB-INF/lib/log4j-api-2.16.0.jar +jetty_bastillion/bastillion/WEB-INF/lib/log4j-core-2.16.0.jar +jetty_bastillion/bastillion/WEB-INF/lib/log4j-slf4j-impl-2.16.0.jar +jetty_bastillion/bastillion/WEB-INF/lib/ognl-3.1.26.jar +jetty_bastillion/bastillion/WEB-INF/lib/slf4j-api-1.8.0-beta4.jar +jetty_bastillion/bastillion/WEB-INF/lib/thymeleaf-3.0.14.RELEASE.jar jetty_bastillion/bastillion/WEB-INF/lib/unbescape-1.1.6.RELEASE.jar jetty_bastillion/bastillion/WEB-INF/web.xml jetty_bastillion/bastillion/_res/css/bastillion.css