From df471b30a42ca1d555c06397d0236f28d692d768 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Mas=C5=82owski?= Date: Mon, 4 Mar 2013 09:55:17 +0100 Subject: pacman: use SyncFirst for keyring packages, not for pacman. There were more changes recently when updating pacman first broke it (e.g. it depended on newer libarchive or glibc) than when it was needed. Keyring packages need to be updated first if updates signed by new keys are downloaded. --- libre/pacman/PKGBUILD | 8 ++++---- libre/pacman/pacman.conf | 2 +- libre/pacman/pacman.conf.mips64el | 2 +- libre/pacman/pacman.conf.x86_64 | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'libre') diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index 4e92336c2..6f82bded2 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -29,11 +29,11 @@ source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig} md5sums=('387965c7125e60e5f0b9ff3b427fe0f9' '1a70392526c8768470da678b31905a6e' '1a9b79788640907a2b34e8671cacc94a' - 'a9ddd43891bed364e1e97d27b2887bf1' + 'a9ddd43891bed364e1e97d27b2887bf1' '2e8cbf55a94b1954b167c5dee6b62317' - '6f284de1facaead73de918b4f380fa7f' - 'f2213945821548c05d654a299ce077f7' - 'a45ce4bd0bafb2d60181da5cfa7ceede' + '4ce9e714919e632f48129985ea6b671f' + '43628d586f93d64354654ae3f51aab85' + 'f117e2e13f7d70629ce6923117c73881' 'debc512689a1aa8c124fe0ccf27f5758') build() { diff --git a/libre/pacman/pacman.conf b/libre/pacman/pacman.conf index 59e55cf0b..fa8839c3d 100644 --- a/libre/pacman/pacman.conf +++ b/libre/pacman/pacman.conf @@ -16,7 +16,7 @@ #GPGDir = /etc/pacman.d/gnupg/ HoldPkg = pacman glibc # If upgrades are available for these packages they will be asked for first -SyncFirst = pacman +SyncFirst = archlinux-keyring parabola-keyring #XferCommand = /usr/bin/curl -C - -f %u > %o #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #CleanMethod = KeepInstalled diff --git a/libre/pacman/pacman.conf.mips64el b/libre/pacman/pacman.conf.mips64el index 3c32ddb78..e6cff6811 100644 --- a/libre/pacman/pacman.conf.mips64el +++ b/libre/pacman/pacman.conf.mips64el @@ -16,7 +16,7 @@ #GPGDir = /etc/pacman.d/gnupg/ HoldPkg = pacman glibc # If upgrades are available for these packages they will be asked for first -SyncFirst = pacman +SyncFirst = archlinux-keyring parabola-keyring #XferCommand = /usr/bin/curl -C - -f %u > %o #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #CleanMethod = KeepInstalled diff --git a/libre/pacman/pacman.conf.x86_64 b/libre/pacman/pacman.conf.x86_64 index 6a28406eb..aa17bc498 100644 --- a/libre/pacman/pacman.conf.x86_64 +++ b/libre/pacman/pacman.conf.x86_64 @@ -16,7 +16,7 @@ #GPGDir = /etc/pacman.d/gnupg/ HoldPkg = pacman glibc # If upgrades are available for these packages they will be asked for first -SyncFirst = pacman +SyncFirst = archlinux-keyring parabola-keyring #XferCommand = /usr/bin/curl -C - -f %u > %o #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #CleanMethod = KeepInstalled -- cgit v1.2.3-2-g168b