Date: Wed, 15 Dec 2021 07:03:21 GMT From: Alexander Leidinger <netchild@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: a1420b9aec7c - main - net/serviio: update to 2.2.1 (log4j security fix) Message-ID: <202112150703.1BF73L8k048374@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by netchild: URL: https://cgit.FreeBSD.org/ports/commit/?id=a1420b9aec7c071e35f3f297277713c70d23ebf4 commit a1420b9aec7c071e35f3f297277713c70d23ebf4 Author: Alexander Leidinger <netchild@FreeBSD.org> AuthorDate: 2021-12-15 06:49:19 +0000 Commit: Alexander Leidinger <netchild@FreeBSD.org> CommitDate: 2021-12-15 06:55:56 +0000 net/serviio: update to 2.2.1 (log4j security fix) --- net/serviio/Makefile | 6 +++--- net/serviio/distinfo | 6 +++--- net/serviio/files/patch-log4j2 | 11 +++++++++++ net/serviio/files/patch-logging | 21 --------------------- net/serviio/pkg-plist | 9 ++++----- 5 files changed, 21 insertions(+), 32 deletions(-) diff --git a/net/serviio/Makefile b/net/serviio/Makefile index 41fd3fa33f02..7061f74f7029 100644 --- a/net/serviio/Makefile +++ b/net/serviio/Makefile @@ -1,8 +1,8 @@ # Created by: Mikhail Teterin <mi@aldan.algebra.com> PORTNAME= serviio -PORTVERSION= 2.1 -PORTREVISION= 2 +PORTVERSION= 2.2.1 +PORTREVISION= 0 CATEGORIES= net multimedia java www MASTER_SITES= https://download.serviio.org/releases/ EXTRACT_SUFX= -linux.tar.gz @@ -39,7 +39,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/lib/*.jar \ ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}/ ${MKDIR} ${STAGEDIR}${PREFIX}/etc/${PORTNAME} -.for f in application-profiles profiles log4j +.for f in application-profiles profiles log4j2 ${INSTALL_DATA} ${WRKSRC}/config/$f.xml \ ${STAGEDIR}${ETCDIR}/$f.xml.sample .endfor diff --git a/net/serviio/distinfo b/net/serviio/distinfo index fbbff6176a4e..cbd09c2f8250 100644 --- a/net/serviio/distinfo +++ b/net/serviio/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1588579013 -SHA256 (serviio-2.1-linux.tar.gz) = 51748160b38e31ba54db1b11381d3d9d705852ed7757ad111e881327a16fb757 -SIZE (serviio-2.1-linux.tar.gz) = 29354372 +TIMESTAMP = 1639505046 +SHA256 (serviio-2.2.1-linux.tar.gz) = b9145628cbf87f66f5c8813d3a75c3219026728ab0ffc174cf52ce7ac401b324 +SIZE (serviio-2.2.1-linux.tar.gz) = 28789070 diff --git a/net/serviio/files/patch-log4j2 b/net/serviio/files/patch-log4j2 new file mode 100644 index 000000000000..35948fb9117b --- /dev/null +++ b/net/serviio/files/patch-log4j2 @@ -0,0 +1,11 @@ +--- /var/ports/root/net/serviio/work/serviio-2.2.1/config/log4j2.xml.orig 2021-12-14 19:08:41.946554000 +0100 ++++ /var/ports/root/net/serviio/work/serviio-2.2.1/config/log4j2.xml 2021-12-14 19:09:19.554143000 +0100 +@@ -9,7 +9,7 @@ + <Configuration> + + <Appenders> +- <RollingFile name="FILE" fileName="${sys:serviio.home}/log/serviio.log" filePattern="${sys:serviio.home}/log/serviio.log.%i"> ++ <RollingFile name="FILE" fileName="/var/log/serviio/serviio.log" filePattern="/var/log/serviio/serviio.log.%i"> + <PatternLayout pattern="%d{ISO8601} %-5p [%c{1}] %m%n" /> + <Policies> + <SizeBasedTriggeringPolicy size="5000KB" /> diff --git a/net/serviio/files/patch-logging b/net/serviio/files/patch-logging index 01511b7fa229..9296bef10382 100644 --- a/net/serviio/files/patch-logging +++ b/net/serviio/files/patch-logging @@ -8,24 +8,3 @@ seem to work fine... derby.storage.pageSize=8192 derby.storage.pageCacheSize=3000 -The port makes sure, the below file is only used to configure logging of -serviio-daemon process. The console is configured separately -- by -default it simply logs everything to stderr. - ---- config/log4j.xml 2011-01-23 14:24:59.000000000 -0500 -+++ config/log4j.xml 2011-02-04 00:13:33.000000000 -0500 -@@ -1,3 +1,3 @@ --<?xml version="1.0" encoding="UTF-8"?> -+<?xml version="1.0" encoding="US-ASCII"?> - <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> - -@@ -10,8 +10,8 @@ - <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> - - <appender name="FILE" class="org.apache.log4j.RollingFileAppender"> - <param name="Threshold" value="DEBUG"/> - <param name="Append" value="true" /> -- <param name="File" value="${serviio.home}/log/serviio.log" /> -+ <param name="File" value="/var/log/serviio/serviio.log" /> - <param name="MaxFileSize" value="500KB" /> - <param name="MaxBackupIndex" value="5" /> diff --git a/net/serviio/pkg-plist b/net/serviio/pkg-plist index 82850f823b01..4f4638a9d451 100644 --- a/net/serviio/pkg-plist +++ b/net/serviio/pkg-plist @@ -1,6 +1,4 @@ %%JAVAJARDIR%%/serviio/activation.jar -%%JAVAJARDIR%%/serviio/aspectjrt.jar -%%JAVAJARDIR%%/serviio/aspectjweaver.jar %%JAVAJARDIR%%/serviio/commons-codec.jar %%JAVAJARDIR%%/serviio/commons-imaging.jar %%JAVAJARDIR%%/serviio/commons-io.jar @@ -23,7 +21,9 @@ %%JAVAJARDIR%%/serviio/jdom.jar %%JAVAJARDIR%%/serviio/jnat-pmplib.jar %%JAVAJARDIR%%/serviio/jul-to-slf4j.jar -%%JAVAJARDIR%%/serviio/log4j.jar +%%JAVAJARDIR%%/serviio/log4j-api.jar +%%JAVAJARDIR%%/serviio/log4j-core.jar +%%JAVAJARDIR%%/serviio/log4j-slf4j-impl.jar %%JAVAJARDIR%%/serviio/lucene-analyzers-common.jar %%JAVAJARDIR%%/serviio/lucene-core.jar %%JAVAJARDIR%%/serviio/mimepull.jar @@ -44,7 +44,6 @@ %%JAVAJARDIR%%/serviio/serviio.jar %%JAVAJARDIR%%/serviio/simple.jar %%JAVAJARDIR%%/serviio/slf4j-api.jar -%%JAVAJARDIR%%/serviio/slf4j-log4j12.jar %%JAVAJARDIR%%/serviio/stax-api.jar %%JAVAJARDIR%%/serviio/stax-ex.jar %%JAVAJARDIR%%/serviio/streamflyer-core.jar @@ -52,7 +51,7 @@ %%JAVAJARDIR%%/serviio/xstream.jar @sample %%ETCDIR%%/application-profiles.xml.sample @sample %%ETCDIR%%/console-log4j.properties.sample -@sample %%ETCDIR%%/log4j.xml.sample +@sample %%ETCDIR%%/log4j2.xml.sample @sample %%ETCDIR%%/profiles.xml.sample @sample %%ETCDIR%%/serviio.jks.sample sbin/serviiod
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112150703.1BF73L8k048374>