Date: Fri, 12 Jun 2026 09:17:36 +0000 From: "Dave Cottlehuber" <dch@FreeBSD.org> To: dev@nicolas-provost.fr Cc: "FreeBSD Stable" <freebsd-stable@freebsd.org> Subject: Re: Unable to apply errata EN-26:15 (OpenSSL) Message-ID: <84786ced-e542-4d3c-a3f9-18a743ce21e6@app.fastmail.com> In-Reply-To: <6a2ab026.sykH78yHrFSaCEYx%dev@nicolas-provost.fr>
index | next in thread | previous in thread | raw e-mail
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>home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?84786ced-e542-4d3c-a3f9-18a743ce21e6>