diff options
author | Claire Farron | 2015-06-29 13:23:29 +0100 |
---|---|---|
committer | Claire Farron | 2015-06-29 13:23:29 +0100 |
commit | 296e7b4a38e208bee537c8421e0b15637ead900e (patch) | |
tree | a9ac64a649b574f9218b450257f68f35aa843e7a | |
parent | 9652903c457a9501095c7ab17b5dc67b41d60437 (diff) | |
download | aur-296e7b4a38e208bee537c8421e0b15637ead900e.tar.gz |
Update for 3.14.45
-rw-r--r-- | .SRCINFO | 14 | ||||
-rw-r--r-- | PKGBUILD | 8 | ||||
-rw-r--r-- | gcc5_buildfixes.diff | 49 | ||||
-rw-r--r-- | tresor-patch-3.6.2_i686.patch | 2 | ||||
-rw-r--r-- | tresor-patch-3.6.2_i686.patch.asc | 26 | ||||
-rw-r--r-- | tresor-patch-3.8.2_aesni.patch | 2 | ||||
-rw-r--r-- | tresor-patch-3.8.2_aesni.patch.asc | 26 |
7 files changed, 89 insertions, 38 deletions
@@ -1,6 +1,6 @@ pkgbase = linux-lts-tresor pkgdesc = Linux longterm stable kernel and modules with integrated TRESOR - pkgver = 3.14.40 + pkgver = 3.14.45 pkgrel = 1 url = http://www1.informatik.uni-erlangen.de/tresor arch = i686 @@ -14,8 +14,8 @@ pkgbase = linux-lts-tresor options = !strip source = https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.14.tar.xz source = https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.14.tar.sign - source = https://www.kernel.org/pub/linux/kernel/v3.x/patch-3.14.40.xz - source = https://www.kernel.org/pub/linux/kernel/v3.x/patch-3.14.40.sign + source = https://www.kernel.org/pub/linux/kernel/v3.x/patch-3.14.45.xz + source = https://www.kernel.org/pub/linux/kernel/v3.x/patch-3.14.45.sign source = config source = config.x86_64 source = linux-lts-tresor.preset @@ -26,9 +26,10 @@ pkgbase = linux-lts-tresor source = 0003-module-remove-MODULE_GENERIC_TABLE.patch source = 0006-genksyms-fix-typeof-handling.patch source = http://www1.informatik.uni-erlangen.de/filepool/projects/tresor/tresor_sysfs.c + source = gcc5_buildfixes.diff sha256sums = 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa sha256sums = SKIP - sha256sums = 6334031465a7cdf8187c86016ba63e1adc58c892910f2c3703c70eaae2fdbafe + sha256sums = a652bc01594f6cea4885ca55c6a6b8b19289ee7c05f927c885411537d70cd7af sha256sums = SKIP sha256sums = 4e99472f8281b485a9ef3468de13e909597c9d921706b306fbb26960941d595e sha256sums = 145a66ef4f702ed516a57d846dd00b5acac7b5cc1eff86d1e7ee6bd5a66040b2 @@ -40,17 +41,18 @@ pkgbase = linux-lts-tresor sha256sums = 65d58f63215ee3c5f9c4fc6bce36fc5311a6c7dbdbe1ad29de40647b47ff9c0d sha256sums = cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7 sha256sums = d6fcbd0ea7a5a4c42d326286b60bbd5b1d476b8a6752046fa28133e05351c1fe + sha256sums = 9c89039a0f876888fda3be6f574bca5a120e3587d8342747bbc0723b0b4cde7a source_i686 = http://www1.informatik.uni-erlangen.de/filepool/projects/tresor/tresor-patch-3.6.2_i686 source_i686 = tresor-patch-3.6.2_i686.patch source_i686 = tresor-patch-3.6.2_i686.patch.asc sha256sums_i686 = 9a286a85c16ca5b6a02419af1aedbfe6e8b89bcabdcb32670ead3f26c09eadfd - sha256sums_i686 = 0ceee86dd811c5a3e306985eeb83be4eea6a83589e268cb7e12867d7f161ffb3 + sha256sums_i686 = c37ffc3d12b6763707a4fa9984453535d60dc04eb1bf1cffc5b9304410fd22ea sha256sums_i686 = SKIP source_x86_64 = http://www1.informatik.uni-erlangen.de/filepool/projects/tresor/tresor-patch-3.8.2_aesni source_x86_64 = tresor-patch-3.8.2_aesni.patch source_x86_64 = tresor-patch-3.8.2_aesni.patch.asc sha256sums_x86_64 = 54009b369b95a77ab13f6dd7cdbe22b0785b6314cae3a6c39190b48f4c4b12ce - sha256sums_x86_64 = 10b954d0a4ae7efe83fe67faa84cd1ee2ebef18d64a37cbe4d1a3bd7d8ac75c1 + sha256sums_x86_64 = 9db1161de0940baac8043a1340946d695d6078dd79fd049933a6150e3e2ef78b sha256sums_x86_64 = SKIP pkgname = linux-lts-tresor @@ -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.44 +pkgver=3.14.45 pkgrel=1 arch=('i686' 'x86_64') url="http://www1.informatik.uni-erlangen.de/tresor" @@ -50,7 +50,7 @@ source_x86_64+=("http://www1.informatik.uni-erlangen.de/filepool/projects/tresor sha256sums=('61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa' 'SKIP' - '5af4e26194d3195e5a7c9235b0e6b60f577e7948ba2e1f653341d6263ef2ffc0' + 'a652bc01594f6cea4885ca55c6a6b8b19289ee7c05f927c885411537d70cd7af' 'SKIP' '4e99472f8281b485a9ef3468de13e909597c9d921706b306fbb26960941d595e' '145a66ef4f702ed516a57d846dd00b5acac7b5cc1eff86d1e7ee6bd5a66040b2' @@ -64,10 +64,10 @@ sha256sums=('61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa' 'd6fcbd0ea7a5a4c42d326286b60bbd5b1d476b8a6752046fa28133e05351c1fe' '9c89039a0f876888fda3be6f574bca5a120e3587d8342747bbc0723b0b4cde7a') sha256sums_i686=('9a286a85c16ca5b6a02419af1aedbfe6e8b89bcabdcb32670ead3f26c09eadfd' - '70299f864c2ec04ea72dc7a6ba814ad1c516c2662aa3acd69a74996a056a5e83' + 'c37ffc3d12b6763707a4fa9984453535d60dc04eb1bf1cffc5b9304410fd22ea' 'SKIP') sha256sums_x86_64=('54009b369b95a77ab13f6dd7cdbe22b0785b6314cae3a6c39190b48f4c4b12ce' - '60f118c95104f561fa42b1992621399c6cc44aea7026437bf0c04c565c609f18' + '9db1161de0940baac8043a1340946d695d6078dd79fd049933a6150e3e2ef78b' 'SKIP') validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linux Torvalds diff --git a/gcc5_buildfixes.diff b/gcc5_buildfixes.diff new file mode 100644 index 000000000000..e8a85b05564e --- /dev/null +++ b/gcc5_buildfixes.diff @@ -0,0 +1,49 @@ +diff --git a/lib/mpi/mpi-inline.h b/lib/mpi/mpi-inline.h +index e2b3985..c245ea3 100644 +--- a/lib/mpi/mpi-inline.h ++++ b/lib/mpi/mpi-inline.h +@@ -30,7 +30,7 @@ + #define G10_MPI_INLINE_H + + #ifndef G10_MPI_INLINE_DECL +-#define G10_MPI_INLINE_DECL extern inline ++#define G10_MPI_INLINE_DECL static inline + #endif + + G10_MPI_INLINE_DECL mpi_limb_t +diff --git a/lib/mpi/mpi-internal.h b/lib/mpi/mpi-internal.h +index 60cf765..91ef8ac 100644 +--- a/lib/mpi/mpi-internal.h ++++ b/lib/mpi/mpi-internal.h +@@ -168,20 +168,24 @@ void mpi_rshift_limbs(MPI a, unsigned int count); + int mpi_lshift_limbs(MPI a, unsigned int count); + + /*-- mpihelp-add.c --*/ ++#ifndef __GNUC__ + mpi_limb_t mpihelp_add_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, + mpi_size_t s1_size, mpi_limb_t s2_limb); +-mpi_limb_t mpihelp_add_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, +- mpi_ptr_t s2_ptr, mpi_size_t size); + mpi_limb_t mpihelp_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size, + mpi_ptr_t s2_ptr, mpi_size_t s2_size); ++#endif ++mpi_limb_t mpihelp_add_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, ++ mpi_ptr_t s2_ptr, mpi_size_t size); + + /*-- mpihelp-sub.c --*/ ++#ifndef __GNUC__ + mpi_limb_t mpihelp_sub_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, + mpi_size_t s1_size, mpi_limb_t s2_limb); +-mpi_limb_t mpihelp_sub_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, +- mpi_ptr_t s2_ptr, mpi_size_t size); + mpi_limb_t mpihelp_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size, + mpi_ptr_t s2_ptr, mpi_size_t s2_size); ++#endif ++mpi_limb_t mpihelp_sub_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, ++ mpi_ptr_t s2_ptr, mpi_size_t size); + + /*-- mpihelp-cmp.c --*/ + int mpihelp_cmp(mpi_ptr_t op1_ptr, mpi_ptr_t op2_ptr, mpi_size_t size); +-- +1.9.3 + diff --git a/tresor-patch-3.6.2_i686.patch b/tresor-patch-3.6.2_i686.patch index e00a2b5001ff..ee9b2eed0ccb 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 = 44 ++ SUBLEVEL = 45 -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 020db0ecedf3..62d942610618 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 -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 +iQIcBAABCgAGBQJVkTiBAAoJEMwFw/ZU+6RwzjkQAIRM7jdZOhmc60Hy8AJXPeSc +X2UOq5kmiK0SMZ8WfbK13c6g4YwXn4WIrlGExN3BySzLu5jA8zITvww1ZlVpv+QV +6E9Qfqc6YJscWIHldlN1g84AbvfejzWSQTg3Vpd9Lir+hJLBi8Z3gIWdeSfBe/3q +ZYqiaoDgdXS96ug1LyEG0vi9FjrcUvisbeh/dc1U5IQ+nHlVUcHrlVmFo6M2pXnQ +53TXYh8d8GwYdhOP2kOS2vRPxlzTbWgJqSv0EGhcMitMXHkPlKSQF4ABmBue0P+0 +1bDU9Kg0jYBLbm8QJIlUBnRbHqKQ8E5GWQpw2kWQA9ocAEP6XQ0xKQ5+j3vbFA+j +LvghZchOmuXKDbvN6wxTfec6qCimp6BVNwjBtmhxayOJe/pFIFecKQ314RphzTYg +xHrFt8IfUgq+mnHvWFVKMPa1RFfA7BMEhkHr5FDWzYT0+Kzi8owXOvegrW1BQzcZ +gbKkwwr/zJHQVn7dPZZrzERbciSFnGuFYd+OgbjmhWnCiu8DF0nqRDVZAq3zGYjH +pYrcRJlnmCgL+veUrJ1Rs+k5eECjA4Xnt1XTxly11bKZi7Hs+D/TOU+hWj1K+n7C +vgEPNRyA3p4qX3dgkijWm9V3IFxzanbW6p4w+hqji6D8gX0R3IeLQ9DizjCpnd7V +X1shOYNCyGnurpdRO/iL +=vC3l -----END PGP SIGNATURE----- diff --git a/tresor-patch-3.8.2_aesni.patch b/tresor-patch-3.8.2_aesni.patch index f5f2b71f5beb..449397e35259 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 = 44 ++ SUBLEVEL = 45 -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 90bf14fd8201..e93fe9a3b327 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 -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 +iQIcBAABCgAGBQJVkTiWAAoJEMwFw/ZU+6RwyzAP/3Lcf/+I5LhJAhS1L1gToFAO +t3RZgB0BaDBVSSpVpLmNnb6DRCvKABl3HGcbXIDxKe/FTnB4ZnZt7uTG5fg8CH2x +fqlPVwQ7aRUdA7EfbJsuoKW/eKTH61Es+58ZLqpzpYVmQROetEvXPDGigceREcbz +f5HOena/CozYUOiZFvVQbaHYxSL54eCMmaAstA2Zy8fJoO6ZAdLvEvy2wddDIAaP +EOUTVjT3GM3LlZFLEchuvuOsQ5xP+bYcQBjXUzwc9+13sLReTlfOLaS2OX1VZcAN +6IGDXKNV6HlYS1ogssj572gvzulAim5kLZ0907tCjF3fD69g2jYFlIV+xlu/BPZq +4/M+8qKWDzAGjxYD952p6CMlGH7vZk2VMEME/K+fG0yhFwRIcoRUY8qz2YXgZFrk +hlL/VN3Pu57z1Bol0Rqu5iKrhClqtVfuulj8AP18oTj6tNjZ8gHZ2rpO5fkxmkPW +AJdclcb7pdf1Y76/cfvNw7ATB6+OVHCtYkU92VrvVBtH7f3tR7TUPQH3Ue0y4HHG +Qf4DCsqlbB+wn+RkzHmgqg2u6cnRRFzIIrtrhSd5KgLWJ7I6LqEFCAddibT6Zali +KMqlGpKlya8x0lHd5t/K+lQuX2vecQUv80UfqT1CiEv3tdU1gs4UicT556Rwk3ih +KS8A66xqFd9BwMhbvVjE +=DnxL -----END PGP SIGNATURE----- |