summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--archbuild.in4
-rw-r--r--makepkg-i686.conf43
-rw-r--r--makepkg-x86_64.conf43
-rw-r--r--mkarchroot.in8
-rw-r--r--pacman-extra.conf14
-rw-r--r--pacman-gnome-unstable.conf15
-rw-r--r--pacman-kde-unstable.conf15
-rw-r--r--pacman-multilib-staging.conf19
-rw-r--r--pacman-multilib-testing.conf16
-rw-r--r--pacman-multilib.conf16
-rw-r--r--pacman-staging.conf16
-rw-r--r--pacman-testing.conf14
13 files changed, 109 insertions, 116 deletions
diff --git a/Makefile b/Makefile
index f0f374a..acae452 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-V=20130127
+V=20130406
PREFIX = /usr/local
diff --git a/archbuild.in b/archbuild.in
index 4dcc0f3..06c9815 100644
--- a/archbuild.in
+++ b/archbuild.in
@@ -53,7 +53,9 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then
lock_open_write 9 "$copy.lock" "Locking chroot copy '$copy'"
- { type -P btrfs && btrfs subvolume delete "${copy}"; } &>/dev/null
+ if [[ "$(stat -f -c %T "${copy}")" == btrfs ]]; then
+ { type -P btrfs && btrfs subvolume delete "${copy}"; } &>/dev/null
+ fi
rm -rf --one-file-system "${copy}"
done
lock_close 9
diff --git a/makepkg-i686.conf b/makepkg-i686.conf
index 725c2a2..0b1c1cb 100644
--- a/makepkg-i686.conf
+++ b/makepkg-i686.conf
@@ -11,7 +11,7 @@
DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
'http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
- 'rsync::/usr/bin/rsync -z %u %o'
+ 'rsync::/usr/bin/rsync --no-motd -z %u %o'
'scp::/usr/bin/scp -C %u %o')
# Other common tools:
@@ -29,11 +29,15 @@ CHOST="i686-pc-linux-gnu"
#-- Compiler and Linker Flags
# -march (or -mcpu) builds exclusively for an architecture
# -mtune optimizes for an architecture, but builds for whole processor family
-CFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
-CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
+CPPFLAGS="-D_FORTIFY_SOURCE=2"
+CFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4"
+CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4"
LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro"
#-- Make Flags: change this for DistCC/SMP systems
#MAKEFLAGS="-j2"
+#-- Debugging flags
+DEBUG_CFLAGS="-g -fvar-tracking-assignments"
+DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
#########################################################################
# BUILD ENVIRONMENT
@@ -63,18 +67,20 @@ BUILDENV=(fakeroot !distcc color !ccache check !sign)
# These are default values for the options=() settings
#########################################################################
#
-# Default: OPTIONS=(strip docs libtool emptydirs zipman purge !upx)
+# Default: OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !upx !debug)
# A negated option will do the opposite of the comments below.
#
-#-- strip: Strip symbols from binaries/libraries
-#-- docs: Save doc directories specified by DOC_DIRS
-#-- libtool: Leave libtool (.la) files in packages
-#-- emptydirs: Leave empty directories in packages
-#-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip
-#-- purge: Remove files specified by PURGE_TARGETS
-#-- upx: Compress binary executable files using UPX
-#
-OPTIONS=(strip docs libtool emptydirs zipman purge !upx)
+#-- strip: Strip symbols from binaries/libraries
+#-- docs: Save doc directories specified by DOC_DIRS
+#-- libtool: Leave libtool (.la) files in packages
+#-- staticlibs: Leave static library (.a) files in packages
+#-- emptydirs: Leave empty directories in packages
+#-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip
+#-- purge: Remove files specified by PURGE_TARGETS
+#-- upx: Compress binary executable files using UPX
+#-- debug: Add debugging flags as specified in DEBUG_* variables
+#
+OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !upx !debug)
#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
INTEGRITY_CHECK=(md5)
@@ -109,6 +115,17 @@ PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
#GPGKEY=""
#########################################################################
+# COMPRESSION DEFAULTS
+#########################################################################
+#
+COMPRESSGZ=(gzip -c -f -n)
+COMPRESSBZ2=(bzip2 -c -f)
+COMPRESSXZ=(xz -c -z -)
+COMPRESSLRZ=(lrzip -q)
+COMPRESSLZO=(lzop -q)
+COMPRESSZ=(compress -c -f)
+
+#########################################################################
# EXTENSION DEFAULTS
#########################################################################
#
diff --git a/makepkg-x86_64.conf b/makepkg-x86_64.conf
index 4de5c67..04e20a6 100644
--- a/makepkg-x86_64.conf
+++ b/makepkg-x86_64.conf
@@ -11,7 +11,7 @@
DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
'http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
- 'rsync::/usr/bin/rsync -z %u %o'
+ 'rsync::/usr/bin/rsync --no-motd -z %u %o'
'scp::/usr/bin/scp -C %u %o')
# Other common tools:
@@ -29,11 +29,15 @@ CHOST="x86_64-unknown-linux-gnu"
#-- Compiler and Linker Flags
# -march (or -mcpu) builds exclusively for an architecture
# -mtune optimizes for an architecture, but builds for whole processor family
-CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
-CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
+CPPFLAGS="-D_FORTIFY_SOURCE=2"
+CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4"
+CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4"
LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro"
#-- Make Flags: change this for DistCC/SMP systems
#MAKEFLAGS="-j2"
+#-- Debugging flags
+DEBUG_CFLAGS="-g -fvar-tracking-assignments"
+DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
#########################################################################
# BUILD ENVIRONMENT
@@ -63,18 +67,20 @@ BUILDENV=(fakeroot !distcc color !ccache check !sign)
# These are default values for the options=() settings
#########################################################################
#
-# Default: OPTIONS=(strip docs libtool emptydirs zipman purge !upx)
+# Default: OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !upx !debug)
# A negated option will do the opposite of the comments below.
#
-#-- strip: Strip symbols from binaries/libraries
-#-- docs: Save doc directories specified by DOC_DIRS
-#-- libtool: Leave libtool (.la) files in packages
-#-- emptydirs: Leave empty directories in packages
-#-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip
-#-- purge: Remove files specified by PURGE_TARGETS
-#-- upx: Compress binary executable files using UPX
-#
-OPTIONS=(strip docs libtool emptydirs zipman purge !upx)
+#-- strip: Strip symbols from binaries/libraries
+#-- docs: Save doc directories specified by DOC_DIRS
+#-- libtool: Leave libtool (.la) files in packages
+#-- staticlibs: Leave static library (.a) files in packages
+#-- emptydirs: Leave empty directories in packages
+#-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip
+#-- purge: Remove files specified by PURGE_TARGETS
+#-- upx: Compress binary executable files using UPX
+#-- debug: Add debugging flags as specified in DEBUG_* variables
+#
+OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !upx !debug)
#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
INTEGRITY_CHECK=(md5)
@@ -109,6 +115,17 @@ PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
#GPGKEY=""
#########################################################################
+# COMPRESSION DEFAULTS
+#########################################################################
+#
+COMPRESSGZ=(gzip -c -f -n)
+COMPRESSBZ2=(bzip2 -c -f)
+COMPRESSXZ=(xz -c -z -)
+COMPRESSLRZ=(lrzip -q)
+COMPRESSLZO=(lzop -q)
+COMPRESSZ=(compress -c -f)
+
+#########################################################################
# EXTENSION DEFAULTS
#########################################################################
#
diff --git a/mkarchroot.in b/mkarchroot.in
index ce732be..cff046f 100644
--- a/mkarchroot.in
+++ b/mkarchroot.in
@@ -10,7 +10,7 @@
m4_include(lib/common.sh)
-CHROOT_VERSION='v2'
+CHROOT_VERSION='v3'
FORCE='n'
MODE='i'
@@ -187,8 +187,10 @@ elif [[ $MODE == i ]]; then
mkdir -p "${working_dir}"
fi
- if { type -P btrfs && btrfs subvolume create "${working_dir}"; } &>/dev/null; then
- chmod 0755 "${working_dir}"
+ if [[ "$(stat -f -c %T "${working_dir}")" == btrfs ]]; then
+ if { type -P btrfs && btrfs subvolume create "${working_dir}"; } &>/dev/null; then
+ chmod 0755 "${working_dir}"
+ fi
fi
chroot_lock
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
diff --git a/pacman-gnome-unstable.conf b/pacman-gnome-unstable.conf
index 9bdca63..911d4db 100644
--- a/pacman-gnome-unstable.conf
+++ b/pacman-gnome-unstable.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,27 +70,21 @@ Architecture = auto
# after the header, and they will be used before the default mirrors.
[gnome-unstable]
-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
diff --git a/pacman-kde-unstable.conf b/pacman-kde-unstable.conf
index 1bec946..382f091 100644
--- a/pacman-kde-unstable.conf
+++ b/pacman-kde-unstable.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,27 +70,21 @@ Architecture = auto
# after the header, and they will be used before the default mirrors.
[kde-unstable]
-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
diff --git a/pacman-multilib-staging.conf b/pacman-multilib-staging.conf
index 3d1ab75..d1b38e0 100644
--- a/pacman-multilib-staging.conf
+++ b/pacman-multilib-staging.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,45 +70,35 @@ Architecture = auto
# after the header, and they will be used before the default mirrors.
[staging]
-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-staging]
-SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist
[community-testing]
-SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist
[community]
-SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist
# If you want to run 32 bit applications on your x86_64 system,
# enable the multilib repositories as required here.
[multilib-staging]
-SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist
[multilib-testing]
-SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist
[multilib]
-SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist
# An example of a custom package repository. See the pacman manpage for
diff --git a/pacman-multilib-testing.conf b/pacman-multilib-testing.conf
index d24eb6c..276e747 100644
--- a/pacman-multilib-testing.conf
+++ b/pacman-multilib-testing.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,33 +70,26 @@ 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
# If you want to run 32 bit applications on your x86_64 system,
# enable the multilib repositories as required here.
[multilib-testing]
-SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist
[multilib]
-SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist
# An example of a custom package repository. See the pacman manpage for
diff --git a/pacman-multilib.conf b/pacman-multilib.conf
index 8d10757..a6511e0 100644
--- a/pacman-multilib.conf
+++ b/pacman-multilib.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,34 +70,27 @@ 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
# If you want to run 32 bit applications on your x86_64 system,
# enable the multilib repositories as required here.
#[multilib-testing]
-#SigLevel = PackageRequired
#Include = /etc/pacman.d/mirrorlist
[multilib]
-SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist
# An example of a custom package repository. See the pacman manpage for
diff --git a/pacman-staging.conf b/pacman-staging.conf
index d4116e2..e3d6e47 100644
--- a/pacman-staging.conf
+++ b/pacman-staging.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,31 +70,24 @@ Architecture = auto
# after the header, and they will be used before the default mirrors.
[staging]
-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-staging]
-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
diff --git a/pacman-testing.conf b/pacman-testing.conf
index 353bdbb..5712937 100644
--- a/pacman-testing.conf
+++ b/pacman-testing.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