Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 29 Sep 2019 09:47:24 -0600
From:      Adam Weinberger <adamw@adamw.org>
To:        Dan Langille <dan@langille.org>
Cc:        dvl <dvl@freebsd.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   Re: svn commit: r513143 - head/security/acme.sh
Message-ID:  <1A43121A-6000-478D-BF0D-7F43E6B93E57@adamw.org>
In-Reply-To: <94882d1c-49e7-4ab4-a318-98e272aaf696@www.fastmail.com>
References:  <94882d1c-49e7-4ab4-a318-98e272aaf696@www.fastmail.com>

next in thread | previous in thread | raw e-mail | index | archive | help
> On Sep 29, 2019, at 09:44, Dan Langille <dan@langille.org> wrote:
>=20
> =EF=BB=BF
>> On Sat, Sep 28, 2019, at 8:06 PM, Dan Langille wrote:
>>=20
>>=20
>>> On Sat, Sep 28, 2019, at 7:52 PM, Adam Weinberger wrote:
>>> > On Sep 28, 2019, at 11:14, Dan Langille <dvl@freebsd.org> wrote:
>>> >=20
>>> > =EF=BB=BFAuthor: dvl
>>> > Date: Sat Sep 28 17:14:06 2019
>>> > New Revision: 513143
>>> > URL: https://svnweb.freebsd.org/changeset/ports/513143
>>> >=20
>>> > Log:
>>> >  Update to 2.8.3
>>> >=20
>>> >  Letsencrypt CA recent changed the CDN provider, which resulted in han=
ging
>>> >  issues. Any downstream package should update. This is important.
>>> >=20
>>> >  re: https://github.com/Neilpang/acme.sh/releases/tag/2.8.3
>>> >=20
>>> >  Submitted by:    Ken (via private email)
>>>=20
>>> Hi Dan,
>>>=20
>>> Can you please MFH this?
>>>=20
>>> # Adam
>>=20
>> The new quarter is out in a few days. Happy to MFH tomorrow. Anyone else i=
s free to proceed before I get to it.
>=20
> This is not a simple MFH.
>=20
> re https://www.freshports.org/security/acme.sh/
>=20
> ./mfh 513143 gives conflicts because:
>=20
> * head contains 2.8.3
> * 2019Q3 contains 2.81
>=20
> Complicating this, head has:
> * fixed for IDN
> * Converted to UCL & cleanup pkg-message
>=20
> This merges cleanly:
>=20
> ./mfh 507462 507519 507519 508628 508668 508909 509509 51314
>=20
> Given that 2019Q4 comes out in less than 48 hours, should we proceed with t=
his MFH?

You can do the first command and just fix up the conflict manually by simply=
 copying in the version from head. I was hoping to get it in for last night t=
o get the fix to people running @weekly in cron, but now that that=E2=80=99s=
 passed, if it=E2=80=99s a PITA to merge then we can wait for the new branch=
.

# Adam


=E2=80=94
Adam Weinberger
adamw@adamw.org
https://www.adamw.org=



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1A43121A-6000-478D-BF0D-7F43E6B93E57>