6 files changed, 34 insertions, 37 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() {
diff --git a/kernels/linux-libre-pax-flags/PKGBUILD b/kernels/linux-libre-pax-flags/PKGBUILD
deleted file mode 100644
index 102f5ee74..000000000
--- a/kernels/linux-libre-pax-flags/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Contributors:
-#   henning mueller <henning@orgizm.net>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-_pkgname=linux-pax-flags
-pkgname=linux-libre-pax-flags
-pkgdesc='Deactivates PaX flags for several libre binaries to work with PaX enabled kernels'
-pkgver=1.0.26
-pkgrel=1
-arch=(any)
-url='https://projects.parabolagnulinux.org/abslibre.git/tree/kernels/linux-libre-pax-flags/'
-license=(GPL2)
-depends=(bash paxctl)
-replaces=('linux-pax-flags')
-conflicts=('linux-pax-flags')
-provides=("linux-pax-flags=$pkgver")
-source=($_pkgname)
-sha256sums=(bf1fda4919e7ed8052711c91933d9da5d86945ba44133c94e1952dedb4d1759b)
-
-build() {
-  return 0
-}
-
-package() {
-  install -D -m755 $srcdir/$_pkgname $pkgdir/usr/bin/$_pkgname
-}
diff --git a/kernels/paxutils/PKGBUILD b/kernels/paxutils/PKGBUILD
new file mode 100644
index 000000000..3d6d1e772
--- /dev/null
+++ b/kernels/paxutils/PKGBUILD
@@ -0,0 +1,24 @@
+# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+
+pkgname=paxutils
+pkgdesc='PaX utilities to configure flags for several binaries to work with PaX kernels'
+pkgver=0.1.0
+pkgrel=2
+arch=(any)
+url='https://projects.parabolagnulinux.org/abslibre.git/tree/kernels/paxutils/'
+license=(GPL2)
+depends=(bash paxctl)
+replaces=('linux-pax-flags' 'linux-libre-pax-flags')
+conflicts=('linux-pax-flags' 'linux-libre-pax-flags')
+provides=('linux-pax-flags' 'linux-libre-pax-flags')
+source=($pkgname)
+sha256sums=(bf1fda4919e7ed8052711c91933d9da5d86945ba44133c94e1952dedb4d1759b)
+
+build() {
+  return 0
+}
+
+package() {
+  install -D -m755 $srcdir/$pkgname $pkgdir/usr/bin/$pkgname
+}
diff --git a/kernels/linux-libre-pax-flags/linux-pax-flags b/kernels/paxutils/paxutils
index 22f5a8171..22f5a8171 100755
--- a/kernels/linux-libre-pax-flags/linux-pax-flags
+++ b/kernels/paxutils/paxutils