summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrtan Samos <drtan@lavabit.com>2013-04-27 22:48:49 +0200
committerDrtan Samos <drtan@lavabit.com>2013-04-27 22:48:49 +0200
commitae961e812c333ea71c1192169843bd0cfe3f021f (patch)
treef77d21b45688da982b4e7e7049820bad6dbc67c7
parentc869a8ee4354645ecb837b3af7d23e0e8d2267db (diff)
Pacman configuration updated to the latest version.
-rw-r--r--configs/gnome/pacman.conf21
-rw-r--r--configs/releng/pacman.conf21
2 files changed, 18 insertions, 24 deletions
diff --git a/configs/gnome/pacman.conf b/configs/gnome/pacman.conf
index 108260d..a5e0417 100644
--- a/configs/gnome/pacman.conf
+++ b/configs/gnome/pacman.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,11 +38,13 @@ 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 Parabola GNU/Linux-libre
-# packagers with `pacman-key --populate archlinux`.
+# packagers with `pacman-key --populate archlinux` and `pacman-key --populate parabola`.
#
# REPOSITORIES
@@ -68,28 +69,25 @@ Architecture = auto
# repo name header and Include lines. You can add preferred servers immediately
# after the header, and they will be used before the default mirrors.
+#[libre-testing]
+#Include = /etc/pacman.d/mirrorlist
+
[libre]
-SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist
#[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
@@ -97,4 +95,3 @@ Include = /etc/pacman.d/mirrorlist
#[custom]
#SigLevel = Optional TrustAll
#Server = file:///home/custompkgs
-
diff --git a/configs/releng/pacman.conf b/configs/releng/pacman.conf
index 108260d..a5e0417 100644
--- a/configs/releng/pacman.conf
+++ b/configs/releng/pacman.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,11 +38,13 @@ 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 Parabola GNU/Linux-libre
-# packagers with `pacman-key --populate archlinux`.
+# packagers with `pacman-key --populate archlinux` and `pacman-key --populate parabola`.
#
# REPOSITORIES
@@ -68,28 +69,25 @@ Architecture = auto
# repo name header and Include lines. You can add preferred servers immediately
# after the header, and they will be used before the default mirrors.
+#[libre-testing]
+#Include = /etc/pacman.d/mirrorlist
+
[libre]
-SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist
#[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
@@ -97,4 +95,3 @@ Include = /etc/pacman.d/mirrorlist
#[custom]
#SigLevel = Optional TrustAll
#Server = file:///home/custompkgs
-