summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorClaire Farron2015-06-17 23:36:53 +0100
committerClaire Farron2015-06-17 23:36:53 +0100
commit9652903c457a9501095c7ab17b5dc67b41d60437 (patch)
tree267178c0ee3807d73f143ee215029239b741b761
parent82684f59696e1b78fd36fae383d0e678b1a9a024 (diff)
downloadaur-9652903c457a9501095c7ab17b5dc67b41d60437.tar.gz
Update for 3.14.44.
-rw-r--r--PKGBUILD20
-rw-r--r--tresor-patch-3.6.2_i686.patch2
-rw-r--r--tresor-patch-3.6.2_i686.patch.asc26
-rw-r--r--tresor-patch-3.8.2_aesni.patch2
-rw-r--r--tresor-patch-3.8.2_aesni.patch.asc26
5 files changed, 42 insertions, 34 deletions
diff --git a/PKGBUILD b/PKGBUILD
index e9598ffa0c79..7a3ee6e5c8b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,7 +17,7 @@ pkgbase=linux-lts-tresor # Build stock -lts kernel with TRESOR patches
_srcname=linux-3.14
pkgname=linux-lts-tresor # placeholder
pkgdesc="Linux longterm stable kernel and modules with integrated TRESOR"
-pkgver=3.14.40
+pkgver=3.14.44
pkgrel=1
arch=('i686' 'x86_64')
url="http://www1.informatik.uni-erlangen.de/tresor"
@@ -39,7 +39,8 @@ source=("https://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz"
'0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch'
'0003-module-remove-MODULE_GENERIC_TABLE.patch'
'0006-genksyms-fix-typeof-handling.patch'
- 'http://www1.informatik.uni-erlangen.de/filepool/projects/tresor/tresor_sysfs.c')
+ 'http://www1.informatik.uni-erlangen.de/filepool/projects/tresor/tresor_sysfs.c'
+ 'gcc5_buildfixes.diff')
source_i686+=("http://www1.informatik.uni-erlangen.de/filepool/projects/tresor/tresor-patch-3.6.2_i686"
'tresor-patch-3.6.2_i686.patch'
'tresor-patch-3.6.2_i686.patch.asc')
@@ -49,7 +50,7 @@ source_x86_64+=("http://www1.informatik.uni-erlangen.de/filepool/projects/tresor
sha256sums=('61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa'
'SKIP'
- '6334031465a7cdf8187c86016ba63e1adc58c892910f2c3703c70eaae2fdbafe'
+ '5af4e26194d3195e5a7c9235b0e6b60f577e7948ba2e1f653341d6263ef2ffc0'
'SKIP'
'4e99472f8281b485a9ef3468de13e909597c9d921706b306fbb26960941d595e'
'145a66ef4f702ed516a57d846dd00b5acac7b5cc1eff86d1e7ee6bd5a66040b2'
@@ -60,12 +61,13 @@ sha256sums=('61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa'
'52dec83a8805a8642d74d764494acda863e0aa23e3d249e80d4b457e20a3fd29'
'65d58f63215ee3c5f9c4fc6bce36fc5311a6c7dbdbe1ad29de40647b47ff9c0d'
'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7'
- 'd6fcbd0ea7a5a4c42d326286b60bbd5b1d476b8a6752046fa28133e05351c1fe')
+ 'd6fcbd0ea7a5a4c42d326286b60bbd5b1d476b8a6752046fa28133e05351c1fe'
+ '9c89039a0f876888fda3be6f574bca5a120e3587d8342747bbc0723b0b4cde7a')
sha256sums_i686=('9a286a85c16ca5b6a02419af1aedbfe6e8b89bcabdcb32670ead3f26c09eadfd'
- '0ceee86dd811c5a3e306985eeb83be4eea6a83589e268cb7e12867d7f161ffb3'
+ '70299f864c2ec04ea72dc7a6ba814ad1c516c2662aa3acd69a74996a056a5e83'
'SKIP')
sha256sums_x86_64=('54009b369b95a77ab13f6dd7cdbe22b0785b6314cae3a6c39190b48f4c4b12ce'
- '10b954d0a4ae7efe83fe67faa84cd1ee2ebef18d64a37cbe4d1a3bd7d8ac75c1'
+ '60f118c95104f561fa42b1992621399c6cc44aea7026437bf0c04c565c609f18'
'SKIP')
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linux Torvalds
@@ -85,6 +87,12 @@ prepare() {
# add upstream patch
patch -p1 -i "${srcdir}/patch-${pkgver}"
+ # buildfixes for gcc5
+ # https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/drivers/scsi/qla2xxx/qla_nx2.c?id=9493c2422cae272d6f1f567cbb424195defe4176
+ # https://lkml.org/lkml/2014/11/9/27
+ # https://lkml.org/lkml/2014/12/14/55
+ patch -p1 -i "${srcdir}/gcc5_buildfixes.diff"
+
# add latest fixes from stable queue, if needed
# http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
diff --git a/tresor-patch-3.6.2_i686.patch b/tresor-patch-3.6.2_i686.patch
index 138d0f59e5a2..e00a2b5001ff 100644
--- a/tresor-patch-3.6.2_i686.patch
+++ b/tresor-patch-3.6.2_i686.patch
@@ -7,7 +7,7 @@
- PATCHLEVEL = 6
- SUBLEVEL = 2
+ PATCHLEVEL = 14
-+ SUBLEVEL = 40
++ SUBLEVEL = 44
-EXTRAVERSION =
+EXTRAVERSION = -tresor0.3
- NAME = Terrified Chipmunk
diff --git a/tresor-patch-3.6.2_i686.patch.asc b/tresor-patch-3.6.2_i686.patch.asc
index df8b9e12ef39..020db0ecedf3 100644
--- a/tresor-patch-3.6.2_i686.patch.asc
+++ b/tresor-patch-3.6.2_i686.patch.asc
@@ -1,17 +1,17 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQIcBAABCgAGBQJVQMmSAAoJEMwFw/ZU+6Rw6nwQAKYafdIjTOxn7VG7U1FAjOi0
-O4dSFu8q6bD3fuI0RYzLBe7OHIbFM0Sml9+Age5CK0nAtamYrHi7pVNkyAOyn2HS
-SxaMeG4svciX+lWQYpCDQ0zvVBFrbm2VuY1IJnIVgbh/1gdoBOZ47xaafPKPjhjc
-ZNMM6gVge65nzw/Ps72T+Cd7QcwBdneglkBzWgYWR+KjTW2zenWO2BVhHv7mIJ4o
-SV2Ezz1HR/vwpVfEI0TvYXLYSNiJC1ntMtjfsDnJt1Q3RCY5vCpUnzPxO27blffO
-k5UikuD8JrnKf2yueII1z0h+D0dqYat97XriuKGq7UXmwXxnPlL2aVZoXCMFe5MV
-KQjjhhwQc+nk0KEh7qDmH83r96mU772HDPHh9SeVBkARjgANfkrwG6+HCMRRapRF
-aBy4+Tov5jakg0+o+QXBCViHyGe9lkH5TjXGpZAvOr1Hi2ImCot1ESohauE+4Z9c
-FdRInu472StfkXBoWqZi1mSnJePVoSypBX0Hc5YNRBFLBj6kfsIfZ7EjQwJgI/QL
-Rs6SzJ4Qp9n/iuQ4tBv27J93qOcOLpyk3Yw5+gY0m08Ek2qJsRTOSEdoEmmx2YKF
-hvh6ZAcUFgSUrJ+pxk1R7U4qLTudpFUB5k6LiEoAcFEXky4ttrMvcQHiSQjwqqK5
-lUpk81zB139HwpQkuVk9
-=0Tin
+iQIcBAABCgAGBQJVgdR1AAoJEMwFw/ZU+6RwlGsP/RdYzqdafqC5ObnITk2HlQPF
+dop/dKV2dKO9oQGuTa0uvEolyDN1ufr3UB6sRIfutOVAHQi+I5CF160976pgOpWt
+xhHd5wLHtfaCau3t5nW/VuOzviu9rjiF4YRoK66W8wdobRt4PP6fNDE6Tak+evMx
++6wqcApmXYXANYCbvv6jcNcAt8QuzQjONkDIOlrtyBAzsgYri09znjGmKRHHq/uF
+106gElzlRIuEeZROKuOcaR1ahvjlomJ1+YVwNZhrz9CxCr7MKSCh3ONaDy9YWAGe
+TG63e2niUg1f2jvNqizTCvk1CdC7G+2YJiswbxDu/roXVs37yN0Y7k5KYaw0bpYy
+rd3ZoOLItktKbxmFdG7SC3FxOUq0FEmuw+LzOdPHc0tRQFbhTGbi60+aP5RR4sao
+gOXdgNIntbcosiYqkDCnkzFg0Em2qxM2a9m5Q2JU5t0LBAu0w09sApD0M/coKNsa
+R4Oovb7iK4SiEP/UllxXP+PzHxFFgiPdFw3PXbFYek5b/WNJzUWW8CCVlGyqOZ22
+EvnUKWYk5UEGOdTJ4e0abpA/5BeJRsn6ZYpP7WmNFGh4FKl501QJ9Gb0oZMCG35j
+0xqSPWkvOtA6ZgNseOsF8GNfrwTIvk5YISQzqi1HQgL7MvdSSehD0wlvK77z3wkE
+Vi0G6Dd7vmnJWesj+IDJ
+=mbPe
-----END PGP SIGNATURE-----
diff --git a/tresor-patch-3.8.2_aesni.patch b/tresor-patch-3.8.2_aesni.patch
index 14423b40f304..f5f2b71f5beb 100644
--- a/tresor-patch-3.8.2_aesni.patch
+++ b/tresor-patch-3.8.2_aesni.patch
@@ -7,7 +7,7 @@
- PATCHLEVEL = 8
- SUBLEVEL = 2
+ PATCHLEVEL = 14
-+ SUBLEVEL = 40
++ SUBLEVEL = 44
-EXTRAVERSION =
+EXTRAVERSION = -tresor0.5
- NAME = Unicycling Gorilla
diff --git a/tresor-patch-3.8.2_aesni.patch.asc b/tresor-patch-3.8.2_aesni.patch.asc
index 1a2de7b34840..90bf14fd8201 100644
--- a/tresor-patch-3.8.2_aesni.patch.asc
+++ b/tresor-patch-3.8.2_aesni.patch.asc
@@ -1,17 +1,17 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQIcBAABCgAGBQJVQMmaAAoJEMwFw/ZU+6Rw+f0QAKb3Nkq3JWfo3/ELQ5wEA2sz
-lSFuPhhE2OYPrdkcqIcTfN0rn62xku37GsK1i6oQA8n8tnjYJWsxVO9+IndMFFDp
-f/rSLsvz4BbWkBLJYF/KPakyhXZv3d/M7E64zoj392X6nKW5bmhJlk8ipWdc0KYU
-V07XtKv9v7e6/7+5evVPeLbEjFGbNh/XZvKqB3xPvAFCctb5597rBAH2+OSYD23G
-3vkWk6Z5zXZRqSBCeXe+rr+gt2lbpKzZBGiNZR6hKcTjLOHaqgKoJYtnJgd0wY1Q
-zl2iWOOA3OmcxuoXCkVGLi73OphRYCMPbq6mCxbVM+qJwmA5biRENOZcWsMKX4eV
-vVKhmuX2ktLrHd0UcnRDho1Qd9JL5YCAoRzOM68PM5uGJubXsmBWmJiz5nwr5SEi
-X8DgM29GuQmofYEe3obEZGl51lOWEa04LlPBB/xvjhYVaz/0XRrF2LDMCVW3C6gj
-BR3h3ZvT9Y9CW7++ulk7Feo7U+hYv132oZpgp0ICNljIXiUPhydnsnOsqiYKr7sx
-L2VwACkY/aDSxTXWdc7eE6Y0/2prnODdniYgx9BGJ5alEXb+0LV7Lo5oXCe4KF8o
-scpVX42WYEOUyQ0dIEmsm6F+2TKhiLAAjxZg2AATlIYqcfCjJfNj9LxDvb0z0DKz
-DfxUB4P1b2xOjJ/XBbkM
-=tTF3
+iQIcBAABCgAGBQJVgdRrAAoJEMwFw/ZU+6Rwe48QAJ3vFzUz2omoT0G4X1jeljCV
+6duU1/9qU46INsy3SOi97v4aLl3INUfsCLR9Bng30Aa8/iaJKXuCLm2pZD8yJP5F
+lo/A3Dq30/bJEINadFzTgD+aEFMbZFVinvmqUjqJWLBSFlDEED7zMY2lo4cwMlI6
+mHlDJrIIXpTb8RFDyRhmBeLGI4ySKq2OA8QdjTiou1uTA4yRT7WEyMXKTicYBAs2
+x3wFoZM9zhkFdY/weSrSryMDhLUblkv76AYQKClHQfEx0r4j7/letyhz1OEOgyeY
+5s9hom9PY76eIfUf44rWzjTiefrrTMycISc0T8DHuhD6M0OjiSB6jneiNxxnfhfn
+RFMIw4LwYAtXW1dhFsXehWPzt5CGySzb5c7g9WXIPg/fzMUfBRlP6t22KCnjO8vv
+W4IytE3nL4dZrXtkLGIfl2+ZpiiszFF9IRsA43LFzRiAntWvcjBUxgXO0qud8kzh
+HlqevzRCkBT6ut7DEZkT0+AkCojN5TyQg1VnVLwOmW2GagYMy4rTmM/T/oS4q13f
+SKGnII/UaMRMKRBcq8Jbvo+bg4f6hl2fFQUC7JIyVJxS/NB97JFGzHuTv92BA276
+0wrj6bTomrTGbhxhlkdGAWGSaEO1XuEfrfrq9EoS4msWVhjXTMeKOKNTIRnohHgf
+8NU4HD7p3sWidl6jU2jZ
+=vm90
-----END PGP SIGNATURE-----