Merge branch 'master' of ssh://projects.parabolagnulinux.org:1863/~git/abslibre

4 files changed, 18 insertions, 23 deletions

diff --git a/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD
index dae385379..ce00e55da 100644
--- a/libre/linux-libre-grsec/PKGBUILD
+++ b/libre/linux-libre-grsec/PKGBUILD
@@ -12,9 +12,9 @@
 
 pkgbase=linux-libre-grsec   # Build kernel with -grsec localname
 _pkgbasever=3.17-gnu
-_pkgver=3.17.6-gnu
+_pkgver=3.17.7-gnu
 _grsecver=3.0
-_timestamp=201412142110
+_timestamp=201412211910
 
 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
 _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname
@@ -46,12 +46,12 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
         '3.17-rc6-5358c5e4e5-loongson-community.patch')
 sha256sums=('3b2e9a862ada390a318f95d5a436d07dd32664434f4f383e27fd5cc0b4f41f0e'
             'SKIP'
-            'df2553ec61d83e0b35098efe8676573f01ac217f06b17fb515dd32f6b99148f1'
+            'c86985d513f5cb08dd658cf8d59f95be79a079cb0037ea714dccb4a343a3e1ac'
             'SKIP'
-            'c87af490619c1b0156193650805397bf5fc4d28d1dae28e7a90dc267e734a7a8'
+            '7c681d20aa17fa40484535d01b529a9377d44c4d242bd2234a03aa4a88d373e8'
             'SKIP'
-            'b21812c69df32e1e5d7c54f4e9a8bfd8e2ec9d922bd5cb0f84ec6cf06fadd339'
-            'ba1f4e3a3cc864eb1de2cb534feeb78e353e16dd2b0b50054fdf3bc170716bc3'
+            '3a7417131572fd66a1ace899dc49a1a8f105eb51aa1652c4b322653201eaec08'
+            '8ca435239a8b7ff20c217be6e3f8b471cecac158511bd02fac6db5df856b1ea3'
             '8ccdacf8db378d8ec23e65586ec256b963b91fc67492bcaef400451074e9f6c5'
             'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
             '074b67818582874146c389c029bc43648d145891a27e47aa2c5c42d3571f0264'
@@ -59,6 +59,10 @@ sha256sums=('3b2e9a862ada390a318f95d5a436d07dd32664434f4f383e27fd5cc0b4f41f0e'
             'f67f60a30bcf2e9a2ba88ad97cace308da7a7f94919bb95c3dc030f5885a8015'
             '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
             '95b933f692c982496d2d7a16e9d44d72beb2f7fa664a3321b2fa71b37029d0fc')
+validpgpkeys=(
+              '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
+              'DE9452CE46F42094907F108B44D1C0F82525FE49' # Bradley Spengler
+)
 
 _kernelname=${pkgbase#linux-libre}
 _replacesarchkernel=("${_replacesarchkernel[@]/\%/${_kernelname}}")
diff --git a/libre/linux-libre-grsec/config.i686 b/libre/linux-libre-grsec/config.i686
index 3cbd6f4b4..51c3630d7 100644
--- a/libre/linux-libre-grsec/config.i686
+++ b/libre/linux-libre-grsec/config.i686
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.17.1-gnu-201410192051-1-grsec Kernel Configuration
+# Linux/x86 3.17.7-gnu-201412211910-1-grsec Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -420,8 +420,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
@@ -5523,7 +5521,6 @@ CONFIG_RTC_DRV_DS1511=m
 CONFIG_RTC_DRV_DS1553=m
 CONFIG_RTC_DRV_DS1742=m
 CONFIG_RTC_DRV_DS2404=m
-CONFIG_RTC_DRV_EFI=m
 CONFIG_RTC_DRV_STK17TA8=m
 CONFIG_RTC_DRV_M48T86=m
 CONFIG_RTC_DRV_M48T35=m
diff --git a/libre/linux-libre-grsec/config.x86_64 b/libre/linux-libre-grsec/config.x86_64
index 40396c06e..053438e09 100644
--- a/libre/linux-libre-grsec/config.x86_64
+++ b/libre/linux-libre-grsec/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.17.1-gnu-201410192051-1-grsec Kernel Configuration
+# Linux/x86 3.17.7-gnu-201412211910-1-grsec Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -415,8 +415,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
@@ -5294,7 +5292,6 @@ CONFIG_RTC_DRV_DS1511=m
 CONFIG_RTC_DRV_DS1553=m
 CONFIG_RTC_DRV_DS1742=m
 CONFIG_RTC_DRV_DS2404=m
-CONFIG_RTC_DRV_EFI=m
 CONFIG_RTC_DRV_STK17TA8=m
 CONFIG_RTC_DRV_M48T86=m
 CONFIG_RTC_DRV_M48T35=m
diff --git a/libre/linux-libre-grsec/linux.install b/libre/linux-libre-grsec/linux.install
index 99069bc58..cee2a22fc 100644
--- a/libre/linux-libre-grsec/linux.install
+++ b/libre/linux-libre-grsec/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.15.6_gnu.201407232200-2) -lt 0 ]]; then
-    _uderef_warning
+  if [[ $(vercmp $2 3.17.7_gnu.201412211910-1) -lt 0 ]]; then
+    _uderef_news
   fi
 }