Merge branch 'master' of ssh://lukeshu.com:1863/srv/git/mirror/parabola/abslibre

6 files changed, 17 insertions, 18 deletions

diff --git a/libre/acpi_call/PKGBUILD b/libre/acpi_call/PKGBUILD
index 7fe934c68..0db197cc2 100644
--- a/libre/acpi_call/PKGBUILD
+++ b/libre/acpi_call/PKGBUILD
@@ -14,8 +14,8 @@ if [[ ${_kernelname} == "" ]]; then
   _parabolarel=2
 elif [[ ${_kernelname} == -lts ]]; then
   _basekernel=3.14
-  _archrel=7
-  _parabolarel=3
+  _archrel=8
+  _parabolarel=1
 elif [[ ${_kernelname} == -grsec ]]; then
   _basekernel=3.16
   _archrel=1
diff --git a/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD
index aed1a69c5..9c613e0e6 100644
--- a/libre/linux-libre-grsec/PKGBUILD
+++ b/libre/linux-libre-grsec/PKGBUILD
@@ -23,7 +23,7 @@ _replacesoldmodules=() # '%' gets replaced with _kernelname
 _srcname=linux-${_pkgbasever%-*}
 _archpkgver=${_pkgver%-*}.${_timestamp}
 pkgver=${_pkgver//-/_}.${_timestamp}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="https://grsecurity.net/"
 license=('GPL2')
@@ -47,7 +47,7 @@ sha256sums=('9c2a524c901febe0f0138f702bfdeb52d6f79f22c1fdbabaa37580bc70f16218'
             '1f2cb71892020365e8f064182ddc2f534d8bae2c89f8733775e683795ae67642'
             'SKIP'
             '0fe0836dfa1df977312a4f15f25baf558a7fa1293c6c1a258f9d7b5492e054b4'
-            'cfb236dd8da3097327c3a0bf28c60f24f6b9581b5cf139b4042d44aee1922804'
+            '64527518bebdffdc4c40ee78f55f8dc54e079dac5a0ec32cf2cb28a93112529b'
             '54062ad5a1200fdb1a5a13fed316dbe74fbcfba87e37245328f94960d21aa365'
             'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
             '074b67818582874146c389c029bc43648d145891a27e47aa2c5c42d3571f0264'
diff --git a/libre/linux-libre-grsec/config.x86_64 b/libre/linux-libre-grsec/config.x86_64
index de6b35bc3..5333ddfe7 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.16.2-gnu-201409082129-1-grsec Kernel Configuration
+# Linux/x86 3.16.2-gnu-201409082129-2-grsec Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -6336,10 +6336,6 @@ CONFIG_TIMER_STATS=y
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
 # CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_LOCK_STAT is not set
 # CONFIG_DEBUG_ATOMIC_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_LOCK_TORTURE_TEST is not set
@@ -6472,6 +6468,7 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
 #
 # Grsecurity
 #
+CONFIG_PAX_KERNEXEC_PLUGIN=y
 CONFIG_PAX_PER_CPU_PGD=y
 CONFIG_TASK_SIZE_MAX_SHIFT=42
 CONFIG_PAX_USERCOPY_SLABS=y
@@ -6510,8 +6507,9 @@ CONFIG_PAX_EMUTRAMP=y
 CONFIG_PAX_MPROTECT=y
 # CONFIG_PAX_MPROTECT_COMPAT is not set
 # CONFIG_PAX_ELFRELOCS is not set
-# CONFIG_PAX_KERNEXEC is not set
-CONFIG_PAX_KERNEXEC_PLUGIN_METHOD=""
+CONFIG_PAX_KERNEXEC=y
+CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS=y
+CONFIG_PAX_KERNEXEC_PLUGIN_METHOD="bts"
 
 #
 # Address Space Layout Randomization
@@ -6529,6 +6527,7 @@ CONFIG_PAX_MEMORY_STACKLEAK=y
 CONFIG_PAX_MEMORY_STRUCTLEAK=y
 CONFIG_PAX_MEMORY_UDEREF=y
 CONFIG_PAX_REFCOUNT=y
+CONFIG_PAX_CONSTIFY_PLUGIN=y
 CONFIG_PAX_USERCOPY=y
 # CONFIG_PAX_USERCOPY_DEBUG is not set
 CONFIG_PAX_SIZE_OVERFLOW=y
diff --git a/libre/linux-libre-grsec/linux.install b/libre/linux-libre-grsec/linux.install
index 406ab9ae9..99069bc58 100644
--- a/libre/linux-libre-grsec/linux.install
+++ b/libre/linux-libre-grsec/linux.install
@@ -46,7 +46,7 @@ post_upgrade() {
     echo ">>>          include the 'keyboard' hook in your mkinitcpio.conf."
   fi
 
-  if [[ $(vercmp $2 3.15.6.201407232200-2) -lt 0 ]]; then
+  if [[ $(vercmp $2 3.15.6_gnu.201407232200-2) -lt 0 ]]; then
     _uderef_warning
   fi
 }
diff --git a/libre/usermin/PKGBUILD b/libre/usermin/PKGBUILD
index b9fda8d02..2ec5cae60 100644
--- a/libre/usermin/PKGBUILD
+++ b/libre/usermin/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 208134 2014-03-18 07:25:18Z tpowa $
+# $Id: PKGBUILD 221299 2014-09-09 12:47:52Z tpowa $
 # Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>
 pkgname=usermin
-pkgver=1.590
+pkgver=1.610
 pkgrel=1.parabola1
 pkgdesc="a web interface that can be used to easily perform tasks like reading mail, setting up SSH or configuring mail forwarding (Parabola rebranded)"
 arch=(i686 x86_64 mips64el)
@@ -126,6 +126,6 @@ package() {
   #install license
   install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/usermin/LICENCE
 }
-md5sums=('e2c8ab2d0269f860f85b562e02e69ca2'
+md5sums=('d73f0696e2644034f1ec8202b9f020be'
          'a5bd5e5ee779f8a3cf3d776ca77ee36e'
          'ec37a79f948f778224550930d2a7ca07')
diff --git a/libre/webmin/PKGBUILD b/libre/webmin/PKGBUILD
index 34e3a51bf..bf2d2e23b 100644
--- a/libre/webmin/PKGBUILD
+++ b/libre/webmin/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 208132 2014-03-18 07:22:29Z tpowa $
+# $Id: PKGBUILD 221302 2014-09-09 12:49:48Z tpowa $
 # Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>
 pkgname=webmin
-pkgver=1.680
+pkgver=1.700
 pkgrel=1.parabola1
 pkgdesc="a web-based interface for system administration (Parabola rebranded)"
 arch=(i686 x86_64 mips64el)
@@ -212,7 +212,7 @@ package() {
   # install license
   install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/webmin/LICENCE
 }
-md5sums=('52654bd0fe36e9cace00fa74e49d41d8'
+md5sums=('e5261114a6a6ed10caf570d3239ed5b7'
          'b0b3e3fb231a12e60165b6b4d604dcfa'
          'c86518037449e0fc0c60fc24537ea038'
          'fc29ecb6a5cd8c278abe054e60381095')