From 7bea32fd382fe993229cd2db29c3a13cb8138b09 Mon Sep 17 00:00:00 2001
From: Andreas Wacknitz <A.Wacknitz@gmx.de>
Date: Tue, 09 Apr 2024 22:50:43 +0200
Subject: [PATCH] libarchive: update to 3.7.3
---
/dev/null | 12 ------------
components/library/libarchive/test/results-all.master | 0
components/library/libarchive/manifests/sample-manifest.p5m | 2 +-
components/library/libarchive/Makefile | 13 ++-----------
components/library/libarchive/pkg5 | 2 +-
5 files changed, 4 insertions(+), 25 deletions(-)
diff --git a/components/library/libarchive/Makefile b/components/library/libarchive/Makefile
index 93d810e..66acd82 100644
--- a/components/library/libarchive/Makefile
+++ b/components/library/libarchive/Makefile
@@ -27,11 +27,10 @@
BUILD_BITS= 64_and_32
OPENSSL_VERSION= 3.1
USE_DEFAULT_TEST_TRANSFORMS= yes
-USE_COMMON_TEST_MASTER= no
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= libarchive
-COMPONENT_VERSION= 3.7.2
+COMPONENT_VERSION= 3.7.3
COMPONENT_SUMMARY= multi-format archive and compression library
COMPONENT_DESCRIPTION= The libarchive(3LIB) library provides a flexible\
interface for reading and writing archives in various formats such as\
@@ -43,7 +42,7 @@
COMPONENT_SRC= libarchive-$(COMPONENT_VERSION)
COMPONENT_PROJECT_URL= https://www.libarchive.org/
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_HASH= sha256:df404eb7222cf30b4f8f93828677890a2986b66ff8bf39dac32a804e96ddf104
+COMPONENT_ARCHIVE_HASH= sha256:f27a97bc22ceb996e72502df47dc19f99f9a0f09181ae909f09f3c9eb17b67e2
COMPONENT_ARCHIVE_URL= https://www.libarchive.org/downloads/$(COMPONENT_ARCHIVE)
COMPONENT_FMRI= library/libarchive
COMPONENT_CLASSIFICATION= System/Libraries
@@ -91,14 +90,6 @@
PKG_PROTO_DIRS += $(COMPONENT_SRC)/doc/man
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
-
-# Needed for "gmake test" to work successfully.
-# If SHELLOPTS is exported (as it is by the userland makefiles),
-# then all shell options get exported to child invocations of bash,
-# which results in test failures due to nounset and xtrace being
-# set unexpectedly, and errors such as "$1: unbound variable" and
-# diffs failing due to script tracing in output files.
-unexport SHELLOPTS
# Tests may fail for other locales.
COMPONENT_TEST_ENV += LC_ALL=C.UTF-8
diff --git a/components/library/libarchive/manifests/sample-manifest.p5m b/components/library/libarchive/manifests/sample-manifest.p5m
index 886c2cf..5ae70e1 100644
--- a/components/library/libarchive/manifests/sample-manifest.p5m
+++ b/components/library/libarchive/manifests/sample-manifest.p5m
@@ -10,7 +10,7 @@
#
#
-# Copyright 2023 <contributor>
+# Copyright 2024 <contributor>
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
diff --git a/components/library/libarchive/pkg5 b/components/library/libarchive/pkg5
index dd59daf..3983ef0 100644
--- a/components/library/libarchive/pkg5
+++ b/components/library/libarchive/pkg5
@@ -15,4 +15,4 @@
"library/libarchive"
],
"name": "libarchive"
-}
\ No newline at end of file
+}
diff --git a/components/library/libarchive/test/results-32.master b/components/library/libarchive/test/results-32.master
deleted file mode 100644
index 00b52e2..0000000
--- a/components/library/libarchive/test/results-32.master
+++ /dev/null
@@ -1,12 +0,0 @@
-FAIL: libarchive_test
-PASS: bsdtar_test
-PASS: bsdcpio_test
-PASS: bsdcat_test
-PASS: bsdunzip_test
-# TOTAL: 5
-# PASS: 4
-# SKIP: 0
-# XFAIL: 0
-# FAIL: 1
-# XPASS: 0
-# ERROR: 0
diff --git a/components/library/libarchive/test/results-64.master b/components/library/libarchive/test/results-all.master
similarity index 100%
rename from components/library/libarchive/test/results-64.master
rename to components/library/libarchive/test/results-all.master
--
Gitblit v1.9.3