From e0f9e26c21ab21ee319aca3007924122cf6c8f37 Mon Sep 17 00:00:00 2001 From: Hinnerk van Bruinehsen Date: Sat, 10 Feb 2018 02:35:54 +0100 Subject: [PATCH] findutils: update to version 4.6 --- repos/ports/ports/findutils.hash | 2 +- repos/ports/ports/findutils.port | 8 ++---- .../ports/src/noux-pkg/findutils/build.patch | 28 ------------------- 3 files changed, 4 insertions(+), 34 deletions(-) delete mode 100644 repos/ports/src/noux-pkg/findutils/build.patch diff --git a/repos/ports/ports/findutils.hash b/repos/ports/ports/findutils.hash index 1e6d8e90e..7eda0a2df 100644 --- a/repos/ports/ports/findutils.hash +++ b/repos/ports/ports/findutils.hash @@ -1 +1 @@ -7723b1d40a0401c190986127db1e819e3484ddaa +76f9a0d2e1f8a3cdbc6fcb10eb1c90e08b570acd diff --git a/repos/ports/ports/findutils.port b/repos/ports/ports/findutils.port index 4add0a7f0..c194a6198 100644 --- a/repos/ports/ports/findutils.port +++ b/repos/ports/ports/findutils.port @@ -1,13 +1,11 @@ LICENSE := GPLv3 -VERSION := 4.4.2 +VERSION := 4.6.0 DOWNLOADS := findutils.archive -URL(findutils) := http://ftp.gnu.org/pub/gnu/findutils/findutils-$(VERSION).tar.gz -SHA(findutils) := e8dd88fa2cc58abffd0bfc1eddab9020231bb024 +URL(findutils) := https://ftp.gnu.org/pub/gnu/findutils/findutils-$(VERSION).tar.gz +SHA(findutils) := f18e8aaee3f3d4173a1f598001003be8706d28b0 SIG(findutils) := ${URL(findutils)} KEY(findutils) := GNU DIR(findutils) := src/noux-pkg/findutils -PATCHES := src/noux-pkg/findutils/build.patch -PATCH_OPT := -p1 -d src/noux-pkg/findutils diff --git a/repos/ports/src/noux-pkg/findutils/build.patch b/repos/ports/src/noux-pkg/findutils/build.patch deleted file mode 100644 index 5e30df7a0..000000000 --- a/repos/ports/src/noux-pkg/findutils/build.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/gnulib/lib/getdate.y b/gnulib/lib/getdate.y ---- a/gnulib/lib/getdate.y -+++ b/gnulib/lib/getdate.y -@@ -114,7 +114,8 @@ - wraps around, but there's no portable way to check for that at - compile-time. */ - verify (TYPE_IS_INTEGER (time_t)); --verify (LONG_MIN <= TYPE_MINIMUM (time_t) && TYPE_MAXIMUM (time_t) <= LONG_MAX); -+/* the Genode libc defines 'time_t' as '__int64_t' on ARM, which makes this test fail */ -+/* verify (LONG_MIN <= TYPE_MINIMUM (time_t) && TYPE_MAXIMUM (time_t) <= LONG_MAX); */ - - /* An integer value, and the number of digits in its textual - representation. */ -diff --git a/gnulib/lib/mktime.c b/gnulib/lib/mktime.c ---- a/gnulib/lib/mktime.c -+++ b/gnulib/lib/mktime.c -@@ -165,8 +165,9 @@ - int year0, int yday0, int hour0, int min0, int sec0) - { - verify (C99_integer_division, -1 / 2 == 0); -- verify (long_int_year_and_yday_are_wide_enough, -- INT_MAX <= LONG_MAX / 2 || TIME_T_MAX <= UINT_MAX); -+ /* the Genode libc defines 'time_t' as '__int64_t' on ARM, which makes this test fail */ -+ /* verify (long_int_year_and_yday_are_wide_enough, -+ INT_MAX <= LONG_MAX / 2 || TIME_T_MAX <= UINT_MAX); */ - - /* Compute intervening leap days correctly even if year is negative. - Take care to avoid integer overflow here. */