Update to actual 1.8.6pre2 and fix build with GCC 10

1 files changed, 6 insertions, 15 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 7976091fa5c7..8203bfe52cf1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=openafs-modules-dkms
 _srcname=openafs
-pkgver=1.8.6pre1
+pkgver=1.8.6pre2
 pkgrel=1
 pkgdesc="Kernel module for OpenAFS (dkms)"
 arch=('i686' 'x86_64' 'armv7h')
@@ -18,25 +18,16 @@ conflicts=('openafs-features-libafs' 'openafs-modules' 'openafs<1.6.6-2')
 options=(!emptydirs)
 source=("http://openafs.org/dl/openafs/candidate/${pkgver}/${_srcname}-${pkgver}-src.tar.bz2"
         "dkms.conf"
-        0001-LINUX-Avoid-building-rand-fortuna-kernel.o.patch
-        0002-LINUX-5.6-define-time_t-and-use-timespec-timespec64.patch
-        0003-Update-NEWS-for-OpenAFS-1.8.6pre2.patch
-        0004-Make-OpenAFS-1.8.6pre2.patch)
-sha256sums=('4ae020010632fbc9198be94ea97d6f6301c813227117fd8a28e15f32e8f58517'
+        0001-Temporary-fix-for-compilation-with-GCC-10.patch)
+sha256sums=('ae1aa62c977fc13d61df1f9822ff75af301c50f8ff0528c8fd1f2914fffafcf5'
             '5ea5e184f9b44f5ed45817d2b5a10149d15c8c54f49e0b5b4b773652673cb9b0'
-            '3639bc58cf7896f4b3c5a0c93f8a7a65a119dbd6eff0cb55597e3762ac2e6b3f'
-            'a75af2f13ac35e4d324183ac76727f53b832e7fa3b16f4983b48226a0c5452d2'
-            '5fc7fc6c44f950c99a1ad9629d6fe56bd88bd1f0b2f2ce3922939e7d073790c9'
-            'd15fd705b0b24280c06ca8f2cb6d5c08bcb492cdb1f8f509de1d2c076c01c99d')
+            'ebd26d2434689ca7f1c71434cf9a524cf8f2457faa2ba93b90723f4244092451')
 
 prepare() {
   cd "${srcdir}/${_srcname}-${pkgver}"
 
-  # Imitate what is likely to become 1.8.6pre2
-  patch -p1 < "${srcdir}/0001-LINUX-Avoid-building-rand-fortuna-kernel.o.patch"
-  patch -p1 < "${srcdir}/0002-LINUX-5.6-define-time_t-and-use-timespec-timespec64.patch"
-  patch -p1 < "${srcdir}/0003-Update-NEWS-for-OpenAFS-1.8.6pre2.patch"
-  patch -p1 < "${srcdir}/0004-Make-OpenAFS-1.8.6pre2.patch"
+  # Fix compilation with GCC 10 (see https://bugs.gentoo.org/706738 and https://gerrit.openafs.org/14106)
+  patch -p1 < "${srcdir}/0001-Temporary-fix-for-compilation-with-GCC-10.patch"
 
   # Only needed when changes to configure were made
   ./regen.sh -q