summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD8
2 files changed, 3 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bdb3f34ba424..b2d53b19b838 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Wed Dec 21 17:17:23 UTC 2016
+# Wed Dec 21 17:24:04 UTC 2016
pkgbase = linux-tomoyo
pkgver = 4.8.15
- pkgrel = 1
+ pkgrel = 2
url = https://www.kernel.org/
arch = i686
arch = x86_64
@@ -23,7 +23,6 @@ pkgbase = linux-tomoyo
source = 99-linux.hook
source = linux-tomoyo.preset
source = change-default-console-loglevel.patch
- source = fix_race_condition_in_packet_set_ring.diff
source = net_handle_no_dst_on_skb_in_icmp6_send.patch
sha256sums = 3e9150065f193d3d94bcf46a1fe9f033c7ef7122ab71d75a7fb5a2f0c9a7e11a
sha256sums = SKIP
@@ -34,7 +33,6 @@ pkgbase = linux-tomoyo
sha256sums = 834bd254b56ab71d73f59b3221f056c72f559553c04718e350ab2a3e2991afe0
sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65
sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99
- sha256sums = ad1ee95f906f88d31fcdb9273cd08e02e8eda177449f0c98dc1bff8cbf1483c2
sha256sums = b595a1588bafb3d732841cd1b73633970706914f57f2d215c9f1494212d13989
pkgname = linux-tomoyo
diff --git a/PKGBUILD b/PKGBUILD
index 3f37ae384f3d..d152108723e5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
pkgbase=linux-tomoyo
_srcname=linux-4.8
pkgver=4.8.15
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url="https://www.kernel.org/"
license=('GPL2')
@@ -25,7 +25,6 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
# standard config files for mkinitcpio ramdisk
'linux-tomoyo.preset'
'change-default-console-loglevel.patch'
- 'fix_race_condition_in_packet_set_ring.diff'
'net_handle_no_dst_on_skb_in_icmp6_send.patch'
)
@@ -38,7 +37,6 @@ sha256sums=('3e9150065f193d3d94bcf46a1fe9f033c7ef7122ab71d75a7fb5a2f0c9a7e11a'
'834bd254b56ab71d73f59b3221f056c72f559553c04718e350ab2a3e2991afe0'
'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
'1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
- 'ad1ee95f906f88d31fcdb9273cd08e02e8eda177449f0c98dc1bff8cbf1483c2'
'b595a1588bafb3d732841cd1b73633970706914f57f2d215c9f1494212d13989')
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
@@ -53,10 +51,6 @@ prepare() {
# add upstream patch
patch -p1 -i "${srcdir}/patch-${pkgver}"
- # fix a race condition that allows to gain root
- # https://marc.info/?l=linux-netdev&m=148054660230570&w=2
- patch -p1 -i "${srcdir}/fix_race_condition_in_packet_set_ring.diff"
-
# https://bugzilla.kernel.org/show_bug.cgi?id=189851
patch -p1 -i "${srcdir}/net_handle_no_dst_on_skb_in_icmp6_send.patch"