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

[Christian Hesse]

    Date: Wednesday, February 9, 2022 @ 15:21:18
  Author: eworm
Revision: 436721

upgpkg: libarchive 3.6.0-1: new upstream release

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

------------------------------------------+
 0001-unescape-when-extracting-link.patch |   21 ---------------------
 PKGBUILD                                 |   18 +++++-------------
 2 files changed, 5 insertions(+), 34 deletions(-)

Deleted: 0001-unescape-when-extracting-link.patch
===================================================================
--- 0001-unescape-when-extracting-link.patch	2022-02-09 15:08:50 UTC (rev 436720)
+++ 0001-unescape-when-extracting-link.patch	2022-02-09 15:21:18 UTC (rev 436721)
@@ -1,21 +0,0 @@
-commit d6e57967495107d6c85880f8514bed5c6d20e9d6
-Author: Christian Hesse <mail at eworm.de>
-Date:   Mon Dec 20 10:36:50 2021 +0100
-
-    unescape when extracting link
-    
-    The file name is escaped when archiving, so it needs to be unescaped
-    when extracting.
-
-diff --git a/libarchive/archive_read_support_format_mtree.c b/libarchive/archive_read_support_format_mtree.c
-index 9c46cfae..88bca76f 100644
---- 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	2022-02-09 15:08:50 UTC (rev 436720)
+++ PKGBUILD	2022-02-09 15:21:18 UTC (rev 436721)
@@ -2,8 +2,8 @@
 # Maintainer: Dan McGee <dan at archlinux.org>
 
 pkgname=libarchive
-pkgver=3.5.3
-pkgrel=2
+pkgver=3.6.0
+pkgrel=1
 pkgdesc='Multi-format archive and compression library'
 arch=('x86_64')
 url='https://libarchive.org/'
@@ -12,18 +12,10 @@
 provides=('libarchive.so')
 options=('debug')
 validpgpkeys=('A5A45B12AD92D964B89EEE2DEC560C81CEC2276E') # Martin Matuska <mm at FreeBSD.org>
-source=("https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.xz"{,.asc}
-        '0001-unescape-when-extracting-link.patch')
-sha256sums=('5cac725dd4be31c4a10b65d30f29dc957ea29ef3d758df6e46e8ae90a996a19a'
-            'SKIP'
-            '5e5c5f080cb58d1d621ab8b39a2c1565b6dad826a18dbb3ac7d88357f95fb359')
+source=("https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.xz"{,.asc})
+sha256sums=('df283917799cb88659a5b33c0a598f04352d61936abcd8a48fe7b64e74950de7'
+            'SKIP')
 
-prepare() {
-  cd "${pkgname}-${pkgver}"
-
-  patch -Np1 < ../0001-unescape-when-extracting-link.patch
-}
-
 build() {
   cd "${pkgname}-${pkgver}"