archivers/libarchive: Backport upstream commit 6110e9c

Reference: libarchive/libarchive@6110e9c PR: 278051 Reviewed by: glewis (maintainer)
freebsd · Mar 30, 2024 · a2151ed · a2151ed
1 parent 4f76884
commit a2151ed
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/archivers/libarchive/Makefile b/archivers/libarchive/Makefile
@@ -1,13 +1,14 @@
 PORTNAME=	libarchive
 DISTVERSION=	3.7.2
-PORTREVISION=	1
+PORTREVISION=	2
 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=	3bd918d92f8c34ba12de9c6604d96f9e262a59fc.patch:-p1
+PATCHFILES=	3bd918d92f8c34ba12de9c6604d96f9e262a59fc.patch:-p1 \
+		6110e9c82d8ba830c3440f36b990483ceaaea52c.patch:-p1
 
 MAINTAINER=	glewis@FreeBSD.org
 COMMENT=	Library to create and read several streaming archive formats

diff --git a/archivers/libarchive/distinfo b/archivers/libarchive/distinfo
@@ -1,5 +1,7 @@
-TIMESTAMP = 1697883701
+TIMESTAMP = 1711804132
 SHA256 (libarchive-3.7.2.tar.xz) = 04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb
 SIZE (libarchive-3.7.2.tar.xz) = 5237056
 SHA256 (3bd918d92f8c34ba12de9c6604d96f9e262a59fc.patch) = 25257cc6897984f52939123d08e1d3e1df29d1050bf60013757315e86c389a51
 SIZE (3bd918d92f8c34ba12de9c6604d96f9e262a59fc.patch) = 1211
+SHA256 (6110e9c82d8ba830c3440f36b990483ceaaea52c.patch) = b677eae8f6fd1a9c3c2184dfd26a0d2862e0182dd295a376af10d18431299a41
+SIZE (6110e9c82d8ba830c3440f36b990483ceaaea52c.patch) = 945