summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Gorski2019-06-12 12:48:29 +0200
committerPiotr Gorski2019-06-12 12:48:29 +0200
commit995320aa480057a66604d9bc88dd60f25a7a6097 (patch)
treecd001766810db7c9ebe91597bdf8580a1dd24e29
parentc0ef36ea19312f147ae8fe886b9a518a9a348327 (diff)
downloadaur-995320aa480057a66604d9bc88dd60f25a7a6097.tar.gz
Sync with Arch
Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD13
-rw-r--r--config4
3 files changed, 20 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 49aacfc229c..32fababeff2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = linux-next-git
- pkgver = 20190603.r0.gae3cad8f39cc
+ pkgver = 20190612.r0.g81a72c79224f
pkgrel = 1
url = http://www.kernel.org/
arch = x86_64
@@ -8,15 +8,20 @@ pkgbase = linux-next-git
makedepends = inetutils
makedepends = bc
makedepends = libelf
+ makedepends = git
options = !strip
source = git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
+ source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/5.1/arch-patches-v3/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
+ source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/5.1/arch-patches-v3/0002-ZEN-Add-CONFIG-for-unprivileged_userns_clone.patch
source = config
source = 60-linux.hook
source = 90-linux.hook
source = 99-linux.hook
source = linux.preset
sha512sums = SKIP
- sha512sums = 6f08c5c576f385b43b186a09d09c869fb8e314dc3bda30fb27a8e4d62ff866d4f24bb240ed628d99629286b5ce93319b87d8f23b182e80ded4b1e0ebca0e9506
+ sha512sums = 2f7a1939c8e9e86b39a3385ef33f1fb738e507ae771696f57d5fa2032a46438c50e5ce54ad607643dffa0d544d401fc40616db9e88defcf7719f32efa3cdbefc
+ sha512sums = ad3f2c10467341fcbf0f6a636aef0bf216d9c0d993d79ce3825e5432ad8261e6e596772931a6ac090742cf7299bdf72730e75184efc9502246ed521d79214034
+ sha512sums = ab361b61a7d3d2f57f699984ab334d003f8f945361941c33bc8a4c9101a70a1881a17bc457157d73fc95209b9f3fb91cd40b112070718e3b4582d997747e355d
sha512sums = 7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a
sha512sums = 2718b58dbbb15063bacb2bde6489e5b3c59afac4c0e0435b97fe720d42c711b6bcba926f67a8687878bd51373c9cf3adb1915a11666d79ccb220bf36e0788ab7
sha512sums = 8742e2eed421e2f29850e18616f435536c12036ff793f5682a3a8c980cf5dbfc88d17fd9539c87de15d9e4663dc3190f964f18a4722940465437927b6052abbf
diff --git a/PKGBUILD b/PKGBUILD
index 280a247bcb5..3032688babb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -50,16 +50,21 @@ _1k_HZ_ticks=
### Do not edit below this line unless you know what you're doing
pkgbase=linux-next-git
-pkgver=20190603.r0.gae3cad8f39cc
+pkgver=20190612.r0.g81a72c79224f
_srcname=linux-next
pkgrel=1
arch=('x86_64')
url="http://www.kernel.org/"
license=('GPL2')
options=('!strip')
-makedepends=('kmod' 'inetutils' 'bc' 'libelf')
+makedepends=('kmod' 'inetutils' 'bc' 'libelf' 'git')
+_lucjanver=5.1
+#_lucjanpath="https://raw.githubusercontent.com/sirlucjan/kernel-patches/master/${_lucjanver}"
+_lucjanpath="https://gitlab.com/sirlucjan/kernel-patches/raw/master/${_lucjanver}"
source=("git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git"
+ "${_lucjanpath}/arch-patches-v3/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch"
+ "${_lucjanpath}/arch-patches-v3/0002-ZEN-Add-CONFIG-for-unprivileged_userns_clone.patch"
# the main kernel config files
'config'
# pacman hook for depmod
@@ -358,7 +363,9 @@ for _p in "${pkgname[@]}"; do
done
sha512sums=('SKIP'
- '6f08c5c576f385b43b186a09d09c869fb8e314dc3bda30fb27a8e4d62ff866d4f24bb240ed628d99629286b5ce93319b87d8f23b182e80ded4b1e0ebca0e9506'
+ '2f7a1939c8e9e86b39a3385ef33f1fb738e507ae771696f57d5fa2032a46438c50e5ce54ad607643dffa0d544d401fc40616db9e88defcf7719f32efa3cdbefc'
+ 'ad3f2c10467341fcbf0f6a636aef0bf216d9c0d993d79ce3825e5432ad8261e6e596772931a6ac090742cf7299bdf72730e75184efc9502246ed521d79214034'
+ 'ab361b61a7d3d2f57f699984ab334d003f8f945361941c33bc8a4c9101a70a1881a17bc457157d73fc95209b9f3fb91cd40b112070718e3b4582d997747e355d'
'7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a'
'2718b58dbbb15063bacb2bde6489e5b3c59afac4c0e0435b97fe720d42c711b6bcba926f67a8687878bd51373c9cf3adb1915a11666d79ccb220bf36e0788ab7'
'8742e2eed421e2f29850e18616f435536c12036ff793f5682a3a8c980cf5dbfc88d17fd9539c87de15d9e4663dc3190f964f18a4722940465437927b6052abbf'
diff --git a/config b/config
index f9f36d1da9e..4fa789c11f3 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.1.0-arch1 Kernel Configuration
+# Linux/x86 5.1.8-arch1 Kernel Configuration
#
#
@@ -167,6 +167,7 @@ CONFIG_NAMESPACES=y
CONFIG_UTS_NS=y
CONFIG_IPC_NS=y
CONFIG_USER_NS=y
+CONFIG_USER_NS_UNPRIVILEGED=y
CONFIG_PID_NS=y
CONFIG_NET_NS=y
CONFIG_CHECKPOINT_RESTORE=y
@@ -780,6 +781,7 @@ CONFIG_HAVE_RELIABLE_STACKTRACE=y
CONFIG_ISA_BUS_API=y
CONFIG_OLD_SIGSUSPEND3=y
CONFIG_COMPAT_OLD_SIGACTION=y
+CONFIG_64BIT_TIME=y
CONFIG_COMPAT_32BIT_TIME=y
CONFIG_HAVE_ARCH_VMAP_STACK=y
CONFIG_VMAP_STACK=y