SF.net SVN: gar:[26997] csw/mgar/pkg/xz/trunk

[idogan23 at users.sourceforge.net]

Revision: 26997
          http://sourceforge.net/p/gar/code/26997
Author:   idogan23
Date:     2023-01-13 09:38:20 +0000 (Fri, 13 Jan 2023)
Log Message:
-----------
xz: Update to 5.4.1

Modified Paths:
--------------
    csw/mgar/pkg/xz/trunk/Makefile
    csw/mgar/pkg/xz/trunk/checksums

Removed Paths:
-------------
    csw/mgar/pkg/xz/trunk/files/0001-solaris_test_fix.patch

Modified: csw/mgar/pkg/xz/trunk/Makefile
===================================================================
--- csw/mgar/pkg/xz/trunk/Makefile	2023-01-12 20:19:21 UTC (rev 26996)
+++ csw/mgar/pkg/xz/trunk/Makefile	2023-01-13 09:38:20 UTC (rev 26997)
@@ -1,5 +1,5 @@
 NAME = xz
-VERSION = 5.4.0
+VERSION = 5.4.1
 GARTYPE = v2
 
 DESCRIPTION = XZ Utils is free data compression software with high compression ratio
@@ -13,8 +13,6 @@
 MASTER_SITES = http://tukaani.org/xz/
 DISTFILES  = $(DISTNAME).tar.xz
 
-PATCHFILES += 0001-solaris_test_fix.patch
-
 PACKAGES += CSWxz
 SPKG_DESC_CSWxz = $(DESCRIPTION)
 RUNTIME_DEP_PKGS_CSWxz += CSWlibintl9

Modified: csw/mgar/pkg/xz/trunk/checksums
===================================================================
--- csw/mgar/pkg/xz/trunk/checksums	2023-01-12 20:19:21 UTC (rev 26996)
+++ csw/mgar/pkg/xz/trunk/checksums	2023-01-13 09:38:20 UTC (rev 26997)
@@ -1 +1 @@
-3518b2c6e00400f4df5dd8d2a70fc2a9  xz-5.4.0.tar.xz
+47d831c659e94071d5dd384d0d1ed4c6  xz-5.4.1.tar.xz

Deleted: csw/mgar/pkg/xz/trunk/files/0001-solaris_test_fix.patch
===================================================================
--- csw/mgar/pkg/xz/trunk/files/0001-solaris_test_fix.patch	2023-01-12 20:19:21 UTC (rev 26996)
+++ csw/mgar/pkg/xz/trunk/files/0001-solaris_test_fix.patch	2023-01-13 09:38:20 UTC (rev 26997)
@@ -1,92 +0,0 @@
-From 3200759bb238bb22bb39f6791adb467e177d38fb Mon Sep 17 00:00:00 2001
-From: Ihsan Dogan <ihsan at opencsw.org>
-Date: Wed, 4 Jan 2023 20:06:24 +0100
-Subject: [PATCH] solaris_test_fix
-
----
- tests/create_compress_files.c          |  2 +-
- tests/test_compress.sh                 | 20 +++++++++++++-------
- tests/test_compress_prepared_bcj_sparc |  2 +-
- tests/test_compress_prepared_bcj_x86   |  2 +-
- 4 files changed, 16 insertions(+), 10 deletions(-)
-
-diff --git a/tests/create_compress_files.c b/tests/create_compress_files.c
-index 797a73e..76aa3e3 100644
---- a/tests/create_compress_files.c
-+++ b/tests/create_compress_files.c
-@@ -24,7 +24,7 @@
- // Avoid re-creating the test files every time the tests are run.
- #define maybe_create_test(argc, argv, name) \
- do { \
--	if ((argc < 2 || strcmp(argv[1], #name) == 0) \
-+	if ((argc < 2 || strcmp(argv[1], "compress_generated_" #name) == 0) \
- 			&& !file_exists("compress_generated_" #name)) { \
- 		FILE *file = file_create("compress_generated_" #name); \
- 		write_ ## name(file); \
-diff --git a/tests/test_compress.sh b/tests/test_compress.sh
-index 0692a8b..ecf8bf1 100755
---- a/tests/test_compress.sh
-+++ b/tests/test_compress.sh
-@@ -85,9 +85,16 @@ test -x ../src/xzdec/xzdec || XZDEC=
- 
- # Create the required input file if needed.
- FILE=$1
-+# Derive temporary filenames for compressed and uncompressed outputs
-+# from the input filename. This is needed when multiple tests are
-+# run in parallel.
-+TMP_COMP="tmp_comp_$FILE"
-+TMP_UNCOMP="tmp_uncomp_$FILE"
- case $FILE in
-+#      compress_generated files will be created in the build directory
-+#      in the /tests/ sub-directory.
- 	compress_generated_*)
--		if ./create_compress_files "${FILE#compress_generated_}" ; then
-+		if ./create_compress_files "$FILE" ; then
- 			:
- 		else
- 			rm -f "$FILE"
-@@ -95,18 +102,17 @@ case $FILE in
- 			exit 1
- 		fi
- 		;;
-+#      compress_prepared files exist in the source directory since they
-+#       do not need to be copied or regenerated.
-+       compress_prepared_*)
-+               FILE="$srcdir/$FILE"
-+               ;;
- 	'')
- 		echo "No test file was specified."
- 		exit 1
- 		;;
- esac
- 
--# Derive temporary filenames for compressed and uncompressed outputs
--# from the input filename. This is needed when multiple tests are
--# run in parallel.
--TMP_COMP="tmp_comp_${FILE##*/}"
--TMP_UNCOMP="tmp_uncomp_${FILE##*/}"
--
- # Remove temporary now (in case they are something weird), and on exit.
- rm -f "$TMP_COMP" "$TMP_UNCOMP"
- trap 'rm -f "$TMP_COMP" "$TMP_UNCOMP"' 0
-diff --git a/tests/test_compress_prepared_bcj_sparc b/tests/test_compress_prepared_bcj_sparc
-index 01447e1..deb76ef 100755
---- a/tests/test_compress_prepared_bcj_sparc
-+++ b/tests/test_compress_prepared_bcj_sparc
-@@ -1,3 +1,3 @@
- #!/bin/sh
- 
--exec "$srcdir/test_compress.sh" "$srcdir/compress_prepared_bcj_sparc"
-+exec "$srcdir/test_compress.sh" compress_prepared_bcj_sparc
-diff --git a/tests/test_compress_prepared_bcj_x86 b/tests/test_compress_prepared_bcj_x86
-index a277149..3452d7f 100755
---- a/tests/test_compress_prepared_bcj_x86
-+++ b/tests/test_compress_prepared_bcj_x86
-@@ -1,3 +1,3 @@
- #!/bin/sh
- 
--exec "$srcdir/test_compress.sh" "$srcdir/compress_prepared_bcj_x86"
-+exec "$srcdir/test_compress.sh" compress_prepared_bcj_x86
--- 
-2.4.0
-

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.