From owner-svn-ports-head@freebsd.org Sun Sep 29 18:09:33 2019 Return-Path: Delivered-To: svn-ports-head@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 E676612659B; Sun, 29 Sep 2019 18:09:33 +0000 (UTC) (envelope-from dan@langille.org) Received: from wout5-smtp.messagingengine.com (wout5-smtp.messagingengine.com [64.147.123.21]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 46hD7x1P3xz3JHg; Sun, 29 Sep 2019 18:09:32 +0000 (UTC) (envelope-from dan@langille.org) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 31CEC3A2; Sun, 29 Sep 2019 14:09:31 -0400 (EDT) Received: from imap36 ([10.202.2.86]) by compute4.internal (MEProxy); Sun, 29 Sep 2019 14:09:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=langille.org; h= mime-version:message-id:in-reply-to:references:date:from:to:cc :subject:content-type; s=fm2; bh=yTpmi8mQUJm0KuxeTTNdtv0g7wrwfi2 hvcZvpExIEeI=; b=H6rF/YtK5HDOqHV2hUcTGln46pDMp40ycb7mfqa5w8OKBEs FykWbmqxGUINdzKItzknh2+2CxeeN/CpJkOVeFZfNmTzbg23ZVCT9/aAS+cGs9d9 /b9uetjI9zA1LefNCJHEPIF4Cp7J7rXPRU4vriCfZHqrhcAeGvXkPB46BjeRS3Hx NcAVxxsU9kS5poyqlP78FgkSd81HZwIAVhug3gea/ww/T9Seq1TgpKYilNU8i5jY M0L6Gn4DIzYe16XO+QTnGUgSJuaaIH/14Pp9rDJ6186ZLradP+zjhtcYvKRM3GgP MsimaMYl4knYKzHpGoLi359n+UJMiotLf4f0iDw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=yTpmi8 mQUJm0KuxeTTNdtv0g7wrwfi2hvcZvpExIEeI=; b=GgEBJ0tmJtUJNv4bMnE5l1 t0/hSrU6tATMzk6oHqeYWYbk2lWo42+eSY0d7u1b64J2xITFzAMXqvZJ78Q2LuT9 hte54mLNYd9lxU4xKnhUp6okUCcdWGIEEOFoW8MneBz4EoupDaQ1kfHjPAhsdzAF 6VmCxxXK5UhLqCsaLpLY/Qd0fukW4NcyEiOh5N7171tpiUjiJhiZiNGccaPUllb0 cfYVPIvCCnQSoTKtEBFY7P/wxGN//fm5iUB9lfAbmLe/NrszAMLT568jxTDZsg9w /NI3yB31ESM0SK2kYsgRnsFU9Z0jrzgtXwZSxowywUSSyq7N6wxLL2uXO1HlskEQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedufedrgedtgdduvdegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepofgfggfkjghffffhvffutgesrgdtreerreerjeenucfhrhhomhepfdffrghn ucfnrghnghhilhhlvgdfuceouggrnheslhgrnhhgihhllhgvrdhorhhgqeenucffohhmrg hinhepfhhrvggvsghsugdrohhrghdpghhithhhuhgsrdgtohhmpdhfrhgvshhhphhorhht shdrohhrghenucfrrghrrghmpehmrghilhhfrhhomhepuggrnheslhgrnhhgihhllhgvrd horhhgnecuvehluhhsthgvrhfuihiivgeptd X-ME-Proxy: Received: by mailuser.nyi.internal (Postfix, from userid 501) id 1243A188005C; Sun, 29 Sep 2019 14:09:29 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.1.7-305-g4111847-fmstable-20190924v1 Mime-Version: 1.0 Message-Id: <6f5a4681-6e39-4689-b833-fde14ee77b35@www.fastmail.com> In-Reply-To: <1A43121A-6000-478D-BF0D-7F43E6B93E57@adamw.org> References: <94882d1c-49e7-4ab4-a318-98e272aaf696@www.fastmail.com> <1A43121A-6000-478D-BF0D-7F43E6B93E57@adamw.org> Date: Sun, 29 Sep 2019 14:09:09 -0400 From: "Dan Langille" To: "Adam Weinberger" Cc: "Dan Langille" , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r513143 - head/security/acme.sh X-Rspamd-Queue-Id: 46hD7x1P3xz3JHg X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=langille.org header.s=fm2 header.b=H6rF/YtK; dkim=pass header.d=messagingengine.com header.s=fm3 header.b=GgEBJ0tm; dmarc=pass (policy=none) header.from=langille.org; spf=pass (mx1.freebsd.org: domain of dan@langille.org designates 64.147.123.21 as permitted sender) smtp.mailfrom=dan@langille.org X-Spamd-Result: default: False [-5.58 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_DKIM_ALLOW(-0.20)[langille.org:s=fm2,messagingengine.com:s=fm3]; XM_UA_NO_VERSION(0.01)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:64.147.123.21]; MV_CASE(0.50)[]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; IP_SCORE(-3.49)[ip: (-9.82), ipnet: 64.147.123.0/24(-4.90), asn: 11403(-2.68), country: US(-0.05)]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[langille.org:+,messagingengine.com:+]; DMARC_POLICY_ALLOW(-0.50)[langille.org,none]; RCVD_IN_DNSWL_LOW(-0.10)[21.123.147.64.list.dnswl.org : 127.0.5.1]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:11403, ipnet:64.147.123.0/24, country:US]; RCVD_TLS_LAST(0.00)[]; MID_RHS_WWW(0.50)[] Content-Type: text/plain;charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Sep 2019 18:09:34 -0000 > On Sep 29, 2019, at 11:47 AM, Adam Weinberger wrote:= >=20 >> On Sep 29, 2019, at 09:44, Dan Langille wrote: >>=20 >> 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 wrote: >>>> >=20 >>>> > Author: 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= hanging >>>> > 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 is 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 this MFH? >=20 > 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 l= ast night to 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. >=20 Ahh yes, before @weekly was a good idea. When I read your message last night, I was out to dinner. This morning w= as my first chance. Committed. --=20 Dan Langille - BSDCan / PGCon dan@langille.org