From d8756cfead40be9c7a38a7165107d86080aa542c Mon Sep 17 00:00:00 2001
From: Andreas Wacknitz <A.Wacknitz@gmx.de>
Date: Sun, 21 May 2023 17:40:51 +0200
Subject: [PATCH] diffutils: update to 3.10
---
components/text/diffutils/pkg5 | 3 ---
components/text/diffutils/test/results-all.master | 11 +++++++----
components/text/diffutils/Makefile | 14 +++++++++-----
3 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/components/text/diffutils/Makefile b/components/text/diffutils/Makefile
index 3e26470..152f47c 100644
--- a/components/text/diffutils/Makefile
+++ b/components/text/diffutils/Makefile
@@ -29,18 +29,20 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= diffutils
-COMPONENT_VERSION= 3.9
-COMPONENT_SUMMARY= GNU diffutils
+COMPONENT_VERSION= 3.10
+COMPONENT_SUMMARY= GNU Diffutils is a package of several programs related to finding differences between files
COMPONENT_PROJECT_URL= https://www.gnu.org/software/diffutils/
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.xz
-COMPONENT_ARCHIVE_HASH= sha256:d80d3be90a201868de83d78dad3413ad88160cc53bcc36eb9eaf7c20dbf023f1
+COMPONENT_ARCHIVE_HASH= sha256:90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e
COMPONENT_ARCHIVE_URL= https://ftp.gnu.org/gnu/diffutils/$(COMPONENT_ARCHIVE)
COMPONENT_FMRI= text/gnu-diffutils
COMPONENT_CLASSIFICATION= Applications/System Utilities
COMPONENT_LICENSE= GPLv3, FDLv1.3
include $(WS_MAKE_RULES)/common.mk
+
+PATH = $(PATH.gnu)
CFLAGS += $(CPP_LARGEFILES)
CPPFLAGS += $(CPP_LARGEFILES)
@@ -61,7 +63,9 @@
'-e "/^XXX_CC_XXX$$/d" '
COMPONENT_SYSTEM_TEST_DIR = $(@D)/tests
-COMPONENT_SYSTEM_TEST_ENV += PATH="$(GNUBIN):$(PATH)"
+# Note on tests: Some tests require the new version already to be installed because we have paths (eg. for diff3) hardcoded.
+# Even setting the PATH for the tests might not work as intended:
+COMPONENT_SYSTEM_TEST_ENV += PATH="$(PROTO_DIR)/usr/gnu/bin:$(PATH)"
ASLR_MODE = $(ASLR_ENABLE)
@@ -69,7 +73,7 @@
REQUIRED_PACKAGES += text/gnu-gettext
# Test dependency
-REQUIRED_PACKAGES += developer/debug/valgrind
+TEST_REQUIRED_PACKAGES += developer/debug/valgrind
# Auto-generated dependencies
REQUIRED_PACKAGES += system/library
diff --git a/components/text/diffutils/pkg5 b/components/text/diffutils/pkg5
index 6372580..50b2e63 100644
--- a/components/text/diffutils/pkg5
+++ b/components/text/diffutils/pkg5
@@ -1,8 +1,5 @@
{
"dependencies": [
- "SUNWcs",
- "developer/debug/valgrind",
- "shell/ksh93",
"system/library",
"text/gnu-gettext"
],
diff --git a/components/text/diffutils/test/results-all.master b/components/text/diffutils/test/results-all.master
index 1da8df3..61186a0 100644
--- a/components/text/diffutils/test/results-all.master
+++ b/components/text/diffutils/test/results-all.master
@@ -8,6 +8,7 @@
PASS: diff3
PASS: excess-slash
PASS: help-version
+PASS: ifdef
PASS: invalid-re
PASS: function-line-vs-leading-space
PASS: ignore-matching-lines
@@ -22,12 +23,14 @@
PASS: strip-trailing-cr
PASS: timezone
PASS: colors
+y2038-vs-32bit: skipped test: touch -t 2039... failed
+SKIP: y2038-vs-32bit
============================================================================
-Testsuite summary for GNU diffutils 3.9
+Testsuite summary for GNU diffutils 3.10
============================================================================
-# TOTAL: 23
-# PASS: 21
-# SKIP: 1
+# TOTAL: 25
+# PASS: 22
+# SKIP: 2
# XFAIL: 1
# FAIL: 0
# XPASS: 0
--
Gitblit v1.9.3