[arch-commits] Commit in linux-lts/trunk (2 files)

[Bartłomiej Piotrowski]

    Date: Thursday, August 14, 2014 @ 08:14:31
  Author: bpiotrowski
Revision: 219733

upgpkg: linux-lts 3.14.17-1

new upstream release

Modified:
  linux-lts/trunk/PKGBUILD
Deleted:
  linux-lts/trunk/net-v2-net-sctp-inherit-auth_capable-on-INIT-collisions.patch

---------------------------------------------------------------+
 PKGBUILD                                                      |   13 +++-------
 net-v2-net-sctp-inherit-auth_capable-on-INIT-collisions.patch |   12 ---------
 2 files changed, 4 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-08-14 06:02:18 UTC (rev 219732)
+++ PKGBUILD	2014-08-14 06:14:31 UTC (rev 219733)
@@ -4,8 +4,8 @@
 
 pkgbase=linux-lts
 _srcname=linux-3.14
-pkgver=3.14.16
-pkgrel=2
+pkgver=3.14.17
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.kernel.org/"
 license=('GPL2')
@@ -22,11 +22,10 @@
         '0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch'
         '0003-module-remove-MODULE_GENERIC_TABLE.patch'
         '0006-genksyms-fix-typeof-handling.patch'
-        'net-v2-net-sctp-inherit-auth_capable-on-INIT-collisions.patch'
         )
 # https://www.kernel.org/pub/linux/kernel/v3.x/sha256sums.asc
 sha256sums=('61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa'
-            '3d3e79fd9795812f293aa38799c056aaea0f14da8294b31067f7768e9f38db2d'
+            '50b0e2a6812597b401a417bd1269b5388fdd980b6009d564fff09605100f0df8'
             '4c05b88384ee809120da06e6a3d0bbafb7cdfe6208b2e62237aaeaa25dfb29b7'
             'a5b318c7fd21c1be2ac262d1b919d50bacedd0c841e9a82e7bca53d5b25b217b'
             '1f036f7464da54ae510630f0edb69faa115287f86d9f17641197ffda8cfd49e0'
@@ -34,8 +33,7 @@
             '6d72e14552df59e6310f16c176806c408355951724cd5b48a47bf01591b8be02'
             '52dec83a8805a8642d74d764494acda863e0aa23e3d249e80d4b457e20a3fd29'
             '65d58f63215ee3c5f9c4fc6bce36fc5311a6c7dbdbe1ad29de40647b47ff9c0d'
-            'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7'
-            '7e5cd2df597ea9235c41957d019d6afd769213a068a4bfa38796b18abe048d25')
+            'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7')
 
 _kernelname=${pkgbase#linux}
 
@@ -64,9 +62,6 @@
   # http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=dc53324060f324e8af6867f57bf4891c13c6ef18
   patch -p1 -i "${srcdir}/0006-genksyms-fix-typeof-handling.patch"
 
-  # fixes NULL pointer dereference in net/sctp
-  patch -p1 -i "${srcdir}"/net-v2-net-sctp-inherit-auth_capable-on-INIT-collisions.patch
-
   if [ "${CARCH}" = "x86_64" ]; then
     cat "${srcdir}/config.x86_64" > ./.config
   else

Deleted: net-v2-net-sctp-inherit-auth_capable-on-INIT-collisions.patch
===================================================================
--- net-v2-net-sctp-inherit-auth_capable-on-INIT-collisions.patch	2014-08-14 06:02:18 UTC (rev 219732)
+++ net-v2-net-sctp-inherit-auth_capable-on-INIT-collisions.patch	2014-08-14 06:14:31 UTC (rev 219733)
@@ -1,12 +0,0 @@
-diff --git a/net/sctp/associola.c b/net/sctp/associola.c
-index 9de23a2..06a9ee6 100644
---- a/net/sctp/associola.c
-+++ b/net/sctp/associola.c
-@@ -1097,6 +1097,7 @@ void sctp_assoc_update(struct sctp_association *asoc,
- 	asoc->c = new->c;
- 	asoc->peer.rwnd = new->peer.rwnd;
- 	asoc->peer.sack_needed = new->peer.sack_needed;
-+	asoc->peer.auth_capable = new->peer.auth_capable;
- 	asoc->peer.i = new->peer.i;
- 	sctp_tsnmap_init(&asoc->peer.tsn_map, SCTP_TSN_MAP_INITIAL,
- 			 asoc->peer.i.initial_tsn, GFP_ATOMIC);