pacman: Update patches

2022-02-09 18:43:10 +01:00 · 2022-02-09 18:43:10 +01:00 · fa6a437157
commit fa6a437157
parent 6b03ed5beb
23 changed files with 75 additions and 45 deletions
--- a/pacman/0001-Msysize.patch
+++ b/pacman/0001-Msysize.patch
@ -938,5 +938,5 @@ index 94b0930..f008f22 100644
         vprint("\ttime elapsed: %.2fs" % (time_end - time_start))
 
 -- 
-2.33.0
+2.35.1

--- a/pacman/0002-More-debugging-info.patch
+++ b/pacman/0002-More-debugging-info.patch
@ -54,5 +54,5 @@ index 299d287..533ed49 100644
 			}
 		} else if(WIFSIGNALED(status) != 0) {
 -- 
-2.33.0
+2.35.1

--- a/pacman/0003-Core-update.patch
+++ b/pacman/0003-Core-update.patch
@ -316,5 +316,5 @@ index b6da1a3..2dd8e18 100644
 			colon_printf(_("Starting full system upgrade...\n"));
 			alpm_logaction(config->handle, PACMAN_CALLER_PREFIX,
 -- 
-2.33.0
+2.35.1

--- a/pacman/0004-Remove-ldconfig.patch
+++ b/pacman/0004-Remove-ldconfig.patch
@ -254,5 +254,5 @@ index 9b2967e..0000000
 -self.addrule("PACMAN_RETCODE=0")
 -self.addrule("FILE_EXIST=etc/ld.so.cache")
 -- 
-2.33.0
+2.35.1

--- a/pacman/0005-Change-the-epoch-separator.patch
+++ b/pacman/0005-Change-the-epoch-separator.patch
@ -51,5 +51,5 @@ index 7aab705..2d4dd2d 100644
 		printf "%s\n" "$pkgver-$pkgrel"
 	fi
 -- 
-2.33.0
+2.35.1

--- a/pacman/0006-makepkg-avoid-creating-.tar-files-with-extended-attr.patch
+++ b/pacman/0006-makepkg-avoid-creating-.tar-files-with-extended-attr.patch
@ -36,5 +36,5 @@ index 6c8446b..7ad3a0e 100644
 
 	shopt -u -o pipefail
 -- 
-2.33.0
+2.35.1

--- a/pacman/0007-pacman-libalpm-ignore-file-conflicts-for-foo.exe-foo.patch
+++ b/pacman/0007-pacman-libalpm-ignore-file-conflicts-for-foo.exe-foo.patch
@ -51,5 +51,5 @@ index b471bf2..f7fa9d8 100644
 			if(pfile_isdir) {
 				if(S_ISDIR(lsbuf.st_mode)) {
 -- 
-2.33.0
+2.35.1

--- a/pacman/0008-Change-default-answer-of-all-queries-to-yes.patch
+++ b/pacman/0008-Change-default-answer-of-all-queries-to-yes.patch
@ -68,5 +68,5 @@ index 2dd8e18..a5cc23b 100644
 				continue;
 			}
 -- 
-2.33.0
+2.35.1

--- a/pacman/0009-Use-pipe-instead-of-socket.patch
+++ b/pacman/0009-Use-pipe-instead-of-socket.patch
@ -75,5 +75,5 @@ index fecee3a..ce28fd8 100644
 		retval = 1;
 		goto cleanup;
 -- 
-2.33.0
+2.35.1

--- a/pacman/0010-pacman-make-file-list-comparisons-between-packages-c.patch
+++ b/pacman/0010-pacman-make-file-list-comparisons-between-packages-c.patch
@ -110,5 +110,5 @@ index 07239c3..9c044b5 100644
 			qsort(filelist->files, filelist->count,
 					sizeof(alpm_file_t), _alpm_files_cmp);
 -- 
-2.33.0
+2.35.1

--- a/pacman/0011-Translate-MSYS2-specific-messages-into-Japanese.patch
+++ b/pacman/0011-Translate-MSYS2-specific-messages-into-Japanese.patch
@ -43,5 +43,5 @@ index bc1e923..99b4e77 100644
 #, c-format
 msgid "Starting full system upgrade...\n"
 -- 
-2.33.0
+2.35.1

--- a/pacman/0012-Workaround-compressing-packages-with-bsdtar-under-Ac.patch
+++ b/pacman/0012-Workaround-compressing-packages-with-bsdtar-under-Ac.patch
@ -45,5 +45,5 @@ index a231699..8d6d32d 100644
 
 		create_signature "$tempname"
 -- 
-2.33.0
+2.35.1

--- a/pacman/0013-Fix-asciidoc-argparse.patch
+++ b/pacman/0013-Fix-asciidoc-argparse.patch
@ -26,5 +26,5 @@ index 5a8eb3a..e7ac240 100644
     ],
     input : input,
 -- 
-2.33.0
+2.35.1

--- a/pacman/0014-Remove-fakeroot.patch
+++ b/pacman/0014-Remove-fakeroot.patch
@ -24,5 +24,5 @@ index 8536a54..d5b6dcc 100644
   'gzip.sh.in',
   'pacman.sh.in',
 -- 
-2.33.0
+2.35.1

--- a/pacman/0015-Remove-sudo.patch
+++ b/pacman/0015-Remove-sudo.patch
@ -25,5 +25,5 @@ index d5b6dcc..535da57 100644
 ]
 
 -- 
-2.33.0
+2.35.1

--- a/pacman/0016-Use-msys-tools.patch
+++ b/pacman/0016-Use-msys-tools.patch
@ -25,5 +25,5 @@ index 50eb905..9396923 100644
   { 'name' : 'util',          'has_subdir' : true },
 ]
 -- 
-2.33.0
+2.35.1

--- a/pacman/0017-Export-CC-and-CXX-variables-explicitly.patch
+++ b/pacman/0017-Export-CC-and-CXX-variables-explicitly.patch
@ -33,5 +33,5 @@ index 873dd82..4ba1dbc 100644
 	fi
 }
 -- 
-2.33.0
+2.35.1

--- a/pacman/0018-pacman.c-handle-cr-on-stdin-as-well.patch
+++ b/pacman/0018-pacman.c-handle-cr-on-stdin-as-well.patch
@ -40,5 +40,5 @@ index 36c3b5e..33feca9 100644
 				if(line[0] == '\0') {
 					/* skip empty lines */
 -- 
-2.33.0
+2.35.1

--- a/pacman/0019-Add-a-CI-job.patch
+++ b/pacman/0019-Add-a-CI-job.patch
@ -70,5 +70,5 @@ index 0000000..5b198ca
 +          name: install
 +          path: _dest/
 -- 
-2.33.0
+2.35.1

--- a/pacman/0020-Strip-static-libraries-as-well.patch
+++ b/pacman/0020-Strip-static-libraries-as-well.patch
@ -23,5 +23,5 @@ index c376a39..7324fc3 100644
 					strip_flags="$STRIP_SHARED";;
 				*Type:*'DYN (Position-Independent Executable file)'*) # Relocatable binaries
 -- 
-2.33.0
+2.35.1

--- a/pacman/0021-Fix-building-staticlibs-with-LTO.patch
+++ b/pacman/0021-Fix-building-staticlibs-with-LTO.patch
@ -1,7 +1,7 @@
 From f578b472aa42851f8a142de20cd8c70664c60248 Mon Sep 17 00:00:00 2001
 From: Mehdi Chinoune <mehdi.chinoune@hotmail.com>
 Date: Sat, 13 Nov 2021 08:27:49 +0100
-Subject: [PATCH] Fix building staticlibs with LTO
+Subject: [PATCH 21/N] Fix building staticlibs with LTO

 Unless `-ffat-lto-objects` get passed to the compiler, It will only generate LTO bytecode.

@ -13,7 +13,7 @@ https://fedoraproject.org/wiki/Changes/LTOBuildImprovements
 1 file changed, 5 insertions(+)

 diff --git a/scripts/libmakepkg/buildenv/lto.sh.in b/scripts/libmakepkg/buildenv/lto.sh.in
-index 8e7be66a5..c216a24fa 100644
+index 8e7be66..c216a24 100644
 --- a/scripts/libmakepkg/buildenv/lto.sh.in
 +++ b/scripts/libmakepkg/buildenv/lto.sh.in
@@ -33,5 +33,10 @@ buildenv_lto() {
@ -27,3 +27,6 @@ index 8e7be66a5..c216a24fa 100644
 +		fi
 	fi
 }
+-- 
+2.35.1
+
--- a/pacman/0022-fixup-Export-CC-and-CXX-variables-explicitly.patch
+++ b/pacman/0022-fixup-Export-CC-and-CXX-variables-explicitly.patch
@ -0,0 +1,24 @@
+From 61a06846a149e3843758b9a3a8efaf896d66cc50 Mon Sep 17 00:00:00 2001
+From: Christoph Reiter <reiter.christoph@gmail.com>
+Date: Mon, 7 Feb 2022 19:55:55 +0100
+Subject: [PATCH 22/N] fixup! Export CC and CXX variables explicitly
+
+---
+ scripts/libmakepkg/buildenv/buildflags.sh.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/libmakepkg/buildenv/buildflags.sh.in b/scripts/libmakepkg/buildenv/buildflags.sh.in
+index 4ba1dbc..873dd82 100644
+--- a/scripts/libmakepkg/buildenv/buildflags.sh.in
+++ b/scripts/libmakepkg/buildenv/buildflags.sh.in
+@@ -30,6 +30,6 @@ buildenv_functions+=('buildenv_buildflags')
+ 
+ buildenv_buildflags() {
+ 	if check_option "buildflags" "n"; then
+-		unset CC CXX CPPFLAGS CFLAGS DEBUG_CFLAGS CXXFLAGS DEBUG_CXXFLAGS LDFLAGS RUSTFLAGS DEBUG_RUSTFLAGS
+		unset CPPFLAGS CFLAGS DEBUG_CFLAGS CXXFLAGS DEBUG_CXXFLAGS LDFLAGS RUSTFLAGS DEBUG_RUSTFLAGS
+ 	fi
+ }
+-- 
+2.35.1
+
--- a/pacman/PKGBUILD
+++ b/pacman/PKGBUILD
@ -63,7 +63,8 @@ source=(pacman-${pkgver}::git+https://gitlab.archlinux.org/pacman/pacman.git#com
        0018-pacman.c-handle-cr-on-stdin-as-well.patch
        0019-Add-a-CI-job.patch
        0020-Strip-static-libraries-as-well.patch
-        0021-fix-lto-staticlibs.patch)
+        0021-Fix-building-staticlibs-with-LTO.patch
+        0022-fixup-Export-CC-and-CXX-variables-explicitly.patch)
 validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD'  # Allan McRae <allan@archlinux.org>
              'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory (pacman) <andrew@archlinux.org>
 sha256sums=('SKIP'
@ -71,27 +72,28 @@ sha256sums=('SKIP'
            'ee9f8a5ec60a1334725adb102f531f38badfe1bb66bde82c4aeb3131a2becc2f'
            '606e4b2808a40e856b7043244fc993d426dab25bc2e03b2b8ee5b869f5102507'
            '98198e1f0f252eae0560d271bee4b9149e127399dd0d3fd5d8d24579d9e0550f'
-            '57fd01cd215294e2a9c91b616fe3854e96acddfb3de6a758912d9d8ea61fdc18'
-            '9c1b99443d26732b21aec3943c17678aa9c7add584b413476873dafb1de4a9c0'
-            'b1f3ade9e06f2cdfc23ae09a8598ae3c5603182c13d53d664af8a06eed74590b'
-            '3379e1c85bfc6a5cc23f13e62354f9542679ab3d99c88fd6065456302b879613'
-            '7391a51cf2fd3061acb839e5b08ca9a3ba9bfb18f5b9aba529c329a0c38a4b63'
-            '2467f8e15bc8e9aa7cd7cdaad25d543760bb54c4698586e34db2a20c51e38e83'
-            '0ff33efa51e92f7e6b095f19cccaa94ddd47e7639e93e2f43fffbd8b83eab5de'
-            'ccc0b5d6a6c0bd716d5810916f5539f47517ebb305c70cf04c3b380607bd46dc'
-            '3ad5dd5cfff806d8548062bb3e6cd62ebff82631743106d3792f631a96c18820'
-            '57dfe16e07ab4ad927906a8b7a86ada92cc11473e1839791cbfbd491a7030dc7'
-            '9fdaa03800ed3be96e6191b765fa54660735f92e1637cf9696b78fe4d552ef0b'
-            '0c21c0c675a2fa5582f32b3a96d7f9f828049c23b09a52f2f2a8432986554f26'
-            '85d279412e923a575ec07f02fff5f961afb44bd89f7864c7ecc3d73a592df4d8'
-            '43b9d741a4624e0dbe3b41fa8523789cbd483b5751d738ffaf04c9f3f51d819c'
-            'bfd2235372bdf013254f0dbadd7ab398fc118ce0f7b6d50d4001c014366b65f9'
-            '48a0b3b9e5206cc46b7092f2736da2493194a4ce44a154ba8f7740d690ccedb2'
-            '5029415842e9c51dd8aa6e380636316cf3f8f2b3ef0ae3f9430658213cb56a2a'
-            '0ac2184c8419041f2948517a1c8b66ed740cf0bb1ac5856b384008495317e87b'
-            '17604e359cbc1666b678359a5f46b5f822ca0d3a62c6c672b74d45399d78ab5e'
-            '7e1b6df6806a62e69ec072188bb5fdc6575d030e7ac140cee191d0fdf78454a5'
-            '45dadd786e1dd64fda7cff3efcf2f5e0b873b2a80b42a41a21448686b4db0fe6')
+            'fe9db024623179e42242af57ca80867cee6cfa8634214cca6721f42800aecb09'
+            '160e1135fe69341af6bc67e58b13b2f12bfdaf8152425f4c2c314ff339a6559b'
+            '4c0e2fe7f7ac921037e90ae6aac1b1778f67fa3b80dc1a5491d3bc6e406f2779'
+            '65ad517673b02eef4031279ed1a34a98dda33a88ec090f37a794be6c42c156f0'
+            'c7622ed144f1e915954637b5d8063cfafd41c711837181f80cb6b6be47ee39cc'
+            '608012fde55d67c998425bf948f1b6cced6996f8f23ffa8519fabc64da7c32c0'
+            'ec0d34468457d655e731dd1c21ed492198d1f7001b83c471d77c492dd78f6ea9'
+            '0453d869ff8de53390833b137a974a301b1dd6018a204203dae612df7b28b35a'
+            'b8d0567b4475373c5acca79cf309120a856266991901500ca6cdff30ce4d9930'
+            'a903302fee8549d6d60f917cec4a0546b09bf03d83fca167ea7dedc86796c5ea'
+            '45edc0291534491db8ffe721894756d3b0f7f471052d991ccb9bce939d45b33b'
+            'c03191c52fec5b60edaf8351e564c931e0a6b2c9ddafd49d5043da5d88366ab9'
+            'b542b4be1d170c2eaad9c5913d68f3b3e81bca63148c973a4af2cb7d295fc8b8'
+            '5aa736f44ad2bde1a4646ad96b1d264aabafcf64d7cc767f514f47b1ec435822'
+            '4adf61ad10b30c62a9786fe35f06554b4b6a0b6582e157d1c4e2a514c5962baa'
+            '8a7c23d1230ddb22a6f165a8a7d7e154d1a4ed658f22766f501fd5d300d138c9'
+            'dee87cbe931f59053f7eeaf1640e0f17b9628216951e110b34ab78a2d59c05f9'
+            '214bbebd943e6aa80fd71cbd474ed40935517110ebb61524cafa9337369a4200'
+            '8f2fee02f186c0108d7b8b57ec5567b7c5590a1bf5550ad1cc87bba707dcc7e2'
+            '66a9d277c91df8ef1e7e157f4f976a2b17a53f5984b72386a4d3eaf3ee525f81'
+            'c28e00baa470ba9849c5fa98c646e869bf5b6b3afa183c0cd88826fc26ed9a9a'
+            '7aa85f11fb929a0234b228354ae1f6135567d77bfaf424340bd1afc65fadc1b4')

 apply_git_am_with_msg() {
  for _patch in "$@"
@ -128,7 +130,8 @@ prepare() {
  0018-pacman.c-handle-cr-on-stdin-as-well.patch \
  0019-Add-a-CI-job.patch \
  0020-Strip-static-libraries-as-well.patch \
-  0021-fix-lto-staticlibs.patch
+  0021-Fix-building-staticlibs-with-LTO.patch \
+  0022-fixup-Export-CC-and-CXX-variables-explicitly.patch
 }

 build() {