[arch-commits] Commit in libarchive/trunk (2 files)

[Christian Hesse]

    Date: Monday, December 20, 2021 @ 21:00:07
  Author: eworm
Revision: 432833

upgpkg: libarchive 3.5.2-2: fix extracting link

Added:
  libarchive/trunk/0001-unescape-when-extracting-link.patch
Modified:
  libarchive/trunk/PKGBUILD

------------------------------------------+
 0001-unescape-when-extracting-link.patch |   10 ++++++++++
 PKGBUILD                                 |   14 +++++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)

Added: 0001-unescape-when-extracting-link.patch
===================================================================
--- 0001-unescape-when-extracting-link.patch	                        (rev 0)
+++ 0001-unescape-when-extracting-link.patch	2021-12-20 21:00:07 UTC (rev 432833)
@@ -0,0 +1,10 @@
+--- a/libarchive/archive_read_support_format_mtree.c
++++ b/libarchive/archive_read_support_format_mtree.c
+@@ -1675,6 +1675,7 @@ parse_keyword(struct archive_read *a, struct mtree *mtree,
+ 		break;
+ 	case 'l':
+ 		if (strcmp(key, "link") == 0) {
++			parse_escapes(val, NULL);
+ 			archive_entry_copy_symlink(entry, val);
+ 			return (ARCHIVE_OK);
+ 		}

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-20 20:12:44 UTC (rev 432832)
+++ PKGBUILD	2021-12-20 21:00:07 UTC (rev 432833)
@@ -3,7 +3,7 @@
 
 pkgname=libarchive
 pkgver=3.5.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Multi-format archive and compression library'
 arch=('x86_64')
 url='https://libarchive.org/'
@@ -11,10 +11,18 @@
 depends=('acl' 'libacl.so' 'bzip2' 'expat' 'lz4' 'openssl' 'xz' 'zlib' 'zstd')
 provides=('libarchive.so')
 validpgpkeys=('A5A45B12AD92D964B89EEE2DEC560C81CEC2276E') # Martin Matuska <mm at FreeBSD.org>
-source=("https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.xz"{,.asc})
+source=("https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.xz"{,.asc}
+        '0001-unescape-when-extracting-link.patch')
 sha256sums=('f0b19ff39c3c9a5898a219497ababbadab99d8178acc980155c7e1271089b5a0'
-            'SKIP')
+            'SKIP'
+            '4872d9b6db95a3d7ecaced31bd3d7dffff3db4f5b2524b45cde157374e0ceb80')
 
+prepare() {
+  cd $pkgname-$pkgver 
+
+  patch -Np1 < ../0001-unescape-when-extracting-link.patch
+}
+
 build() {
   cd $pkgname-$pkgver