summaryrefslogtreecommitdiff
path: root/kernels/linux-libre-grsec
diff options
context:
space:
mode:
authoraurelien <tek@localhost.localdomain>2012-11-24 09:26:36 +0100
committeraurelien <tek@localhost.localdomain>2012-11-24 09:26:36 +0100
commitab0be3de19998f413b3b1406f2efb26076abdef7 (patch)
tree56ff4526a8cb5457513710efd5a660132cababf3 /kernels/linux-libre-grsec
parent0a9a064dde6943f5ce78d9eb03f403326cd5b4ef (diff)
parent4591321353c89b7069c32cd0f83b36c6d825ddcc (diff)
downloadabslibre-ab0be3de19998f413b3b1406f2efb26076abdef7.tar.gz
abslibre-ab0be3de19998f413b3b1406f2efb26076abdef7.tar.bz2
abslibre-ab0be3de19998f413b3b1406f2efb26076abdef7.zip
Merge http://projects.parabolagnulinux.org/abslibre
Diffstat (limited to 'kernels/linux-libre-grsec')
-rwxr-xr-xkernels/linux-libre-grsec/PKGBUILD10
-rw-r--r--kernels/linux-libre-grsec/config.x86_644
-rwxr-xr-xkernels/linux-libre-grsec/linux-libre-grsec.install6
3 files changed, 10 insertions, 10 deletions
diff --git a/kernels/linux-libre-grsec/PKGBUILD b/kernels/linux-libre-grsec/PKGBUILD
index c22a208d5..c0f1eb2a9 100755
--- a/kernels/linux-libre-grsec/PKGBUILD
+++ b/kernels/linux-libre-grsec/PKGBUILD
@@ -11,9 +11,9 @@ pkgbase=linux-libre-grsec # Build stock -LIBRE-GRSEC kernel
_basekernel=3.6
_sublevel=7
_grsecver=2.9.1
-_timestamp=201211181105
+_timestamp=201211221000
pkgver=${_basekernel}.${_sublevel}
-pkgrel=3
+pkgrel=4
_lxopkgver=${_basekernel}.7 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
@@ -37,9 +37,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('a2312edd0265b5b07bd4b50afae2b380'
'a4e642180c7d757a642175fe32e4a264'
- 'af1f2097a6e26d36801188193d3eb185'
+ '25ad4a2c727ae5d0fcfe30008a6cce09'
'508ce60a46a36c65d847c4759ac5f6c7'
- 'ec6b214e3744cc5fb38bcafb0c6218d6'
+ 'e0df7f5866d6d74ecc339347ac58ea3b'
'5f66bed97a5c37e48eb2f71b2d354b9a'
'2967cecc3af9f954ccc822fd63dca6ff'
'8267264d9a8966e57fdacd1fa1fc65c4'
@@ -161,7 +161,7 @@ build() {
_package() {
pkgdesc="The ${pkgbase} kernel and modules with grsecurity/PaX patches"
[ "${pkgbase}" = "linux-libre" ] && groups=('base')
- depends=('gradm' 'linux-libre-pax-flags' 'coreutils' 'linux-libre-firmware' 'kmod')
+ depends=('gradm' 'paxutils' 'coreutils' 'linux-libre-firmware' 'kmod')
optdepends=('crda: to set the correct wireless channels of your country')
provides=("kernel26${_kernelname}=${pkgver}" "linux${_kernelname}=${pkgver}")
conflicts=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}")
diff --git a/kernels/linux-libre-grsec/config.x86_64 b/kernels/linux-libre-grsec/config.x86_64
index 281b26f47..c1729bff5 100644
--- a/kernels/linux-libre-grsec/config.x86_64
+++ b/kernels/linux-libre-grsec/config.x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.6.1-2 Kernel Configuration
+# Linux/x86_64 3.6.7-4 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -5609,6 +5609,7 @@ CONFIG_PAX_USERCOPY=y
#
CONFIG_GRKERNSEC_KMEM=y
# CONFIG_GRKERNSEC_IO is not set
+CONFIG_GRKERNSEC_JIT_HARDEN=y
CONFIG_GRKERNSEC_PROC_MEMMAP=y
CONFIG_GRKERNSEC_BRUTE=y
CONFIG_GRKERNSEC_MODHARDEN=y
@@ -5690,7 +5691,6 @@ CONFIG_GRKERNSEC_BLACKHOLE=y
# Sysctl Support
#
CONFIG_GRKERNSEC_SYSCTL=y
-# CONFIG_GRKERNSEC_SYSCTL_DISTRO is not set
CONFIG_GRKERNSEC_SYSCTL_ON=y
#
diff --git a/kernels/linux-libre-grsec/linux-libre-grsec.install b/kernels/linux-libre-grsec/linux-libre-grsec.install
index ad209388f..4c65c9783 100755
--- a/kernels/linux-libre-grsec/linux-libre-grsec.install
+++ b/kernels/linux-libre-grsec/linux-libre-grsec.install
@@ -2,14 +2,14 @@
# arg 2: the old package version
KERNEL_NAME=-grsec
-KERNEL_VERSION=3.6.7-1-LIBRE-GRSEC
+KERNEL_VERSION=3.6.7-4-LIBRE-GRSEC
_fix_permissions() {
- /usr/bin/linux-pax-flags
+ /usr/bin/paxutils
echo
echo You can repeat this process after updating or installing affected
- echo binaries by running "linux-pax-flags".
+ echo binaries by running "paxutils".
}
_add_trusted_group() {