From nobody Fri Apr 22 09:46:10 2022 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 391DE199C8DB; Fri, 22 Apr 2022 09:46:11 +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 4Kl8g718J0z528p; Fri, 22 Apr 2022 09:46:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650620771; 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=tPf/0hI+FZYb+i2vV6+1SeGOFBMnUuRhjIkIllVRywk=; b=tutk31VdlHaRXGDylXxgXSson5ewi9YD0H5snR0K/tbLSkWsFwj55dhqUgdtgcoMCSyP9F tvnU5hm+DQntvYyGWDGfkuZ0Wwo9XIbHDlYP1+rkb9ZbwwHdhA+J1eh514yHAryDmRFDiF V95xgXwwK6SI+fdClM/cJAg1GbAXbiE8w4+TImxJTZZXkgc2E939hu5Tmh49bkpN9VNWrk rYU5Py72Cd7prBgWflVf7oT577/SeDt42Eyx0pqrqymwowHBeZn4mu2YGSx39SFufb9DQ5 86pFZy8DMUBmQT7mE6DcOQZRqve96hmJDNXYXd9zR+n1rXKnaZMZqlwaas5Ykg== 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 EA82B1B049; Fri, 22 Apr 2022 09:46:10 +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 23M9kAW6023543; Fri, 22 Apr 2022 09:46:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23M9kAAd023542; Fri, 22 Apr 2022 09:46:10 GMT (envelope-from git) Date: Fri, 22 Apr 2022 09:46:10 GMT Message-Id: <202204220946.23M9kAAd023542@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: "Lev A. Serebryakov" Subject: git: 115fa564c8ce - 2022Q2 - devel/subversion: Update to latest version 1.14.2, fix two CVEs 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: lev X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q2 X-Git-Reftype: branch X-Git-Commit: 115fa564c8ce85904377fefac911340f5ba66e80 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650620771; 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=tPf/0hI+FZYb+i2vV6+1SeGOFBMnUuRhjIkIllVRywk=; b=Ie0KbtPxdM3y5KNUhUYTfDHmLFOA9wONjSq5wqq0TbEHqVR5JEbvvggqbFy7GFHVmOG5pb anG6/zKpbMMrMOTUe/6Diu3QgfjV5EMdN2WJLXmbzoAVkDkWVucEbsTndHy07FQ96h+T3I vz4CeHQpfRmluK6A+EMh0sPh4YEIJvoJOudvShdQ+OOdLB1ZsNYq1FxhWlK8xTdHFtkymK 4W207Fo99frOMWc0iloT0QSEdK1Je3Kp8IXJlZ88pFk73eqjV/OmPBFdQx+8TpyVfYemdk ixorHtYhr+yjB5NseB7O3MEPDt2JZwuU8O0vfsb3FEUdlcf5d5F8DMrd0KlpeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650620771; a=rsa-sha256; cv=none; b=CSoCvF6224f9p5FMPymwxIg/HuG/68tUh60RsT65j1fIrnbiktdr/zPQL1W2FJQtAEZRhO gVPwfe7tJgxYnVV1oIRCsi3Yd2yDEuVkhh//FjinUzwHIyTcGaAl9eIWdt/amEmuK/IBJG A53wOrZPi88uFJZbQ7ZWI5MnMW4yWUXW/JXf7a7PMEwytr1b29r9zlV8+HV3pJO22g0lXC pOD0GsG3O1YlFdvtEg6CTHJyYDjLhsN6R7uZ/0VmVvbNelNR9YvMJm1p5j3T7U6l7zZxGm 1JTv86BDQHYpUNyhZw4gVonq5ANqCypXXfqbm8VW8h836IRJCMPC0evhCNRPGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by lev: URL: https://cgit.FreeBSD.org/ports/commit/?id=115fa564c8ce85904377fefac911340f5ba66e80 commit 115fa564c8ce85904377fefac911340f5ba66e80 Author: Lev A. Serebryakov AuthorDate: 2022-04-13 14:06:45 +0000 Commit: Lev A. Serebryakov CommitDate: 2022-04-22 09:46:04 +0000 devel/subversion: Update to latest version 1.14.2, fix two CVEs Update subversion to 1.14.2. This fix two CVEs. Also, allows build with database/db18. PR: 262672 Security: CVE-2021-28544 Security: CVE-2022-24070 (cherry picked from commit b3eb02cd1ee47155c83cc87a2eab5132beedac3b) --- devel/subversion/Makefile | 4 ++-- devel/subversion/Makefile.common | 2 +- devel/subversion/distinfo | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile index 8589bc367982..bfcf3b3dcd98 100644 --- a/devel/subversion/Makefile +++ b/devel/subversion/Makefile @@ -114,9 +114,9 @@ pre-everything:: pre-configure: .if ${PORT_OPTIONS:MBDB} @BDB_VERSION=`${APR_APU_DIR}/${APU_CONFIG} --db-version`; \ - if [ "$${BDB_VERSION}" != "4" -a "$${BDB_VERSION}" != "5" -a "$${BDB_VERSION}" != "6" ] ; then \ + if [ "$${BDB_VERSION}" != "4" -a "$${BDB_VERSION}" != "5" -a "$${BDB_VERSION}" != "6" -a "$${BDB_VERSION}" != "18" ] ; then \ ${ECHO_MSG} "" ; \ - ${ECHO_MSG} 'You should build `'"devel/apr1' with Berkeley DB (4, 5 or 6) support to use subversion with it." ; \ + ${ECHO_MSG} 'You should build `'"devel/apr1' with Berkeley DB (4, 5, 6 or 18) support to use subversion with it." ; \ ${ECHO_MSG} 'Please rebuild `'"devel/apr1' with option "'`'"BDB' and try again." ; \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} "Or you can disable Berkeley DB support. Only 'fs' repository backend will be available." ; \ diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common index a0a6e6bf4760..a38333f0533d 100644 --- a/devel/subversion/Makefile.common +++ b/devel/subversion/Makefile.common @@ -1,7 +1,7 @@ # Created by: rooneg@electricjellyfish.net PORTNAME?= subversion -PORTVERSION= 1.14.1 +PORTVERSION= 1.14.2 PORTREVISION?= 0 CATEGORIES+= devel MASTER_SITES= APACHE/subversion diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo index 74eee5896d0f..128d62aad5a1 100644 --- a/devel/subversion/distinfo +++ b/devel/subversion/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1612972241 -SHA256 (subversion-1.14.1.tar.bz2) = 2c5da93c255d2e5569fa91d92457fdb65396b0666fad4fd59b22e154d986e1a9 -SIZE (subversion-1.14.1.tar.bz2) = 8504612 +TIMESTAMP = 1649858194 +SHA256 (subversion-1.14.2.tar.bz2) = c9130e8d0b75728a66f0e7038fc77052e671830d785b5616aad53b4810d3cc28 +SIZE (subversion-1.14.2.tar.bz2) = 8606570