PR#22: libre/pacman: 6.0.0-3 - abslibre

abslibre

#22 libre/pacman: 6.0.0-3

Closed 2 years ago by billauger. Opened 2 years ago by grizzlyuser.

pacman into master

libre/pacman: sync makepkg.conf.in with upstream

grizzlyuser • 2 years ago

ff27861

libre/pacman: 6.0.0-3 sync with upstream

grizzlyuser • 2 years ago

4dd0942

libre/pacman/PKGBUILD

file modified

+8 -2

		`@@ -8,7 +8,7 @@`

		`pkgname=pacman`
		`pkgver=6.0.0`
		`- pkgrel=2`
		`+ pkgrel=3`
		`pkgrel+=.parabola1`
		`pkgdesc="A library-based package manager with dependency support"`
		`arch=('x86_64')`
		`@@ -32,6 +32,8 @@`
		`validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD' # Allan McRae <allan@archlinux.org>`
		`'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory (pacman) <andrew@archlinux.org>`
		`source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.xz{,.sig}`
		`+ pacman-6.0.0-fix-404-download.patch::https://git.archlinux.org/pacman.git/patch/?id=3401f9e142ac4c701cd98c52618cb13164f2146b`
		`+ pacman-6.0.0-fix-key-import-double-free.patch::https://git.archlinux.org/pacman.git/patch/?id=542910d684191eb7f25ddc5d3d8fe3060028a267`
		`"${arch[@]/#/pacman.conf.}"`
		`makepkg.conf.in`
		`pacman-keyring.service`
		`@@ -42,10 +44,12 @@`
		`0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch)`
		`sha256sums=('004448085a7747bdc7a0a4dd5d1fb7556c6b890111a06e029ab088f9905d4808'`
		`'SKIP'`
		`+ 'fe7e037e1b84bfa5bc401650d148c2a2e87d827705a6ec18a596ff5eea3cc0fd'`
		`+ 'a51b57dd47818d97e29ac0b8604b4b409916bbe6029adfbb03ac7e7c2b2a0819'`
		`'29815f65c9dc402cd22651ae1b24def9a6b1525554b348b28a398530a79a1092'`
		`'4a4198d6269a8a6b76edf66df4185c599f0b12e143fb7cc9a3497cc78f5e33f8'`
		`'a7bc662bda8e5707eddc2b8891fd756afed4aeea76e5a0145ecba128a8210d7f'`
		`- '39330da7fceba67e1ed5c8981e5565668711dbe46f4b305b84ac853da4bdd317'`
		`+ '20e9de1b612c3f24736e76a753cd38b7ea0f80160185012a538a77297acfb31f'`
		`'220f1b25a64727041dc6fa3fd486b0a043f735a3f6cecedc4e2f7c47ec6ce66d'`
		`'2a857061f032ff5485f5c75ab74e6f6532621e08963ef48640a792cca16cacd6'`
		`'9ccc7ef5bd27a68d8788f10c6e5b36495c5d9038d4eb160f9ea4dc9901b622d8')`
		`@@ -55,6 +59,8 @@`

		`prepare() {`
		`cd "$pkgname-$pkgver"`
		`+ patch -p1 -i "$srcdir"/pacman-6.0.0-fix-404-download.patch`
		`+ patch -p1 -i "$srcdir"/pacman-6.0.0-fix-key-import-double-free.patch`

		`# From Arch ARM`
		`if [ "${CARCH}" = "armv7h" ]; then`

libre/pacman/makepkg.conf.in

file modified

+4 -4

		`@@ -37,7 +37,7 @@`
		`CHOST="@CHOST@"`

		`#-- Compiler and Linker Flags`
		`- CPPFLAGS=""`
		`+ #CPPFLAGS=""`
		`CFLAGS="@CARCHFLAGS@"`
		`CXXFLAGS="@CARCHFLAGS@ -Wp,-D_GLIBCXX_ASSERTIONS"`
		`LDFLAGS="@LDFLAGS@"`
		`@@ -76,7 +76,7 @@`
		`# These are default values for the options=() settings`
		`#########################################################################`
		`#`
		`- # Makepkg defaults: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge debug !lto)`
		`+ # Makepkg defaults: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug !lto)`
		`# A negated option will do the opposite of the comments below.`
		`#`
		`#-- strip: Strip symbols from binaries/libraries`
		`@@ -89,7 +89,7 @@`
		`#-- debug: Add debugging flags as specified in DEBUG_* variables`
		`#-- lto: Add compile flags for building with link time optimization`
		`#`
		`- OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge debug !lto)`
		`+ OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug !lto)`

		`#-- File integrity checks to use. Valid: md5, sha1, sha224, sha256, sha384, sha512, b2`
		`INTEGRITY_CHECK=(sha256)`
		`@@ -145,7 +145,7 @@`
		`# EXTENSION DEFAULTS`
		`#########################################################################`
		`#`
		`- PKGEXT='.pkg.tar.xz'`
		`+ PKGEXT='.pkg.tar.zst'`
		`SRCEXT='.src.tar.gz'`

		`#########################################################################`

grizzlyuser commented 2 years ago

Built for x86_64, i686, armv7h.

armv7h build failed on check() stage when using ancient version of qemu-user-static from the repos, but completed successfully using binfmt-qemu-static-all-arch-20200413-1 and qemu-user-static-5.2.0-1 which I built some time ago directly from the AUR.

NOTE: Please pay extra attention to the changes from https://pagure.io/abslibre/c/ff2786145f6f3cd7260440a578841a70b267e8f3, because I'm not sure if there's been any rationale for Parabola to diverge from Arch for those configuration options.