aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoryar2016-01-25 13:59:56 -0800
committeryar2016-01-25 13:59:56 -0800
commit9035d660f215f0ccacbc1d2f935a10bed750c217 (patch)
tree71422053543c50a5aac446949c0dd2bb1f553917
parent97b6f55c4323f0d533cc96c7b2abb76e78e9badd (diff)
downloadaur-9035d660f215f0ccacbc1d2f935a10bed750c217.tar.gz
bump 4.3.4
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD13
-rw-r--r--cve-2016-0728-fix.patch20
3 files changed, 11 insertions, 36 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e933baa0e6a1..6e56a0228211 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Wed Jan 20 01:22:21 UTC 2016
+# Mon Jan 25 21:58:46 UTC 2016
pkgbase = linux-linode
pkgdesc = Kernel for Linode servers
- pkgver = 4.3.3
- pkgrel = 2
+ pkgver = 4.3.4
+ pkgrel = 1
url = https://github.com/yardenac/linux-linode
install = install
arch = i686
@@ -27,22 +27,20 @@ pkgbase = linux-linode
backup = boot/grub/menu.lst
source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.3.tar.xz
source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.3.tar.sign
- source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.3.3.xz
- source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.3.3.sign
+ source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.3.4.xz
+ source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.3.4.sign
source = config
source = config.x86_64
source = menu.lst
source = preset
- source = cve-2016-0728-fix.patch
sha512sums = d25812043850530fdcfdb48523523ee980747f3c2c1266149330844dae2cba0d056d4ddd9c0f129f570f5d1f6df5c20385aec5f6a2e0755edc1e2f5f93e2c6bc
sha512sums = SKIP
- sha512sums = 1b9cc343a589a7cdaa66284b3d7129be9869195f5b839dac0222050af42dc7a7451d4e2bf176c1a9939d6572a44a9b6f4534b0c7a79032881a9bc8f8f56c9c69
+ sha512sums = ae0454d09a81168164a97e5663f6476e953bfb42ecca597ba9bc07ce4142f8e9567a1e0e1b6726f002669e1acdd39fed0a3ecda54e5719efbf17bd661ea0ba56
sha512sums = SKIP
sha512sums = ad52875e372eb68a1b3dfd8e6f8ccbfd9e2cafec7d98b10e99d6a84f4c867979934c27ef70d0f34d159c7bd994e966c1824b9c1e41c950a3d3180a90bb7ce882
sha512sums = 2e1fb253d39dd2c9c8a44f0acebdd3a12400ab93b0035ef1962065085c2beb5b536b78ac1cacdad3606684513b45bbc0578b7255b9b9788dcc258963b9d6087b
sha512sums = 2beaa01dc9679a66ccbbca0f4abeb0f77956651e3f83f114030b2ef344a16240124a549ccee2588b6a1179be6a66b4a8dc931e2c15c4d5282afeb85bb6ada210
sha512sums = a0a78831075336edef0a8faa34fa550986c3c4d89a89f4f39d798da0211129dc90257d162bec2cdefabef2eb5886a710e70c72074b2f3016788861d05d1e2a1f
- sha512sums = 21daef6e568c94a611bff8d76b18c54b46ca84f3036c7d92cad6719422d993c90678e4846cb7bd96fe4dae9635f3114332bf1cd565360265d7d9029a10a0f016
pkgname = linux-linode
diff --git a/PKGBUILD b/PKGBUILD
index 127daa7690ab..8f490ddc86ae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@ pkgname=linux-linode
_basekernel=4.3
_kernelname=${pkgname#linux}
_srcname=linux-${_basekernel}
-pkgver=${_basekernel}.3
-pkgrel=2
+pkgver=${_basekernel}.4
+pkgrel=1
arch=('i686' 'x86_64')
url="https://github.com/yardenac/linux-linode"
license=(GPL2)
@@ -17,15 +17,13 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar."{xz,sign}
'config'
'config.x86_64'
'menu.lst'
- 'preset'
- 'cve-2016-0728-fix.patch')
+ 'preset')
sha512sums=('d25812043850530fdcfdb48523523ee980747f3c2c1266149330844dae2cba0d056d4ddd9c0f129f570f5d1f6df5c20385aec5f6a2e0755edc1e2f5f93e2c6bc' 'SKIP'
- '1b9cc343a589a7cdaa66284b3d7129be9869195f5b839dac0222050af42dc7a7451d4e2bf176c1a9939d6572a44a9b6f4534b0c7a79032881a9bc8f8f56c9c69' 'SKIP'
+ 'ae0454d09a81168164a97e5663f6476e953bfb42ecca597ba9bc07ce4142f8e9567a1e0e1b6726f002669e1acdd39fed0a3ecda54e5719efbf17bd661ea0ba56' 'SKIP'
'ad52875e372eb68a1b3dfd8e6f8ccbfd9e2cafec7d98b10e99d6a84f4c867979934c27ef70d0f34d159c7bd994e966c1824b9c1e41c950a3d3180a90bb7ce882'
'2e1fb253d39dd2c9c8a44f0acebdd3a12400ab93b0035ef1962065085c2beb5b536b78ac1cacdad3606684513b45bbc0578b7255b9b9788dcc258963b9d6087b'
'2beaa01dc9679a66ccbbca0f4abeb0f77956651e3f83f114030b2ef344a16240124a549ccee2588b6a1179be6a66b4a8dc931e2c15c4d5282afeb85bb6ada210'
- 'a0a78831075336edef0a8faa34fa550986c3c4d89a89f4f39d798da0211129dc90257d162bec2cdefabef2eb5886a710e70c72074b2f3016788861d05d1e2a1f'
- '21daef6e568c94a611bff8d76b18c54b46ca84f3036c7d92cad6719422d993c90678e4846cb7bd96fe4dae9635f3114332bf1cd565360265d7d9029a10a0f016')
+ 'a0a78831075336edef0a8faa34fa550986c3c4d89a89f4f39d798da0211129dc90257d162bec2cdefabef2eb5886a710e70c72074b2f3016788861d05d1e2a1f')
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linux Torvalds
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
@@ -40,7 +38,6 @@ install=install
prepare() {
cd "${srcdir}/${_srcname}"
patch -p1 -i "${srcdir}/patch-${pkgver}"
- patch -Np1 -i "${srcdir}/cve-2016-0728-fix.patch"
if [ "${CARCH}" = "x86_64" ]; then
cat "${srcdir}/config.x86_64" > ./.config
else
diff --git a/cve-2016-0728-fix.patch b/cve-2016-0728-fix.patch
deleted file mode 100644
index 0e64298c3ce2..000000000000
--- a/cve-2016-0728-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Reported-by: Yevgeny Pats <yevgeny@perception-point.io>
-Signed-off-by: David Howells <dhowells@redhat.com>
-Acked-by: Don Zickus <dzickus@redhat.com>
-Acked-by: Prarit Bhargava <prarit@redhat.com>
-Acked-by: Jarod Wilson <jarod@redhat.com>
----
- security/keys/process_keys.c | 1 +
- 1 file changed, 1 insertion(+)
-diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c
-index a3f85d2a00bb..e6d50172872f 100644
---- a/security/keys/process_keys.c
-+++ b/security/keys/process_keys.c
-@@ -794,6 +794,7 @@ long join_session_keyring(const char *name)
- ret = PTR_ERR(keyring);
- goto error2;
- } else if (keyring == new->session_keyring) {
-+ key_put(keyring);
- ret = 0;
- goto error2;
- }