diff options
Diffstat (limited to 'kernels/linux-libre-grsec-knock')
| -rw-r--r-- | kernels/linux-libre-grsec-knock/PKGBUILD | 17 | ||||
| -rw-r--r-- | kernels/linux-libre-grsec-knock/config.i686 | 5 | ||||
| -rw-r--r-- | kernels/linux-libre-grsec-knock/config.x86_64 | 5 | ||||
| -rw-r--r-- | kernels/linux-libre-grsec-knock/linux.install | 15 |
4 files changed, 19 insertions, 23 deletions
diff --git a/kernels/linux-libre-grsec-knock/PKGBUILD b/kernels/linux-libre-grsec-knock/PKGBUILD index 7c1cbfcfb..4dfa74849 100644 --- a/kernels/linux-libre-grsec-knock/PKGBUILD +++ b/kernels/linux-libre-grsec-knock/PKGBUILD @@ -12,9 +12,9 @@ pkgbase=linux-libre-grsec-knock # Build kernel with -grsec-knock localname _pkgbasever=3.17-gnu -_pkgver=3.17.6-gnu +_pkgver=3.17.7-gnu _grsecver=3.0 -_timestamp=201412142110 +_timestamp=201412211910 _knockpatchver=3.16_1 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname @@ -49,14 +49,14 @@ 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' '70cbe962aa01989ffa83490bb0765d6e4c781f6133dc8d768d84bd6716ac0209' 'SKIP' - '7394b2989345d351148c00aa087e4af683378d123939d7018f0e5568538f8193' - 'b6e0a7ec389fcdf90d56dcc1cf94ebb18bc44ad177356bc00efc20b82b3eaea7' + 'f2c9208b93a910c10ddae624ebb113489f2e929fad391233654cb02ac71ebefb' + 'd3e66ff3904e38f117c7a87805c1ca64599fce6fe82df767f379705e6f716094' '1c93cef83caeee606234b797ee9335ebc926fc0a83b03841caef3256f9f5e7b7' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' '074b67818582874146c389c029bc43648d145891a27e47aa2c5c42d3571f0264' @@ -64,6 +64,11 @@ sha256sums=('3b2e9a862ada390a318f95d5a436d07dd32664434f4f383e27fd5cc0b4f41f0e' 'f67f60a30bcf2e9a2ba88ad97cace308da7a7f94919bb95c3dc030f5885a8015' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' '95b933f692c982496d2d7a16e9d44d72beb2f7fa664a3321b2fa71b37029d0fc') +validpgpkeys=( + '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva + 'DE9452CE46F42094907F108B44D1C0F82525FE49' # Bradley Spengler + 'F949CFBD140A6DD071E90B8CDC24396B6D451038' # Julian Kirsch +) _kernelname=${pkgbase#linux-libre} _replacesarchkernel=("${_replacesarchkernel[@]/\%/${_kernelname}}") diff --git a/kernels/linux-libre-grsec-knock/config.i686 b/kernels/linux-libre-grsec-knock/config.i686 index 16a9e7c04..32ac7aa65 100644 --- a/kernels/linux-libre-grsec-knock/config.i686 +++ b/kernels/linux-libre-grsec-knock/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.17.1-gnu-201410192051-1-grsec-knock Kernel Configuration +# Linux/x86 3.17.7-gnu-201412211910-1-grsec-knock 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 @@ -5524,7 +5522,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/kernels/linux-libre-grsec-knock/config.x86_64 b/kernels/linux-libre-grsec-knock/config.x86_64 index a0bf84ae5..a0da84f1c 100644 --- a/kernels/linux-libre-grsec-knock/config.x86_64 +++ b/kernels/linux-libre-grsec-knock/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.17.1-gnu-201410192051-1-grsec-knock Kernel Configuration +# Linux/x86 3.17.7-gnu-201412211910-1-grsec-knock 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 @@ -5295,7 +5293,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/kernels/linux-libre-grsec-knock/linux.install b/kernels/linux-libre-grsec-knock/linux.install index 99069bc58..cee2a22fc 100644 --- a/kernels/linux-libre-grsec-knock/linux.install +++ b/kernels/linux-libre-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.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 } |