summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorfunilrys2018-02-07 14:23:34 +0100
committerfunilrys2018-02-07 14:23:34 +0100
commitc46af16036f71295e68dcde5c6fee8f74ba7722f (patch)
tree2aed6bbdd7e016e7c34896f0da1b2c45cd00f045
parentfc4a95d0c50f2b245a0935adfa564782a5216077 (diff)
downloadaur-c46af16036f71295e68dcde5c6fee8f74ba7722f.tar.gz
Fix issue regarding the recent update of crypto++. Cf:https://www.cryptopp.com/wiki/Std::byte#The_Problem
-rwxr-xr-x.SRCINFO2
-rwxr-xr-xPKGBUILD12
2 files changed, 12 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8e1ac71c944..1ce2f392f62 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 8766b32d277..d7c6a0b8564 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 \