summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorfunilrys2018-03-02 20:14:46 +0100
committerfunilrys2018-03-02 20:14:46 +0100
commitcc039e334bc048d2b304241f29e6e6335a3be593 (patch)
tree24ed24951ccc9fe2471909f02c6b4612a31148a2
parentc46af16036f71295e68dcde5c6fee8f74ba7722f (diff)
downloadaur-cc039e334bc048d2b304241f29e6e6335a3be593.tar.gz
Update urbackup2-server to v 2.2.8
-rwxr-xr-x.SRCINFO8
-rwxr-xr-xPKGBUILD16
-rw-r--r--cryptopp-bytes.patch16
-rw-r--r--md5-bytes.patch25
4 files changed, 50 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1ce2f392f62..802b127ac12 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = urbackup2-server
pkgdesc = Client Server backup system
- pkgver = 2.1.20
- pkgrel = 2
+ pkgver = 2.2.8
+ pkgrel = 1
url = http://www.urbackup.org/
install = urbackup.install
arch = i686
@@ -22,8 +22,8 @@ pkgbase = urbackup2-server
depends = fuse
depends = zlib
conflicts = urbackup-server
- source = https://www.urbackup.org/downloads/Server/2.1.20/urbackup-server-2.1.20.tar.gz
- sha512sums = 6bd41d6d51c9a4b43f9e4b04eb76c46cd268e8195399f68c0ca3b2ceb0f0a14bf9b459db84cac9b7078123687d7354dbc6465c0abff96b27a524feb45bdc7408
+ source = https://www.urbackup.org/downloads/Server/2.2.8/urbackup-server-2.2.8.tar.gz
+ sha512sums = 5cc4e039f74b0776192413c2520dc9499ba1ee213953b86b0c654d737ba7f962dcec89f990f09ac9cd3dd380d0340632c242fb4dc9471bd91bff72cf095601ab
pkgname = urbackup2-server
diff --git a/PKGBUILD b/PKGBUILD
index d7c6a0b8564..84f9f49bed8 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
# Maintainer: Nissar Chababy <funilrys at outlook dot com>
# Ex-Maintainer: K0n24d <konrad AT knauber DOT net>
pkgname=urbackup2-server
-pkgver=2.1.20
-pkgrel=2
+pkgver=2.2.8
+pkgrel=1
pkgdesc="Client Server backup system"
arch=('i686' 'x86_64' 'armv5' 'armv6h' 'armv6' 'armv7h' 'armv7' 'aarch64')
url="http://www.urbackup.org/"
@@ -12,7 +12,7 @@ depends=('sqlite' 'crypto++' 'curl' 'fuse' 'zlib')
conflicts=('urbackup-server')
source=("https://www.urbackup.org/downloads/Server/${pkgver}/urbackup-server-${pkgver}.tar.gz")
install='urbackup.install'
-sha512sums=('6bd41d6d51c9a4b43f9e4b04eb76c46cd268e8195399f68c0ca3b2ceb0f0a14bf9b459db84cac9b7078123687d7354dbc6465c0abff96b27a524feb45bdc7408')
+sha512sums=('5cc4e039f74b0776192413c2520dc9499ba1ee213953b86b0c654d737ba7f962dcec89f990f09ac9cd3dd380d0340632c242fb4dc9471bd91bff72cf095601ab')
CFLAGS="-march=native -O2 -pipe -fstack-protector-strong -ansi"
CXXFLAGS="${CFLAGS}"
@@ -21,14 +21,8 @@ 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
+ patch -d"${srcdir}/urbackup-server-${pkgver}/cryptoplugin" -p0 < ../cryptopp-bytes.patch
+ patch -d"${srcdir}/urbackup-server-${pkgver}" -p0 < ../md5-bytes.patch
cd "${srcdir}/urbackup-server-${pkgver}"
./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc \
diff --git a/cryptopp-bytes.patch b/cryptopp-bytes.patch
new file mode 100644
index 00000000000..d34e1553313
--- /dev/null
+++ b/cryptopp-bytes.patch
@@ -0,0 +1,16 @@
+diff --git cryptopp_inc.h cryptopp_inc.h
+index 1295d7c..51ab406 100644
+--- cryptopp_inc.h
++++ cryptopp_inc.h
+@@ -44,4 +44,9 @@
+ #include CRYPTOPP_INCLUDE_ECCRYPTO
+ #include CRYPTOPP_INCLUDE_OIDS
+ #include CRYPTOPP_INCLUDE_DSA
+-#endif
+\ No newline at end of file
++#endif
++#if (CRYPTOPP_VERSION >= 600) && (__cplusplus >= 201103L)
++ using byte = CryptoPP::byte;
++#else
++ typedef unsigned char byte;
++#endif
diff --git a/md5-bytes.patch b/md5-bytes.patch
new file mode 100644
index 00000000000..d4b88fe7dfe
--- /dev/null
+++ b/md5-bytes.patch
@@ -0,0 +1,25 @@
+diff --git md5.h md5.h
+index d8b96df..86103da 100644
+--- md5.h
++++ md5.h
+@@ -124,6 +124,13 @@ private:
+ #include CRYPTOPP_INCLUDE_MD5
+ #endif
+
++#if (CRYPTOPP_VERSION >= 600) && (__cplusplus >= 201103L)
++ using byte = CryptoPP::byte;
++#else
++ typedef unsigned char byte;
++#endif
++
++
+ class MD5 {
+
+ public:
+@@ -151,4 +158,4 @@ private:
+
+ #endif //DO_NOT_USE_CRYPTOPP_MD5
+
+-#endif //MD5_H
+\ No newline at end of file
++#endif //MD5_H