Skip to content
Snippets Groups Projects
Verified Commit cd59344d authored by Morten Linderud's avatar Morten Linderud :surfer:
Browse files

Merge remote-tracking branch 'origin/merge-requests/11'

* origin/merge-requests/11:
  Automatically revert patches with revertme- prefix
  Iterate only over patches in apply loop
  upgpkg: 6.1.0-1
parents 4928cf89 efd4a552
No related branches found
No related tags found
1 merge request!11upgpkg: 6.1.0-1
pkgbase = pacman pkgbase = pacman
pkgdesc = A library-based package manager with dependency support pkgdesc = A library-based package manager with dependency support
pkgver = 6.0.2 pkgver = 6.1.0
pkgrel = 9 pkgrel = 1
url = https://www.archlinux.org/pacman/ url = https://www.archlinux.org/pacman/
arch = x86_64 arch = x86_64
license = GPL-2.0-or-later license = GPL-2.0-or-later
...@@ -26,43 +26,17 @@ pkgbase = pacman ...@@ -26,43 +26,17 @@ pkgbase = pacman
options = strip options = strip
backup = etc/pacman.conf backup = etc/pacman.conf
backup = etc/makepkg.conf backup = etc/makepkg.conf
source = https://sources.archlinux.org/other/pacman/pacman-6.0.2.tar.xz source = https://gitlab.archlinux.org/pacman/pacman/-/releases/v6.1.0/downloads/pacman-6.1.0.tar.xz
source = https://sources.archlinux.org/other/pacman/pacman-6.0.2.tar.xz.sig source = https://gitlab.archlinux.org/pacman/pacman/-/releases/v6.1.0/downloads/pacman-6.1.0.tar.xz.sig
source = pacman-always-create-directories-from-debugedit.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/efd0c24c07b86be014a4edb5a8ece021b87e3900.patch source = REVERT-ME_makepkg-remove-libdepends-and-libprovides.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/354a300cd26bb1c7e6551473596be5ecced921de.patch
source = pacman-always-create-directories-from-debugedit-fixup.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/86981383a2f4380bda26311831be94cdc743649b.patch
source = pacman-fix-unique-source-paths.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/478af273dfe24ded197ec54ae977ddc3719d74a0.patch
source = pacman-strip-include-o-files-similar-to-kernel-modules.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/de11824527ec4e2561e161ac40a5714ec943543c.patch
source = pacman-fix-compatibility-with-bash-5.2-patsub_replacement.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/0e938f188692c710be36f9dd9ea7b94381aed1b4.patch
source = pacman-fix-order-of-fakechroot-fakeroot-nesting.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/05f283b5ad8f5b8f995076e93a27c8772076f872.patch
source = pacman-change-default-checksum-from-md5-to-sha256.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/aa3a1bc3b50d797fb75278f79a83cd7dde50c66e.patch
source = pacman-sort-debuginfod-repro.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/843bf21e794c79c5b3bcf8a57e45ef9c62312fee.patch
source = pacman-split-off-strip-debug.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/7a4fff3310ba2eadd3d5428cbb92e58eb2ee853b.patch
source = pacman-ignore-a-files.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/00d2b1f90261bf77eaaf262d2504af016562f2ac.patch
source = pacman-early-err-git.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/3aa096a74f717d31650e0eb3cf34e9a5ebadc313.patch
source = pacman-fix-gnupg-binary-data.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/86ec26b2d33372a4b3bda48f22c4a9f226c3ccce.patch
source = pacman-fix-gnupg-newsig-check.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/16a064701a30d7e1175e1185cc6da44238302fab.patch
source = pacman-check-pipes-gnupg.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/f8c2e59ec57c86827b1f1b1c2f6760dc3e59fe40.patch
source = pacman.conf source = pacman.conf
source = makepkg.conf source = makepkg.conf
validpgpkeys = 6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD validpgpkeys = 6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD
validpgpkeys = B8151B117037781095514CA7BBDFFC92306B1121 validpgpkeys = B8151B117037781095514CA7BBDFFC92306B1121
sha256sums = 7d8e3e8c5121aec0965df71f59bedf46052c6cf14f96365c4411ec3de0a4c1a5 sha256sums = 5a60ac6e6bf995ba6140c7d038c34448df1f3daa4ae7141d2cad88eeb5f1f9d9
sha256sums = SKIP sha256sums = SKIP
sha256sums = 6fed94326b9ecfbb438ab17a4576b5e9d52ecc0f4574f29d46adfde3886dee03 sha256sums = b3bce9d662e189e8e49013b818f255d08494a57e13fc264625f852f087d3def2
sha256sums = d2bc104788290e3de829a232590b66ad745cf5b4762a01acc1191ebf70fef114
sha256sums = f3d4f39ef24e312f610cbb3439fb02bc6b8829e37bcf1a50ae50cd0a69bde5d0
sha256sums = d87d0c9957c613fda272553bee58140349d151ae399f346ddaf6d75ee5916312
sha256sums = 8641d514ef4cae9e4d1867aadf4b9c850a9e8dc9792c6c559f9d2a0e1713a5a1
sha256sums = b11f62d4bd9557e9d3e7456bc95f63e9eabab5ecee1368f4a14a84bc94b1c8d1
sha256sums = cf749ad981e8f3dedd89c05a5e69a9c91d1e58ef9407e8f8e04ba9c183939623
sha256sums = 17e7af22533984924aaf1cf36c74aa26b46b04ad140cd76b65521be906bd3ff7
sha256sums = 94d1f3575d0c3faf8bf11fee8e5ef36c8b339ebfd24868931903ba179ffecf4e
sha256sums = 96efb79a96abf8cdcecb9f8dc461552549cf46159f44bb4160eb073e1ea5000a
sha256sums = 0ac6a34e6fc126a243a642e509f459f6cde20af213ab949791a5cc325cf031f9
sha256sums = 6e81b34e6a5f312d48ce3aaca0f02ddd10b7a43325cb32acf7666b6b7ac41552
sha256sums = 250598a27a3077ec1dfe97a30af8bb0daf449d3ab456ed6a0c7a5bea0eb58f51
sha256sums = 94c273f07e4e28125b6002567c62e1f6c65f543597de6a8bd79e8c5bf6e4a125
sha256sums = 656c4d4cb8cb12adbf178fc8cb2fd25f8c285d6572bbdbb24d865d00e0d5a85a sha256sums = 656c4d4cb8cb12adbf178fc8cb2fd25f8c285d6572bbdbb24d865d00e0d5a85a
sha256sums = f2791b51588104ec6dbaafa389451056f3c61fa6c19510dcce3a9a6cc19cba29 sha256sums = 9a7a4be6174b4e43c0070ee6291fea281fe172d7975fd3c1506cb451d2d761c4
pkgname = pacman pkgname = pacman
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
# Maintainer: Morten Linderud <foxboron@archlinux.org> # Maintainer: Morten Linderud <foxboron@archlinux.org>
pkgname=pacman pkgname=pacman
pkgver=6.0.2 pkgver=6.1.0
pkgrel=9 pkgrel=1
pkgdesc="A library-based package manager with dependency support" pkgdesc="A library-based package manager with dependency support"
arch=('x86_64') arch=('x86_64')
url="https://www.archlinux.org/pacman/" url="https://www.archlinux.org/pacman/"
...@@ -19,54 +19,36 @@ backup=(etc/pacman.conf ...@@ -19,54 +19,36 @@ backup=(etc/pacman.conf
options=('strip') options=('strip')
validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD' # Allan McRae <allan@archlinux.org> validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD' # Allan McRae <allan@archlinux.org>
'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory (pacman) <andrew@archlinux.org> 'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory (pacman) <andrew@archlinux.org>
source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.xz{,.sig} source=(https://gitlab.archlinux.org/pacman/pacman/-/releases/v$pkgver/downloads/pacman-$pkgver.tar.xz{,.sig}
pacman-always-create-directories-from-debugedit.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/efd0c24c07b86be014a4edb5a8ece021b87e3900.patch revertme-makepkg-remove-libdepends-and-libprovides.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/354a300cd26bb1c7e6551473596be5ecced921de.patch
pacman-always-create-directories-from-debugedit-fixup.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/86981383a2f4380bda26311831be94cdc743649b.patch
pacman-fix-unique-source-paths.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/478af273dfe24ded197ec54ae977ddc3719d74a0.patch
pacman-strip-include-o-files-similar-to-kernel-modules.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/de11824527ec4e2561e161ac40a5714ec943543c.patch
pacman-fix-compatibility-with-bash-5.2-patsub_replacement.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/0e938f188692c710be36f9dd9ea7b94381aed1b4.patch
pacman-fix-order-of-fakechroot-fakeroot-nesting.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/05f283b5ad8f5b8f995076e93a27c8772076f872.patch
pacman-change-default-checksum-from-md5-to-sha256.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/aa3a1bc3b50d797fb75278f79a83cd7dde50c66e.patch
pacman-sort-debuginfod-repro.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/843bf21e794c79c5b3bcf8a57e45ef9c62312fee.patch
pacman-split-off-strip-debug.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/7a4fff3310ba2eadd3d5428cbb92e58eb2ee853b.patch
pacman-ignore-a-files.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/00d2b1f90261bf77eaaf262d2504af016562f2ac.patch
pacman-early-err-git.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/3aa096a74f717d31650e0eb3cf34e9a5ebadc313.patch
pacman-fix-gnupg-binary-data.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/86ec26b2d33372a4b3bda48f22c4a9f226c3ccce.patch
pacman-fix-gnupg-newsig-check.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/16a064701a30d7e1175e1185cc6da44238302fab.patch
pacman-check-pipes-gnupg.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/f8c2e59ec57c86827b1f1b1c2f6760dc3e59fe40.patch
pacman.conf pacman.conf
makepkg.conf) makepkg.conf)
sha256sums=('7d8e3e8c5121aec0965df71f59bedf46052c6cf14f96365c4411ec3de0a4c1a5' sha256sums=('5a60ac6e6bf995ba6140c7d038c34448df1f3daa4ae7141d2cad88eeb5f1f9d9'
'SKIP' 'SKIP'
'6fed94326b9ecfbb438ab17a4576b5e9d52ecc0f4574f29d46adfde3886dee03' 'b3bce9d662e189e8e49013b818f255d08494a57e13fc264625f852f087d3def2'
'd2bc104788290e3de829a232590b66ad745cf5b4762a01acc1191ebf70fef114'
'f3d4f39ef24e312f610cbb3439fb02bc6b8829e37bcf1a50ae50cd0a69bde5d0'
'd87d0c9957c613fda272553bee58140349d151ae399f346ddaf6d75ee5916312'
'8641d514ef4cae9e4d1867aadf4b9c850a9e8dc9792c6c559f9d2a0e1713a5a1'
'b11f62d4bd9557e9d3e7456bc95f63e9eabab5ecee1368f4a14a84bc94b1c8d1'
'cf749ad981e8f3dedd89c05a5e69a9c91d1e58ef9407e8f8e04ba9c183939623'
'17e7af22533984924aaf1cf36c74aa26b46b04ad140cd76b65521be906bd3ff7'
'94d1f3575d0c3faf8bf11fee8e5ef36c8b339ebfd24868931903ba179ffecf4e'
'96efb79a96abf8cdcecb9f8dc461552549cf46159f44bb4160eb073e1ea5000a'
'0ac6a34e6fc126a243a642e509f459f6cde20af213ab949791a5cc325cf031f9'
'6e81b34e6a5f312d48ce3aaca0f02ddd10b7a43325cb32acf7666b6b7ac41552'
'250598a27a3077ec1dfe97a30af8bb0daf449d3ab456ed6a0c7a5bea0eb58f51'
'94c273f07e4e28125b6002567c62e1f6c65f543597de6a8bd79e8c5bf6e4a125'
'656c4d4cb8cb12adbf178fc8cb2fd25f8c285d6572bbdbb24d865d00e0d5a85a' '656c4d4cb8cb12adbf178fc8cb2fd25f8c285d6572bbdbb24d865d00e0d5a85a'
'f2791b51588104ec6dbaafa389451056f3c61fa6c19510dcce3a9a6cc19cba29') '9a7a4be6174b4e43c0070ee6291fea281fe172d7975fd3c1506cb451d2d761c4')
prepare() { prepare() {
cd "${pkgname}-${pkgver}" cd "$pkgname-$pkgver"
# we backport way too often in pacman
# lets at least make it more convenient # handle patches
local src local -a patches
for src in "${source[@]}"; do patches=($(printf '%s\n' "${source[@]}" | grep '.patch'))
src="${src%%::*}" patches=("${patches[@]%%::*}")
src="${src##*/}" patches=("${patches[@]##*/}")
[[ $src = *.patch ]] || continue
msg2 "Applying patch $src..." if (( ${#patches[@]} != 0 )); then
patch -Np1 < "../$src" for patch in "${patches[@]}"; do
done if [[ $patch =~ revertme-* ]]; then
msg2 "Reverting patch $patch..."
patch -RNp1 < "../$patch"
else
msg2 "Applying patch $patch..."
patch -Np1 < "../$patch"
fi
done
fi
} }
build() { build() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment