summaryrefslogtreecommitdiffstats
path: root/pacman-extra.conf
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2013-04-06 18:59:16 +0200
committerPierre Schmitz <pierre@archlinux.de>2013-04-06 18:59:16 +0200
commit092fe2ffde2075705b0a9c686246b3081aea963c (patch)
tree68b5629dec1432ea3ed2dec61806ed450eab2272 /pacman-extra.conf
parent71b15aafb64b8c8d032eab7d41e15c6e4f648c58 (diff)
downloaddevtools-092fe2ffde2075705b0a9c686246b3081aea963c.tar.gz
devtools-092fe2ffde2075705b0a9c686246b3081aea963c.tar.xz
Sync pacman.conf and makepkg.conf with pacman 4.1
Diffstat (limited to 'pacman-extra.conf')
-rw-r--r--pacman-extra.conf14
1 files changed, 5 insertions, 9 deletions
diff --git a/pacman-extra.conf b/pacman-extra.conf
index 821f9a5..45fe03d 100644
--- a/pacman-extra.conf
+++ b/pacman-extra.conf
@@ -15,11 +15,10 @@
#LogFile = /var/log/pacman.log
#GPGDir = /etc/pacman.d/gnupg/
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/wget --passive-ftp -c -O %o %u
#CleanMethod = KeepInstalled
+#UseDelta = 0.7
Architecture = auto
# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
@@ -31,7 +30,7 @@ Architecture = auto
# Misc options
#UseSyslog
-#UseDelta
+#Color
#TotalDownload
# We cannot check disk space from within a chroot environment
#CheckSpace
@@ -39,7 +38,9 @@ Architecture = auto
# 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.
-#SigLevel = Optional TrustedOnly
+SigLevel = Required DatabaseOptional
+LocalFileSigLevel = Optional
+#RemoteFileSigLevel = Required
# NOTE: You must run `pacman-key --init` before first using pacman; the local
# keyring can then be populated with the keys of all official Arch Linux
@@ -69,23 +70,18 @@ Architecture = auto
# after the header, and they will be used before the default mirrors.
#[testing]
-#SigLevel = PackageRequired
#Include = /etc/pacman.d/mirrorlist
[core]
-SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist
[extra]
-SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist
#[community-testing]
-#SigLevel = PackageRequired
#Include = /etc/pacman.d/mirrorlist
[community]
-SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist
# An example of a custom package repository. See the pacman manpage for