Update to 1.8.4pre2

This prerelease version provides support for Linux 5.3, so we use it
instead of patching our module packages.

3 files changed, 19 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a4ce52587a21..3c2283b0e7c0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = openafs
 	pkgdesc = Open source implementation of the AFS distributed file system
-	pkgver = 1.8.3
+	pkgver = 1.8.4pre2
 	pkgrel = 1
 	url = http://www.openafs.org
 	install = openafs.install
@@ -17,13 +17,13 @@ pkgbase = openafs
 	backup = etc/openafs/ThisCell
 	backup = etc/openafs/cacheinfo
 	backup = etc/openafs/CellServDB
-	source = http://openafs.org/dl/openafs/1.8.3/openafs-1.8.3-src.tar.bz2
-	source = http://openafs.org/dl/openafs/1.8.3/openafs-1.8.3-doc.tar.bz2
+	source = http://openafs.org/dl/openafs/candidate/1.8.4pre2/openafs-1.8.4pre2-src.tar.bz2
+	source = http://openafs.org/dl/openafs/candidate/1.8.4pre2/openafs-1.8.4pre2-doc.tar.bz2
 	source = 0001-Adjust-RedHat-config-and-service-files.patch
 	source = tmpfiles.d-openafs.conf
-	sha256sums = ead9c16c50404b98b06e1d22fb6359880bfc6e93a6108a12e5e4e1c73b64cea5
-	sha256sums = 58da20546b5ad6ab8aebf3e701f13e61910a1a95f275bef762c319172c6c5593
-	sha256sums = 2fc6176c05ed77f0f113e966d8bf860799f0a132d98d323ebb1e9f7903661d89
+	sha256sums = a0a8a814b73040131f5d19bf122c071a98bd56245a204df244466ae589b140fc
+	sha256sums = cc90856d105e0282882b38b4e3245d9dd9dd20abb13c841920c67324cb8bfc56
+	sha256sums = cba06b94f1e0c50f95e5811fcc23d448a97fa1c5efa8ce99a09c53cde60144f3
 	sha256sums = 18d7b0173bbffbdc212f4e58c5b3ce369adf868452aabc3485f2a6a2ddb35d68
 
 pkgname = openafs
diff --git a/0001-Adjust-RedHat-config-and-service-files.patch b/0001-Adjust-RedHat-config-and-service-files.patch
index ade1f287ad84..56944525f479 100644
--- a/0001-Adjust-RedHat-config-and-service-files.patch
+++ b/0001-Adjust-RedHat-config-and-service-files.patch
@@ -1,4 +1,4 @@
-From e30c4fdcabb7e2500c632636d99e7e987870fac4 Mon Sep 17 00:00:00 2001
+From cb6022a7261bbec2b44c373e5a83dab039467b73 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20La=C3=9F?= <lass@mail.uni-paderborn.de>
 Date: Thu, 19 Feb 2015 19:34:00 +0100
 Subject: [PATCH] Adjust RedHat config and service files
@@ -8,14 +8,13 @@ Basically we reuse upstream's config for RedHat but we change a few things:
  * adjust paths to match ArchLinux packaging
  * remove the dynamic creation of CellServDB
  * enable network traffic encryption by default
- * wait for dkms if dkms is used
 
-Change-Id: I44dea414d837f51fc69c52e54d99aee130820e30
+Change-Id: I58edd1c30b0915624a386bbae96879345d7e8b4b
 ---
  src/packaging/RedHat/openafs-cacheinfo      |  2 +-
- src/packaging/RedHat/openafs-client.service | 17 ++++++++---------
+ src/packaging/RedHat/openafs-client.service | 15 +++++++--------
  src/packaging/RedHat/openafs-server.service |  4 ++--
- 3 files changed, 11 insertions(+), 12 deletions(-)
+ 3 files changed, 10 insertions(+), 11 deletions(-)
 
 diff --git a/src/packaging/RedHat/openafs-cacheinfo b/src/packaging/RedHat/openafs-cacheinfo
 index dd0fd05cb..1663c79b5 100755
@@ -25,17 +24,10 @@ index dd0fd05cb..1663c79b5 100755
 -/afs:/usr/vice/cache:100000
 +/afs:/var/cache/openafs:100000
 diff --git a/src/packaging/RedHat/openafs-client.service b/src/packaging/RedHat/openafs-client.service
-index 09379bea3..a63fce486 100644
+index f79240c7f..a63fce486 100644
 --- a/src/packaging/RedHat/openafs-client.service
 +++ b/src/packaging/RedHat/openafs-client.service
-@@ -1,21 +1,20 @@
- [Unit]
- Description=OpenAFS Client Service
- Wants=network-online.target
--After=syslog.target network-online.target
-+After=syslog.target network-online.target dkms.service
- Before=remote-fs.target
- 
+@@ -7,15 +7,14 @@ Before=remote-fs.target
  [Service]
  Type=forking
  RemainAfterExit=true
@@ -74,5 +66,5 @@ index ac9d3c411..0a4b3bfea 100644
  
  [Install]
 -- 
-2.17.0
+2.23.0
 
diff --git a/PKGBUILD b/PKGBUILD
index 590d7762cf9f..eb3bcd3a9692 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 # https://github.com/michaellass/AUR
 
 pkgname=openafs
-pkgver=1.8.3
+pkgver=1.8.4pre2
 pkgrel=1
 pkgdesc="Open source implementation of the AFS distributed file system"
 arch=('i686' 'x86_64' 'armv7h')
@@ -21,13 +21,13 @@ backup=(etc/conf.d/openafs
         etc/openafs/CellServDB)
 options=(!emptydirs)
 install=openafs.install
-source=(http://openafs.org/dl/openafs/${pkgver}/${pkgname}-${pkgver}-src.tar.bz2
-        http://openafs.org/dl/openafs/${pkgver}/${pkgname}-${pkgver}-doc.tar.bz2
+source=(http://openafs.org/dl/openafs/candidate/${pkgver}/${pkgname}-${pkgver}-src.tar.bz2
+        http://openafs.org/dl/openafs/candidate/${pkgver}/${pkgname}-${pkgver}-doc.tar.bz2
         0001-Adjust-RedHat-config-and-service-files.patch
         tmpfiles.d-openafs.conf)
-sha256sums=('ead9c16c50404b98b06e1d22fb6359880bfc6e93a6108a12e5e4e1c73b64cea5'
-            '58da20546b5ad6ab8aebf3e701f13e61910a1a95f275bef762c319172c6c5593'
-            '2fc6176c05ed77f0f113e966d8bf860799f0a132d98d323ebb1e9f7903661d89'
+sha256sums=('a0a8a814b73040131f5d19bf122c071a98bd56245a204df244466ae589b140fc'
+            'cc90856d105e0282882b38b4e3245d9dd9dd20abb13c841920c67324cb8bfc56'
+            'cba06b94f1e0c50f95e5811fcc23d448a97fa1c5efa8ce99a09c53cde60144f3'
             '18d7b0173bbffbdc212f4e58c5b3ce369adf868452aabc3485f2a6a2ddb35d68')
 
 # If you need the kauth tools set this to 1. But be aware that these tools