pacman: update

pacman/PKGBUILD

@@ -1,10 +1,8 @@
-
 # vim: set ts=2 sw=2 et:
-# Maintainer: Dan McGee <dan@archlinux.org>
+# Maintainer: 
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
 
 pkgname=pacman
-pkgver=6.0.0alpha1.r118.ge176b8ec
+pkgver=6.0.0
 pkgrel=1
 pkgdesc="A library-based package manager with dependency support"
 arch=('x86_64')
@@ -13,7 +11,7 @@ license=('GPL')
 groups=('base-devel')
 depends=('bash' 'glibc' 'libarchive' 'curl'
          'gpgme' 'pacman-mirrorlist' 'archlinux-keyring')
-makedepends=('asciidoc' 'meson')
+makedepends=('meson' 'asciidoc' 'doxygen')
 checkdepends=('python' 'fakechroot')
 optdepends=('perl-locale-gettext: translation support in makepkg-template')
 provides=('libalpm.so')
@@ -26,14 +24,10 @@ source=(git+https://git.archlinux.org/pacman.git
         pacman.conf
         makepkg.conf)
 sha256sums=('SKIP'
-            '6740bd04402ff6aa833883f315b21ddbe882c5a2c7b3050cbc6a71dc367b9752'
+            '4aea8b8dc81188e9f195d0ac887e3a7c85d1be6545fd675f6c160623023d85b5'
-            '81ee3d013c94ec4b6575d512df427d5029d487bfb73224bccd29be1054bf5aae')
+            '0bb12dca951de441259941be02051912b4adef81c2aa96ad8f2a4bfd7e5a0a8a')
 
 
-prepare() {
-  cd pacman
-}
-
 pkgver() {
   cd pacman
 
@@ -41,30 +35,30 @@ pkgver() {
 }
 
 build() {
-
+  cd pacman
-  mkdir -p pacman/build
-  cd pacman/build
 
   meson --prefix=/usr \
         --buildtype=plain \
         -Ddoc=enabled \
+        -Ddoxygen=enabled \
         -Duse-git-version=true \
         -Dscriptlet-shell=/usr/bin/bash \
         -Dldconfig=/usr/bin/ldconfig \
-        ..
+        build
-  ninja
+
+  meson compile -C build
 }
 
 check() {
-  cd pacman/build
+  cd pacman
 
-  ninja test
+  meson test -C build
 }
 
 package() {
+  cd pacman
 
-  cd pacman/build
+  DESTDIR="$pkgdir" meson install -C build
-  DESTDIR="$pkgdir" ninja install
 
   # install Arch specific stuff
   install -dm755 "$pkgdir/etc"

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')
@@ -36,11 +37,11 @@ CARCH="x86_64"
 CHOST="x86_64-pc-linux-gnu"
 
 #-- Compiler and Linker Flags
+#CPPFLAGS=""
 CFLAGS="-march=x86-64-v2 -mtune=generic -O2 -pipe -fno-plt -fexceptions \
-        -Wp,-D_FORTIFY_SOURCE=2,-D_GLIBCXX_ASSERTIONS \
+        -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \
-        -Wformat -Werror=format-security \
         -fstack-clash-protection -fcf-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
@@ -54,7 +55,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
@@ -77,7 +78,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
@@ -88,11 +89,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=(ck)
 #-- 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.
@@ -147,3 +149,10 @@ COMPRESSLZ=(lzip -c -f)
 #
 PKGEXT='.pkg.tar.zst'
 SRCEXT='.src.tar.gz'
+
+#########################################################################
+# OTHER
+#########################################################################
+#
+#-- Command used to run pacman as root, instead of trying sudo and su
+#PACMAN_AUTH=()

pacman/pacman.conf

@@ -31,6 +31,7 @@ Architecture = auto
 # Misc options
 #UseSyslog
 Color
+#NoProgressBar
 CheckSpace
 VerbosePkgLists
 ParallelDownloads = 5