summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2018-07-28 07:31:21 +0000
committerAndreas Baumann <mail@andreasbaumann.cc>2018-07-28 07:31:21 +0000
commit043f74201967addd0353517fa10251975f7c723f (patch)
tree60b55602b4f50550e7d5b5fe5751b950c4b01536 /core
parenta285bcc8d431861e2fcc52a9e9c1fe9cafcbf669 (diff)
parent8756fcb2e930b1c246991db06d7f2e089f816c2f (diff)
downloadpackages-043f74201967addd0353517fa10251975f7c723f.tar.xz
Merge branch 'master' into i486
Diffstat (limited to 'core')
-rw-r--r--core/pacman/PKGBUILD2
-rw-r--r--core/pacman/pacman.conf2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/pacman/PKGBUILD b/core/pacman/PKGBUILD
index e76f402c..1a0491e0 100644
--- a/core/pacman/PKGBUILD
+++ b/core/pacman/PKGBUILD
@@ -4,7 +4,7 @@ depends+=(archlinux32-keyring)
# fail if upstream changes makepkg.conf or pacman.conf
if [ "${sha256sums[4]}" = '95b3b2416402059cf6acf3e046082e7ce261e2b88629231dbf579a4200d8a63b' ]; then
- sha256sums[4]='240f25727c5ac21feeb14fb1d4c03b09d2cf0a43c1d02b042376c12e34b1f8ef'
+ sha256sums[4]='008f9da1eb55e679eabbab762e106c7741d5ad303adc9644baf589a99e3c1e41'
fi
if [ "${sha256sums[5]}" = '650ddad24cad6afc4aecb4829cb8f06b9acb70c10a44f756fe8bd279949b518e' ]; then
sha256sums[5]='d1c3e5f9b7259e401ab121aff335531452d23dc67d9e6c2f464771d25f11058a'
diff --git a/core/pacman/pacman.conf b/core/pacman/pacman.conf
index 87a21824..bf27b628 100644
--- a/core/pacman/pacman.conf
+++ b/core/pacman/pacman.conf
@@ -38,7 +38,7 @@ CheckSpace
# 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 = Required DatabaseOptional
+SigLevel = Required DatabaseOptional DatabaseTrustAll
LocalFileSigLevel = Optional
#RemoteFileSigLevel = Required