From cde5f98414c08ef6b8cb832b75369641a4817d9c Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Tue, 1 Jun 2021 18:57:01 +0000 Subject: [PATCH] core/pacman to 6.0.0-2 --- core/pacman/PKGBUILD | 43 ++++++++++++++++++++-------------------- core/pacman/makepkg.conf | 22 +++++++++++++------- core/pacman/pacman.conf | 3 ++- 3 files changed, 38 insertions(+), 30 deletions(-) diff --git a/core/pacman/PKGBUILD b/core/pacman/PKGBUILD index 9abe6c4e1..3218f5c79 100644 --- a/core/pacman/PKGBUILD +++ b/core/pacman/PKGBUILD @@ -10,8 +10,8 @@ # - patch to fix application/gzip change in file 5.37 pkgname=pacman -pkgver=5.2.2 -pkgrel=4 +pkgver=6.0.0 +pkgrel=2 pkgdesc="A library-based package manager with dependency support" arch=('x86_64') url="https://www.archlinux.org/pacman/" @@ -19,7 +19,7 @@ license=('GPL') groups=('base-devel') depends=('bash' 'glibc' 'libarchive' 'curl' 'gpgme' 'pacman-mirrorlist' 'archlinuxarm-keyring') -makedepends=('asciidoc') +makedepends=('meson' 'asciidoc' 'doxygen') checkdepends=('python' 'fakechroot') optdepends=('perl-locale-gettext: translation support in makepkg-template') provides=('libalpm.so') @@ -28,30 +28,23 @@ backup=(etc/pacman.conf options=('strip' 'debug') validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD' # Allan McRae 'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory (pacman) -source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig} +source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.xz{,.sig} 0001-Sychronize-filesystem.patch 0002-Revert-close-stdin-before-running-install-scripts.patch 0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch pacman.conf - makepkg.conf - pacman-5.2.2-fix-strip-messing-up-file-attributes.patch::'https://git.archlinux.org/pacman.git/patch/?id=88d054093c1c99a697d95b26bd9aad5bc4d8e170' - pacman-5.2.2-fix-debug-packages-with-gcc11.patch::'https://git.archlinux.org/pacman.git/patch/?id=bdf6aa3fb757a2363a4e708174b7d23a4997763d') -sha256sums=('bb201a9f2fb53c28d011f661d50028efce6eef2c1d2a36728bdd0130189349a0' + makepkg.conf) +sha256sums=('004448085a7747bdc7a0a4dd5d1fb7556c6b890111a06e029ab088f9905d4808' 'SKIP' '187bef40b14461ef7caba83e8124b6725e0cc9d46fa84353dae3b2afdc013589' '83597d3092edb2414d3b1a3e2e7337c0edcf102636a5884f3d3f3755fdceb2b0' '6e6434d123dd57961922627b39d967de384e3902a041e12dfc077081552fec28' - '7210ba34cc95650425b9be1e9f87f77637348b8bd77c8cb68ab293ac08871aee' - '636ed8abfb219770251df5fb46cf6e7717aec9329526c5a13cbf223ad9950878' - '871fd97b3f13f1718358e4b8e046a56c0262c9042b5e3b5d60835606735798bd' - '6be31dd7f4e1645e58c26fafaf1d9df4ba5e31b629fc3e8f4070d771571d0011') + '19f189accab294af7085cb709417eb41784d21aa8da07a8aa24bf7591ec3ce94' + '5db3f78ca0c3afa0678d5df83df810c202ce1fbdc82f8f73d90515929c0eb4ce') prepare() { cd "$pkgname-$pkgver" - patch -Np1 < "$srcdir"/pacman-5.2.2-fix-strip-messing-up-file-attributes.patch - patch -Np1 < "$srcdir"/pacman-5.2.2-fix-debug-packages-with-gcc11.patch - patch -p1 -i ../0001-Sychronize-filesystem.patch patch -p1 -i ../0002-Revert-close-stdin-before-running-install-scripts.patch patch -p1 -i ../0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch @@ -60,21 +53,27 @@ prepare() { build() { cd "$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --enable-doc \ - --with-scriptlet-shell=/usr/bin/bash \ - --with-ldconfig=/usr/bin/ldconfig - make V=1 + meson --prefix=/usr \ + --buildtype=plain \ + -Ddoc=enabled \ + -Ddoxygen=enabled \ + -Dscriptlet-shell=/usr/bin/bash \ + -Dldconfig=/usr/bin/ldconfig \ + build + + meson compile -C build } check() { - make -C "$pkgname-$pkgver" check + cd "$pkgname-$pkgver" + + meson test -C build } package() { cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" meson install -C build # install Arch specific stuff install -dm755 "$pkgdir/etc" diff --git a/core/pacman/makepkg.conf b/core/pacman/makepkg.conf index 84594b74c..d4ee32a02 100644 --- a/core/pacman/makepkg.conf +++ b/core/pacman/makepkg.conf @@ -24,6 +24,7 @@ DLAGENTS=('file::/usr/bin/curl -gqC - -o %o %u' #-- The package required by makepkg to download VCS sources # Format: 'protocol::package' VCSCLIENTS=('bzr::bzr' + 'fossil::fossil' 'git::git' 'hg::mercurial' 'svn::subversion') @@ -40,10 +41,9 @@ CHOST="@CHOST@" # -mtune optimizes for an architecture, but builds for whole processor family CPPFLAGS="" CFLAGS="@CARCHFLAGS@-O2 -pipe -fstack-protector-strong -fno-plt -fexceptions \ - -Wp,-D_FORTIFY_SOURCE=2,-D_GLIBCXX_ASSERTIONS \ - -Wformat -Werror=format-security \ + -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \ -fstack-clash-protection" -CXXFLAGS="$CFLAGS" +CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS" LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now" #RUSTFLAGS="-C opt-level=2" #-- Make Flags: change this for DistCC/SMP systems @@ -57,7 +57,7 @@ DEBUG_CXXFLAGS="-g -fvar-tracking-assignments" # BUILD ENVIRONMENT ######################################################################### # -# Defaults: BUILDENV=(!distcc !color !ccache check !sign) +# Makepkg defaults: BUILDENV=(!distcc !color !ccache check !sign) # A negated environment option will do the opposite of the comments below. # #-- distcc: Use the Distributed C/C++/ObjC compiler @@ -80,7 +80,7 @@ BUILDENV=(!distcc color !ccache check !sign) # These are default values for the options=() settings ######################################################################### # -# Default: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug) +# 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 @@ -91,11 +91,12 @@ BUILDENV=(!distcc color !ccache check !sign) #-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip #-- purge: Remove files specified by PURGE_TARGETS #-- 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) +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=(md5) +INTEGRITY_CHECK=(sha256) #-- Options to be used when stripping binaries. See `man strip' for details. STRIP_BINARIES="--strip-all" #-- Options to be used when stripping shared libraries. See `man strip' for details. @@ -150,3 +151,10 @@ COMPRESSLZ=(lzip -c -f) # PKGEXT='.pkg.tar.xz' SRCEXT='.src.tar.gz' + +######################################################################### +# OTHER +######################################################################### +# +#-- Command used to run pacman as root, instead of trying sudo and su +#PACMAN_AUTH=() diff --git a/core/pacman/pacman.conf b/core/pacman/pacman.conf index 8ffcb8ba2..b9f10ed15 100644 --- a/core/pacman/pacman.conf +++ b/core/pacman/pacman.conf @@ -31,9 +31,10 @@ Architecture = @CARCH@ # Misc options #UseSyslog #Color -#TotalDownload +#NoProgressBar CheckSpace #VerbosePkgLists +#ParallelDownloads = 5 # By default, pacman accepts packages signed by keys that its local keyring # trusts (see pacman-key and its man page), as well as unsigned packages.