From nobody Fri Jun 12 09:17:36 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 4gcDSl1d3Wz6hQF8 for ; Fri, 12 Jun 2026 09:17:59 +0000 (UTC) (envelope-from dch@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gcDSl0zMfz3wBY; Fri, 12 Jun 2026 09:17:59 +0000 (UTC) (envelope-from dch@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781255879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vHo5MW9v3Ac7JkLgMhdI61FFa6yBEbA53tL8+qmitIE=; b=wmiBg0jgG7I9ampvAECcLB+DSJcOIkIHXMIxzTqIJpGGDzbJC4gYKW/Bo1e1X8NYOm8N93 Cw72epRJvi8RPBPILYG1X6leQWUljNEA+gcH5/6+mZlLP56KPW350lw12QWK1+nXe+1gih iY3sMfHQZJknvwRDr9efBsfF03JxD77upHbl06noSG+mL2mh5IMyD3o59o1EX/awdPm7IM D837y3O8T5seU7etSVfR3soXE8Q97BwtCwAm/reH6h4YkKHrXi7xWPtak2AwHbV6gAl+ja EDf58nlnM94pB/Ou9ksh8XWRdKggqfPkFHA9gJadhna6htlfppbeICYDcTuprQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781255879; a=rsa-sha256; cv=none; b=sswXf8KG8cjnyUJ8fS67vngautcKrjfIExUjCViOdeqVGLYjN4mWj+y2WJgB7xxwwwfS7W CbzddxOQSA6Y0OPyZB/A+w2fAdDyfgw8IZueIrLn4b396uRsm0UFdmbQP1KykeqTa6Fhg2 0cALDclTDpj2khKjJbQcrrA1JxCg/aRkOD5FoxKbANdrus3FRH5XuF+POvq3v3CAzX+a/S 1wuJZbo6WwZ0wLx1RTCNRr/I9RGrLuXO3+/KdUkBIDD7Md5tUGvk+0yUpbESA4941pblCA Uv4wjB3Yt3g8CGh7xvf4s9UZuRsvuu7z7dzhsbwoxUxHCmiggq6UHOZRyevbWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781255879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vHo5MW9v3Ac7JkLgMhdI61FFa6yBEbA53tL8+qmitIE=; b=lykQ9raL8csYKSGD9oCHlw1CRpXrwaiacqgZcFQjZZwG13k2uvOerrZi+yEsBerP9qgw0/ 038KSc/8J0jdONW4Zugamnp0f03E1MOShCTI6g8mPlikgK2ep5YrkGinTeZxPY60dg2vOs +X4UCXd6ELs/7et25L4u+4ovfpvgDnAFc/ZIUjjn2C94k8reidRXMeWxwvQOadvcnn59ug q1BCHGgbdVhrV3ULCdyCmTDhKuGPHBnkJseoMICllOEXuVq2y16xijl6JqCHsWy6zlGw5H Svp1zhZBixvF9Sj5YzcgFbDlpA6zTYU5w2xKo+o1ppN3I/7P+8iBo4aZ3xaDwA== Received: from fauth-a1-smtp.messagingengine.com (fauth-a1-smtp.messagingengine.com [103.168.172.200]) (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) (Authenticated sender: dch/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4gcDSl0765z18cw; Fri, 12 Jun 2026 09:17:58 +0000 (UTC) (envelope-from dch@FreeBSD.org) Received: from phl-compute-06.internal (phl-compute-06.internal [10.202.2.46]) by mailfauth.phl.internal (Postfix) with ESMTP id AEB8AF4007A; Fri, 12 Jun 2026 05:17:57 -0400 (EDT) Received: from phl-imap-08 ([10.202.2.84]) by phl-compute-06.internal (MEProxy); Fri, 12 Jun 2026 05:17:57 -0400 X-ME-Sender: X-ME-Proxy-Cause: dmFkZTGMT7OvtP2tQIvwpqPakVB9HLo8zlMIljzknMiGBMMmP27FFLSfh1MDqevpqFSHwO G67hYKIPsWSL+AMt9itMp4Cl8XwJugucAKY/ToVZF7UIUrGuCaGBOtqwrn9BVf2ypUswds dIZqyh0I+HQzhAcV6XhBnu9JpLpuiJD8TgVfxv+ejyXYMA1NPDXRrMmotYAq3+wlOr2ZsH Z3SgWUP60Yiz9APUgoT60W1DQ0DMRO739Phske0w0Uf8xT8R6xM0ac8QksCfZkj+TIbBY5 yxu9jGEJPrpYVP0m8mxvyoA4jtY5TD88g5h8oK4Jc6XhVyb9n9QxnsBNQ6O6domM9rjPEi xRxS5ikau+FhSbQVVCj2Ob4JGIZLZT7iT+57SLUfCvtdehMuE7fC3uxyYAOp+miKcYUgso Fe3YvEPHD57zisH/2Eh4be49w4X+2RrWMoQOBvloofkQlJinLGjBy4SJhgH3ObUbprntuw rBOO5BDR8Tv+CYd8rqI74LesokUN5X4UD87tOInheP/cCAP441eydT5QW5hCOWJf8A9kiU 4HMGqLdJjyjM2PCKSktUUzdbDntjebA54C6l8ikhrcZpFXqyXFR9GNWZWUMeagbfngbygg RJr1A5luBEpihK7oCJaEEYMf2pM5O+faMhWI/QUoQEQJHiGLlTDykyUyB8rw X-ME-Proxy: Feedback-ID: icedc46df:Fastmail Received: by mailuser.phl.internal (Postfix, from userid 501) id 904B52CE3309; Fri, 12 Jun 2026 05:17:57 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface 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 X-ThreadId: AoQ5xA3sJY1g Date: Fri, 12 Jun 2026 09:17:36 +0000 From: "Dave Cottlehuber" To: dev@nicolas-provost.fr Cc: "FreeBSD Stable" Message-Id: <84786ced-e542-4d3c-a3f9-18a743ce21e6@app.fastmail.com> In-Reply-To: <6a2ab026.sykH78yHrFSaCEYx%dev@nicolas-provost.fr> References: <6a2ab026.sykH78yHrFSaCEYx%dev@nicolas-provost.fr> Subject: Re: Unable to apply errata EN-26:15 (OpenSSL) Content-Type: text/plain Content-Transfer-Encoding: 7bit On Thu, 11 Jun 2026, at 12:55, dev@nicolas-provost.fr wrote: > I'm trying to apply errata EN-26:15 on a 15.0 fresh tree, with all > other erratas and advisories already applied except SA-26:35 (also > OpenSSL related, which seems to depend on EN-26:15). Using patch > --dry-run < ... I'm getting some errors when target file is > "+++/dev/null" (first file concerned is > crypto/openssl/util/check-format-commit.sh.orig). I checked the patch > signature. Any idea ?? Hi Nicolas I'm not sure how you fetched your tree but this is probably simplest using git these days and have all the patches nicely lined up for you in one lazy move. https://cgit.freebsd.org/src/log/?h=releng/15.0 shows a specific tag & branch, we can use this directly, thanks secteam@ ! Assuming you want that in /usr/src: $ git clone --single-branch -b releng/15.0 https://git.freebsd.org/src.git /usr/src wrt your original issue, here's what I did to repro, I will follow this up. A+ Dave ``` $ fetch https://download.freebsd.org/releases/amd64/15.0-RELEASE/src.txz $ tar xzf src.txz -C /tmp $ cd /tmp/usr/src $ fetch https://security.FreeBSD.org/patches/EN-26:15/openssl-15.0.patch -o - | patch --dry-run ``` Patching file crypto/openssl/tools/c_rehash.in using Plan A... Hunk #1 succeeded at 192. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- crypto/openssl/util/check-format-commit.sh.orig |+++ /dev/null -------------------------- File to patch: No file found--skip this patch? [y] Skipping patch... Hunk #1 ignored at 0. 1 out of 1 hunks ignored Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- crypto/openssl/util/check-format-test-negatives.c.orig |+++ /dev/null -------------------------- File to patch: No file found--skip this patch? [y] Skipping patch... Hunk #1 ignored at 0. 1 out of 1 hunks ignored Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- crypto/openssl/util/check-format-test-positives.c.orig |+++ /dev/null -------------------------- File to patch: No file found--skip this patch? [y] Skipping patch... patch: **** malformed patch at line 618620: */ dch@o01 /t/u/src>