Befator-Inc-Firmen-Netzwerk/MSYS2-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

pacman: Update

Browse Source
This commit is contained in:
Christoph Reiter 2023-01-16 18:22:16 +01:00
parent 4b352767a4
commit 3054b5823c
2 changed files with 48 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
pacman/0025-Fix-strip-with-file-5.44.patch Normal file
View File

@ -0,0 +1,41 @@
From e782c7968f1eb004204c22cc6e602e01f146745f Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Mon, 16 Jan 2023 18:08:32 +0100
Subject: [PATCH 25/N] Fix strip with file >= 5.44
file 5.44 no longer reports .exe and .dll as "application/x-dosexec",
but as "application/vnd.microsoft.portable-executable".
Likely related to https://github.com/file/file/commit/d22701be6a71b946eacb
This leads to pacman no longer stripping binaries resulting in very larger
packages.
When looking for files to strip check for both strings instead.
---
scripts/libmakepkg/tidy/strip.sh.in | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/scripts/libmakepkg/tidy/strip.sh.in b/scripts/libmakepkg/tidy/strip.sh.in
index 7324fc3..cd9cd9a 100644
--- a/scripts/libmakepkg/tidy/strip.sh.in
+++ b/scripts/libmakepkg/tidy/strip.sh.in
@@ -40,7 +40,7 @@ strip_file() {
local binary=$1; shift
case "$(file -bi "$binary")" in
- *application/x-dosexec*)
+ *application/x-dosexec* | *application/vnd.microsoft.portable-executable*)
if check_option "debug" "y"; then
if [[ -f "$dbgdir/$binary.debug" ]]; then
return
@@ -201,7 +201,9 @@ tidy_strip() {
chmod 0755 "${binary}";
case "$(@FILECMD@ -bi "$binary")" in
- *application/x-dosexec*) # Windows executables and dlls
+ *application/x-dosexec*) # Windows executables and dlls (file <=5.43)
+ strip_flags="$STRIP_SHARED";;
+ *application/vnd.microsoft.portable-executable*) # Windows executables and dlls (file >=5.44)
strip_flags="$STRIP_SHARED";;
*application/x-archive*) # Static and Import Libraries (*.a and *.dll.a)
strip_flags="$STRIP_STATIC"

11
pacman/PKGBUILD
View File

@ -4,7 +4,7 @@
pkgname=pacman
pkgver=6.0.1
pkgrel=28
pkgrel=29
pkgdesc="A library-based package manager with dependency support (MSYS2 port)"
arch=('i686' 'x86_64')
url="https://www.archlinux.org/pacman/"
@ -65,7 +65,8 @@ source=(pacman-${pkgver}::git+https://gitlab.archlinux.org/pacman/pacman.git#com
0021-Fix-building-staticlibs-with-LTO.patch
0022-fixup-Export-CC-and-CXX-variables-explicitly.patch
0023-Make-lint_pkgbuild-opt-in-via-MAKEPKG_LINT_PKGBUILD-.patch
0024-libmakepkg-fix-compatibility-with-bash-5.2-globskipd.patch)
0024-libmakepkg-fix-compatibility-with-bash-5.2-globskipd.patch
0025-Fix-strip-with-file-5.44.patch)
validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD' # Allan McRae <allan@archlinux.org>
'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory (pacman) <andrew@archlinux.org>
sha256sums=('SKIP'
@ -96,7 +97,8 @@ sha256sums=('SKIP'
'4f8db01c932f592479dc0019eeb494bee8afc4a46e068de372df43de6e63e65c'
'2debaf890678f07503dca1368869ef975ab53099b682232661e202b66d55ccd1'
'335f3d23cdac35a203044e594053a84f9fbad3fb6ae3c6977aab9b06cf34a3e3'
'0da1d2c6670ce1475af6ac81005285d7854f48b03c0a01e1ee6c96ad76f12b93')
'0da1d2c6670ce1475af6ac81005285d7854f48b03c0a01e1ee6c96ad76f12b93'
'525e4248cef9d70c8973c5c1aa39fa011ffe05cb7b9aae54ac5b9f8e7af85b4b')
apply_git_with_msg() {
for _patch in "$@"
@ -136,7 +138,8 @@ prepare() {
0021-Fix-building-staticlibs-with-LTO.patch \
0022-fixup-Export-CC-and-CXX-variables-explicitly.patch \
0023-Make-lint_pkgbuild-opt-in-via-MAKEPKG_LINT_PKGBUILD-.patch \
0024-libmakepkg-fix-compatibility-with-bash-5.2-globskipd.patch
0024-libmakepkg-fix-compatibility-with-bash-5.2-globskipd.patch \
0025-Fix-strip-with-file-5.44.patch
}
build() {