From nobody Mon Dec 13 15:11:52 2021 X-Original-To: dev-commits-ports-branches@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 C7B5E18E5400; Mon, 13 Dec 2021 15:11:52 +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 4JCQ2w2XySz3lRZ; Mon, 13 Dec 2021 15:11:52 +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 3761F16D41; Mon, 13 Dec 2021 15:11:52 +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 1BDFBq9v048898; Mon, 13 Dec 2021 15:11:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BDFBqU0048897; Mon, 13 Dec 2021 15:11:52 GMT (envelope-from git) Date: Mon, 13 Dec 2021 15:11:52 GMT Message-Id: <202112131511.1BDFBqU0048897@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Fechner Subject: git: c0f35eb18159 - 2021Q4 - textproc/apache-solr: disable format lookup for log4j List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: c0f35eb18159608517a8012fe7f36a8f0617fe8f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639408312; 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=wqo0cQbfkgpc7qqZqxFh3HMyq8dBUSpsNR49NzmDz0w=; b=XaepDaNz7S04S0aTML86uf8jmVIp8wzkQwIVZtO2eJ5VWc9TJJnCcnbFStLJ2c4IcELt5V RzquAcQAVfYmK5Kjbm+K2BlP0iSeZHAxecKhZMrcIjXPdgYW2+NBKG0UM66fF/EURgcRAf mMeZ4cSmeqXwJKQc+4jauQpNgDg0Fcx4/8I3uB7/6Nj4U7A7z8g5QyVsG5tv+5g2JfPz2H AKxnQQyXiixtmaUIIreC3M+SXaRcjMqv/SsWG19KcNTs4mn0doflO3CgOlehchui2T/0Kn xsKav1KGAS1uyricpKhUVXh4Oo3pHnuOyc0Lp1fxmWwC7WPhGVFh0lgtubr7hA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639408312; a=rsa-sha256; cv=none; b=jL4uyT0phLe7dclc96mZl6NxM7KDbvuHQUMNsL41CaEG85eieTBryjgQ6QdtK7NU0XojZ1 rJvzyitENkqiheBR03eKTjIhSOyVdsZTnfP5BFHa/TNrRL213O8UbvmjoQRazv6R9sxs6S g5aOSoo2KBar7JJ/fQ6VJF5QGxs+ROmVSTh/0lYjraCvDi4dWIAzabSoCT8qMcKptNUf8J RflqFld6p11K30+O0HdWkfpigOA5GK5xv5AYIE+rRtHIbclG/xnyaBAA4+LYfF/KeB92eB K4zFuDooe/2mc6/rZpUU5l5dJNKk0Avj7s9JQ41qCHgQ8+QvV+6tTZsLlXQBFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=c0f35eb18159608517a8012fe7f36a8f0617fe8f commit c0f35eb18159608517a8012fe7f36a8f0617fe8f Author: Matthias Fechner AuthorDate: 2021-12-13 15:04:44 +0000 Commit: Matthias Fechner CommitDate: 2021-12-13 15:11:42 +0000 textproc/apache-solr: disable format lookup for log4j As recommended here: https://solr.apache.org/news.html#apache-solr-affected-by-apache-log4j-cve-2021-44228 disable lookup that opens a security vulnerability with log4j < 2.15.0. This is a mitigation for CVE-2021-44228. PR: 260373 (cherry picked from commit 7604d31e30b4c523981eb3fd1b41cc5697f94a26) --- textproc/apache-solr/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/textproc/apache-solr/Makefile b/textproc/apache-solr/Makefile index 003e52dda678..1648d1e7f32a 100644 --- a/textproc/apache-solr/Makefile +++ b/textproc/apache-solr/Makefile @@ -2,6 +2,7 @@ PORTNAME= apache-solr PORTVERSION= 8.11.0 +PORTREVISION= 1 CATEGORIES= textproc java MASTER_SITES= APACHE/lucene/solr/${PORTVERSION} DISTNAME= solr-${PORTVERSION} @@ -47,7 +48,7 @@ do-install: ${ECHO} 'SOLR_LOGS_DIR="/var/log/solr"' >> ${STAGEDIR}${PREFIX}/etc/solr.in.sh.sample ${ECHO} 'SOLR_PORT="8983"' >> ${STAGEDIR}${PREFIX}/etc/solr.in.sh.sample ${ECHO} 'SOLR_PID_DIR="/var/db/solr"' >> ${STAGEDIR}${PREFIX}/etc/solr.in.sh.sample - ${ECHO} 'SOLR_OPTS="$$SOLR_OPTS -Djetty.host=localhost"' >> ${STAGEDIR}${PREFIX}/etc/solr.in.sh.sample + ${ECHO} 'SOLR_OPTS="$$SOLR_OPTS -Djetty.host=localhost -Dlog4j2.formatMsgNoLookups=true"' >> ${STAGEDIR}${PREFIX}/etc/solr.in.sh.sample ${MKDIR} ${STAGEDIR}/var/db/solr ${MKDIR} ${STAGEDIR}/var/log/solr