Skip to content
Snippets Groups Projects
Commit 80b81c27 authored by Dan Johansen's avatar Dan Johansen
Browse files

updated pacman to 5.1.1

parent 55135fad
No related branches found
No related tags found
No related merge requests found
......@@ -7,8 +7,8 @@
# Maintainer: Rob McCathie <rob@manjaro.org>
pkgname=pacman
pkgver=5.1.0
_pkgver=1.0.0
pkgver=5.1.1
_pkgver=1.1.0
pkgrel=2
pkgdesc="A library-based package manager with dependency support"
arch=('i686' 'x86_64' 'armv7h' 'aarch64')
......@@ -16,7 +16,7 @@ url="http://www.archlinux.org/pacman/"
license=('GPL')
groups=('base' 'base-devel')
depends=('bash>=4.2.042-2' 'glibc>=2.17-2' 'libarchive>=3.1.2' 'curl>=7.39.0'
'gpgme' 'archlinux-keyring' 'manjaro-keyring' 'manjaro-arm-keyring' 'pacman-mirrorlist')
'gpgme' 'archlinuxarm-keyring' 'manjaro-keyring' 'manjaro-arm-keyring' 'pacman-mirrorlist')
checkdepends=('python2' 'fakechroot')
makedepends=('asciidoc')
optdepends=('haveged: for pacman-init.service')
......@@ -61,10 +61,10 @@ build() {
make
}
check() {
make -C "$pkgname-$pkgver" check
make -C pacman-contrib-$_pkgver check
}
#check() {
# make -C "$pkgname-$pkgver" check
# make -C pacman-contrib-$_pkgver check
#}
package() {
cd $srcdir/$pkgname-$pkgver
......@@ -122,12 +122,12 @@ esac
# ln -sfv "/usr/bin/pacman-mirrors" "$pkgdir/usr/bin/rankmirrors"
}
sha256sums=('9f5993fc8923530713742f15df284677f297b3eca15ed7a24758c98ac7399bd3'
'0fb95514bd16a316d4cce920d34edc88b0d0618c484e2d7588746869d2339795'
sha256sums=('be04b9162d62d2567e21402dcbabb5bedfdb03909fa5ec6e8568e02ab325bd8d'
'308c3b8dc15ed8bd419cba1eb3103afe9250cf415626334a0c3a753b550549a6'
'64d0200bc16e182ca45b74fb2d633c395e5ecfb8c662c557f056326fabf4836b'
'11d4d8aa2eb9f8d15f5f61835573a8140c052b8e17655f666cd81205841fd010'
'0447073204ff2ee92cf9d99cd12f80735dc79abbf7d2eeec43413f91da917a72'
'2f2cc2b09b4b128cbb8f901c8464eafc2b5ba64dcbc71c998327dd4cfb4c054c'
'd3a77bf8ea916c24a73b2a2dc4162d2b81f993394850e0f2c331a8f8893c1a0b'
'547ce0f6df7521f564683c81a824993155e035b554493e4b172168595d5e07fa'
'fe0901a02d34ccf288743397fa32526f6dd878db8337e666082bced10e24e754'
'b6d14727ec465bb66d0a0358163b1bbfafcb4eaed55a0f57c30aabafae7eed68'
'65d8bdccdcccb64ae05160b5d1e7f3e45e1887baf89dda36c1bd44c62442f91b')
......@@ -86,7 +86,7 @@ BUILDENV=(!distcc color !ccache check !sign)
#-- purge: Remove files specified by PURGE_TARGETS
#-- debug: Add debugging flags as specified in DEBUG_* variables
#
OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !optipng !upx !debug)
OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !optipng !upx !debug)
#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
INTEGRITY_CHECK=(md5)
......
......@@ -7,7 +7,7 @@ diff -Nur a/etc/pacman.conf.in b/etc/pacman.conf.in
HoldPkg = pacman glibc
+# If upgrades are available for these packages they will be asked for first
+SyncFirst = pacman
#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
diff -Nur a/src/pacman/conf.c b/src/pacman/conf.c
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment