Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
alpine
aports
Commits
55cdaad8
Commit
55cdaad8
authored
Feb 16, 2017
by
Natanael Copa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
main/linux-grsec: upgrade to 4.9.10
parent
014f28c0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
19 deletions
+5
-19
main/linux-grsec/APKBUILD
main/linux-grsec/APKBUILD
+5
-7
main/linux-grsec/pax-cmpxchg8b_emu.patch
main/linux-grsec/pax-cmpxchg8b_emu.patch
+0
-12
No files found.
main/linux-grsec/APKBUILD
View file @
55cdaad8
...
...
@@ -2,12 +2,12 @@
_mainflavor
=
grsec
pkgname
=
linux-
$_mainflavor
pkgver
=
4.9.
9
pkgver
=
4.9.
10
case
$pkgver
in
*
.
*
.
*
)
_kernver
=
${
pkgver
%.*
}
;;
*
.
*
)
_kernver
=
${
pkgver
}
;;
esac
pkgrel
=
1
pkgrel
=
0
pkgdesc
=
"Linux kernel with grsecurity"
url
=
http://grsecurity.net
depends
=
"mkinitfs"
...
...
@@ -17,8 +17,7 @@ options="!strip"
install
=
source
=
"https://kernel.org/pub/linux/kernel/v4.x/linux-
$_kernver
.tar.xz
https://kernel.org/pub/linux/kernel/v4.x/patch-
$pkgver
.xz
http://dev.alpinelinux.org/~ncopa/grsec/grsecurity-3.1-4.9.9-201702122044.patch
pax-cmpxchg8b_emu.patch
http://dev.alpinelinux.org/~ncopa/grsec/grsecurity-3.1-4.9.10-201702152052.patch
zfs-fix.patch
config-grsec.x86
config-grsec.x86_64
...
...
@@ -199,9 +198,8 @@ _dev() {
}
sha512sums
=
"bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a linux-4.9.tar.xz
a7a2d44b83b00b20f1424d12af0f42e1c576d3053feacd13491ef185661fb1c789b9265c500b62f5ede39f57b72f358820000fa6c852a5f035e566ee1dfcd5d9 patch-4.9.9.xz
ba7396e1f69e89335cecd47db52c8855c993c13c9b2b9e805a0742fa1bd3a9092ae0459adb06f07a5233ff208ad9b6ced0fa68cacfe1a99b498c43ad953d5388 grsecurity-3.1-4.9.9-201702122044.patch
05b59599d7744415cca29f7c820343bb247df5ab52d461f663a7674c246e028ed4fc9509b7f21bfb18be1a72cfdc37d5a673f30067c343f2c1ac40cbcd5b88a9 pax-cmpxchg8b_emu.patch
93958f4b932a46bbd9a122f52bf09b8c4b864b419a0774514baeb7dc83f11f55a5ba84f2e586a904dbfeeb7d976352e40670fbe2e32e25c35085ddf87e41b58d patch-4.9.10.xz
93b4ce0663ad1d9abac249c3960acf8a4b4e6d8cb78a66bb1aec9a34b07da60a49d6d83623c2accbf4d9b7a9ec70a5cac7a64a8acafca4091371b201355309f9 grsecurity-3.1-4.9.10-201702152052.patch
5a0a78e6de11eb8180d96830b9faa9ac560586f7beb663c8196a16ac6232b5008b9181b3c9b94e2b13a444acba4b6e80a3408d34606432f92eb4d169c3953d5d zfs-fix.patch
de080dc463af81f60e142c4ed52f294f523759710ac6d5dc227e6dc26c4bd53c61d94480a9af3e377a658360c16cab86060afd68694545cbe501d8bb0915ef36 config-grsec.x86
de5ad64e86bda944c1e6e7ae0eb77463fb0165e89c8ec23d9af12fddb79c0b566e8f3079b7bed1de8b27cef9bf1539f479e7114070772c078cb4288c45df1ff6 config-grsec.x86_64
...
...
main/linux-grsec/pax-cmpxchg8b_emu.patch
deleted
100644 → 0
View file @
014f28c0
diff --git a/arch/x86/lib/cmpxchg8b_emu.S b/arch/x86/lib/cmpxchg8b_emu.S
index 34c859b..6793bf2 100644
--- a/arch/x86/lib/cmpxchg8b_emu.S
+++ b/arch/x86/lib/cmpxchg8b_emu.S
@@ -8,6 +8,7 @@
#include <linux/linkage.h>
#include <asm/export.h>
+#include <asm/alternative-asm.h>
.text
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment