summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2018-07-17 14:05:15 +0000
committerAndreas Baumann <mail@andreasbaumann.cc>2018-07-17 14:05:15 +0000
commitdd08c93f6c1f79489699034f1361bd20b5703edc (patch)
treeeb0e8479078bb3c4d9ea5f7b4beb4d7d5433d4fa
parentccc3a90d2823a96868590ae42b5ed70529d6a146 (diff)
parent2817fb443a79ab91e914fd39b0ea6dd40ab54a5e (diff)
downloadpackages-dd08c93f6c1f79489699034f1361bd20b5703edc.tar.xz
Merge branch 'master' into i486
-rw-r--r--extra/linux-pae/PKGBUILD6
-rw-r--r--extra/linux-pae/config3
-rw-r--r--extra/python2/PKGBUILD2
3 files changed, 5 insertions, 6 deletions
diff --git a/extra/linux-pae/PKGBUILD b/extra/linux-pae/PKGBUILD
index 706a4838..bc29e7a5 100644
--- a/extra/linux-pae/PKGBUILD
+++ b/extra/linux-pae/PKGBUILD
@@ -5,7 +5,7 @@
pkgbase=linux-pae # Build stock -ARCH kernel
_srcname=linux-4.17
-pkgver=4.17.6
+pkgver=4.17.7
pkgrel=1
arch=('i686')
url="https://www.kernel.org/"
@@ -29,9 +29,9 @@ validpgpkeys=(
)
sha256sums=('9faa1dd896eaea961dc6e886697c0b3301277102e5bc976b2758f9a62d3ccd13'
'SKIP'
- '7699b2246e4ed1e284f2947d5e0b66653c27574995caf6a02a3280bd055cfedf'
+ '7f96003274d45fabda457951919c68a5856c7b40e4ee230baa0492dd8caf2e97'
'SKIP'
- '810db6f47c166a726425b217c753a14a9928db236d608f5b65291c1652141a28'
+ '8c7c3fc8e594abe5894b620ea77c889a97af68e8d53c96246e089a3b26be582f'
'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
'75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
diff --git a/extra/linux-pae/config b/extra/linux-pae/config
index a0ce2427..1f6b8d30 100644
--- a/extra/linux-pae/config
+++ b/extra/linux-pae/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.17.6-1 Kernel Configuration
+# Linux/x86 4.17.7-1 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -9360,7 +9360,6 @@ CONFIG_CRYPTO_DES=m
CONFIG_CRYPTO_FCRYPT=m
CONFIG_CRYPTO_KHAZAD=m
CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_SALSA20_586=m
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_SEED=m
CONFIG_CRYPTO_SERPENT=m
diff --git a/extra/python2/PKGBUILD b/extra/python2/PKGBUILD
index 60148bdb..7ff6b97e 100644
--- a/extra/python2/PKGBUILD
+++ b/extra/python2/PKGBUILD
@@ -6,7 +6,7 @@
eval "$(
declare -f build | \
sed '
- /export OPT=/ s/"$/ -fwrapv"/
+ /export OPT=/ s/";$/ -fwrapv";/
'
declare -f check | \
sed '