From nobody Wed Dec 15 07:03:21 2021 X-Original-To: dev-commits-ports-main@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 8A2D518D858A; Wed, 15 Dec 2021 07:03:21 +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 4JDR6K1tn6z3qqY; Wed, 15 Dec 2021 07:03:21 +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 208C317CA6; Wed, 15 Dec 2021 07:03:21 +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 1BF73LNd048375; Wed, 15 Dec 2021 07:03:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BF73L8k048374; Wed, 15 Dec 2021 07:03:21 GMT (envelope-from git) Date: Wed, 15 Dec 2021 07:03:21 GMT Message-Id: <202112150703.1BF73L8k048374@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: a1420b9aec7c - main - net/serviio: update to 2.2.1 (log4j security fix) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: a1420b9aec7c071e35f3f297277713c70d23ebf4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639551801; 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=ciIoH7DyZFpAPNq1krmoaZihicYaWHnt9S6QAMPMAb8=; b=mOHhra0DJCivp7kY3c4amlUOY52f74wFXJkQglCtq7awAUiYjTKbkKI9dY55bZUv/qLGCS 3OwunjDFQgmqB7rPv7LaWZivddgnSwY3IUBzMORSCievrCPQqkpPE647U39IlfeAocBQ3Q JsfURGqpZbjT+f9JRcJv7T4r/pVOZqQCYpVwC9jF2aXsEe6e7/OcsUvpNL710qwaiHxkvF 0Z9zwJ3R3jl10O04VuiYpWTOLzAK5wQ5EZkiB5GDqpxP5R03aC0iJSKvM7BhLGWzv6MuSv n801Nyxi1v1PNGCdYDBRvNiYJOKPhE3TvHEbupNF4SR/n64F662bJrCebStcng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639551801; a=rsa-sha256; cv=none; b=qR1nOb5AhRhgqBMXB7CeTMS5jFFUFlv8TVhuXVT/V7Y1VHDxg2/2OKJE/B9DH5+x9HDrYW 8Fd0zEL3RZsUmq5tDURrOd9KaqVu3EsliGhYYVzPn/4XuazbBWdSDfEpiKToUc2mPldoY1 304dee75v7ozz3F963odENg/ZeOPvqZ3Jf19CH/aZY7CglacHYW2hRakbdo8DeLH/eeLjo AjQiw2rLS3kXG41rDri47Hq4lmKbSpTCIF77zbktopf10+q88hi/TOLGmSld8yJsGaVFdG cePLkV7e8LYFRcX/ZKqixsTXUIJGRODGfAKoJU9iSuvY78ctwU+KTQa1IvRoiA== 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=a1420b9aec7c071e35f3f297277713c70d23ebf4 commit a1420b9aec7c071e35f3f297277713c70d23ebf4 Author: Alexander Leidinger AuthorDate: 2021-12-15 06:49:19 +0000 Commit: Alexander Leidinger 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 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 @@ + + + +- ++ + + + 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 @@ -- -+ - - -@@ -10,8 +10,8 @@ - - - - - -- -+ - - 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