Fix issue regarding the recent update of crypto++. Cf:https://www.cryptopp.com/wiki/Std::byte#The_Problem

2 files changed, 12 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8e1ac71c9447..1ce2f392f627 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = urbackup2-server
 	pkgdesc = Client Server backup system
 	pkgver = 2.1.20
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.urbackup.org/
 	install = urbackup.install
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 8766b32d277f..d7c6a0b85644 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Ex-Maintainer: K0n24d <konrad AT knauber DOT net>
 pkgname=urbackup2-server
 pkgver=2.1.20
-pkgrel=1
+pkgrel=2
 pkgdesc="Client Server backup system"
 arch=('i686' 'x86_64' 'armv5' 'armv6h' 'armv6' 'armv7h' 'armv7' 'aarch64')
 url="http://www.urbackup.org/"
@@ -20,6 +20,16 @@ MAKEFLAGS="-j$(nproc)"
 
 build() {
 	sed  -i '/\#include \"cryptopp_inc.h\"/a #include "assert.h"' "${srcdir}/urbackup-server-${pkgver}/cryptoplugin/AESGCMDecryption.h"
+
+	cat >> "${srcdir}/urbackup-server-${pkgver}/cryptoplugin/cryptopp_inc.h" <<EOL
+
+#if (CRYPTOPP_VERSION >= 600) && (__cplusplus >= 201103L)
+    using byte = CryptoPP::byte;
+#else
+    typedef unsigned char byte;
+#endif
+EOL
+
 	cd "${srcdir}/urbackup-server-${pkgver}"
 	./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc \
 		--localstatedir=/var --enable-packaging \