diffutils 3.12

OBS-URL: https://build.opensuse.org/package/show/Base:System/diffutils?expand=0&rev=81

diff-fix-allocation-typo-leading-to-crashes.patch

@@ -1,27 +0,0 @@
-From: Paul Eggert <eggert@cs.ucla.edu>
-Subject: diff: fix allocation typo leading to crashes
-Date: Fri Feb 28 22:53:28 2025 -0800
-Git-repo: https://git.savannah.gnu.org/git/diffutils.git
-Git-commit: e9f8e6a439fd607adbdd846ab93267dc367b5c79
-References: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=77265
-Signed-off-by: Tony Jones <tonyj@suse.de>
-
-    diff: fix allocation typo leading to crashes
-    
-    But reported by Nick Smallbone, with one-line fix by
-    Collin Funk <https://bugs.gnu.org/76613>.
-    * src/io.c (find_and_hash_each_line): Fix size computation.
-
-diff --git a/src/io.c b/src/io.c
-index a62c529..eba4aba 100644
---- a/src/io.c
-+++ b/src/io.c
-@@ -1012,7 +1012,7 @@ find_and_hash_each_line (struct file_data *current)
- 	  linbuf += linbuf_base;
- 	  linbuf = xpalloc (linbuf, &n, 1, -1, sizeof *linbuf);
- 	  linbuf -= linbuf_base;
--	  alloc_lines = n - linbuf_base;
-+	  alloc_lines = linbuf_base + n;
-         }
-       linbuf[line] = p;
- 

diffutils-3.11.tar.xz.sig

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEFV0/xQDINEhtHupnf9n8ywAL7u4FAmegTMoACgkQf9n8ywAL
-7u4/Hw/+Krffku9ToMb9l4rGs1s8cNFLs8xReYwCUe7MR1Wz7wi4UOhfWQWeuBEQ
-SWQQBbvQg05H9AFSL/Bs8EgPNr0UqF413XdGMvf4s+lJ5OffOZkmOkdWGTUAa1iG
-eTXpL19/dYGdAqhWcmLVyo8QZrr17KvcVwrFMi1b4obi3zqDFe/9sbpyYerDLuMa
-jaN9Piu1lXrVdjQSfsgLunatD+SfNikaKXpD9IPh1009ghHBbeEa1MDoMF0wwXQs
-DkclLmdo7/5fCy0f9owBDc8RgbzILCABE0Vq+gEm0mQgPj6eJRigQUowpmAVLTrg
-mhJybOCEF/pkzvSgjFX2zMGuXNmPfUs5BLjvtNtCdTa+xo/6Hh1n/B02hP+Oe6mU
-z1JO8WOrgtLddEMykR1T7/h/R/D2O22IWcazJ34RegI4A7RlxEoCIFYcVtExqDnN
-UcOkNDPeBBMAi+exsgA7ellLsOOpsM/gfWGaQpz4Qa3VUk1HzgdTbSji6E/l6zrp
-FWJfF1NmSDCe0P5ESVzCAIH7pUhUz2B+ood8XvA/7Cw/whyhP8l549D5BsKAHUJC
-QkZDhtWKhZmrIP1nBt6ljopGyaldBu/47CMDPeoQHsJq9SGUDD7BdnFD5HKxFWdC
-gZpaBXFDUdqc6lEwoC0RqXPVSs6cYH7ugK20kHp6snIfppOPecs=
-=m3W8
------END PGP SIGNATURE-----

diffutils-3.12.tar.xz.sig

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEFV0/xQDINEhtHupnf9n8ywAL7u4FAmf14TEACgkQf9n8ywAL
+7u5tEg//YI75CvWhml5WPNESJWoNVcb+ak8K5g29sHXE5RW9ZuzvEjHAy2IGpkmG
+QbSC2GA3s1BhjIvrm567Xvnz5Rdn4lultZygznL/+oD4PMoantux4dF6P4KcO7jG
+KNPWBF0+/gue9KeJIx4tIGXjQ7g/aAxN/U7UukD5NELrF/4KAsFSWC0PA++taGyd
+R+kZNl3IX3rci0m4vMXCZX+h1td39NinLuYueOqniZhN84+kjfKfLe+EOPmpdSNr
+md25Ez5vcZ7p1meHHFIRhW1xnyF4FEC5H1ePv56wMlKShtflS2/hjmQadlo+9CQn
+fnotq12Yi2BEDwn/wlB9t0J4wgGVbvJM5Ie8ggK74ys77JsXbAtaTeJvCYKI/3bF
+D2Xt2gI2+Xdfm7zr9xXg4ygf/AqJ0Dc1Cx0hNpgV4BRgMUjKnyp1VgE7bDZn6R4w
+W2YRXMsKJQp8NpAk5+XI5El3EYoMcPuI6OQs+b+e98wcGgeeOafWjWrUliIUDln6
+iTXtOBFebV0JtdSWdzNPrxT0+WbmdYSfP7qrqIgMrPHbp5cN7XjVPu6nky07N2RE
+f4Q2Ny8KyCul8AskCNimYzGU0rsN1qQtDRSx2CR5ABYztwc/WY2KgXL9aGZ+eIfa
+YRIpzush1GB5Bu50huAT2VCCqrk6VCg7v1vLfr3V/eszEUVhPZg=
+=vkFD
+-----END PGP SIGNATURE-----

diffutils.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Apr 11 04:45:45 UTC 2025 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- diffutils 3.12:
+  * diff -r no longer merely summarizes when comparing an empty
+    regular file to a nonempty regular file.
+  * diff -y no longer crashes when given nontrivial differences
+- drop diff-fix-allocation-typo-leading-to-crashes.patch
+
 -------------------------------------------------------------------
 Sat Apr  5 03:20:31 UTC 2025 - Tony Jones <tonyj@suse.com>
 

diffutils.spec

@@ -18,7 +18,7 @@
 
 
 Name:           diffutils
-Version:        3.11
+Version:        3.12
 Release:        0
 Summary:        GNU diff Utilities
 License:        GFDL-1.2-only AND GPL-3.0-or-later
@@ -27,7 +27,6 @@ URL:            https://www.gnu.org/software/diffutils/
 Source0:        https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
 Source1:        https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig
 Source2:        https://savannah.gnu.org/project/release-gpgkeys.php?group=diffutils&download=1#/%{name}.keyring
-Patch1:         diff-fix-allocation-typo-leading-to-crashes.patch
 Provides:       diff = %{version}
 Obsoletes:      diff < %{version}