[arch-commits] Commit in pacman/trunk (PKGBUILD pacman.conf)

[Allan McRae]

    Date: Friday, July 27, 2018 @ 03:38:30
  Author: allan
Revision: 329572

upgpkg: pacman 5.1.1-1

upstream update

Modified:
  pacman/trunk/PKGBUILD
  pacman/trunk/pacman.conf

-------------+
 PKGBUILD    |   21 +++++----------------
 pacman.conf |    2 +-
 2 files changed, 6 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-07-27 01:56:09 UTC (rev 329571)
+++ PKGBUILD	2018-07-27 03:38:30 UTC (rev 329572)
@@ -4,8 +4,8 @@
 # Maintainer: Dave Reisner <dreisner at archlinux.org>
 
 pkgname=pacman
-pkgver=5.1.0
-pkgrel=2
+pkgver=5.1.1
+pkgrel=1
 pkgdesc="A library-based package manager with dependency support"
 arch=('x86_64')
 url="http://www.archlinux.org/pacman/"
@@ -15,30 +15,19 @@
          'gpgme' 'pacman-mirrorlist' 'archlinux-keyring')
 makedepends=('asciidoc')
 checkdepends=('python2' 'fakechroot')
-optdpepends=('perl-locale-gettext: translation support in makepkg-template')
+optdepends=('perl-locale-gettext: translation support in makepkg-template')
 backup=(etc/pacman.conf etc/makepkg.conf)
 options=('strip' 'debug')
 validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD'  # Allan McRae <allan at archlinux.org>
               'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory (pacman) <andrew at archlinux.org>
 source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
-        0001-makepkg-Clear-ERR-trap-before-trying-to-restore-it.patch
-        0002-makepkg-Don-t-use-parameterless-return.patch
         pacman.conf
         makepkg.conf)
-sha256sums=('9f5993fc8923530713742f15df284677f297b3eca15ed7a24758c98ac7399bd3'
+sha256sums=('be04b9162d62d2567e21402dcbabb5bedfdb03909fa5ec6e8568e02ab325bd8d'
             'SKIP'
-            '9b2304141582a421e812c76760a74f360a3cbd780472cbb60cf023a34d6fcb3d'
-            '2a31d4db5f6e19e0148d4892de14317514f2b2dfb5369c7972a641ca8be89e5a'
-            '95b3b2416402059cf6acf3e046082e7ce261e2b88629231dbf579a4200d8a63b'
+            'b82e9c1073292766c2f49b5c771dddf37383f1151117ef9cd5e0c11047b4f3eb'
             '650ddad24cad6afc4aecb4829cb8f06b9acb70c10a44f756fe8bd279949b518e')
 
-prepare() {
-  cd "$pkgname-$pkgver"
-  # Fix install_packages failure exit code, required by makechrootpkg
-  patch -Np1 -i ../0001-makepkg-Clear-ERR-trap-before-trying-to-restore-it.patch
-  patch -Np1 -i ../0002-makepkg-Don-t-use-parameterless-return.patch
-}
-
 build() {
   cd "$pkgname-$pkgver"
 

Modified: pacman.conf
===================================================================
--- pacman.conf	2018-07-27 01:56:09 UTC (rev 329571)
+++ pacman.conf	2018-07-27 03:38:30 UTC (rev 329572)
@@ -16,7 +16,7 @@
 #GPGDir      = /etc/pacman.d/gnupg/
 #HookDir     = /etc/pacman.d/hooks/
 HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -C - -f %u > %o
+#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
 #UseDelta    = 0.7