Merge branch 'master' of ssh://projects.parabola.nu:1863/~git/abslibre/abslibre

4 files changed, 19 insertions, 21 deletions

diff --git a/kernels/linux-libre-lts-grsec-knock/PKGBUILD b/kernels/linux-libre-lts-grsec-knock/PKGBUILD
index 96bba6b10..b6d674b80 100644
--- a/kernels/linux-libre-lts-grsec-knock/PKGBUILD
+++ b/kernels/linux-libre-lts-grsec-knock/PKGBUILD
@@ -12,9 +12,9 @@
 
 pkgbase=linux-libre-lts-grsec-knock   # Build kernel with lts-grsec-knock localname
 _pkgbasever=3.14-gnu
-_pkgver=3.14.26-gnu
+_pkgver=3.14.27-gnu
 _grsecver=3.0
-_timestamp=201412142109
+_timestamp=201412211908
 _knockpatchver=3.16_1
 
 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
@@ -53,14 +53,14 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
         '3.14.14-a410a5e2b7-loongson-community.patch')
 sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b'
             'SKIP'
-            'bd8eafb8a64bcd8c4d39e4c201acc9ed1761016e761da65d47fa3b7e4f0f245b'
+            'fea5b9d31f8100c955c1ffee3bb45cae90efcae372fcd35f3c44feb979604b43'
             'SKIP'
-            '385544961bdd232293b2d1c22226899f8477fb97f94ebeeaa80b8bd160196bd8'
+            '6a54cf72bf2d0231f6c1e13eda0585919178e66312270522d91a9c34c32643f7'
             'SKIP'
             '70cbe962aa01989ffa83490bb0765d6e4c781f6133dc8d768d84bd6716ac0209'
             'SKIP'
-            '421bd0710d0fb9b16f53eb20a298bed5fc10e47697e14d566126afc8827e17bb'
-            '49d90ee3713ebd017e4f2c82f558a337f404b316b28a74ff586c384783b234f2'
+            '30cbb772d4ef6562cb761149c82213db2844e9ab853ddfb1936d76446f54df0b'
+            '545babe1eb6b6bb5dc8b7d4692bc6ca8a4166debb9d680875268925932231f56'
             '4b029accfd05ea03b337a278a39e217dfd6aba1d934ed350e61724b1af53b65d'
             'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
             '074b67818582874146c389c029bc43648d145891a27e47aa2c5c42d3571f0264'
@@ -72,6 +72,11 @@ sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b'
             '65d58f63215ee3c5f9c4fc6bce36fc5311a6c7dbdbe1ad29de40647b47ff9c0d'
             'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7'
             '78d67e41175873d18018ec4dd46f3b9d59c9fbf54ec8c1d616bfef9362cf0b49')
+validpgpkeys=(
+              '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
+              'DE9452CE46F42094907F108B44D1C0F82525FE49' # Bradley Spengler
+              'F949CFBD140A6DD071E90B8CDC24396B6D451038' # Julian Kirsch
+)
 
 _kernelname=${pkgbase#linux-libre}
 _replacesarchkernel=("${_replacesarchkernel[@]/\%/${_kernelname}}")
diff --git a/kernels/linux-libre-lts-grsec-knock/config.i686 b/kernels/linux-libre-lts-grsec-knock/config.i686
index fdb5914cc..768b8fc9b 100644
--- a/kernels/linux-libre-lts-grsec-knock/config.i686
+++ b/kernels/linux-libre-lts-grsec-knock/config.i686
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.14.19-gnu-201409180900-1-lts-grsec-knock Kernel Configuration
+# Linux/x86 3.14.27-gnu-201412211908-1-lts-grsec-knock Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -411,8 +411,6 @@ CONFIG_X86_MCE_THRESHOLD=y
 # CONFIG_X86_MCE_INJECT is not set
 CONFIG_X86_THERMAL_VECTOR=y
 CONFIG_VM86=y
-CONFIG_X86_16BIT=y
-CONFIG_X86_ESPFIX32=y
 CONFIG_TOSHIBA=m
 CONFIG_I8K=m
 CONFIG_X86_REBOOTFIXUPS=y
diff --git a/kernels/linux-libre-lts-grsec-knock/config.x86_64 b/kernels/linux-libre-lts-grsec-knock/config.x86_64
index 8652fb6a3..dbfb5fe70 100644
--- a/kernels/linux-libre-lts-grsec-knock/config.x86_64
+++ b/kernels/linux-libre-lts-grsec-knock/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.14.19-gnu-201409180900-1-lts-grsec-knock Kernel Configuration
+# Linux/x86 3.14.27-gnu-201412211908-1-lts-grsec-knock Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -403,8 +403,6 @@ CONFIG_X86_MCE_AMD=y
 CONFIG_X86_MCE_THRESHOLD=y
 # CONFIG_X86_MCE_INJECT is not set
 CONFIG_X86_THERMAL_VECTOR=y
-CONFIG_X86_16BIT=y
-CONFIG_X86_ESPFIX64=y
 CONFIG_I8K=m
 CONFIG_MICROCODE=m
 # CONFIG_MICROCODE_INTEL is not set
diff --git a/kernels/linux-libre-lts-grsec-knock/linux.install b/kernels/linux-libre-lts-grsec-knock/linux.install
index 19b161976..cdd4fc784 100644
--- a/kernels/linux-libre-lts-grsec-knock/linux.install
+++ b/kernels/linux-libre-lts-grsec-knock/linux.install
@@ -4,13 +4,12 @@
 KERNEL_NAME=
 KERNEL_VERSION=
 
-_uderef_warning() {
+_uderef_news() {
   if [[ $(uname -m) = x86_64 ]]; then
     cat <<EOF
-CONFIG_PAX_MEMORY_UDEREF is now enabled on x86_64 and can be disabled by
-passing \`pax_nouderef\` on the kernel line. UDEREF's PCID support on Sandy
-Bridge and later is known to have issues with recent kernel versions and can be
-disabled by passing \`nopcid\` to use the legacy implementation.
+The UDEREF PCID bug has been fixed. If you added \`nopcid\` or \`pax_nouderef\`
+to the kernel line as a workaround it should now be removed to take advantage
+of the stronger PCID-based UDEREF implementation.
 EOF
   fi
 }
@@ -21,8 +20,6 @@ post_install () {
   depmod ${KERNEL_VERSION}
   echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
   mkinitcpio -p linux-libre${KERNEL_NAME}
-
-  _uderef_warning
 }
 
 post_upgrade() {
@@ -46,8 +43,8 @@ post_upgrade() {
     echo ">>>          include the 'keyboard' hook in your mkinitcpio.conf."
   fi
 
-  if [[ $(vercmp $2 3.14.18_gnu.201409082127-2) -lt 0 ]]; then
-    _uderef_warning
+  if [[ $(vercmp $2 3.14.27_gnu.201412211908-1) -lt 0 ]]; then
+    _uderef_news
   fi
 }