aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2023-12-24 15:08:00 +0100
committerLudovic Courtès <ludo@gnu.org>2024-08-31 10:44:18 +0200
commit563538a4e23ddd3d7c1336d7c5d0c635c3e6a66d (patch)
treeebfb9e16d362beef9c3340abe87d2df70d7f9724 /gnu/packages/patches
parent5f238e3e36e41bdec424aec78a99e8f68eb779c4 (diff)
downloadguix-563538a4e23ddd3d7c1336d7c5d0c635c3e6a66d.tar.gz
guix-563538a4e23ddd3d7c1336d7c5d0c635c3e6a66d.zip
gnu: diffutils: Update to 3.10.
* gnu/packages/base.scm (diffutils): Update to 3.10. * gnu/packages/patches/diffutils-fix-signal-processing.patch: Delete. * gnu/local.mk (dist_patch_DATA): Remove it. Change-Id: I795fa93938f8723090887d33574baa1a392ef42e
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r--gnu/packages/patches/diffutils-fix-signal-processing.patch58
1 files changed, 0 insertions, 58 deletions
diff --git a/gnu/packages/patches/diffutils-fix-signal-processing.patch b/gnu/packages/patches/diffutils-fix-signal-processing.patch
deleted file mode 100644
index 134dd3f718..0000000000
--- a/gnu/packages/patches/diffutils-fix-signal-processing.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Author: Frédéric Bonnard <frediz@debian.org>
-
-Obtained from:
-
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=922552#19
-
-Fixes bug reported upstream at:
-
-https://debbugs.gnu.org/cgi/bugreport.cgi?bug=34519
-
-diff --git a/src/diff.c b/src/diff.c
-index e2eb32437353..b574e8282dc9 100644
---- a/src/diff.c
-+++ b/src/diff.c
-@@ -1451,6 +1451,8 @@ compare_files (struct comparison const *parent,
- }
- }
-
-+ final_process_signals ();
-+
- /* Now the comparison has been done, if no error prevented it,
- and STATUS is the value this function will return. */
-
-diff --git a/src/diff.h b/src/diff.h
-index 03daaa4a0530..e177fe600a25 100644
---- a/src/diff.h
-+++ b/src/diff.h
-@@ -390,6 +390,7 @@ extern enum changes analyze_hunk (struct change *, lin *, lin *, lin *, lin *);
- extern void begin_output (void);
- extern void debug_script (struct change *);
- extern void fatal (char const *) __attribute__((noreturn));
-+extern void final_process_signals (void);
- extern void finish_output (void);
- extern void message (char const *, char const *, char const *);
- extern void message5 (char const *, char const *, char const *,
-diff --git a/src/util.c b/src/util.c
-index 4f4d9bb285eb..56d292de2927 100644
---- a/src/util.c
-+++ b/src/util.c
-@@ -237,6 +237,18 @@ process_signals (void)
- }
- }
-
-+/* Process remaining signals once before exit */
-+void
-+final_process_signals (void)
-+{
-+ static int last = 1;
-+
-+ if (last) {
-+ process_signals ();
-+ last = 0;
-+ }
-+}
-+
- static void
- install_signal_handlers (void)
- {