[arch-commits] Commit in libarchive/repos/testing-x86_64 (3 files)

[Christian Hesse]

    Date: Tuesday, February 8, 2022 @ 10:58:50
  Author: eworm
Revision: 436467

archrelease: copy trunk to testing-x86_64

Added:
  libarchive/repos/testing-x86_64/0001-unescape-when-extracting-link.patch
    (from rev 436466, libarchive/trunk/0001-unescape-when-extracting-link.patch)
  libarchive/repos/testing-x86_64/PKGBUILD
    (from rev 436466, libarchive/trunk/PKGBUILD)
Deleted:
  libarchive/repos/testing-x86_64/PKGBUILD

------------------------------------------+
 0001-unescape-when-extracting-link.patch |   21 ++++++
 PKGBUILD                                 |   89 +++++++++++++++--------------
 2 files changed, 70 insertions(+), 40 deletions(-)

Copied: libarchive/repos/testing-x86_64/0001-unescape-when-extracting-link.patch (from rev 436466, libarchive/trunk/0001-unescape-when-extracting-link.patch)
===================================================================
--- 0001-unescape-when-extracting-link.patch	                        (rev 0)
+++ 0001-unescape-when-extracting-link.patch	2022-02-08 10:58:50 UTC (rev 436467)
@@ -0,0 +1,21 @@
+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);
+ 		}

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-08 10:58:47 UTC (rev 436466)
+++ PKGBUILD	2022-02-08 10:58:50 UTC (rev 436467)
@@ -1,40 +0,0 @@
-# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Maintainer: Dan McGee <dan at archlinux.org>
-
-pkgname=libarchive
-pkgver=3.5.3
-pkgrel=1
-pkgdesc='Multi-format archive and compression library'
-arch=('x86_64')
-url='https://libarchive.org/'
-license=('BSD')
-depends=('acl' 'libacl.so' 'bzip2' 'expat' 'lz4' 'openssl' 'xz' 'zlib' 'zstd')
-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})
-sha256sums=('5cac725dd4be31c4a10b65d30f29dc957ea29ef3d758df6e46e8ae90a996a19a'
-            'SKIP')
-
-build() {
-  cd $pkgname-$pkgver 
-
-  ./configure \
-      --prefix=/usr \
-      --without-xml2 \
-      --without-nettle \
-      --disable-static
-
-  make
-}
-
-check() {
-  cd $pkgname-$pkgver
-  make check
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-  install -Dm0644 COPYING "$pkgdir/usr/share/licenses/libarchive/COPYING"
-}

Copied: libarchive/repos/testing-x86_64/PKGBUILD (from rev 436466, libarchive/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-02-08 10:58:50 UTC (rev 436467)
@@ -0,0 +1,49 @@
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Maintainer: Dan McGee <dan at archlinux.org>
+
+pkgname=libarchive
+pkgver=3.5.3
+pkgrel=2
+pkgdesc='Multi-format archive and compression library'
+arch=('x86_64')
+url='https://libarchive.org/'
+license=('BSD')
+depends=('acl' 'libacl.so' 'bzip2' 'expat' 'lz4' 'openssl' 'xz' 'zlib' 'zstd')
+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')
+
+prepare() {
+  cd "${pkgname}-${pkgver}"
+
+  patch -Np1 < ../0001-unescape-when-extracting-link.patch
+}
+
+build() {
+  cd "${pkgname}-${pkgver}"
+
+  ./configure \
+      --prefix=/usr \
+      --without-xml2 \
+      --without-nettle \
+      --disable-static
+  make
+}
+
+check() {
+  cd "${pkgname}-${pkgver}"
+
+  make check
+}
+
+package() {
+  cd "${pkgname}-${pkgver}"
+
+  make DESTDIR="$pkgdir" install
+  install -Dm0644 COPYING "$pkgdir/usr/share/licenses/libarchive/COPYING"
+}