git: bdb933b4223e - main - archivers/libarchive: Update to 3.7.1

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Daniel Engberg <diizzy_at_FreeBSD.org>
Date: Fri, 18 Aug 2023 17:35:05 UTC
The branch main has been updated by diizzy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=bdb933b4223ee1ec70a278e2a51b89fb3d3e918d

commit bdb933b4223ee1ec70a278e2a51b89fb3d3e918d
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2023-08-18 17:01:06 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2023-08-18 17:34:14 +0000

    archivers/libarchive: Update to 3.7.1
    
    * Move plist from Makefile to pkg-list
    
    Changelog: https://github.com/libarchive/libarchive/releases/tag/v3.7.1
    
    PR:             272577
    Reviewed by:    glewis (maintainer)
    Sponsored by:   Blinkinblox
---
 archivers/libarchive/Makefile                      | 80 ++++------------------
 archivers/libarchive/distinfo                      |  8 +--
 .../patch-libarchive-archive_openssl_evp_private.h | 12 ----
 archivers/libarchive/pkg-plist                     | 55 +++++++++++++++
 4 files changed, 70 insertions(+), 85 deletions(-)

diff --git a/archivers/libarchive/Makefile b/archivers/libarchive/Makefile
index 9ff04ead7cd4..ec64e856df42 100644
--- a/archivers/libarchive/Makefile
+++ b/archivers/libarchive/Makefile
@@ -1,13 +1,10 @@
 PORTNAME=	libarchive
-DISTVERSION=	3.6.2
+DISTVERSION=	3.7.1
 PORTEPOCH=	1
 CATEGORIES=	archivers
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/ \
 		https://libarchive.org/downloads/
 
-PATCH_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/commit/
-PATCHFILES=	1f35c466aaa9444335a1b854b0b7223b0d2346c2.patch:-p1
-
 MAINTAINER=	glewis@FreeBSD.org
 COMMENT=	Library to create and read several streaming archive formats
 WWW=		https://libarchive.org/
@@ -17,78 +14,25 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libexpat.so:textproc/expat2
 
-OPTIONS_DEFINE=	LZ4 LZO ZSTD
-OPTIONS_DEFAULT=LZ4 ZSTD OPENSSL
-
-OPTIONS_RADIO=	CRYPTO
-OPTIONS_RADIO_CRYPTO=	OPENSSL MBEDTLS NETTLE
-
-CRYPTO_DESC=	Crypto and hashing support
-NETTLE_DESC=	Crypto support via Nettle
-
 USES=		autoreconf cpe iconv libtool localbase:ldflags pathfix \
 		pkgconfig tar:xz
-GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
+GNU_CONFIGURE=	yes
+
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
 CONFIGURE_ARGS=	--disable-static --without-xml2
 
-PLIST_FILES=	bin/bsdcat \
-		bin/bsdcpio \
-		bin/bsdtar \
-		include/archive.h \
-		include/archive_entry.h \
-		lib/libarchive.so \
-		lib/libarchive.so.13 \
-		lib/libarchive.so.1${DISTVERSION} \
-		libdata/pkgconfig/libarchive.pc \
-		man/man1/bsdcat.1.gz \
-		man/man1/bsdcpio.1.gz \
-		man/man1/bsdtar.1.gz \
-		man/man3/archive_entry.3.gz \
-		man/man3/archive_entry_acl.3.gz \
-		man/man3/archive_entry_linkify.3.gz \
-		man/man3/archive_entry_misc.3.gz \
-		man/man3/archive_entry_paths.3.gz \
-		man/man3/archive_entry_perms.3.gz \
-		man/man3/archive_entry_stat.3.gz \
-		man/man3/archive_entry_time.3.gz \
-		man/man3/archive_read.3.gz \
-		man/man3/archive_read_add_passphrase.3.gz \
-		man/man3/archive_read_data.3.gz \
-		man/man3/archive_read_disk.3.gz \
-		man/man3/archive_read_extract.3.gz \
-		man/man3/archive_read_filter.3.gz \
-		man/man3/archive_read_format.3.gz \
-		man/man3/archive_read_free.3.gz \
-		man/man3/archive_read_header.3.gz \
-		man/man3/archive_read_new.3.gz \
-		man/man3/archive_read_open.3.gz \
-		man/man3/archive_read_set_options.3.gz \
-		man/man3/archive_util.3.gz \
-		man/man3/archive_write.3.gz \
-		man/man3/archive_write_blocksize.3.gz \
-		man/man3/archive_write_data.3.gz \
-		man/man3/archive_write_disk.3.gz \
-		man/man3/archive_write_filter.3.gz \
-		man/man3/archive_write_finish_entry.3.gz \
-		man/man3/archive_write_format.3.gz \
-		man/man3/archive_write_free.3.gz \
-		man/man3/archive_write_header.3.gz \
-		man/man3/archive_write_new.3.gz \
-		man/man3/archive_write_open.3.gz \
-		man/man3/archive_write_set_options.3.gz \
-		man/man3/archive_write_set_passphrase.3.gz \
-		man/man3/libarchive.3.gz \
-		man/man3/libarchive_changes.3.gz \
-		man/man3/libarchive_internals.3.gz \
-		man/man5/cpio.5.gz \
-		man/man5/libarchive-formats.5.gz \
-		man/man5/mtree.5.gz \
-		man/man5/tar.5.gz
+OPTIONS_DEFINE=	LZ4 LZO ZSTD
+OPTIONS_DEFAULT=LZ4 ZSTD OPENSSL
+
+OPTIONS_RADIO=	CRYPTO
+OPTIONS_RADIO_CRYPTO=	OPENSSL MBEDTLS NETTLE
+
+CRYPTO_DESC=	Crypto and hashing support
+NETTLE_DESC=	Crypto support via Nettle
 
 LZO_LIB_DEPENDS=	liblzo2.so:archivers/lzo2
 LZO_CONFIGURE_WITH=	lzo2
@@ -117,7 +61,7 @@ CONFIGURE_ENV+=	ac_cv_header_localcharset_h=no \
 		ac_cv_lib_charset_locale_charset=no
 .endif
 
-# Prior to 1301508 we didn't ship openssl.pc which libarchive now excepts
+# Prior to 1301508 we didn't ship openssl.pc which libarchive now expects
 # so we need to use the old approach on older versions of FreeBSD
 # which is not to define Requires.private in libarchive.pc
 
diff --git a/archivers/libarchive/distinfo b/archivers/libarchive/distinfo
index 1b971ca6d177..77986d1b4fab 100644
--- a/archivers/libarchive/distinfo
+++ b/archivers/libarchive/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1672469724
-SHA256 (libarchive-3.6.2.tar.xz) = 9e2c1b80d5fbe59b61308fdfab6c79b5021d7ff4ff2489fb12daf0a96a83551d
-SIZE (libarchive-3.6.2.tar.xz) = 5213196
-SHA256 (1f35c466aaa9444335a1b854b0b7223b0d2346c2.patch) = 6db4da971fb4d5b3974bfec4c75a4d920a98b1b3bc9a9ccc381055a02205a272
-SIZE (1f35c466aaa9444335a1b854b0b7223b0d2346c2.patch) = 1329
+TIMESTAMP = 1690759351
+SHA256 (libarchive-3.7.1.tar.xz) = b17403ce670ff18d8e06fea05a9ea9accf70678c88f1b9392a2e29b51127895f
+SIZE (libarchive-3.7.1.tar.xz) = 5254260
diff --git a/archivers/libarchive/files/patch-libarchive-archive_openssl_evp_private.h b/archivers/libarchive/files/patch-libarchive-archive_openssl_evp_private.h
deleted file mode 100644
index 0b00e15fe55c..000000000000
--- a/archivers/libarchive/files/patch-libarchive-archive_openssl_evp_private.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- libarchive/archive_openssl_evp_private.h.orig	2017-01-29 05:06:27 UTC
-+++ libarchive/archive_openssl_evp_private.h
-@@ -28,7 +28,8 @@
- #include <openssl/evp.h>
- #include <openssl/opensslv.h>
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
-+    (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
- #include <stdlib.h> /* malloc, free */
- #include <string.h> /* memset */
- static inline EVP_MD_CTX *EVP_MD_CTX_new(void)
diff --git a/archivers/libarchive/pkg-plist b/archivers/libarchive/pkg-plist
new file mode 100644
index 000000000000..4bbe0d741284
--- /dev/null
+++ b/archivers/libarchive/pkg-plist
@@ -0,0 +1,55 @@
+bin/bsdcat
+bin/bsdcpio
+bin/bsdtar
+bin/bsdunzip
+include/archive.h
+include/archive_entry.h
+lib/libarchive.so
+lib/libarchive.so.13
+lib/libarchive.so.13.7.1
+libdata/pkgconfig/libarchive.pc
+man/man1/bsdcat.1.gz
+man/man1/bsdcpio.1.gz
+man/man1/bsdtar.1.gz
+man/man1/bsdunzip.1.gz
+man/man3/archive_entry.3.gz
+man/man3/archive_entry_acl.3.gz
+man/man3/archive_entry_linkify.3.gz
+man/man3/archive_entry_misc.3.gz
+man/man3/archive_entry_paths.3.gz
+man/man3/archive_entry_perms.3.gz
+man/man3/archive_entry_stat.3.gz
+man/man3/archive_entry_time.3.gz
+man/man3/archive_read.3.gz
+man/man3/archive_read_add_passphrase.3.gz
+man/man3/archive_read_data.3.gz
+man/man3/archive_read_disk.3.gz
+man/man3/archive_read_extract.3.gz
+man/man3/archive_read_filter.3.gz
+man/man3/archive_read_format.3.gz
+man/man3/archive_read_free.3.gz
+man/man3/archive_read_header.3.gz
+man/man3/archive_read_new.3.gz
+man/man3/archive_read_open.3.gz
+man/man3/archive_read_set_options.3.gz
+man/man3/archive_util.3.gz
+man/man3/archive_write.3.gz
+man/man3/archive_write_blocksize.3.gz
+man/man3/archive_write_data.3.gz
+man/man3/archive_write_disk.3.gz
+man/man3/archive_write_filter.3.gz
+man/man3/archive_write_finish_entry.3.gz
+man/man3/archive_write_format.3.gz
+man/man3/archive_write_free.3.gz
+man/man3/archive_write_header.3.gz
+man/man3/archive_write_new.3.gz
+man/man3/archive_write_open.3.gz
+man/man3/archive_write_set_options.3.gz
+man/man3/archive_write_set_passphrase.3.gz
+man/man3/libarchive.3.gz
+man/man3/libarchive_changes.3.gz
+man/man3/libarchive_internals.3.gz
+man/man5/cpio.5.gz
+man/man5/libarchive-formats.5.gz
+man/man5/mtree.5.gz
+man/man5/tar.5.gz