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

Allan McRae allan at archlinux.org
Wed Jul 1 01:55:36 UTC 2020


    Date: Wednesday, July 1, 2020 @ 01:55:36
  Author: allan
Revision: 390677

upgpkg: pacman 5.2.2-1: upstream update

Modified:
  pacman/trunk/PKGBUILD
  pacman/trunk/makepkg.conf
Deleted:
  pacman/trunk/makepkg-fix-one-more-file-seccomp-issue.patch
  pacman/trunk/pacman-5.2.1-fix-pactest-package-tar-format.patch
  pacman/trunk/pacman-5.2.1-reproducible-libprovides.patch

---------------------------------------------------+
 PKGBUILD                                          |   20 ++----------
 makepkg-fix-one-more-file-seccomp-issue.patch     |   30 ------------------
 makepkg.conf                                      |    6 ++-
 pacman-5.2.1-fix-pactest-package-tar-format.patch |   32 --------------------
 pacman-5.2.1-reproducible-libprovides.patch       |   13 --------
 5 files changed, 8 insertions(+), 93 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-01 00:57:10 UTC (rev 390676)
+++ PKGBUILD	2020-07-01 01:55:36 UTC (rev 390677)
@@ -3,8 +3,8 @@
 # Maintainer: Dave Reisner <dreisner at archlinux.org>
 
 pkgname=pacman
-pkgver=5.2.1
-pkgrel=6
+pkgver=5.2.2
+pkgrel=1
 pkgdesc="A library-based package manager with dependency support"
 arch=('x86_64')
 url="https://www.archlinux.org/pacman/"
@@ -22,25 +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
-        makepkg-fix-one-more-file-seccomp-issue.patch
-        pacman-5.2.1-reproducible-libprovides.patch
         pacman.conf
         makepkg.conf)
-sha256sums=('1930c407265fd039cb3a8e6edc82f69e122aa9239d216d9d57b9d1b9315af312'
+sha256sums=('bb201a9f2fb53c28d011f661d50028efce6eef2c1d2a36728bdd0130189349a0'
             'SKIP'
-            '824a5c9dd458fb27b05a9a0b4b5d75b7a392de0dae79a18f5cfe8beaf4d82f0c'
-            'e481a161bba76729cd434c97e0b319ddfcb1d93b2e4890d72b4e8a32982531d9'
-            '667ba659f85e3740fda9808e4751a44a63e0484072594d961b87e474c607b79c'
             '3353f363088c73f1f86a890547c0f87c7473e5caf43bbbc768c2e9a7397f2aa2'
-            '8c100b64450f5a19a16325dd05c143d49395bdeb96bd957f863cde4b95d3cb86')
+            '9c769f13c09a6f24c393a9762474eded2f269d8966e7764d9160d62232a7919b')
 
-prepare() {
-  cd "$pkgname-$pkgver"
-  patch -Np1 < ../pacman-5.2.1-fix-pactest-package-tar-format.patch
-  patch -Np1 < ../makepkg-fix-one-more-file-seccomp-issue.patch
-  patch -Np1 < ../pacman-5.2.1-reproducible-libprovides.patch
-}
 
 build() {
   cd "$pkgname-$pkgver"

Deleted: makepkg-fix-one-more-file-seccomp-issue.patch
===================================================================
--- makepkg-fix-one-more-file-seccomp-issue.patch	2020-07-01 00:57:10 UTC (rev 390676)
+++ makepkg-fix-one-more-file-seccomp-issue.patch	2020-07-01 01:55:36 UTC (rev 390677)
@@ -1,30 +0,0 @@
-From 00cfc6c5c9700b597c384743c2f057a2ba7125e2 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz at archlinux.org>
-Date: Thu, 9 Jan 2020 20:49:17 -0500
-Subject: [pacman-dev] [PATCH] makepkg: fix one more file-seccomp issue
-
-When file is called via fakeroot, it doesn't matter whether you use -z
-or not, it is still incompatible with seccomp. Fix by configuring it
-with FILECMD when used in the fakeroot 'tidy' run.
-
-Signed-off-by: Eli Schwartz <eschwartz at archlinux.org>
----
- scripts/libmakepkg/tidy/strip.sh.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/scripts/libmakepkg/tidy/strip.sh.in b/scripts/libmakepkg/tidy/strip.sh.in
-index 1bd810f0..876f00f0 100644
---- a/scripts/libmakepkg/tidy/strip.sh.in
-+++ b/scripts/libmakepkg/tidy/strip.sh.in
-@@ -111,7 +111,7 @@ tidy_strip() {
- 
- 		local binary strip_flags
- 		find . -type f -perm -u+w -print0 2>/dev/null | while IFS= read -rd '' binary ; do
--			case "$(file -bi "$binary")" in
-+			case "$(@FILECMD@ -bi "$binary")" in
- 				*application/x-sharedlib*)  # Libraries (.so)
- 					strip_flags="$STRIP_SHARED";;
- 				*application/x-archive*)    # Libraries (.a)
--- 
-2.24.1
-

Modified: makepkg.conf
===================================================================
--- makepkg.conf	2020-07-01 00:57:10 UTC (rev 390676)
+++ makepkg.conf	2020-07-01 01:55:36 UTC (rev 390677)
@@ -40,11 +40,13 @@
 CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt"
 CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt"
 LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
+#RUSTFLAGS="-C opt-level=2"
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"
 #-- Debugging flags
 DEBUG_CFLAGS="-g -fvar-tracking-assignments"
 DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
+#DEBUG_RUSTFLAGS="-C debuginfo=2"
 
 #########################################################################
 # BUILD ENVIRONMENT
@@ -87,7 +89,7 @@
 #
 OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug)
 
-#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
+#-- File integrity checks to use. Valid: md5, sha1, sha224, sha256, sha384, sha512, b2
 INTEGRITY_CHECK=(md5)
 #-- Options to be used when stripping binaries. See `man strip' for details.
 STRIP_BINARIES="--strip-all"
@@ -141,5 +143,5 @@
 # EXTENSION DEFAULTS
 #########################################################################
 #
-PKGEXT='.pkg.tar.xz'
+PKGEXT='.pkg.tar.zst'
 SRCEXT='.src.tar.gz'

Deleted: pacman-5.2.1-fix-pactest-package-tar-format.patch
===================================================================
--- pacman-5.2.1-fix-pactest-package-tar-format.patch	2020-07-01 00:57:10 UTC (rev 390676)
+++ pacman-5.2.1-fix-pactest-package-tar-format.patch	2020-07-01 01:55:36 UTC (rev 390677)
@@ -1,32 +0,0 @@
-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)

Deleted: pacman-5.2.1-reproducible-libprovides.patch
===================================================================
--- pacman-5.2.1-reproducible-libprovides.patch	2020-07-01 00:57:10 UTC (rev 390676)
+++ pacman-5.2.1-reproducible-libprovides.patch	2020-07-01 01:55:36 UTC (rev 390677)
@@ -1,13 +0,0 @@
-diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
-index d1416d15..b95a03af 100644
---- a/scripts/makepkg.sh.in
-+++ b/scripts/makepkg.sh.in
-@@ -521,7 +521,7 @@ find_libprovides() {
- 		missing=0
- 		case "$p" in
- 			*.so)
--				mapfile -t filename < <(find "$pkgdir" -type f -name $p\*)
-+				mapfile -t filename < <(find "$pkgdir" -type f -name $p\* | LC_ALL=C sort)
- 				if [[ $filename ]]; then
- 					# packages may provide multiple versions of the same library
- 					for fn in "${filename[@]}"; do


More information about the arch-commits mailing list