git: 94d2bb62d559 - main - security/bastillion: update to 3.11.01 (log4j 2.16)

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Alexander Leidinger <netchild_at_FreeBSD.org>
Date: Fri, 17 Dec 2021 07:42:41 UTC
The branch main has been updated by netchild:

URL: https://cgit.FreeBSD.org/ports/commit/?id=94d2bb62d559d10849f6e0f24f937c6d76825737

commit 94d2bb62d559d10849f6e0f24f937c6d76825737
Author:     Alexander Leidinger <netchild@FreeBSD.org>
AuthorDate: 2021-12-17 07:39:58 +0000
Commit:     Alexander Leidinger <netchild@FreeBSD.org>
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