From d176f0aecbbba8f203270cee1a4718cbe631ad1eef4f73606a5ce453ddea39c1 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Mon, 14 Apr 2025 06:12:10 +0000 Subject: [PATCH] diffutils 3.12 OBS-URL: https://build.opensuse.org/package/show/Base:System/diffutils?expand=0&rev=81 --- ...x-allocation-typo-leading-to-crashes.patch | 27 ------------------- diffutils-3.11.tar.xz | 3 --- diffutils-3.11.tar.xz.sig | 16 ----------- diffutils-3.12.tar.xz | 3 +++ diffutils-3.12.tar.xz.sig | 16 +++++++++++ diffutils.changes | 9 +++++++ diffutils.spec | 3 +-- 7 files changed, 29 insertions(+), 48 deletions(-) delete mode 100644 diff-fix-allocation-typo-leading-to-crashes.patch delete mode 100644 diffutils-3.11.tar.xz delete mode 100644 diffutils-3.11.tar.xz.sig create mode 100644 diffutils-3.12.tar.xz create mode 100644 diffutils-3.12.tar.xz.sig diff --git a/diff-fix-allocation-typo-leading-to-crashes.patch b/diff-fix-allocation-typo-leading-to-crashes.patch deleted file mode 100644 index 50e0243..0000000 --- a/diff-fix-allocation-typo-leading-to-crashes.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Paul Eggert -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 - - diff: fix allocation typo leading to crashes - - But reported by Nick Smallbone, with one-line fix by - Collin Funk . - * 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; - diff --git a/diffutils-3.11.tar.xz b/diffutils-3.11.tar.xz deleted file mode 100644 index e501cf9..0000000 --- a/diffutils-3.11.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a73ef05fe37dd585f7d87068e4a0639760419f810138bd75c61ddaa1f9e2131e -size 1926052 diff --git a/diffutils-3.11.tar.xz.sig b/diffutils-3.11.tar.xz.sig deleted file mode 100644 index 8c84f69..0000000 --- a/diffutils-3.11.tar.xz.sig +++ /dev/null @@ -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----- diff --git a/diffutils-3.12.tar.xz b/diffutils-3.12.tar.xz new file mode 100644 index 0000000..33d2819 --- /dev/null +++ b/diffutils-3.12.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c8b7f9fc8609141fdea9cece85249d308624391ff61dedaf528fcb337727dfd +size 1938800 diff --git a/diffutils-3.12.tar.xz.sig b/diffutils-3.12.tar.xz.sig new file mode 100644 index 0000000..659b300 --- /dev/null +++ b/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----- diff --git a/diffutils.changes b/diffutils.changes index 346ffa4..2611b52 100644 --- a/diffutils.changes +++ b/diffutils.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Apr 11 04:45:45 UTC 2025 - Andreas Stieger + +- 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 diff --git a/diffutils.spec b/diffutils.spec index 640fe04..9702885 100644 --- a/diffutils.spec +++ b/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}