[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
80/136: gnu: diffutils: Update to 3.8.
From: |
guix-commits |
Subject: |
80/136: gnu: diffutils: Update to 3.8. |
Date: |
Sun, 17 Oct 2021 05:16:09 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 90b1529849a0ca3396c7228e46fc6a944d7bf3b3
Author: Thiago Jung Bauermann <bauermann@kolabnow.com>
AuthorDate: Sat Aug 28 01:57:15 2021 -0300
gnu: diffutils: Update to 3.8.
‘coreutils-gnulib-tests.patch’ is applied in the gnulib version shipped
with 3.8.
* gnu/packages/base.scm (diffutils): Update to 3.8.
[source]: Remove patch.
* gnu/packages/patches/diffutils-gets-undeclared.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
---
gnu/local.mk | 1 -
gnu/packages/base.scm | 7 +--
.../patches/diffutils-gets-undeclared.patch | 71 ----------------------
3 files changed, 3 insertions(+), 76 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index b2f1af4..2ad4c2a 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -987,7 +987,6 @@ dist_patch_DATA =
\
%D%/packages/patches/dfu-programmer-fix-libusb.patch \
%D%/packages/patches/diffoscope-fix-test_item3_deflate_llvm_bitcode.patch
\
%D%/packages/patches/diffutils-fix-signal-processing.patch \
- %D%/packages/patches/diffutils-gets-undeclared.patch \
%D%/packages/patches/disarchive-cross-compilation.patch \
%D%/packages/patches/dkimproxy-add-ipv6-support.patch \
%D%/packages/patches/docbook-xsl-nonrecursive-string-subst.patch \
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index a6a4bc0..d926b28 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -266,16 +266,15 @@ differences.")
(define-public diffutils
(package
(name "diffutils")
- (version "3.7")
+ (version "3.8")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/diffutils/diffutils-"
version ".tar.xz"))
(sha256
(base32
- "09isrg0isjinv8c535nxsi1s86wfdfzml80dbw41dj9x3hiad9xk"))
- (patches (search-patches "coreutils-gnulib-tests.patch"
-
"diffutils-fix-signal-processing.patch"))))
+ "1v4g8gi0lgakqa7iix8s4fq7lq6l92vw3rjd9wfd2rhjng8xggd6"))
+ (patches (search-patches
"diffutils-fix-signal-processing.patch"))))
(build-system gnu-build-system)
(native-inputs (list perl))
(synopsis "Comparing and merging files")
diff --git a/gnu/packages/patches/diffutils-gets-undeclared.patch
b/gnu/packages/patches/diffutils-gets-undeclared.patch
deleted file mode 100644
index b6cdc77..0000000
--- a/gnu/packages/patches/diffutils-gets-undeclared.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-This patch is needed to allow builds with newer versions of
-the GNU libc (2.16+).
-
-
-commit 66712c23388e93e5c518ebc8515140fa0c807348
-Author: Eric Blake <eblake@redhat.com>
-Date: Thu Mar 29 13:30:41 2012 -0600
-
- stdio: don't assume gets any more
-
- Gnulib intentionally does not have a gets module, and now that C11
- and glibc have dropped it, we should be more proactive about warning
- any user on a platform that still has a declaration of this dangerous
- interface.
-
- * m4/stdio_h.m4 (gl_STDIO_H, gl_STDIO_H_DEFAULTS): Drop gets
- support.
- * modules/stdio (Makefile.am): Likewise.
- * lib/stdio-read.c (gets): Likewise.
- * tests/test-stdio-c++.cc: Likewise.
- * m4/warn-on-use.m4 (gl_WARN_ON_USE_PREPARE): Fix comment.
- * lib/stdio.in.h (gets): Make warning occur in more places.
- * doc/posix-functions/gets.texi (gets): Update documentation.
- Reported by Christer Solskogen.
-
- Signed-off-by: Eric Blake <eblake@redhat.com>
-
-diff --git a/lib/stdio.in.h b/lib/stdio.in.h
-index aa7b599..c377b6e 100644
---- a/lib/stdio.in.h
-+++ b/lib/stdio.in.h
-@@ -698,22 +698,11 @@ _GL_WARN_ON_USE (getline, "getline is unportable - "
- # endif
- #endif
-
--#if @GNULIB_GETS@
--# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
--# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
--# undef gets
--# define gets rpl_gets
--# endif
--_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1)));
--_GL_CXXALIAS_RPL (gets, char *, (char *s));
--# else
--_GL_CXXALIAS_SYS (gets, char *, (char *s));
--# undef gets
--# endif
--_GL_CXXALIASWARN (gets);
- /* It is very rare that the developer ever has full control of stdin,
-- so any use of gets warrants an unconditional warning. Assume it is
-- always declared, since it is required by C89. */
-+ so any use of gets warrants an unconditional warning; besides, C11
-+ removed it. */
-+#undef gets
-+#if HAVE_RAW_DECL_GETS
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- #endif
-
-@@ -1053,9 +1042,9 @@ _GL_WARN_ON_USE (snprintf, "snprintf is unportable - "
- # endif
- #endif
-
--/* Some people would argue that sprintf should be handled like gets
-- (for example, OpenBSD issues a link warning for both functions),
-- since both can cause security holes due to buffer overruns.
-+/* Some people would argue that all sprintf uses should be warned about
-+ (for example, OpenBSD issues a link warning for it),
-+ since it can cause security holes due to buffer overruns.
- However, we believe that sprintf can be used safely, and is more
- efficient than snprintf in those safe cases; and as proof of our
- belief, we use sprintf in several gnulib modules. So this header
- 104/136: build: glib-or-gtk-build-system: Fix indentation., (continued)
- 104/136: build: glib-or-gtk-build-system: Fix indentation., guix-commits, 2021/10/17
- 112/136: gnu: libcloudproviders-minimal: Introduce minimal variant., guix-commits, 2021/10/17
- 122/136: gnu: heimdal: Fix build., guix-commits, 2021/10/17
- 130/136: gnu: webkitgtk: Update to 2.34.0., guix-commits, 2021/10/17
- 127/136: gnu: vala: Update to 0.54.2., guix-commits, 2021/10/17
- 63/136: gnu: gst-plugins-bad: Update to 1.18.5., guix-commits, 2021/10/17
- 110/136: gnu: Add docbook-xsl-ns., guix-commits, 2021/10/17
- 109/136: gnu: json-glib-minimal: Introduce minimal variant., guix-commits, 2021/10/17
- 121/136: gnu: util-linux: Globally disable the lsns test., guix-commits, 2021/10/17
- 66/136: gnu: gst-editing-services: Update to 1.18.5., guix-commits, 2021/10/17
- 80/136: gnu: diffutils: Update to 3.8.,
guix-commits <=
- 83/136: gnu: gcc-5: Fix powerpc64le-linux build, guix-commits, 2021/10/17
- 97/136: gnu: Add python-flit-core., guix-commits, 2021/10/17
- 113/136: gnu: gusb-minimal: Introduce minimal variant., guix-commits, 2021/10/17
- 107/136: gnu: lsof: Disable the LTlock test., guix-commits, 2021/10/17
- 65/136: gnu: gst-libav: Update to 1.18.5., guix-commits, 2021/10/17
- 76/136: gnu: glibc: Look for the current timezone in /etc/localtime., guix-commits, 2021/10/17
- 72/136: gnu: libnice: Update to 0.1.18-0.47a9633., guix-commits, 2021/10/17
- 78/136: gnu: gtk+-2: Fix ‘builder’ test., guix-commits, 2021/10/17
- 81/136: build: qt-utils: Don't wrap .X-real files., guix-commits, 2021/10/17
- 84/136: gnu: make-ld-wrapper: Add a LINKER argument., guix-commits, 2021/10/17