summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2019-04-13 12:14:54 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2019-04-13 12:14:54 -0700
commite51739a63472dbe450e6e72e15109bfa2761a7e1 (patch)
tree984c355154f665fd5ca213e9225facf048d36476
parentUpdated to 5.0.7 (diff)
downloadlinux-e51739a63472dbe450e6e72e15109bfa2761a7e1.tar.xz
Sync with upstream
Remove needless git commit fingerprint Use single line for linux source archive and sig
-rw-r--r--PKGBUILD6
-rw-r--r--config.x86_6417
2 files changed, 16 insertions, 7 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 7e2cec5..ea2e4f7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
# # I maintain this because:
# Arch version patch script does not apply consistently
# Arch version lacks ath9k, greysky2, and raid6 patches
-# Arch version allows SM3 and SM4
+# Arch version allows SEED, SM3, SM4, and Streebog
# Arch version is 300 Hz
# Arch version supports Intel ME
# Arch version is not configured for openrc
@@ -27,8 +27,7 @@ license=('GPL2')
makedepends=('xmlto' 'kmod' 'inetutils' 'bc' 'libelf')
conflicts=('linux-libre')
options=('!strip')
-source=(https://www.kernel.org/pub/linux/kernel/v5.x/linux-${pkgver}.tar.xz
- https://www.kernel.org/pub/linux/kernel/v5.x/linux-${pkgver}.tar.sign
+source=("https://www.kernel.org/pub/linux/kernel/v5.x/linux-$pkgver.tar".{xz,sign}
enable_additional_cpu_optimizations-$_gcc_more_v.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/$_gcc_more_v.tar.gz
ath9k-regdom-hack.patch
raid6-default-algo.patch
@@ -49,7 +48,6 @@ sha256sums=('16e177662b9fc7255bfc51018513979f6effcbe52e459c543aa83a5b15ef54ec'
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
- '8218F88849AAC522E94CF470A5E9288C4FA415FA' # Jan Alexander Steffens (heftig)
)
_kernelname=${pkgbase#linux}
diff --git a/config.x86_64 b/config.x86_64
index 62fc2ff..6c6ac79 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.0.5 Kernel Configuration
+# Linux/x86 5.0.7 Kernel Configuration
#
#
@@ -9290,8 +9290,16 @@ CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
CONFIG_SECURITY_SELINUX_DEVELOP=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
-# CONFIG_SECURITY_SMACK is not set
-# CONFIG_SECURITY_TOMOYO is not set
+CONFIG_SECURITY_SMACK=y
+CONFIG_SECURITY_SMACK_BRINGUP=y
+CONFIG_SECURITY_SMACK_NETFILTER=y
+CONFIG_SECURITY_SMACK_APPEND_SIGNALS=y
+CONFIG_SECURITY_TOMOYO=y
+CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
+CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
+# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
+CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
+CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init"
CONFIG_SECURITY_APPARMOR=y
CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
CONFIG_SECURITY_APPARMOR_HASH=y
@@ -9305,6 +9313,8 @@ CONFIG_INTEGRITY_AUDIT=y
# CONFIG_IMA is not set
# CONFIG_EVM is not set
# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_SMACK is not set
+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
CONFIG_DEFAULT_SECURITY_DAC=y
CONFIG_DEFAULT_SECURITY=""
@@ -9551,6 +9561,7 @@ CONFIG_BINARY_PRINTF=y
# Library routines
#
CONFIG_RAID6_PQ=m
+# CONFIG_RAID6_PQ_BENCHMARK is not set
CONFIG_RAID6_PQ_DEFAULT_ALG_BOOL=y
CONFIG_RAID6_PQ_DEFAULT_ALG="sse2x4"
CONFIG_BITREVERSE=y