upgpkg: pacman-git 6.0.0.r0.g75eb3f4c-2

sync configuration files with final release packaging of pacman 6.0.0-2
jonathonf · May 21, 2021 · 02a1e2e · 02a1e2e
1 parent 58eb0f3
commit 02a1e2e
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 16 deletions.
diff --git a/pacman-git/.SRCINFO b/pacman-git/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pacman-git
 	pkgdesc = A library-based package manager with dependency support
-	pkgver = 6.0.0alpha1.r86.gc294b7cb
-	pkgrel = 1
+	pkgver = 6.0.0.r0.g75eb3f4c
+	pkgrel = 2
 	url = https://www.archlinux.org/pacman/
 	arch = i686
 	arch = x86_64
@@ -24,7 +24,7 @@ pkgbase = pacman-git
 	depends = pacman-mirrorlist
 	optdepends = pacman-contrib: various helper utilities
 	optdepends = perl-locale-gettext: translation support in makepkg-template
-	provides = pacman=6.0.0alpha1
+	provides = pacman=6.0.0
 	conflicts = pacman
 	options = emptydirs
 	options = strip
@@ -37,9 +37,9 @@ pkgbase = pacman-git
 	source = pacman.conf.arm
 	source = makepkg.conf
 	sha256sums = SKIP
-	sha256sums = 07b4e78745b9c9ecd93b703649b24b05803941f02ac2142ef62d50e36cb865a7
-	sha256sums = 4f349704aee808873bef4759a56d92e7985c3f9bffdd7b00bfaa988110124208
-	sha256sums = 6185dc65b18d1d085f65281c6bd1ce556466a64bf883d1f27c89b7e620570334
-	sha256sums = 806b40ba78eacedd96d733c1fa1eeae4b1f7398992976e22cf72e22563ab9c7a
+	sha256sums = 0e09eb240512da85f7eaa314a5a98fe7d4c4e7ed5eebde7e3e937c0ae4ee7054
+	sha256sums = 7ff75a61a07eabbc1718a7171b897b6504a6370f2f59a14caf42bbf0dce26ea6
+	sha256sums = 3fa640a4a2138b8d07b6e6366ff0743206ecb32fc3b7f53490a614388c492cf3
+	sha256sums = 0c1ecbb8c57e8ef2c600b41d4458269095fc4ddb6778d0000d4a9a067f68fe2d
 
 pkgname = pacman-git
diff --git a/pacman-git/PKGBUILD b/pacman-git/PKGBUILD
@@ -5,8 +5,8 @@
 # Contributor: Andres Perera <aepd87@gmail.com>
 
 pkgname=pacman-git
-pkgver=6.0.0alpha1.r86.gc294b7cb
-pkgrel=1
+pkgver=6.0.0.r0.g75eb3f4c
+pkgrel=2
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
 url="https://www.archlinux.org/pacman/"

diff --git a/pacman-git/makepkg.conf b/pacman-git/makepkg.conf
@@ -39,10 +39,9 @@ CHOST="@CHOST@"
 #-- Compiler and Linker Flags
 #CPPFLAGS=""
 CFLAGS="@CARCHFLAGS@ -mtune=generic -O2 -pipe -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 -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
@@ -95,7 +94,7 @@ BUILDENV=(!distcc color !ccache check !sign)
 OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug !lto)
 
 #-- File integrity checks to use. Valid: ck, 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.

diff --git a/pacman-git/pacman.conf.arm b/pacman-git/pacman.conf.arm
@@ -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.

diff --git a/pacman-git/pacman.conf.i686 b/pacman-git/pacman.conf.i686
@@ -31,9 +31,10 @@ Architecture = auto
 # 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.

diff --git a/pacman-git/pacman.conf.x86_64 b/pacman-git/pacman.conf.x86_64
@@ -31,9 +31,10 @@ Architecture = auto
 # 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.