From owner-dev-commits-ports-main@freebsd.org Mon Apr 19 18:07:08 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C329D5F9ECE for ; Mon, 19 Apr 2021 18:07:08 +0000 (UTC) (envelope-from kevin.bowling@kev009.com) Received: from mail-yb1-xb2f.google.com (mail-yb1-xb2f.google.com [IPv6:2607:f8b0:4864:20::b2f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FPFC04l2sz4gnf for ; Mon, 19 Apr 2021 18:07:08 +0000 (UTC) (envelope-from kevin.bowling@kev009.com) Received: by mail-yb1-xb2f.google.com with SMTP id g38so39817495ybi.12 for ; Mon, 19 Apr 2021 11:07:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kev009.com; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Ey5WG2U5WS8r3Ov/pgERLZN/63qjTbPIOw22O1CrAg8=; b=eDc+wdFJpm8rCrWac+CNOQ4sWkP80tgunaj+rtGtZl1ti1ELdX9nu+SRwEuVJtRG0x ejYSnBgDa9TEiezGQe5MtwDolsPyjXMNwcGGOGTygCZueaUhxhuqP+8qBkMkjIbGol13 MCQuUeswHcTVoqivCW49l1uEs/RrK/WvMAO4Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Ey5WG2U5WS8r3Ov/pgERLZN/63qjTbPIOw22O1CrAg8=; b=oA2tlEMW6jdOfkGqKHz5o8WPoCnP5yZ+Wi896g/omXMCss+hJF6IJzWb75LvHjJR3T nv5YlbHURn0/D8mVL1NpYskftCFoBkb20q7SX52vBV41wYaHCSszxG155yMUKkQYxkef 424uYIm6gx7dFgrl1ao3X/WYskPFt3t2W+19kRiOwRRXghazCqQ431bU+XtELVPcc+PN FGsHzC+I3hy22iqzsl/EL+c+WcxmhF1rH+kCEDvZhsbU/YDaHWNCoYddEVq7zN1NaJ3R /Q4XfzUZ8EXs6atV1L8ShMbIhBePSNUWLvc8+u+YM5WDVfs5ilUzPGapa1GrxWjo02b2 BD9A== X-Gm-Message-State: AOAM531uh2zumMlnQnTnGCDwwbbEPpwmAUVn0pflbyCdNql+jhk8A+YE 70lyLB7TW0gYb83yj5HAPSrUalFdtYDJ0vqu3kvufA== X-Google-Smtp-Source: ABdhPJxEswNjyD6lpCQxB4bFRH5KjXye3J5r1GMgum8RequOfUBO6E8ho3qSRdr+ZZC2gUZteosdmY3r3WkukI1ym1w= X-Received: by 2002:a25:e64c:: with SMTP id d73mr19376470ybh.391.1618855627279; Mon, 19 Apr 2021 11:07:07 -0700 (PDT) MIME-Version: 1.0 References: <202104190411.13J4BfrC096512@gitrepo.freebsd.org> <20210419072338.ixoex7jzy42zkfqm@aniel.nours.eu> <20210419073153.zdqcpyw5kqs2qcbo@aniel.nours.eu> <20210419080542.5dl2j76hwiu2lb35@aching.in.mat.cc> In-Reply-To: <20210419080542.5dl2j76hwiu2lb35@aching.in.mat.cc> From: Kevin Bowling Date: Mon, 19 Apr 2021 11:06:55 -0700 Message-ID: Subject: Re: git: 887cfadcdf5e - main - devel/maven: update to 3.8.1 To: Mathieu Arnold Cc: Baptiste Daroussin , Kevin Bowling , ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4FPFC04l2sz4gnf X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Apr 2021 18:07:08 -0000 https://reviews.freebsd.org/D29841 On Mon, Apr 19, 2021 at 1:05 AM Mathieu Arnold wrote: > > On Mon, Apr 19, 2021 at 09:31:53AM +0200, Baptiste Daroussin wrote: > > On Mon, Apr 19, 2021 at 12:29:58AM -0700, Kevin Bowling wrote: > > > On Mon, Apr 19, 2021 at 12:23 AM Baptiste Daroussin wrote: > > > > > > > > On Mon, Apr 19, 2021 at 04:11:41AM +0000, Kevin Bowling wrote: > > > > > The branch main has been updated by kbowling: > > > > > > > > > > URL: https://cgit.FreeBSD.org/ports/commit/?id=887cfadcdf5e7ce9a33ef83ee6ee7b63ff855830 > > > > > > > > > > commit 887cfadcdf5e7ce9a33ef83ee6ee7b63ff855830 > > > > > Author: Kevin Bowling > > > > > AuthorDate: 2021-04-19 04:05:30 +0000 > > > > > Commit: Kevin Bowling > > > > > CommitDate: 2021-04-19 04:11:34 +0000 > > > > > > > > > > devel/maven: update to 3.8.1 > > > > > > > > > > This is not just a bugfix as it contains three features that cause a change of > > > > > default behavior (external HTTP insecure URLs are now blocked by default): your > > > > > builds may fail when using this new Maven release, if you use now blocked > > > > > repositories. Please check and eventually fix before upgrading. > > > > > > > > > > Changes http://maven.apache.org/docs/3.8.1/release-notes.html > > > > > > > > > > PR: 255161 > > > > > Approved by: Jonathan Chen (maintainer) > > > > > Security: CVE-2021-26291 > > > > > CVE-2020-13956 > > > > > --- > > > > > devel/maven/Makefile | 2 +- > > > > > devel/maven/distinfo | 6 ++--- > > > > > devel/maven/pkg-plist | 18 ++++++------- > > > > > security/vuxml/vuln.xml | 67 +++++++++++++++++++++++++++++++++++++++++++++++++ > > > > > 4 files changed, 80 insertions(+), 13 deletions(-) > > > > > > > > You are not supposed to commit the vuxml entry with that actual port (as > > > > explained in the porter handbook), The reason for that is fairly simple, vuxml > > > > entries are not merged back to quarterly branches, so now merging this to the > > > > quarterly branch (which is what we are supposed to do for CVE in particular) > > > > will result in a conflict on vuxml instead of a simple straight forward > > > > cherry-pick > > > > > > Ok. Would you like me to handle the MFH to drop that part of the change? > > > > Would be nice yes > > > > Thank you very much! > > > > Note there used to be a hook to prevent that seems like it has been lost in the > > git transition. > > The hook is ready, just waiting for deployement. > > -- > Mathieu Arnold