From MAILER-DAEMON Fri Jul 03 16:20:09 2026
Received: from list by lists1p.gnu.org with archive (Exim 4.90_1)
	id 1wfkMr-0003GA-4e
	for mharc-bug-diffutils@gnu.org; Fri, 03 Jul 2026 16:20:09 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1wfkMp-0003G2-Df
 for bug-diffutils@gnu.org; Fri, 03 Jul 2026 16:20:07 -0400
Received: from debbugs.gnu.org ([2001:470:142:5::43])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1wfkMp-0003zR-2J
 for bug-diffutils@gnu.org; Fri, 03 Jul 2026 16:20:07 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
 d=debbugs.gnu.org; s=debbugs-gnu-org; 
 h=Date:From:MIME-Version:To:Subject;
 bh=GKygpzfbeDTgAw4RCneselKXgcaGfXA93U2psCdFH3g=; 
 b=bCeEdNhxnuep65Y9N4BV6Snd0T00nPQRtK/ZLunF7+ujjCNxavjfOEm0jeN3n/0IGNc1h+dkXhA9xf4A5RbInaMgugYAhYvPaZ5iB9gIKAslGWiZZ9o+PmhLOuXsigxLALrKjh0ALG9yAkL/RKvmYcn5Ib8RcIa1yebgjfSYeO0i3x7M19R92Utofg9M45yAwaAJihhB5+o3TSAitMSpwMNfE8JX+mzB/FqgX+zPuwXtJsdFD0twc9D9FIyoBiG/3VU1aWxSAYfcgTQ5tz9FG2MeVEPbVarqKVuq2kuX3QKSfZvNORIBlxdUIaXYDCnOPsaPqM3TYT4LZmpRfVA2LQ==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1wfkMo-00055Y-H6
 for bug-diffutils@gnu.org; Fri, 03 Jul 2026 16:20:06 -0400
X-Loop: help-debbugs@gnu.org
Resent-From: Keith Thompson <Keith.S.Thompson@gmail.com>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Fri, 03 Jul 2026 20:20:06 +0000
Resent-Message-ID: <handler.81350.B.178310995419178@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: report 81350
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: 81350@debbugs.gnu.org
Cc: Keith Thompson <Keith.S.Thompson@gmail.com>
X-Debbugs-Original-To: bug-diffutils@gnu.org
Received: via spool by submit@debbugs.gnu.org id=B.178310995419178
 (code B ref -1); Fri, 03 Jul 2026 20:20:06 +0000
Received: (at submit) by debbugs.gnu.org; 3 Jul 2026 20:19:14 +0000
Received: from localhost ([127.0.0.1]:53434 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1wfkLv-0004z2-Nc
 for submit@debbugs.gnu.org; Fri, 03 Jul 2026 16:19:13 -0400
Received: from lists1p.gnu.org ([2001:470:142::17]:54386)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <keithsthompson@gmail.com>)
 id 1wfkLr-0004ww-9s
 for submit@debbugs.gnu.org; Fri, 03 Jul 2026 16:19:08 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <keithsthompson@gmail.com>)
 id 1wfkLf-0003Cz-4K
 for bug-diffutils@gnu.org; Fri, 03 Jul 2026 16:18:56 -0400
Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <keithsthompson@gmail.com>)
 id 1wfkLd-0003az-N2
 for bug-diffutils@gnu.org; Fri, 03 Jul 2026 16:18:54 -0400
Received: by mail-wr1-x42c.google.com with SMTP id
 ffacd0b85a97d-476d8e647e9so841610f8f.0
 for <bug-diffutils@gnu.org>; Fri, 03 Jul 2026 13:18:46 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1783109925; cv=none;
 d=google.com; s=arc-20260327;
 b=plQhLJyqdnAVJkuCRxTzNs4dJMXnHvK63qq7x6xsfyc1sEIBQCIUxitqPyL51+Iq21
 qN5OzAbFh4hOArx0+dSs+db2o5ZUsKpgVCgDN6BiZ0SfCa2MQsSMPK0vtzvF+hHJUsKX
 TofOMyrpVbjR6WCSjuwbjJ1sKmbCWUSGwtPlQBbaXt9Ob7WdEmD4Yma1sCTIfsdx8B0i
 gz7LcnqxX9srUeMiSM1y13R4+rLp1YNKwobzveoir/IUeiXADIMJEdOtDX/lPOPkloxK
 zwNUpq0f8WBnvnfpEsu7//0Ib4N/HXtGeDNQ3zJyVllOjH/hKCZct1N1RSHmFXz6ab8U
 FUEw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
 s=arc-20260327; 
 h=cc:to:subject:message-id:date:from:mime-version:dkim-signature;
 bh=GKygpzfbeDTgAw4RCneselKXgcaGfXA93U2psCdFH3g=;
 fh=fAx/Qmkw0Xpk3+Zmy8pf+leuzknDfAAPGrNxpgygeC8=;
 b=LYw8IfJrzee9bMsb4xqwFy6e7+9xW7zP/nnGiimJAvvqgWbGJy4kKZmo6c94LZofAr
 UQqEPCWq+Cp02JikY4og97Lqt/0LZi1QgksZ5455uHqK5Gw7fll55N+w0f0FC/RCSOqn
 4HCbvAI+N1CXJ68mSH2nMaupM/lwqo3ZlLSJuCVLb6UnJtOc//XczQC2CdzVbSFgXjZq
 gyrZ1NXk5dvKe7h/GByYjU8nkmo51szVs6yuInZKsMpqJpDfTIuBl5Hap1v34VkhRTJY
 ev7J+zv4AVmHzsm037iBUphHMM61ZTFZS9gSXySM0e9ZS716OyNfhBtxY79HfyYJYxti
 66qQ==; darn=gnu.org
ARC-Authentication-Results: i=1; mx.google.com; arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20251104; t=1783109925; x=1783714725; darn=gnu.org;
 h=cc:to:subject:message-id:date:from:mime-version:from:to:cc:subject
 :date:message-id:reply-to;
 bh=GKygpzfbeDTgAw4RCneselKXgcaGfXA93U2psCdFH3g=;
 b=sQTqu36fAnAQa4eJpwczotJe5TqxKDNZU/mGJgoj26eDt8e6UOzw3iKIGBgcpLkPoC
 7QDN4bf506yG7PUmX8CtZbMMI+eK4P/55gAYIMfVBQzIt0LqPn2/2v8rQtyUMGv1uar1
 crVrVLChMLS+gQvzteXvGfQi0nr5QhKbCxiJ8oUwd++5sj0GV8MjXGrdtQhZ1NxqdmFp
 uZe31JxHADLxXmbc2duThqGB3KgeTVZ6vgDFvTVKfRuEnwFGOIPQ9wZCG33P3U5ih0NN
 JDjLZZJA8eKPX4JJfrPQSWlkPVwZMoVZnrFl+wed02R8IDuuymoEbJoTJPyoag4ewvQc
 TWdQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20251104; t=1783109925; x=1783714725;
 h=cc:to:subject:message-id:date:from:mime-version:x-gm-gg
 :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;
 bh=GKygpzfbeDTgAw4RCneselKXgcaGfXA93U2psCdFH3g=;
 b=UCXaJUDg17gOcXw+Pez95JhHD2Ks3xOToI42QxEwJg4A3LsRFD/ePjLW181Kp53m15
 hhgzU4XJZGBmmk5Kp9TsURfMc/wdRzL/+6BP2UVqZchnDg3SrmFXgDoI85T0Am5cRWez
 yB0jP0gYRSElu4RwpwhOlwdDzZdcs16GDp2mRfuz2yA4KNhz2ccayY6Y/1PQL2z4VPqU
 DvSFl2+KfG/S5ZQy6nzHkfnNA2kadCoItn+O1sXA2K+RkYKqhpsd4uY789WXWY8TUJpP
 ksylZtLuVQkaIdPmXCHXM1Tfg2JDLq83JKRxuT0vF9vTnMhx488r8a8u25G5sK4Vsfxa
 KjNQ==
X-Gm-Message-State: AOJu0Yy77v3Ke1QlYr9N8fs67UDvEYGTyvObAU8zG8/OBmKPm5OCJDQP
 qnaNQyz2czzSJTJtf8Y2YbvGVMGVzF9+PVvpLjry6Z6Vrn+Sx11AqCQc5xLSjXm1NO7iQpaMJGV
 6ISnu6Ah2/sJEHcPVCWdcNTvkohRlz+DmjbBY
X-Gm-Gg: AfdE7cmXIqdHVfjtCs3XvHadThDaZqXRihQkPr1Uc3zan0IE5QgFZXvPFfENlUKPKx0
 l8Mfms5peXl4sZqrJlGF9vftR4CUwuLmCfgMVC39b4W6D3XTdKSUmQjqjR1me/hByWq1ABTU0hK
 dL446IyQvZwFI9DuuAOmwIK5eCf6gaXdQixqFJVZK/kxARKlOVISZdXGcYAI9h3cGRMODBgSa+W
 2r6lg8IpislhZtCQJaoxmp9aiyRZbMuGoJe1BccOseKZgqDGuByUhF05TpEWYuOaY1Q/DykIOKE
 vrHOUEk=
X-Received: by 2002:a05:6000:29ca:b0:475:a4ae:e630 with SMTP id
 ffacd0b85a97d-47aadb1643amr558077f8f.37.1783109924573; Fri, 03 Jul 2026
 13:18:44 -0700 (PDT)
MIME-Version: 1.0
From: Keith Thompson <Keith.S.Thompson@gmail.com>
Date: Fri, 3 Jul 2026 13:18:32 -0700
X-Gm-Features: AVVi8Ccil7fwJ4SGG7f6ylil46MExPHA3sbrj-qcZ0hFo8UlV7MNgkxnCq6KlGw
Message-ID: <CAAHpriOxAGv13KTKRVTi8bk9RmvQmLMDZHrn-yg8yJ13UkLNDg@mail.gmail.com>
Content-Type: text/plain; charset="UTF-8"
Received-SPF: pass client-ip=2a00:1450:4864:20::42c;
 envelope-from=keithsthompson@gmail.com; helo=mail-wr1-x42c.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, 
 RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
 SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 2.0 (++)
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-Spam-Score: 1.0 (+)
Subject: [bug-diffutils] bug#81350: Documentation inconsistencies between
 info and man/--help
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Jul 2026 20:20:07 -0000

This is based on the latest version in the git repo,
v3.12-35-gba490bf.

There are several command-line options that are mentioned in the
diff(1) man page and in the output of "diff --help", but are not
mentioned in the "info" documentation:

--normal
--no-ignore-file-name-case (--ignore-file-name-case is mentioned)
-v (--verbose is mentioned)

Several other options are mentioned in the "info" documentation
but not in diff(1) or "diff --help":

--binary
-L, --label
-f, --forward-ed

(The output of "diff --help" and the diff(1) man page are consistent
with each other.)

I understand that the info document is considered definitive, but
since there are only three options not mentioned in the help/man
documentation I suggest it's worth making all three consistent.

-- Keith Thompson




From MAILER-DAEMON Sat Jul 18 08:27:13 2026
Received: from list by lists1p.gnu.org with archive (Exim 4.90_1)
	id 1wl48O-0006SY-R6
	for mharc-bug-diffutils@gnu.org; Sat, 18 Jul 2026 08:27:13 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1wl48E-0006Ru-Ti
 for bug-diffutils@gnu.org; Sat, 18 Jul 2026 08:27:03 -0400
Received: from debbugs.gnu.org ([2001:470:142:5::43])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1wl48E-0001wp-Kn
 for bug-diffutils@gnu.org; Sat, 18 Jul 2026 08:27:02 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
 d=debbugs.gnu.org; s=debbugs-gnu-org; 
 h=MIME-Version:From:Date:To:Subject;
 bh=91iuboiJf0kYO60pXMmYk/efUHjl5IlbUphDD24FYHs=; 
 b=ahpHu7zgmXOPPheVfP+1WJBkXDbhkti4JCPUZ+zOumut4wQ3fD92yQElQF7BHeJndNcN7x1Fh59B2lLhNLcbMvGnVmvdnoNXJuONuXT8PV/zj/sFuXTSc8ud3oaxdxIcHeXg/kO/Npkz+tVGU+jS6GA+OWS3M9y3T3YS4AA2w6/4c8y0gARp9GDlEdATxchA7Igki3sMK1X4Yi/2BWZx+3oJr5DEK7+Cvm3/IMCzpZR/mSoe1GhHA3OIjv1PYi28S0vYUDGB1C/CfLQa6fdn5blPxUFWzC6qo4Hz+TUx2rWSqPv1v5FJjjoo15hTdXta842ChEqIN2+xsIFryv+xvA==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1wl48E-0001mt-FH
 for bug-diffutils@gnu.org; Sat, 18 Jul 2026 08:27:02 -0400
X-Loop: help-debbugs@gnu.org
Resent-From: Andreas Metzler <ametzler@bebt.de>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Sat, 18 Jul 2026 12:27:02 +0000
Resent-Message-ID: <handler.81434.B.17843775716770@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: report 81434
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: 81434@debbugs.gnu.org
X-Debbugs-Original-To: bug-diffutils@gnu.org
Received: via spool by submit@debbugs.gnu.org id=B.17843775716770
 (code B ref -1); Sat, 18 Jul 2026 12:27:02 +0000
Received: (at submit) by debbugs.gnu.org; 18 Jul 2026 12:26:11 +0000
Received: from localhost ([127.0.0.1]:45403 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1wl47O-0001l8-Ct
 for submit@debbugs.gnu.org; Sat, 18 Jul 2026 08:26:10 -0400
Received: from lists1p.gnu.org ([2001:470:142::17]:44610)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <ametzler@bebt.de>) id 1wl47M-0001kP-1X
 for submit@debbugs.gnu.org; Sat, 18 Jul 2026 08:26:08 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <ametzler@bebt.de>) id 1wl47F-0006EN-Mi
 for bug-diffutils@gnu.org; Sat, 18 Jul 2026 08:26:01 -0400
Received: from vsrv21575.customer.vlinux.de ([31.15.64.248])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <ametzler@bebt.de>) id 1wl47D-0001s7-QD
 for bug-diffutils@gnu.org; Sat, 18 Jul 2026 08:26:01 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=bebt.de;
 s=d2; h=Content-Type:MIME-Version:Message-ID:Subject:To:From:Date:From:Sender
 :Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:
 Content-Transfer-Encoding:Content-ID:Content-Description:In-Reply-To:
 References; bh=91iuboiJf0kYO60pXMmYk/efUHjl5IlbUphDD24FYHs=; b=mO6G8cCuCH2s+Y
 KjwUnBoQp2qlaWlbwj/lMaZumPNm1dgF9ARqtsQSOXgwJ+pk7DK77WLFMRN4ghxHqj0YhCiQEHIpx
 mDU4XeVwqsx3qSLwHpHN0QgwRsDfll1ZJvuy/BPNVwMo+daIeBBm9tFBY+QJsQqa3oAzLeUWW9hrg
 ct4GwdtAFmNNgiL6AAeAN9ajFiYWs9Xt0LEz/JaH/5+LRvqs3ogJuC57wlYDOz/PWojI8sp9+1nve
 InpP771N5e6oj/CKXyLkKYLmaUKrcmwwUF3o4C1SB6wC+4GVsOnmgnbpqa3xyS5qh2Y06X2wzlP/z
 DlBDxeJsPHmO0IDSqYeg==;
Received: from [41.66.122.201] (helo=argenau.bebt.de)
 by vsrv21575.customer.vlinux.de with esmtpsa (TLS1.3) tls
 TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.99.4)
 (envelope-from <ametzler@bebt.de>) id 1wl47B-00000001kOe-0m5z
 for bug-diffutils@gnu.org; Sat, 18 Jul 2026 12:25:57 +0000
Received: from [::1] (helo=argenau.bebt.de)
 by argenau.bebt.de with esmtps (TLS1.3) tls
 TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.99.4)
 (envelope-from <ametzler@bebt.de>) id 1wl47B-00000000pKe-3DxE
 for bug-diffutils@gnu.org; Sat, 18 Jul 2026 14:25:56 +0200
Date: Sat, 18 Jul 2026 14:25:55 +0200
From: Andreas Metzler <ametzler@bebt.de>
Message-ID: <altw0-z47WHWn369@argenau.bebt.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
X-Spam-Score: -3.2 (---)
Received-SPF: none client-ip=31.15.64.248; envelope-from=ametzler@bebt.de;
 helo=vsrv21575.customer.vlinux.de
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, 
 SPF_NONE=0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Subject: [bug-diffutils] bug#81434: cannot apply recursive normal-format diff
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Jul 2026 12:27:03 -0000

Hello,

GNU patch 2.8 cannot apply recursive normal-format diffs:

---------------------------
ametzler@argenau:/tmp$ mkdir -p /tmp/reprod/dira
ametzler@argenau:/tmp$ cat << EOF > /tmp/reprod/dira/file
> line 1
> blah
> line 3
> EOF
ametzler@argenau:/tmp$ cp -a /tmp/reprod/dira /tmp/reprod/dirb
ametzler@argenau:/tmp$ sed -i -e 's/blah/blub/' /tmp/reprod/dirb/file
ametzler@argenau:/tmp$ cd /tmp/reprod/
ametzler@argenau:/tmp/reprod$ diff --recursive --new-file dira dirb > diffexamle.diff
ametzler@argenau:/tmp/reprod$ cat diffexamle.diff
diff --recursive --new-file dira/file dirb/file
2c2
< blah
---
> blub
ametzler@argenau:/tmp/reprod$ cd dira/
ametzler@argenau:/tmp/reprod/dira$ patch --dry-run -p1 < ../diffexamle.diff
patch: **** Only garbage was found in the patch input.
ametzler@argenau:/tmp/reprod/dira$ patch --normal --dry-run -p1 < ../diffexamle.diff
can't find file to patch at input line 2
The text leading up to this was:
--------------------------
|diff --recursive --new-file dira/file dirb/file
--------------------------
File to patch: ^C
---------------------------

cu Andreas




From MAILER-DAEMON Sun Jul 19 21:44:06 2026
Received: from list by lists1p.gnu.org with archive (Exim 4.90_1)
	id 1wld38-0002ET-BJ
	for mharc-bug-diffutils@gnu.org; Sun, 19 Jul 2026 21:44:06 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1wld36-0002DW-Eh
 for bug-diffutils@gnu.org; Sun, 19 Jul 2026 21:44:04 -0400
Received: from debbugs.gnu.org ([2001:470:142:5::43])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1wld36-00047V-1U
 for bug-diffutils@gnu.org; Sun, 19 Jul 2026 21:44:04 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
 d=debbugs.gnu.org; s=debbugs-gnu-org; 
 h=MIME-Version:Date:References:In-Reply-To:From:To:Subject;
 bh=xE2FkMccsVlCWOlAI9p0haY9EbEHh0JUJ0gX3nIJsKw=; 
 b=AyoU3PNKX+IptV/PSYKX/gNTP5sea9gjvYtEDdicGPIH81Yy/TBwjjpX8ciy6c8Cii5KRouanl8YovmBns0luFTxi/QJCQB2+UGJ4sr16eC80uUSGNcipT+7V1HY+3jcEEFFRl4QeK+zr2ZPK4WqCfCQR/W23JXil+jyKerctU71KzHxf6+I7I2uO8nUyFXuZJpIbPsL0BPa6S2k0BS9sN861t18SoPaygiGBkPfb6kCKxCh8ygXo80xnrDLXYzqlaB4MivnfVEXMiRnNFN3v7ihvKwm0fwoGGrAi63wUGYXGfYv+RAuNtsVvNZrdDO4SDrkPdJ+RYQGzSfDcNbqOw==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1wld35-0000m1-F2
 for bug-diffutils@gnu.org; Sun, 19 Jul 2026 21:44:03 -0400
X-Loop: help-debbugs@gnu.org
Resent-From: Collin Funk <collin.funk1@gmail.com>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Mon, 20 Jul 2026 01:44:03 +0000
Resent-Message-ID: <handler.81434.B81434.17845118212749@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 81434
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: Andreas Metzler <ametzler@bebt.de>
Cc: 81434@debbugs.gnu.org, bug-patch@gnu.org
Received: via spool by 81434-submit@debbugs.gnu.org id=B81434.17845118212749
 (code B ref 81434); Mon, 20 Jul 2026 01:44:03 +0000
Received: (at 81434) by debbugs.gnu.org; 20 Jul 2026 01:43:41 +0000
Received: from localhost ([127.0.0.1]:57610 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1wld2i-0000i8-Gn
 for submit@debbugs.gnu.org; Sun, 19 Jul 2026 21:43:41 -0400
Received: from mail-pf1-x433.google.com ([2607:f8b0:4864:20::433]:59631)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.84_2) (envelope-from <collin.funk1@gmail.com>)
 id 1wld2g-0000gm-Cq
 for 81434@debbugs.gnu.org; Sun, 19 Jul 2026 21:43:39 -0400
Received: by mail-pf1-x433.google.com with SMTP id
 d2e1a72fcca58-8484a0b998fso9236493b3a.2
 for <81434@debbugs.gnu.org>; Sun, 19 Jul 2026 18:43:38 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20251104; t=1784511812; x=1785116612; darn=debbugs.gnu.org;
 h=content-type:mime-version:user-agent:message-id:date:references
 :in-reply-to:subject:cc:to:from:from:to:cc:subject:date:message-id
 :reply-to:content-type;
 bh=xE2FkMccsVlCWOlAI9p0haY9EbEHh0JUJ0gX3nIJsKw=;
 b=Y0G/rAuQQBdl/VR8ZVyMiHp2+WmxuaRijwvs2A2z9/cQ4ztVcTQDzn/RoEh8PfsJr5
 nWjvCp4hQEvH2hDQ1Hdb13zMGMsxnt88khNPvfzhbpfnVHPS0J6lGAVm6cPgtzu/mQM2
 0GkrsI3JT36ysOpmNLypq5TB/C2SQM9J2ju6qN51mZME3LNRwSFFEbnevbyz6qysKfiD
 hpHfrknr6nonRwSiPsLcVGW0d2oJvlBDDhvRr4FKrzP/I/WhTODnxAD5RA7XAGsByYe7
 m6lwU/7Ch6Qb6Xdg0TaF1Nvx48PVUi0F3+9QvBh52Zjs31a6R0HErnxj1Ts1kpfN5QKX
 ZmZg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20251104; t=1784511812; x=1785116612;
 h=content-type:mime-version:user-agent:message-id:date:references
 :in-reply-to:subject:cc:to:from:x-gm-gg:x-gm-message-state:from:to
 :cc:subject:date:message-id:reply-to:content-type;
 bh=xE2FkMccsVlCWOlAI9p0haY9EbEHh0JUJ0gX3nIJsKw=;
 b=XhjaOAdt8omeu5+tdJNoLDjBCli7hH62uPpx0pBFEyS94olgEuqKhhh2ADwC8TOuQr
 AZ8Xmcb4fPUVR2W2cRon98CGLFMXDI4D66exohzwdhXOj7JNzoo7p8eGgrZOT5xGp7pL
 UXLd8Nr5/1dDsq+Jaba6uSb7t8n+wx08vmKCitjVNMlQpcWPKu3S/XXFuwJ5BtXTavRk
 gheH5Tb9odMtQzJq6XAU8lx8tEGZ71vQz9smeEFFkZZMdRk7IekUoZ4eKxbLXXt5L1+O
 AweexjCjxSyhQCIeMxRvRMYJ6Zi0we4c1XVVujW2qkQaPloHxLp/yi8VoGjUNxPICSw5
 jPtQ==
X-Gm-Message-State: AOJu0YxQcRa47zlnbTkBXhVfvrXBf/jENE760ouc2FUlFxgCA5iiydrP
 SCb+1/t1eTu2hHXo6nfB5/uh5GH8fgiHIvGEUr9zbOaG1IdgdT+s0XMQ
X-Gm-Gg: AfdE7cnKztYoSmM9Fghl/rvZfgPSeH4N66klYVnmj7oNEPnIh/0GR/8QkXGgWjHXiGa
 PV3eVqYeVkA3RVN0GwWzwORHrgDNjAH3O0Noo4uUYChUfj1iZz7cZHNqtB7Ycejbe20Gf0hJoF/
 bf/dkIY4pU8+Ti5MF+Om3NGTBZDcjoMxFTrPZ7vMrvraI3+AfXcZEtTo4RaJhhJmUFI19xqxVKr
 uvJeWXD3aZNXmdNelefB/HZYpeNBgqJugGZFHGMb9migMq3zxdrUkqk9voezN60QQWRrN85HCEd
 OcUtG8+iuJdkKHBpKCpAYtLV0+3VIBgfTeqky4a3AfSgXz3CJ6c6AYNbL8Cw7Ej7o2tz2f1To8x
 mP9EsDh0joFqKNPdfUu2TQ/qsKBe2jcM1Gova/VAT9he7I06uEnM9UFcuFnY=
X-Received: by 2002:a05:6a21:6e4c:b0:3c3:7cd0:fc2e with SMTP id
 adf61e73a8af0-3c3ad8ecc7amr13183995637.48.1784511812176; 
 Sun, 19 Jul 2026 18:43:32 -0700 (PDT)
Received: from fedora ([2601:646:8081:3770::ec00])
 by smtp.gmail.com with ESMTPSA id
 5a478bee46e88-3142a1bb77csm33522221eec.18.2026.07.19.18.43.31
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Sun, 19 Jul 2026 18:43:31 -0700 (PDT)
From: Collin Funk <collin.funk1@gmail.com>
In-Reply-To: <altw0-z47WHWn369@argenau.bebt.de>
References: <altw0-z47WHWn369@argenau.bebt.de>
Date: Sun, 19 Jul 2026 18:43:30 -0700
Message-ID: <874ihua119.fsf@gmail.com>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 1.3 (+)
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-Spam-Score: 0.3 (/)
Subject: [bug-diffutils] bug#81434: bug#81434: cannot apply recursive
 normal-format diff
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Jul 2026 01:44:04 -0000

Hi Andreas,

Andreas Metzler <ametzler@bebt.de> writes:

> GNU patch 2.8 cannot apply recursive normal-format diffs:
>
> ---------------------------
> ametzler@argenau:/tmp$ mkdir -p /tmp/reprod/dira
> ametzler@argenau:/tmp$ cat << EOF > /tmp/reprod/dira/file
>> line 1
>> blah
>> line 3
>> EOF
> ametzler@argenau:/tmp$ cp -a /tmp/reprod/dira /tmp/reprod/dirb
> ametzler@argenau:/tmp$ sed -i -e 's/blah/blub/' /tmp/reprod/dirb/file
> ametzler@argenau:/tmp$ cd /tmp/reprod/
> ametzler@argenau:/tmp/reprod$ diff --recursive --new-file dira dirb > diffexamle.diff
> ametzler@argenau:/tmp/reprod$ cat diffexamle.diff
> diff --recursive --new-file dira/file dirb/file
> 2c2
> < blah
> ---
>> blub
> ametzler@argenau:/tmp/reprod$ cd dira/
> ametzler@argenau:/tmp/reprod/dira$ patch --dry-run -p1 < ../diffexamle.diff
> patch: **** Only garbage was found in the patch input.
> ametzler@argenau:/tmp/reprod/dira$ patch --normal --dry-run -p1 < ../diffexamle.diff
> can't find file to patch at input line 2
> The text leading up to this was:
> --------------------------
> |diff --recursive --new-file dira/file dirb/file
> --------------------------
> File to patch: ^C
> ---------------------------

Thanks for the report. I am going to forward it to bug-patch@gnu.org,
and close this as notabug in diffutils, which does not contain 'patch'.

Collin




From MAILER-DAEMON Mon Jul 20 07:20:06 2026
Received: from list by lists1p.gnu.org with archive (Exim 4.90_1)
	id 1wlm2X-00046Q-IK
	for mharc-bug-diffutils@gnu.org; Mon, 20 Jul 2026 07:20:05 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1wlm2V-000450-G4
 for bug-diffutils@gnu.org; Mon, 20 Jul 2026 07:20:04 -0400
Received: from debbugs.gnu.org ([2001:470:142:5::43])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1wlm2V-0005yn-03
 for bug-diffutils@gnu.org; Mon, 20 Jul 2026 07:20:03 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
 d=debbugs.gnu.org; s=debbugs-gnu-org; 
 h=Date:From:In-Reply-To:References:MIME-Version:To:Subject;
 bh=sTFWhH1PKzsiWPEMVBLnP4kjL0yMCvKB/aGsjZqRECE=; 
 b=P0D3koBOnBgDtqooRQ/bQJBzuDc8rHvPfR7IRudw30d4YGzGW/zJwJeZH9qYdf6C9d/Tt55aNVg0b56DOg/MWZ4IeRRQW2cnEgCw70ubGYaw8G6+wJdt0fYJSZBQBFPPo7q1YAKG/XYuLSh3XrUi7csNy8c/Kq3WwIEa3GlV4zoV2TKBHowTEHLBDIJpGjl/vbGz+Sfm3x62wBxf7UrS6sHmhiGmtc01AJ74pfzsJPgb0KforbG+QWZ57l45nizuY2UJLPu/ovWpbjvnSEumvlG+mFaB/q1pExAm3I30lPbnWUrRo1i8rwxnFZdoGH8aqs7Jn4yRVIQlNbMRubhY+A==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1wlm2U-0006qD-Q5
 for bug-diffutils@gnu.org; Mon, 20 Jul 2026 07:20:02 -0400
X-Loop: help-debbugs@gnu.org
Resent-From: Andreas =?UTF-8?Q?Gr=C3=BCnbacher?= <agruen@gnu.org>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Mon, 20 Jul 2026 11:20:02 +0000
Resent-Message-ID: <handler.81434.B81434.178454635126188@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 81434
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: notabug
To: Collin Funk <collin.funk1@gmail.com>
Cc: 81434@debbugs.gnu.org, bug-patch@gnu.org,
 Andreas Metzler <ametzler@bebt.de>
Received: via spool by 81434-submit@debbugs.gnu.org id=B81434.178454635126188
 (code B ref 81434); Mon, 20 Jul 2026 11:20:02 +0000
Received: (at 81434) by debbugs.gnu.org; 20 Jul 2026 11:19:11 +0000
Received: from localhost ([127.0.0.1]:60359 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1wlm1e-0006oK-E7
 for submit@debbugs.gnu.org; Mon, 20 Jul 2026 07:19:10 -0400
Received: from mail-oi1-f174.google.com ([209.85.167.174]:60460)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.84_2) (envelope-from <andreas.gruenbacher@gmail.com>)
 id 1wlm1b-0006no-89
 for 81434@debbugs.gnu.org; Mon, 20 Jul 2026 07:19:07 -0400
Received: by mail-oi1-f174.google.com with SMTP id
 5614622812f47-499f6e0bbabso4705899b6e.0
 for <81434@debbugs.gnu.org>; Mon, 20 Jul 2026 04:19:07 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1784546341; cv=none;
 d=google.com; s=arc-20260327;
 b=Hfp7npQ/rCLRdK6jvWsZquRDLmcq4Xf06pTQM6zarr2KxBxu4iUUqWVIAxMcJxdc2d
 4MdobLqZoAc8e9iaUDkp1ck3Hzqd2lzc938ltUjSp37A/7iPJS7yPSYyIZHHYowtrrrE
 6Ozrc6foO3f1WZz0SPOuf4Bx+5xB34wqt9jDLAZB/vt2XidQ4D8orV0lWzC11zT9XDGW
 EczbgOe4OtfMZur7mJst4RNQtYxDO05DHSidc6ozNEVU53SEhwl3RVzPkkxK5jWEI7dm
 oErwbAPdlvcBqjGlA1bc2zsjzSgNcNxWLfHrHTy6Wx5Te61YQIey+GFVj+W5/V3OxboI
 avKA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
 s=arc-20260327; 
 h=cc:to:subject:message-id:date:from:in-reply-to:references
 :mime-version;
 bh=sTFWhH1PKzsiWPEMVBLnP4kjL0yMCvKB/aGsjZqRECE=;
 fh=J99gmgqPWqSDMs7p/AYI2d3ht17bc8m0IGMaGzvci0I=;
 b=T5KBZjIcfJs0ekQXuSkT5Sdm7aEKA+2htVGwuf2vRA2A5jHw0L18CG9e6aRksfglE6
 i0J+bjXweJ2uL8fiROyPv1d7bDLKteLLpyqUbT7GJcCBXYBzHrUWagJpMohjIuwD+txb
 1cdUbg/aCpME8H7zv4DPK/EQpr4b+3K74OUQ8NGzTy9AXqzNnxxzcop9MXpkjXCLmjxx
 UgDlNh689xf417NNou5aAMtR5LXWLAhyfcquDwTjKTDcrox8XfqOEck6lvnq06D0/hvq
 RiT3mBUT0w4xiHUc27fvRcMuAp3/UiQpeHty0fKoSySVMFGgfVfb5IAe02XjTwPiKY8S
 537Q==; darn=debbugs.gnu.org
ARC-Authentication-Results: i=1; mx.google.com; arc=none
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20251104; t=1784546341; x=1785151141;
 h=content-type:cc:to:subject:message-id:date:from:in-reply-to
 :references:mime-version:x-gm-gg:x-gm-message-state:from:to:cc
 :subject:date:message-id:reply-to:content-type;
 bh=sTFWhH1PKzsiWPEMVBLnP4kjL0yMCvKB/aGsjZqRECE=;
 b=jOshjzrLV6VSw+edCeWmgxtmdhkzE5ja0gMWinEbHbkeljAtAOrVHqF13Z6KJ/NJJN
 jUrQw3v5NQgNqQRCr79754hfwcHKEs1ajP/umiKrZDJIXkNbw4vhOj89DO6HeHFknTF+
 LTD3pWVEOY0Vq2Gour8FXaJujsTDIE7I8iZDuiauirjFOey6ADCLbPFJQp+JDzyL6Qp2
 +nJxU7OnpS2lqwH8YQK3d9plIiiT10UE+x4MqZBAI8ghEkY9NDbM2zD5GDMpUTGHc9Pi
 Xx1h5lT9NVKC3VteALM0lJswcU4gRi+VUEtyh38Ahz1588z1XMX64qKub7wYqWGe8smj
 Dw/Q==
X-Forwarded-Encrypted: i=1;
 AHgh+RqtZY4DRHMd5nu4qd3U4xDXU0o0G3ptW6wAkY+VIr2kbqqFG6XyER6+avub6F/UZFFxk7b2zg==@debbugs.gnu.org
X-Gm-Message-State: AOJu0Yz7+5wmygMXn8XK9cSTupxVFToHenamqokVq7RVNYgrTDYwF+Gd
 PAL2AhbKx9PXkT7QDvGGxyvwbxO2t/0HP4uZGEvu+QB4Llzf7S//q12LdEdhrgw8oD22k6vsJGM
 6gu7DSnvWAL7vCfR/CyddkMKAe2e4YYE=
X-Gm-Gg: AfdE7cnPbcynWnUbJGsmkNXa2QuePqSpeeE715QSkOOB09TlCJTXwPI/xNmQBlC87Kk
 ycL9IcX5pfx58GUUX9jKy3mbQmSTqPeSr0hrXTmvIFPJMZAUUCDRNzi46A69hJAao5Bjo6QmPqF
 spWK8VICWABIVa9KfK3wRDXt83pIzRmQyEgGtHxjNxpzAFhlSci8VpZjqqTNJBDEOaHf/ZPiHmV
 XcwtI6zYpJDgPkoUqXQR0ywpviif20jQq1928fZ+8Hfv0lnI1PUBrFL+S4C
X-Received: by 2002:a05:6808:1826:b0:4a4:88ab:126f with SMTP id
 5614622812f47-4a4d031b227mr9749297b6e.21.1784546341040; Mon, 20 Jul 2026
 04:19:01 -0700 (PDT)
MIME-Version: 1.0
References: <altw0-z47WHWn369@argenau.bebt.de> <874ihua119.fsf@gmail.com>
In-Reply-To: <874ihua119.fsf@gmail.com>
From: Andreas =?UTF-8?Q?Gr=C3=BCnbacher?= <agruen@gnu.org>
Date: Mon, 20 Jul 2026 13:18:49 +0200
X-Gm-Features: AUfX_mxK5X3J4zncnR3H4SmyAWPa3af4i9a68Vg_X8d8X8hWutoHeRnz3TZ6J0M
Message-ID: <CAHpGcMLTD3Vim-31GcRyWzc7AnK32MT5ATR_D4YYUSaGDtWOpw@mail.gmail.com>
Content-Type: text/plain; charset="UTF-8"
X-Spam-Score: 0.2 (/)
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-Spam-Score: -0.8 (/)
Subject: [bug-diffutils] bug#81434: bug#81434: cannot apply recursive
 normal-format diff
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Jul 2026 11:20:04 -0000

Hi,

Am Mo., 20. Juli 2026 um 03:43 Uhr schrieb Collin Funk <collin.funk1@gmail.com>:
> Hi Andreas,
>
> Andreas Metzler <ametzler@bebt.de> writes:
>
> > GNU patch 2.8 cannot apply recursive normal-format diffs:
> > ---------------------------
> > ametzler@argenau:/tmp$ mkdir -p /tmp/reprod/dira
> > ametzler@argenau:/tmp$ cat << EOF > /tmp/reprod/dira/file
> >> line 1
> >> blah
> >> line 3
> >> EOF
> > ametzler@argenau:/tmp$ cp -a /tmp/reprod/dira /tmp/reprod/dirb
> > ametzler@argenau:/tmp$ sed -i -e 's/blah/blub/' /tmp/reprod/dirb/file
> > ametzler@argenau:/tmp$ cd /tmp/reprod/
> > ametzler@argenau:/tmp/reprod$ diff --recursive --new-file dira dirb > diffexamle.diff
> > ametzler@argenau:/tmp/reprod$ cat diffexamle.diff
> > diff --recursive --new-file dira/file dirb/file
> > 2c2
> > < blah
> > ---
> >> blub
> > ametzler@argenau:/tmp/reprod$ cd dira/
> > ametzler@argenau:/tmp/reprod/dira$ patch --dry-run -p1 < ../diffexamle.diff
> > patch: **** Only garbage was found in the patch input.
> > ametzler@argenau:/tmp/reprod/dira$ patch --normal --dry-run -p1 < ../diffexamle.diff
> > can't find file to patch at input line 2
> > The text leading up to this was:
> > --------------------------
> > |diff --recursive --new-file dira/file dirb/file
> > --------------------------
> > File to patch: ^C
> > ---------------------------
>
> Thanks for the report. I am going to forward it to bug-patch@gnu.org,
> and close this as notabug in diffutils, which does not contain 'patch'.

GNU patch doesn't recognize filenames in "diff" lines, and it never
has. (The exception are lines starting with "diff --git", which are
assumed to be well-structured.)

We could fix that, but only at the risk of breaking existing patches
that contain unexpected "diff" lines. I'm sure we'd have to support
things like multiple filename quoting styles, for example. So unless
an obvious need for this functionality can be demonstrated, I'm fairly
reluctant to add support for it.

Until then, just use unified or context format diffs instead.

Thanks,
Andreas

> Collin




From MAILER-DAEMON Mon Jul 20 12:48:51 2026
Received: from list by lists1p.gnu.org with archive (Exim 4.90_1)
	id 1wlrAd-0006yg-Hc
	for mharc-bug-diffutils@gnu.org; Mon, 20 Jul 2026 12:48:48 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1wlr9v-0006nh-T3
 for bug-diffutils@gnu.org; Mon, 20 Jul 2026 12:48:19 -0400
Received: from debbugs.gnu.org ([2001:470:142:5::43])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1wlr9u-0004NF-7y
 for bug-diffutils@gnu.org; Mon, 20 Jul 2026 12:48:03 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
 d=debbugs.gnu.org; s=debbugs-gnu-org; 
 h=In-Reply-To:MIME-Version:References:From:Date:To:Subject;
 bh=uGOKzHBz/QGxXVmKUwM3CS1KCm3o9BCx7i9Y4A5k4Ps=; 
 b=Mftru1CMsgln6WsrGae1qDyFMT+lih+1K03eY6s1V1YVeGT6Lqs1tgFG0IXDr9SlljUZ6IKb5r57CKIGh48Uk1p1NHkBMXvhBcOzat8w451KWg1zwt367aDpLCxSU77sTeZoUtMJRFMyJoDlm42tRbSHIuyuqDNTB5csfc4F7ux/gq1RTK4FypypkW49j8OjExE/EwFMT+oI8OuPZ3ZDaLopr9ll8V+r+rNw1OEP/1lGJi0EdR4P0akf9IWr0xRoBJyea0yh66msIHdFPeds7Yh43gAYcvbfKSLB4yZ5fLESOWi5klR85ysNCdu7HP04u49k5tSgGcUhLTLNAB9ilg==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1wlr9t-0007R3-SG
 for bug-diffutils@gnu.org; Mon, 20 Jul 2026 12:48:01 -0400
X-Loop: help-debbugs@gnu.org
Resent-From: Andreas Metzler <ametzler@bebt.de>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Mon, 20 Jul 2026 16:48:01 +0000
Resent-Message-ID: <handler.81434.B81434.178456602728492@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 81434
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: notabug
To: Andreas =?UTF-8?Q?Gr=C3=BCnbacher?= <agruen@gnu.org>
Cc: 81434@debbugs.gnu.org, bug-patch@gnu.org,
 Collin Funk <collin.funk1@gmail.com>
Received: via spool by 81434-submit@debbugs.gnu.org id=B81434.178456602728492
 (code B ref 81434); Mon, 20 Jul 2026 16:48:01 +0000
Received: (at 81434) by debbugs.gnu.org; 20 Jul 2026 16:47:07 +0000
Received: from localhost ([127.0.0.1]:34953 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1wlr90-0007PT-SV
 for submit@debbugs.gnu.org; Mon, 20 Jul 2026 12:47:07 -0400
Received: from vsrv21575.customer.vlinux.de ([31.15.64.248]:47066)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <ametzler@bebt.de>) id 1wlr8x-0007PE-Uc
 for 81434@debbugs.gnu.org; Mon, 20 Jul 2026 12:47:05 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=bebt.de;
 s=d2; h=In-Reply-To:Content-Transfer-Encoding:Content-Type:MIME-Version:
 References:Message-ID:Subject:Cc:To:From:Date:From:Sender:Reply-To:Subject:
 Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:
 Content-ID:Content-Description:In-Reply-To:References;
 bh=uGOKzHBz/QGxXVmKUwM3CS1KCm3o9BCx7i9Y4A5k4Ps=; b=PUMVuMAIvWy8LSd7SqSA/D1xMn
 0Qc57oIncBF90CxQp1cjTiLZVnO4qZFehgz+uscV3ZAH+ysb3B2Obq/v7/oLIZ9n0vD1e3qCrkVtd
 nYFb+0UhrAzd+Z1WKAFY4757Wr5a8DNObp0B6yXMD+Wv8UDnODXL3pGiUZYLXIWp7h/coycr6yEqq
 BWWUPpZBSA7LeI/xoVxbpo7XG0OG5MMqP5xtxU8kxgpv+RXfYGkOCqTH+syXLZpuizqWEXEbxrMRd
 uA7vcWKGzAH2aBpGHZiIlwbnvphvWlSEe9BZoSx1co54vzKmOftR1seyxevyqYEXqhC+NAv0v307m
 LlOxrgLg==;
Received: from [41.66.122.201] (helo=argenau.bebt.de)
 by vsrv21575.customer.vlinux.de with esmtpsa (TLS1.3) tls
 TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.99.4)
 (envelope-from <ametzler@bebt.de>) id 1wlr8u-000000025uC-1hQ8;
 Mon, 20 Jul 2026 16:47:01 +0000
Received: from [::1] (helo=argenau.bebt.de)
 by argenau.bebt.de with esmtps (TLS1.3) tls
 TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.99.4)
 (envelope-from <ametzler@bebt.de>) id 1wlr8t-000000000PO-2IHh;
 Mon, 20 Jul 2026 18:46:59 +0200
Date: Mon, 20 Jul 2026 18:46:58 +0200
From: Andreas Metzler <ametzler@bebt.de>
Message-ID: <al5RAiA4OWdniEVw@argenau.bebt.de>
References: <altw0-z47WHWn369@argenau.bebt.de> <874ihua119.fsf@gmail.com>
 <CAHpGcMLTD3Vim-31GcRyWzc7AnK32MT5ATR_D4YYUSaGDtWOpw@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <CAHpGcMLTD3Vim-31GcRyWzc7AnK32MT5ATR_D4YYUSaGDtWOpw@mail.gmail.com>
X-Spam-Score: -3.3 (---)
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Subject: [bug-diffutils] bug#81434: bug#81434: cannot apply recursive
 normal-format diff
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Jul 2026 16:48:32 -0000

On 2026-07-20 Andreas Grünbacher <agruen@gnu.org> wrote:
> Am Mo., 20. Juli 2026 um 03:43 Uhr schrieb Collin Funk <collin.funk1@gmail.com>:
> > Andreas Metzler <ametzler@bebt.de> writes:
> >
> > > GNU patch 2.8 cannot apply recursive normal-format diffs:
> > > ---------------------------

[...]
> > > ametzler@argenau:/tmp/reprod$ diff --recursive --new-file dira dirb > diffexamle.diff
> > > ametzler@argenau:/tmp/reprod$ cat diffexamle.diff
> > > diff --recursive --new-file dira/file dirb/file
> > > 2c2
> > > < blah
> > > ---
> > >> blub

[...]
> > Thanks for the report. I am going to forward it to bug-patch@gnu.org,
> > and close this as notabug in diffutils, which does not contain 'patch'.

> GNU patch doesn't recognize filenames in "diff" lines, and it never
> has. (The exception are lines starting with "diff --git", which are
> assumed to be well-structured.)

> We could fix that, but only at the risk of breaking existing patches
> that contain unexpected "diff" lines. I'm sure we'd have to support
> things like multiple filename quoting styles, for example. So unless
> an obvious need for this functionality can be demonstrated, I'm fairly
> reluctant to add support for it.

> Until then, just use unified or context format diffs instead.

Hello,
sorry for the misdirected report, I had the misconception that GNU patch
and diff were part of the same source and failed to doublecheck.

The patch(es) I tried to apply were historic ones which I cannot
regenerate with sane options as I only have the patches. Since there are
a limited number of them in my project I can get around with a mixture
of scripting and hand holding. Would it be possible to update the
documentation for patch and diff to spell out that "diff --recursive"
*without* e.g. -u cannot be used as input for GNU patch? (I thought I
had well hidden corruption in the patches.)

cu Andreas
-- 
"You people are noisy," Nia said.
I made the gesture of agreement.




From MAILER-DAEMON Fri Jul 24 07:07:04 2026
Received: from list by lists1p.gnu.org with archive (Exim 4.90_1)
	id 1wnDk7-0005cf-UB
	for mharc-bug-diffutils@gnu.org; Fri, 24 Jul 2026 07:07:03 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1wnDk6-0005cU-7u
 for bug-diffutils@gnu.org; Fri, 24 Jul 2026 07:07:02 -0400
Received: from debbugs.gnu.org ([2001:470:142:5::43])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1wnDk5-0000g4-Ve
 for bug-diffutils@gnu.org; Fri, 24 Jul 2026 07:07:02 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
 d=debbugs.gnu.org; s=debbugs-gnu-org; 
 h=MIME-Version:From:Date:To:Subject;
 bh=2xtxDxYnwcMjSWNjiSbyvWwwNa4sXpP3o4FibdDfDIE=; 
 b=jDqglXXaXLtqH96Yk1Hv/Sh8uYD5cz3tzYIPlrthYRPehp9St53tvbYGPot2cGzGzXf6/V8wULIgeKf3PYzYRTtMD0i8zlkinQCqeo7tjaSF20mwPyHqsKuvJygi7SEKYuuPcCbEvDWph0UdVkkb4bf2QA5x7AZBXGaSs0VEKmOW4HUcTKaSFTl3m4snpIfcdgOjSzYZH17H29UhRikiIdV1PYlnr1gvZowr6R+ZYMRIg1Og1VW/xLlQJ0xcoFNc+nwk5w+0I/2YBUesXmsP6Pi6JCfU3bH65IcE+L+p7uld5Dl7BLHSlrSLux+loPh1KheWzOyVNmapa32fB+FgnA==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1wnDk5-0002Oy-Pw
 for bug-diffutils@gnu.org; Fri, 24 Jul 2026 07:07:01 -0400
X-Loop: help-debbugs@gnu.org
Resent-From: Santiago Vila <sanvila@debian.org>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Fri, 24 Jul 2026 11:07:01 +0000
Resent-Message-ID: <handler.81468.B.17848912059193@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: report 81468
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: 81468@debbugs.gnu.org
Cc: 1142675@bugs.debian.org, Salvatore Bonaccorso <carnil@debian.org>
X-Debbugs-Original-To: bug-diffutils@gnu.org
Received: via spool by submit@debbugs.gnu.org id=B.17848912059193
 (code B ref -1); Fri, 24 Jul 2026 11:07:01 +0000
Received: (at submit) by debbugs.gnu.org; 24 Jul 2026 11:06:45 +0000
Received: from localhost ([127.0.0.1]:37571 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1wnDjk-0002O3-7V
 for submit@debbugs.gnu.org; Fri, 24 Jul 2026 07:06:44 -0400
Received: from lists1p.gnu.org ([2001:470:142::17]:55764)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <sanvila@debian.org>)
 id 1wnDjc-0002NP-Rr
 for submit@debbugs.gnu.org; Fri, 24 Jul 2026 07:06:37 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <sanvila@debian.org>)
 id 1wnDjX-0005NK-3c
 for bug-diffutils@gnu.org; Fri, 24 Jul 2026 07:06:27 -0400
Received: from stravinsky.debian.org ([2001:41b8:202:deb::311:108])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <sanvila@debian.org>)
 id 1wnDjV-0000Tt-5g
 for bug-diffutils@gnu.org; Fri, 24 Jul 2026 07:06:26 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debian.org; 
 s=smtpauto.stravinsky;
 h=X-Debian-User:Content-Transfer-Encoding:Content-Type
 :MIME-Version:Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:
 Content-Description:In-Reply-To:References;
 bh=2xtxDxYnwcMjSWNjiSbyvWwwNa4sXpP3o4FibdDfDIE=; b=k0uDSO7xP2RJu+3KzSAhpol2h/
 ui1bqrcF8lx1jDLur1NaAEQpTDbDL3vpV+EJLCxT+ioY//pGUnYjOzB1Gtivi03ycVG0hMc95CwoJ
 GOjiqRksXfPntCUA/qAkTd7ORYx45b3Qgv+3hBKeKQ1fUXN/lz5l4NPQMFVbnhXsPrc9oXub3ETgh
 78vl1Rw5ocXYDEcroBTNgQgD0cxJBm/+R/o6ZIrUAH7GI+k1Sc0FDb9eIoR9ghcHMPwg12GTfUJQ+
 EZ3pIQEH+FHTHAUjrU8HKgRZEGkgxVOXEAUzqj8l0UVKOmB1+bA+ID+9Qb5UiiVmdTMeVwemY+PeR
 LWb94GmQ==;
Received: from authenticated-user by stravinsky.debian.org with esmtpsa
 (TLS1.3:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256)
 (Exim 4.96) (envelope-from <sanvila@debian.org>) id 1wnDjP-004Vt4-0F;
 Fri, 24 Jul 2026 11:06:19 +0000
Date: Fri, 24 Jul 2026 13:06:16 +0200
From: Santiago Vila <sanvila@debian.org>
Message-ID: <amNHKFl3SYeahQv5@nuc>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
X-Debian-User: sanvila
Received-SPF: pass client-ip=2001:41b8:202:deb::311:108;
 envelope-from=sanvila@debian.org; helo=stravinsky.debian.org
X-Spam_score_int: -57
X-Spam_score: -5.8
X-Spam_bar: -----
X-Spam_report: (-5.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.419,
 DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
 RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001,
 SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 1.0 (+)
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-Spam-Score: -0.0 (/)
Subject: [bug-diffutils] bug#81468: [carnil@debian.org: Bug#1142675:
 diffutils: CVE-2026-53910]
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Jul 2026 11:07:02 -0000

Hello.

I received this from the Debian BTS. (Thank you, Salvatore)

The report says this is fixed in [9ff04d5], but it also mentions
[73ed7ce], and when I do "git log" in my clone I also find additional
security-related commits in addition to those two.

So: How many commits should I really apply from the git repo to fix
CVE-2026-53910 ?

Also, while we are at it: Can I expect a diffutils 3.13 release soon?

Thanks.

----- Forwarded message from Salvatore Bonaccorso <carnil@debian.org> -----

Date: Fri, 24 Jul 2026 08:10:04 +0200
From: Salvatore Bonaccorso <carnil@debian.org>
To: Debian Bug Tracking System <submit@bugs.debian.org>
Subject: Bug#1142675: diffutils: CVE-2026-53910
Resent-CC: carnil@debian.org, team@security.debian.org, sanvila@debian.org
X-Mailer: reportbug 13.2.0+nmu1

Source: diffutils
Version: 1:3.12-1
Severity: important
Tags: security upstream
X-Debbugs-Cc: carnil@debian.org, Debian Security Team <team@security.debian.org>

Hi,

The following vulnerability was published for diffutils.

CVE-2026-53910[0]:
| diff3Â tool from GNU diffutilsÂ is vulnerable to a heapâ€‘based buffer
| overflow due to multiple signed integer overflows in lineâ€‘mapping
| calculations. Incorrect arithmetic in mapping line ranges can result
| in corrupted values being used for memory allocation and loop
| bounds. When processing crafted diff output, these overflows may
| cause the application to allocate insufficient memory and
| subsequently perform outâ€‘ofâ€‘bounds writes during internal
| processing.Â  An attacker who can control the output of the diff
| program used by diff3 (e.g. via --diff-program pointing to a
| malicious script) can trigger out-of-bounds writes, resulting in a
| crash and potentially remote code execution depending on the
| environment.   This issue has been fixed in commit
| 9ff04d5b84743e331e80b589335a52c5480d1815


If you fix the vulnerability please also make sure to include the
CVE (Common Vulnerabilities & Exposures) id in your changelog entry.

For further information see:

[0] https://security-tracker.debian.org/tracker/CVE-2026-53910
    https://www.cve.org/CVERecord?id=CVE-2026-53910
[1] https://cgit.git.savannah.gnu.org/cgit/diffutils.git/commit/?id=73ed7ce85cc78effb94daf028c9af6b4e5252e50
[2] https://cgit.git.savannah.gnu.org/cgit/diffutils.git/commit/?id=9ff04d5b84743e331e80b589335a52c5480d1815

Please adjust the affected versions in the BTS as needed.

Regards,
Salvatore

----- End forwarded message -----




From MAILER-DAEMON Fri Jul 24 10:18:18 2026
Received: from list by lists1p.gnu.org with archive (Exim 4.90_1)
	id 1wnGjB-00047s-4N
	for mharc-bug-diffutils@gnu.org; Fri, 24 Jul 2026 10:18:18 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1wnGj3-000469-8s
 for bug-diffutils@gnu.org; Fri, 24 Jul 2026 10:18:10 -0400
Received: from debbugs.gnu.org ([2001:470:142:5::43])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1wnGj2-0006KX-PJ
 for bug-diffutils@gnu.org; Fri, 24 Jul 2026 10:18:08 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
 d=debbugs.gnu.org; s=debbugs-gnu-org; 
 h=MIME-Version:Date:References:In-Reply-To:From:To:Subject;
 bh=oUTKn05+KhD1ISn313KUc6vZ3w2HMk4bT0sZuR4VPOc=; 
 b=uFXIALO1UT7YTKCticKxUdxQaZbj4DbdgMV/93ZInKokbyt3rBzC/jX+7KpLP9M08S/fMmoAxMcnuAvKPEmkALHsUWmrmeZzBQnUkTQLdCYUVRW5V3QjYRlWaupGp8S8DxR1hwxtpZdDNwBSQryECUpOLG1BrNyiiSxyLkEg5jjpVSZzBkjX0+ezrQx4oiKajjmgswifp1lD/vl6CeLsecKnw7wziBv3c3SCdadVycRl3FKfgs/Mf+GFbOcNU6HPCp0G1SasEapk+ZLoae7FNRnvIJlIQ7jmsABoSLAU9hUasgznbVSzOlbbGwWdQjl3vm4Onq4aLlXM2pnXXZvGdw==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1wnGj2-00062K-5v
 for bug-diffutils@gnu.org; Fri, 24 Jul 2026 10:18:08 -0400
X-Loop: help-debbugs@gnu.org
Resent-From: Collin Funk <collin.funk1@gmail.com>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Fri, 24 Jul 2026 14:18:07 +0000
Resent-Message-ID: <handler.81468.B81468.178490268123184@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 81468
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: Santiago Vila <sanvila@debian.org>
Cc: 1142675@bugs.debian.org, 81468@debbugs.gnu.org,
 Salvatore Bonaccorso <carnil@debian.org>
Received: via spool by 81468-submit@debbugs.gnu.org id=B81468.178490268123184
 (code B ref 81468); Fri, 24 Jul 2026 14:18:07 +0000
Received: (at 81468) by debbugs.gnu.org; 24 Jul 2026 14:18:01 +0000
Received: from localhost ([127.0.0.1]:40222 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1wnGir-00061k-UT
 for submit@debbugs.gnu.org; Fri, 24 Jul 2026 10:18:00 -0400
Received: from mail-pg1-x530.google.com ([2607:f8b0:4864:20::530]:61588)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.84_2) (envelope-from <collin.funk1@gmail.com>)
 id 1wnGij-00060V-3u
 for 81468@debbugs.gnu.org; Fri, 24 Jul 2026 10:17:51 -0400
Received: by mail-pg1-x530.google.com with SMTP id
 41be03b00d2f7-c9e607d81fcso330749a12.2
 for <81468@debbugs.gnu.org>; Fri, 24 Jul 2026 07:17:49 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20251104; t=1784902663; x=1785507463; darn=debbugs.gnu.org;
 h=content-type:mime-version:user-agent:message-id:date:references
 :in-reply-to:subject:cc:to:from:from:to:cc:subject:date:message-id
 :reply-to:content-type;
 bh=oUTKn05+KhD1ISn313KUc6vZ3w2HMk4bT0sZuR4VPOc=;
 b=M0l4+8DjwQv+10B8pUvI3pVVbUMbS+eZJ62rj+40J9L7AMB7F06Q8FB9HEE2N7qzkV
 73kfrWG3jx+MyKxpyhCeOpcKXPauDDUQorwf3nc/SX3XC+V4T7K/no3HdxXh8JI5izFm
 52ndyeCAMJ6Wumh0SeY7HUX1GyQvqyDv4UsJueTVx6o2+mEjvz39Hoj+rtpgUi5lUxK5
 E89tVtga4KjBfUG+VrVK395zUtmw75UrAvsXfOaDGAKANoJdxlOzrTyKsD2VXoONZneo
 K8PJxqjCow+fFf8k1giFlk45hGIj0qHqZozbzVdMtysWXbrlWQhfjHZyQtIPCSR1kU7y
 u2Dw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20251104; t=1784902663; x=1785507463;
 h=content-type:mime-version:user-agent:message-id:date:references
 :in-reply-to:subject:cc:to:from:x-gm-gg:x-gm-message-state:from:to
 :cc:subject:date:message-id:reply-to:content-type;
 bh=oUTKn05+KhD1ISn313KUc6vZ3w2HMk4bT0sZuR4VPOc=;
 b=clpV36Px6TpaCFTHOiIzk1PrKHNzQIMLHgFxzIh9nn203Mhk42nwMtNR0/wlF0Mtr/
 FkR8Tg0/45u2N/Xh2uAf/r7Eg4g3QlqjeOJ4hxYyvaMeKcitFBB+2Pat1zO+P9P8bD51
 WcvlCL/Cb1pKEPM9MMqAn/fbXqH6fsg35/nFY4APjuSUQ2vXdp3s9+Pn/WPShnZ4BbtZ
 rDW36tgOrpq9Zf0d7RW08P9+KZ5/2gJnFEcVJ8JsAUik1ARwxWvO60CDBAzPQ6w+nrUd
 3vSOi5UcKwg+cqUApdoViGt343UMTIlPKZQdZ3Mqoc9lkC3L7nc3P5CwthEnVf+StijW
 5Klg==
X-Gm-Message-State: AOJu0YyxeHn8qru69T1JH4Swc3OXz+Q18naCeYVdN/z27evvxzWfUMD2
 xvKDpbEwB9i61bYnelthEuB/QBn0SLFCoEmGUalnVIORY+W9JKV/853h
X-Gm-Gg: AR+sD10nn26XtifEMU67Infgo3a+MGjpKrZ6WY2yt0rDXSJFV+y1cPQU0aHgcbxY+aQ
 OWsN2OZBiOv1bF+tvPmwG5My33BNeYWRIdzeuQMvZSkVNy3wzG+gc8tchfVp6us9omWWC7Bkhif
 /VYCctW7JVzYSct7uULLwEq8s22k/Gr59SwhEVC5yCKLZBnE/v5+jGCwFMqGu0OOMC7vDhUK6rv
 x1wz6Tj4DySxNr8bYYVqMOjY/1dlC0R5sv8pw/i70SvSFjAmaUScm/QTnua20Us/TROmhFSn+mH
 p45H9XXjcHCByD6tIY2H9U6tf4oQ3WFxUnFNnQmDJv4tz+fx7kROCNg0LJ4kfpOXeN0f9fSNfKV
 79gmDMctD709uQ9ylYYXNIrkb0oHJrTPfJUXGCgYaEQpp1YhEGVezxtxwRMa7YmbzcDZUMo0lGe
 mfHuUvg3DBxpzxleGC7ZLnW08G/Dmm17PUE17mKfxMcOHWbErLk2KOoZg=
X-Received: by 2002:a05:6a20:9f09:b0:3c0:9c19:b275 with SMTP id
 adf61e73a8af0-3c44b2ae3c9mr9074554637.67.1784902662609; 
 Fri, 24 Jul 2026 07:17:42 -0700 (PDT)
Received: from XTHCYRY1WD-Collin-Funk
 ([2601:646:8081:3770:cd8a:1a29:444a:8093])
 by smtp.gmail.com with ESMTPSA id
 5a478bee46e88-314bc419c52sm139773eec.10.2026.07.24.07.17.41
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Fri, 24 Jul 2026 07:17:41 -0700 (PDT)
From: Collin Funk <collin.funk1@gmail.com>
In-Reply-To: <amNHKFl3SYeahQv5@nuc> (Santiago Vila's message of "Fri, 24 Jul
 2026 13:06:16 +0200")
References: <amNHKFl3SYeahQv5@nuc>
Date: Fri, 24 Jul 2026 07:17:40 -0700
Message-ID: <m1bjbweakb.fsf@gmail.com>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 1.3 (+)
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-Spam-Score: 0.3 (/)
Subject: [bug-diffutils] bug#81468: bug#81468: [carnil@debian.org:
 Bug#1142675: diffutils: CVE-2026-53910]
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Jul 2026 14:18:10 -0000

Santiago Vila <sanvila@debian.org> writes:

> Hello.
>
> I received this from the Debian BTS. (Thank you, Salvatore)
>
> The report says this is fixed in [9ff04d5], but it also mentions
> [73ed7ce], and when I do "git log" in my clone I also find additional
> security-related commits in addition to those two.
>
> So: How many commits should I really apply from the git repo to fix
> CVE-2026-53910 ?

Do note that the CVE text is highly exaggerated, as many are:

    An attacker who can control the output of the diff program used by
    diff3 (e.g. via --diff-program pointing to a malicious script) can
    trigger out-of-bounds writes, resulting in a crash and potentially
    remote code execution depending on the environment.

If an "attacker" has access to write a malicious script on your local
environment and give them the ability to execute it, surely you have
larger problems than out-of-bounds writes in 'diff'...

Collin




From MAILER-DAEMON Fri Jul 24 13:10:07 2026
Received: from list by lists1p.gnu.org with archive (Exim 4.90_1)
	id 1wnJPT-0002wa-31
	for mharc-bug-diffutils@gnu.org; Fri, 24 Jul 2026 13:10:07 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1wnJPR-0002vk-F4
 for bug-diffutils@gnu.org; Fri, 24 Jul 2026 13:10:05 -0400
Received: from debbugs.gnu.org ([2001:470:142:5::43])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1wnJPQ-0001M8-WF
 for bug-diffutils@gnu.org; Fri, 24 Jul 2026 13:10:05 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
 d=debbugs.gnu.org; s=debbugs-gnu-org; 
 h=In-Reply-To:From:References:MIME-Version:Date:To:Subject;
 bh=XNvHlGkb7gzcrT6kA/eoCWf4WUY+9WgCzE4Jtxs/2K8=; 
 b=dLLJKm8ei9t7+vNWjh8h27UQ9jIE+4i66/UFpK7H8QcQ5L/CAAtqyl+BZHh1LQyeoCFRAKyhDs8hxZyuL6eUxM/w/TB2lXbls1hhtemX923v2WJ04NioTLOYLlTdPAGBU/UZ0lcTMKtiwdmjakcYRc5T1KEHP4IpAcc8HVhdLCon1yhZfcZ23WzR6Hg6S8UIncDk3jeurvCFevcJbaQIACMqwqUq5YOSXXNHwmLF7c1wPqZcC5LjyfonWWufVYRnIgbo6aUtkl444v9gamhI1d1naxCiBiIH0fyJxJ9Lfk1/A7Y07RwDHshNPOus9cYFeZ+b9RVfb5FFkKHM5Zk1JQ==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1wnJPQ-0002LJ-Gd
 for bug-diffutils@gnu.org; Fri, 24 Jul 2026 13:10:04 -0400
X-Loop: help-debbugs@gnu.org
Resent-From: Paul Eggert <eggert@cs.ucla.edu>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Fri, 24 Jul 2026 17:10:04 +0000
Resent-Message-ID: <handler.81468.B.17849129778850@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 81468
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: 81468@debbugs.gnu.org
X-Debbugs-Original-To: bug-diffutils@gnu.org
Received: via spool by submit@debbugs.gnu.org id=B.17849129778850
 (code B ref -1); Fri, 24 Jul 2026 17:10:04 +0000
Received: (at submit) by debbugs.gnu.org; 24 Jul 2026 17:09:37 +0000
Received: from localhost ([127.0.0.1]:41547 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1wnJOw-0002Ie-C7
 for submit@debbugs.gnu.org; Fri, 24 Jul 2026 13:09:36 -0400
Received: from lists1p.gnu.org ([2001:470:142::17]:58610)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <eggert@cs.ucla.edu>)
 id 1wnJOq-0002I1-PP
 for submit@debbugs.gnu.org; Fri, 24 Jul 2026 13:09:30 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <eggert@cs.ucla.edu>)
 id 1wnJOj-0002Qq-Lf
 for bug-diffutils@gnu.org; Fri, 24 Jul 2026 13:09:21 -0400
Received: from mail.cs.ucla.edu ([131.179.128.66])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <eggert@cs.ucla.edu>)
 id 1wnJOh-00016M-T1
 for bug-diffutils@gnu.org; Fri, 24 Jul 2026 13:09:21 -0400
Received: from localhost (localhost [127.0.0.1])
 by mail.cs.ucla.edu (Postfix) with ESMTP id ADCA93C00E430
 for <bug-diffutils@gnu.org>; Fri, 24 Jul 2026 10:09:16 -0700 (PDT)
Received: from mail.cs.ucla.edu ([127.0.0.1])
 by localhost (mail.cs.ucla.edu [127.0.0.1]) (amavis, port 10032) with ESMTP
 id kG2YitkHMq03 for <bug-diffutils@gnu.org>;
 Fri, 24 Jul 2026 10:09:16 -0700 (PDT)
Received: from localhost (localhost [127.0.0.1])
 by mail.cs.ucla.edu (Postfix) with ESMTP id 85AB63C00E432
 for <bug-diffutils@gnu.org>; Fri, 24 Jul 2026 10:09:16 -0700 (PDT)
DKIM-Filter: OpenDKIM Filter v2.10.3 mail.cs.ucla.edu 85AB63C00E432
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cs.ucla.edu;
 s=9D0B346E-2AEB-11ED-9476-E14B719DCE6C; t=1784912956;
 bh=XNvHlGkb7gzcrT6kA/eoCWf4WUY+9WgCzE4Jtxs/2K8=;
 h=Message-ID:Date:MIME-Version:To:From;
 b=ErTn1yPnBPDTDoUEiHprNeoAg0UG+4tA1dUzvV+qy4DCoMpQOtAAijNrqOEoKC2Vt
 HpGnpP5Ptx8/mlWVEikXiFEGNw/Fe1W78TJwAW2+Bw7HWL+oGLJisz5kCWi8qHq+l3
 O2le3z+SrdIZE2rc7LIlgJExswKP0ebseCVqe+/PWGk0U/s2XthK2t+JSxSFzcYbuX
 ZNjHspe3FNgadQV0SKRV9WVmWlZYl43yy18FdBGj12XGGTxkaKBCSNxGFJlqXdC/Id
 AZLdPrF1A/JGQXToEh7f7MfN2Lvo6Xl49bLZxqFPhlbKuBETWn9lKkf1Zjdeao/D4z
 /fUgSJICwyKxQ==
X-Virus-Scanned: amavis at mail.cs.ucla.edu
Received: from mail.cs.ucla.edu ([127.0.0.1])
 by localhost (mail.cs.ucla.edu [127.0.0.1]) (amavis, port 10026) with ESMTP
 id HmP5Ut2gPVN8 for <bug-diffutils@gnu.org>;
 Fri, 24 Jul 2026 10:09:16 -0700 (PDT)
Received: from penguin.cs.ucla.edu
 (47-154-25-11.fdr01.snmn.ca.ip.frontiernet.net [47.154.25.11])
 by mail.cs.ucla.edu (Postfix) with ESMTPSA id 6937E3C00E430
 for <bug-diffutils@gnu.org>; Fri, 24 Jul 2026 10:09:16 -0700 (PDT)
Message-ID: <cf0ee298-90bd-4f20-a237-3298667c8b34@cs.ucla.edu>
Date: Fri, 24 Jul 2026 10:09:16 -0700
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
References: <amNHKFl3SYeahQv5@nuc>
Content-Language: en-US
From: Paul Eggert <eggert@cs.ucla.edu>
Organization: UCLA Computer Science Department
In-Reply-To: <amNHKFl3SYeahQv5@nuc>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Received-SPF: pass client-ip=131.179.128.66; envelope-from=eggert@cs.ucla.edu; 
 helo=mail.cs.ucla.edu
X-Spam_score_int: -42
X-Spam_score: -4.3
X-Spam_bar: ----
X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_DNSWL_MED=-2.3,
 SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 1.0 (+)
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-Spam-Score: -0.0 (/)
Subject: [bug-diffutils] bug#81468: bug#81468: [carnil@debian.org:
 Bug#1142675: diffutils: CVE-2026-53910]
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Jul 2026 17:10:05 -0000

On 2026-07-24 04:06, Santiago Vila wrote:
> So: How many commits should I really apply from the git repo to fix
> CVE-2026-53910 ?
> 
> Also, while we are at it: Can I expect a diffutils 3.13 release soon?

No plans for an immediate release.

I have lost track of which commits exactly track which CVEs. As Collin 
writes, this isn't particularly urgent.




From MAILER-DAEMON Fri Jul 24 15:59:04 2026
Received: from list by lists1p.gnu.org with archive (Exim 4.90_1)
	id 1wnM2y-00079h-OO
	for mharc-bug-diffutils@gnu.org; Fri, 24 Jul 2026 15:59:04 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1wnM2w-00078U-L8
 for bug-diffutils@gnu.org; Fri, 24 Jul 2026 15:59:02 -0400
Received: from debbugs.gnu.org ([2001:470:142:5::43])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1wnM2w-0005DD-CH
 for bug-diffutils@gnu.org; Fri, 24 Jul 2026 15:59:02 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
 d=debbugs.gnu.org; s=debbugs-gnu-org; 
 h=In-Reply-To:MIME-Version:References:From:Date:To:Subject;
 bh=/2kwVMXRwm4/DE9qXO4lXfuOVG7RSggcX2RrAignARM=; 
 b=aGTIfrA/9KKX4RLeczPAe1zINUsuwRBmTXIqjSD8Suj1ZWoAC64ETRP1w1dZ5FyyfGUsf4xcZ9yfatfEVVmavUOwsAjbNwfPcOzFFwmBwXrULGs6b8YHdIUYhPRMUpub+j2fvpv9L7NY2L5pagwnarPT0zgnSsYq4ljv9kJHlhlahQVADp2xqOia0JTQ18Z4HPltovt2H/K8J7BQPxhjWe453u9EJEUJnVofCTiYaBlFkvZXN0DFCfIm7RlmFUo8wTy7iuiR0rB2OoCkQS9WR504Aoemgwb5IMpssWIsEmL3owfPWu05xuJB9LCYqHiBxDkcQkSfUxgISGeiwjNznQ==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1wnM2w-0003Fh-23
 for bug-diffutils@gnu.org; Fri, 24 Jul 2026 15:59:02 -0400
X-Loop: help-debbugs@gnu.org
Resent-From: Salvatore Bonaccorso <carnil@debian.org>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Fri, 24 Jul 2026 19:59:02 +0000
Resent-Message-ID: <handler.81468.B81468.178492311112370@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 81468
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: Collin Funk <collin.funk1@gmail.com>
Cc: Santiago Vila <sanvila@debian.org>, 1142675@bugs.debian.org,
 81468@debbugs.gnu.org
Received: via spool by 81468-submit@debbugs.gnu.org id=B81468.178492311112370
 (code B ref 81468); Fri, 24 Jul 2026 19:59:02 +0000
Received: (at 81468) by debbugs.gnu.org; 24 Jul 2026 19:58:31 +0000
Received: from localhost ([127.0.0.1]:42870 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1wnM2Q-0003DS-IW
 for submit@debbugs.gnu.org; Fri, 24 Jul 2026 15:58:30 -0400
Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:60906)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.84_2) (envelope-from <salvatore.bonaccorso@gmail.com>)
 id 1wnM2N-0003DA-RN
 for 81468@debbugs.gnu.org; Fri, 24 Jul 2026 15:58:28 -0400
Received: by mail-wm1-x336.google.com with SMTP id
 5b1f17b1804b1-49553515a8bso9583735e9.1
 for <81468@debbugs.gnu.org>; Fri, 24 Jul 2026 12:58:27 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20251104; t=1784923102; x=1785527902; darn=debbugs.gnu.org;
 h=in-reply-to:content-disposition:content-type:mime-version
 :references:message-id:subject:cc:to:from:date:sender:from:to:cc
 :subject:date:message-id:reply-to:content-type;
 bh=/2kwVMXRwm4/DE9qXO4lXfuOVG7RSggcX2RrAignARM=;
 b=Pj1wQsGa6sUawHsXGiuHDrJbYD0iRBxj+NKtbKas9n8AlimoxkTdqNmJayFbqiL7hP
 S1O84W8GWLlrWb70Vk8b2rnsKXQuS58HMSXNoGUyM7rTmLNxm73dQ+YPxCC7wH8wsNcG
 Ugb/SynIRue5X5nrOAR5EiGhnvjmc0y75UN3FCcIEaRWaNH2Rtq+kINj1WhBPGu1l4+W
 E1t4XMU2v22uz35wRYJ+IY6O2n0Qbrc8uUefxxL/Ica9DT1jEdFAyLNddjIWS2uGhEaB
 lCCsVhEqPxpoxApHtOAzw06XhcXOVI5EzLVUUEMihZXuPUf6pNNYz+OhCQhwl7r+SqgP
 YImg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20251104; t=1784923102; x=1785527902;
 h=in-reply-to:content-disposition:content-type:mime-version
 :references:message-id:subject:cc:to:from:date:sender:x-gm-gg
 :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to
 :content-type;
 bh=/2kwVMXRwm4/DE9qXO4lXfuOVG7RSggcX2RrAignARM=;
 b=rc+PIQwTCjiNddRTLKhoZQjCKlhtgtUHlslhIcMyWp0ryFw9aveitH7yx0Y/W2sbFI
 EusjQCWLoLUqOJQq3GFM4ZTJhNQO6nxvaxgevELHbSiWUA9bL5MEWRbSuuUCIQ9be/eq
 Fi59qR3waf2qburCxJsnJbs/HdLxESVVjPeP3Rei+EerYOfzIENpdT7EHm4DPRvMEIx/
 t4MWElb8idNfmQoEbNecWb/aVbT50XJYYL/I44rCp0VAjuqWlQ+Tf40FhPMg2FfygB9I
 Wftbf6gShBsM9NKKZKEgOZlkpWuwbQGBL4WMjNaMTZIbvaCvKhP5QKpMAXtyQVqH2Zt/
 7KFg==
X-Forwarded-Encrypted: i=1;
 AHgh+RqfSHi5AjvfLeCYS/hIOBtpodlwC4kkmK0H9yNoOg2cqlZqtKG2PwTCiLFA/uEwCWY7YjWT3w==@debbugs.gnu.org
X-Gm-Message-State: AOJu0Yxg88et1F7brWdCg1VkxxhFO+A3Dii1YZ0IBVb1TPWRimEJUr8Q
 GMvGgnOvO/zSdPIyfwodE7AFBwF+oVMg9E37Pv+GX3Z1KlQOB/Msij26RQpGtLKJjJ8=
X-Gm-Gg: AR+sD12RygqGfRjb/fFVWzUuIeVowsVmkDvsRmhIizvOfn/bdcjoRTF1RneRZOvXArn
 w2qFf1ptdSFhKmgmsCB04mkubBogoICQU/ZE1H4WxddZRF+0plZAUcAerU5i3BzONmtzkbgOF1Y
 vmfGnMfVIEeU80fjrLXNZDdWSnMBvi6qY9LsfSxW0y7ja/qRumeeyZOXylgdgYjBzyh9/eEA+oE
 2AMOZeumOwzEf6rQET8rE1ReEKYAboZzbYnI9lPvMPlpDE/8FQg0d/V9309nMoVb4sftv2awxL+
 0ilQxDu1u/gCaC5pT3senvQXgqQR1TQtChjw/SrJp6qm6K834nweO9LxeYT3Jk6+efYovyz4ygA
 ds5xyv3Glk8Sg8lEDYK3enOxrhqvVjUPd4Vm810rcZ5I4rp+EQn1OE74E3oA+HeOGi465E0JMd4
 kxe0RlD2Sx/XRPv/f4DidQhawD3S/LMmHlnxuWwy1IsYWN8w==
X-Received: by 2002:a05:600c:3111:b0:495:779a:ed33 with SMTP id
 5b1f17b1804b1-495779aeefcmr80496875e9.7.1784923101401; 
 Fri, 24 Jul 2026 12:58:21 -0700 (PDT)
Received: from eldamar.lan (host-95-239-240-57.retail.telecomitalia.it.
 [95.239.240.57]) by smtp.gmail.com with ESMTPSA id
 5b1f17b1804b1-4957bfc2ff2sm63347185e9.4.2026.07.24.12.58.20
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Fri, 24 Jul 2026 12:58:20 -0700 (PDT)
Received: by eldamar.lan (Postfix, from userid 1000)
 id 04A34BE2EE7; Fri, 24 Jul 2026 21:58:19 +0200 (CEST)
Date: Fri, 24 Jul 2026 21:58:18 +0200
From: Salvatore Bonaccorso <carnil@debian.org>
Message-ID: <amPD2j1I-Qta65Mq@eldamar.lan>
References: <amNHKFl3SYeahQv5@nuc>
 <m1bjbweakb.fsf@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <m1bjbweakb.fsf@gmail.com>
X-Spam-Score: 0.3 (/)
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-Spam-Score: -0.7 (/)
Subject: [bug-diffutils] bug#81468: bug#81468: [carnil@debian.org:
 Bug#1142675: diffutils: CVE-2026-53910]
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Jul 2026 19:59:03 -0000

Hi Santiago, hi Collin,

On Fri, Jul 24, 2026 at 07:17:40AM -0700, Collin Funk wrote:
> Santiago Vila <sanvila@debian.org> writes:
> 
> > Hello.
> >
> > I received this from the Debian BTS. (Thank you, Salvatore)
> >
> > The report says this is fixed in [9ff04d5], but it also mentions
> > [73ed7ce], and when I do "git log" in my clone I also find additional
> > security-related commits in addition to those two.
> >
> > So: How many commits should I really apply from the git repo to fix
> > CVE-2026-53910 ?
> 
> Do note that the CVE text is highly exaggerated, as many are:
> 
>     An attacker who can control the output of the diff program used by
>     diff3 (e.g. via --diff-program pointing to a malicious script) can
>     trigger out-of-bounds writes, resulting in a crash and potentially
>     remote code execution depending on the environment.
> 
> If an "attacker" has access to write a malicious script on your local
> environment and give them the ability to execute it, surely you have
> larger problems than out-of-bounds writes in 'diff'...

Sorry indeed, I will mark the CVE as 'unimportant' with a negligible
security impact in the security-tracker, Santiago feel free to
downgrade the severity and then just mark it as fixed once you have a
version which includes the fixes. No strict need to do an update in
stable (or if you do then via a point release).

Regards,
Salvatore




