git: 883ae9061362 - 2024Q3 - sysutils/coreutils: update 9.4 → 9.5, fix CVE-2024-0684
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 26 Aug 2024 01:46:08 UTC
The branch 2024Q3 has been updated by vvd:
URL: https://cgit.FreeBSD.org/ports/commit/?id=883ae90613622153e9649298defa48dcdacaaf70
commit 883ae90613622153e9649298defa48dcdacaaf70
Author: Älven <alster@vinterdalen.se>
AuthorDate: 2024-08-26 01:42:14 +0000
Commit: Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2024-08-26 01:46:01 +0000
sysutils/coreutils: update 9.4 → 9.5, fix CVE-2024-0684
Release annonce:
https://lists.gnu.org/archive/html/coreutils-announce/2024-03/msg00000.html
PR: 281063
Approved by: jharris@widomaker.com (maintainer)
MFH: 2024Q3
(cherry picked from commit 27cc784e0e140938bb27fb5c31ca6087058a80bd)
---
sysutils/coreutils/Makefile | 11 +++++------
sysutils/coreutils/distinfo | 6 +++---
sysutils/coreutils/files/patch-lib_posixtm.c | 24 ------------------------
3 files changed, 8 insertions(+), 33 deletions(-)
diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile
index 86d9611eee5a..02df90412529 100644
--- a/sysutils/coreutils/Makefile
+++ b/sysutils/coreutils/Makefile
@@ -1,6 +1,5 @@
PORTNAME= coreutils
-PORTVERSION= 9.4
-PORTREVISION= 1
+DISTVERSION= 9.5
CATEGORIES= sysutils textproc
MASTER_SITES= GNU
@@ -13,19 +12,19 @@ LICENSE_FILE= ${WRKSRC}/COPYING
USES= cpe iconv perl5 charsetfix tar:xz
CPE_VENDOR= gnu
-USE_PERL5= build # required for tests and man page generation
USE_LDCONFIG= yes
-TEST_TARGET= check
-PIE_UNSAFE= yes
+USE_PERL5= build # required for tests and man page generation
GNU_CONFIGURE= yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
# A rather nasty hack to stop gnustat from conflicting with base gstat
# bugs.freebsd.org/160060
CONFIGURE_ARGS= --program-prefix=g \
--program-transform-name=s/stat/nustat/
CONFIGURE_ENV= FORCE_UNSAFE_CONFIGURE=1
+TEST_TARGET= check
+PIE_UNSAFE= yes
+
CONFLICTS_INSTALL= gdu geneweb gexpr rubygem-god # bin/gdu bin/gexpr bin/god bin/gwc
INFO= coreutils
diff --git a/sysutils/coreutils/distinfo b/sysutils/coreutils/distinfo
index 12dd33e0149a..44185c1c1ca9 100644
--- a/sysutils/coreutils/distinfo
+++ b/sysutils/coreutils/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1707940106
-SHA256 (coreutils-9.4.tar.xz) = ea613a4cf44612326e917201bbbcdfbd301de21ffc3b59b6e5c07e040b275e52
-SIZE (coreutils-9.4.tar.xz) = 5979200
+TIMESTAMP = 1724600904
+SHA256 (coreutils-9.5.tar.xz) = cd328edeac92f6a665de9f323c93b712af1858bc2e0d88f3f7100469470a1b8a
+SIZE (coreutils-9.5.tar.xz) = 6007136
diff --git a/sysutils/coreutils/files/patch-lib_posixtm.c b/sysutils/coreutils/files/patch-lib_posixtm.c
deleted file mode 100644
index 3265544a82bc..000000000000
--- a/sysutils/coreutils/files/patch-lib_posixtm.c
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 67c298c36f69b6906840b7584be06b7b5f33f829
-Author: Paul Eggert <eggert@cs.ucla.edu>
-Date: 2024-01-16T17:21:08-08:00
-
- posixtm: pacify clang 18
-
- Problem reported by Khem Raj in:
- https://lists.gnu.org/r/bug-gnulib/2024-01/msg00045.html
- * lib/posixtm.c (posixtime): Pacify clang 18 by converting bool to int.
- Arguably this is a bug in draft C2x, since the non-pointer args to
- ckd_add should promote just like any other expressions do;
- but thats not clangs fault.
-
---- lib/posixtm.c.orig 2023-01-01 13:39:11 UTC
-+++ lib/posixtm.c
-@@ -191,7 +191,7 @@ posixtime (time_t *p, const char *s, unsigned int synt
- | (tm0.tm_min ^ tm1.tm_min)
- | (tm0.tm_sec ^ tm1.tm_sec)))
- {
-- if (ckd_add (&t, t, leapsec))
-+ if (ckd_add (&t, t, +leapsec))
- return false;
- *p = t;
- return true;