From dev@nicolas-provost.fr Fri Jun 12 18:55:30 2026 X-Original-To: freebsd-stable@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 4gcTHP0cjDz6grR1; Fri, 12 Jun 2026 18:55:45 +0000 (UTC) (envelope-from dev@nicolas-provost.fr) Received: from relay3.validname.com (relay3.validname.com [185.65.56.141]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "relay3.validname.com", Issuer "E7" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gcTHM2qZZz47gm; Fri, 12 Jun 2026 18:55:42 +0000 (UTC) (envelope-from dev@nicolas-provost.fr) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=nicolas-provost.fr header.s=default header.b=oYsyBox+; dmarc=pass (policy=none) header.from=nicolas-provost.fr; spf=pass (mx1.freebsd.org: domain of dev@nicolas-provost.fr designates 185.65.56.141 as permitted sender) smtp.mailfrom=dev@nicolas-provost.fr Received: from smtp7.validname.com ([185.65.56.171]) by relay3.validname.com (185.65.56.234) with ESMTPS id md5001006779723.msg; Fri, 12 Jun 2026 20:55:32 +0200 X-Spam-Processed: relay3.validname.com, Fri, 12 Jun 2026 20:55:32 +0200 (not processed: message from trusted or authenticated source) X-MDRemoteIP: 185.65.56.171 X-MDHelo: smtp7.validname.com X-MDArrival-Date: Fri, 12 Jun 2026 20:55:32 +0200 X-Return-Path: dev@nicolas-provost.fr X-Envelope-From: dev@nicolas-provost.fr Date: Fri, 12 Jun 2026 20:55:30 +0200 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp7.validname.com D2780C0057 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nicolas-provost.fr; s=default; t=1781290530; bh=NX3bfwj4qpUAOyduwhI5LtsBlLIUpjGT80gEnhgKyJI=; h=Date:From:To:Subject:In-Reply-To:References:From; b=oYsyBox+3Jr6In7VeoUhFlcPkPCZOTXLfvQR8kCIBFaXxUPuKMkCVxKPd4CZ1GCWB kmLn9Xr7xvFXPT9bfy1cAEyIPPzVQvO220xaiPY7uE9mKCijn5MupKDTncW8wBUwUz 4s2XOAwriTU+o7FpPuDBgVWpp16sFUb3RMP+hdXVFeqlIoM9KEYGF1ruNVkLEGPyBd SknZc4wxcpK17JvVeUrRikh7rguP944TqRlng84EhgJYTLQ6sEGTvIgYz4ZP8J3pxo iBcs5tMHeY9CCXuqFswm4eU7Ye73wnZ4FRoXH3SV6Vu1YEKkM52h+UqeiO1ggx0awC hAmA5NG9Qxh8A== From: np To: stable@freebsd.org, freebsd-stable@FreeBSD.org Subject: Re: Unable to apply errata EN-26:15 (OpenSSL) User-Agent: K-9 Mail for Android In-Reply-To: <202606121711.65CHB14L009035@mp80.oldach.net> References: <202606121711.65CHB14L009035@mp80.oldach.net> Message-ID: <756482B0-7195-45E2-B554-381F672B6FDD@nicolas-provost.fr> List-Id: Production branch of FreeBSD source code List-Archive: https://lists.freebsd.org/archives/freebsd-stable List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: freebsd-stable@freebsd.org Sender: owner-freebsd-stable@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: multipart/alternative; boundary=----PQKG9TWHV7NKSX41AMZV4P875WPJJ9 Content-Transfer-Encoding: 7bit X-Virus-Scanned: clamav-milter 1.4.3 at rl-smtp7 X-Virus-Status: Clean X-Spamd-Result: default: False [-3.79 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.99)[-0.988]; DMARC_POLICY_ALLOW(-0.50)[nicolas-provost.fr,none]; R_SPF_ALLOW(-0.20)[+ip4:185.65.56.0/24]; ONCE_RECEIVED(0.20)[]; R_DKIM_ALLOW(-0.20)[nicolas-provost.fr:s=default]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; ASN(0.00)[asn:20756, ipnet:185.65.56.0/23, country:FR]; RWL_MAILSPIKE_POSSIBLE(0.00)[185.65.56.141:from]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ARC_NA(0.00)[]; RCVD_COUNT_ONE(0.00)[1]; RCPT_COUNT_TWO(0.00)[2]; MLMMJ_DEST(0.00)[freebsd-stable@FreeBSD.org,stable@freebsd.org]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_TLS_ALL(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; DKIM_TRACE(0.00)[nicolas-provost.fr:+] X-Spamd-Bar: --- X-Rspamd-Queue-Id: 4gcTHM2qZZz47gm ------PQKG9TWHV7NKSX41AMZV4P875WPJJ9 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable I was surprised that even gpatch would not accept this 27mb-super-patch=2E As I'm using fossil and not git for my tree I did not try git-patch this t= ime=2E But it seems that its content can be produced by computing a diff be= tween tags freebsd-15=2E0-p9 and freebsd-15=2E0-p10=2E Ideally, OpenSSL should be updated more often, not only on CVE announces= =2E Another caveat is that EN-26:15 and SA-26:35, both OpenSSL-related, were p= ublished the same day=2E I know that most people are using git=2E But I got once again a source tre= e corrupted last week (llama=2Ecpp=2Egit) without git reporting any problem= =2E=2E so I tried a different way (src=2Etxz + all patches)=2E I understand that git-diff is the most easy way to update that thing, but = it is sad that we cannot use BSD tools or the tools of the base system to u= pdate our OS=2E Le 12 juin 2026 19:11:01 GMT+02:00, freebsd@oldach=2Enet a =C3=A9crit : >Dave Cottlehuber wrote on Fri, 12 Jun 2026 11:17:36 +0200 (CEST): >> $ git clone --single-branch -b releng/15=2E0 https://git=2Efreebsd=2Eor= g/src=2Egit /usr/src > >At the risk of stating the obvious, the EN-26:15 patch is already include= d here=2E > >> $ fetch https://security=2EFreeBSD=2Eorg/patches/EN-26:15/openssl-15=2E= 0=2Epatch -o - | patch --dry-run > >> patch: **** malformed patch at line 618620: */ > >The patch is broken=2E Have a look at said line, you'll notice instantly= =2E > >Kind regards >Helge > ------PQKG9TWHV7NKSX41AMZV4P875WPJJ9 Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: quoted-printable
I was surprised that even gpatch= would not accept this 27mb-super-patch=2E

As I'm using fossil and n= ot git for my tree I did not try git-patch this time=2E But it seems that i= ts content can be produced by computing a diff between tags=C2=A0 freebsd-1= 5=2E0-p9 and freebsd-15=2E0-p10=2E

Ideally, OpenSSL should be update= d more often, not only on CVE announces=2E

Another caveat is that EN= -26:15 and SA-26:35, both OpenSSL-related, were published the same day=2E
I know that most people are using git=2E But I got once again a sourc= e tree corrupted last week (llama=2Ecpp=2Egit) without git reporting any pr= oblem=2E=2E so I tried a different way (src=2Etxz + all patches)=2E

= I understand that git-diff is the most easy way to update that thing, but i= t is sad that we cannot use BSD tools or the tools of the base system to up= date our OS=2E


Le= 12 juin 2026 19:11:01 GMT+02:00, freebsd@oldach=2Enet a =C3=A9crit :
= 
Dave =
Cottlehuber wrote on Fri, 12 Jun 2026 11:17:36 +0200 (CEST):
$ git clone --si=
ngle-branch -b releng/15=2E0 https://git=2Efreebsd=2Eorg/src=2Egit /usr/src

At the risk of stating the obvious, the EN-26:15 pa=
tch is already included here=2E


patch: **** malformed patch at lin=
e 618620:  */

The patch is brok=
en=2E Have a look at said line, you'll notice instantly=2E

Kind rega=
rds
Helge

------PQKG9TWHV7NKSX41AMZV4P875WPJJ9--