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

[Christian Hesse]

    Date: Wednesday, April 15, 2020 @ 20:11:44
  Author: eworm
Revision: 380391

push patch to svn

Patches downloaded from cgit include cgit's version number, thus changing
checksum on update. Push patch to svn to avoid source verification errors.

Added:
  pacman/trunk/pacman-5.2.1-fix-pactest-package-tar-format.patch
Modified:
  pacman/trunk/PKGBUILD

---------------------------------------------------+
 PKGBUILD                                          |    4 +-
 pacman-5.2.1-fix-pactest-package-tar-format.patch |   32 ++++++++++++++++++++
 2 files changed, 34 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-15 19:56:21 UTC (rev 380390)
+++ PKGBUILD	2020-04-15 20:11:44 UTC (rev 380391)
@@ -22,13 +22,13 @@
 validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD'  # Allan McRae <allan at archlinux.org>
               'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory (pacman) <andrew at archlinux.org>
 source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
-        pacman-5.2.1-fix-pactest-package-tar-format.patch::https://git.archlinux.org/pacman.git/patch/?id=b9faf652735c603d1bdf849a570185eb721f11c1
+        pacman-5.2.1-fix-pactest-package-tar-format.patch
         makepkg-fix-one-more-file-seccomp-issue.patch
         pacman.conf
         makepkg.conf)
 sha256sums=('1930c407265fd039cb3a8e6edc82f69e122aa9239d216d9d57b9d1b9315af312'
             'SKIP'
-            'd268379269c9dfa6eb3358f8931d3c84ef5fa4d47fe22567022fcbac8e4638c1'
+            '824a5c9dd458fb27b05a9a0b4b5d75b7a392de0dae79a18f5cfe8beaf4d82f0c'
             'e481a161bba76729cd434c97e0b319ddfcb1d93b2e4890d72b4e8a32982531d9'
             '3353f363088c73f1f86a890547c0f87c7473e5caf43bbbc768c2e9a7397f2aa2'
             '8c100b64450f5a19a16325dd05c143d49395bdeb96bd957f863cde4b95d3cb86')

Added: pacman-5.2.1-fix-pactest-package-tar-format.patch
===================================================================
--- pacman-5.2.1-fix-pactest-package-tar-format.patch	                        (rev 0)
+++ pacman-5.2.1-fix-pactest-package-tar-format.patch	2020-04-15 20:11:44 UTC (rev 380391)
@@ -0,0 +1,32 @@
+From b9faf652735c603d1bdf849a570185eb721f11c1 Mon Sep 17 00:00:00 2001
+From: Allan McRae <allan at archlinux.org>
+Date: Tue, 12 Nov 2019 16:14:57 +1000
+Subject: pactest: set package tar format to GNU_FORMAT
+
+python-3.8 changed the default tar format to PAX_FORMAT. This caused
+issues in our testsuite with package extraction of files with UTF-8
+characters as we run the tests under the C locale.
+
+sycn600.py:
+error: error while reading package /tmp/pactest-xuhri4xa/var/cache/pacman/pkg/unicodechars-2.0-1.pkg.tar.gz: Pathname can't be converted from UTF-8 to current locale.
+
+Set format back to GNU_FORMAT.
+
+Signed-off-by: Allan McRae <allan at archlinux.org>
+---
+ test/pacman/pmpkg.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/pacman/pmpkg.py b/test/pacman/pmpkg.py
+index 6a845222..e40868cc 100644
+--- a/test/pacman/pmpkg.py
++++ b/test/pacman/pmpkg.py
+@@ -142,7 +142,7 @@ class pmpkg(object):
+         util.mkdir(os.path.dirname(self.path))
+ 
+         # Generate package metadata
+-        tar = tarfile.open(self.path, "w:gz")
++        tar = tarfile.open(self.path, "w:gz", format=tarfile.GNU_FORMAT)
+         for name, data in archive_files:
+             info = tarfile.TarInfo(name)
+             info.size = len(data)