Update urbackup2-server to v2.3.6

3 files changed, 32 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9c6debc2897c..83f1619087de 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = urbackup2-server
 	pkgdesc = Client Server backup system
-	pkgver = 2.2.11
+	pkgver = 2.3.6
 	pkgrel = 1
 	url = http://www.urbackup.org/
 	install = urbackup.install
@@ -22,8 +22,8 @@ pkgbase = urbackup2-server
 	depends = fuse
 	depends = zlib
 	conflicts = urbackup-server
-	source = https://www.urbackup.org/downloads/Server/2.2.11/urbackup-server-2.2.11.tar.gz
-	sha512sums = 03b218a2a5c105ba0d0a16ef461ed2a862b12c88bdc260180d4da628334806814bafeadb4fe75d4471527e1e1344107c4e7b5383eb0ec4591b39b31f2fa5f4d5
+	source = https://www.urbackup.org/downloads/Server/2.3.6/urbackup-server-2.3.6.tar.gz
+	sha512sums = 1067052938f988fa6339f1a177c7bf27f9ee627caa2c896ee1ade80702e1868d3cf322714d383a65060b8d9eb6391c085fd5edaa81d99a4fa45e6f966d19d65a
 
 pkgname = urbackup2-server
 
diff --git a/PKGBUILD b/PKGBUILD
index 094f8854aec2..5ca72629777b 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Nissar Chababy <funilrys at outlook dot com>
 # Ex-Maintainer: K0n24d <konrad AT knauber DOT net>
 pkgname=urbackup2-server
-pkgver=2.2.11
+pkgver=2.3.6
 pkgrel=1
 pkgdesc="Client Server backup system"
 arch=('i686' 'x86_64' 'armv5' 'armv6h' 'armv6' 'armv7h' 'armv7' 'aarch64')
@@ -12,43 +12,42 @@ 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=('03b218a2a5c105ba0d0a16ef461ed2a862b12c88bdc260180d4da628334806814bafeadb4fe75d4471527e1e1344107c4e7b5383eb0ec4591b39b31f2fa5f4d5')
+sha512sums=('1067052938f988fa6339f1a177c7bf27f9ee627caa2c896ee1ade80702e1868d3cf322714d383a65060b8d9eb6391c085fd5edaa81d99a4fa45e6f966d19d65a')
 
-CFLAGS="-march=native -O2 -pipe -fstack-protector-strong -ansi"
+CFLAGS="-march=native -O2 -pipe -fstack-protector-strong"
 CXXFLAGS="${CFLAGS}"
 CPPFLAGS="${CPPFLAGS} -DNDEBUG"
 MAKEFLAGS="-j$(nproc)"
 
 build() {
-	sed  -i '/\#include \"cryptopp_inc.h\"/a #include "assert.h"' "${srcdir}/urbackup-server-${pkgver}/cryptoplugin/AESGCMDecryption.h"
-
-	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 \
-		--localstatedir=/var --enable-packaging \
-		--with-mountvhd --with-zlib --with-libcurl
-	make
+    sed  -i '/\#include \"cryptopp_inc.h\"/a #include "assert.h"' "${srcdir}/urbackup-server-${pkgver}/cryptoplugin/AESGCMDecryption.h"
+    
+    patch -d"${srcdir}/urbackup-server-${pkgver}" -p0 < ../md5-bytes.patch
+    
+    cd "${srcdir}/urbackup-server-${pkgver}"
+    ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc \
+    --localstatedir=/var --enable-packaging \
+    --with-mountvhd --with-zlib --with-libcurl
+    make
 }
 
 package() {
-	cd "${srcdir}/urbackup-server-${pkgver}"
-
-	make DESTDIR=$pkgdir install
-
-	# Correct some file mode bits, thanks cfstras
-	chmod a+x "${pkgdir}/usr/share/urbackup/www/"{css,fonts,js,images,}
-
-	install -Dm644 "${srcdir}/urbackup-server-${pkgver}"/urbackup-server.service \
-		"${pkgdir}"/usr/lib/systemd/system/urbackup-server.service
-	install -Dm644 "${srcdir}/urbackup-server-${pkgver}"/urbackup-server-firewalld.xml \
-		"${pkgdir}"/usr/lib/firewalld/services/urbackup-server-firewalld.xml
-	install -Dm644 "${srcdir}/urbackup-server-${pkgver}"/logrotate_urbackupsrv \
-		"${pkgdir}"/etc/logrotate.d/urbackupsrv
-	install -Dm644 "${srcdir}/urbackup-server-${pkgver}"/docs/urbackupsrv.1 \
-		"${pkgdir}"/usr/share/man/man1/urbackupsrv.1
-	install -Dm644 "${srcdir}/urbackup-server-${pkgver}"/defaults_server \
-		"${pkgdir}"/etc/default/urbackupsrv
+    cd "${srcdir}/urbackup-server-${pkgver}"
+    
+    make DESTDIR=$pkgdir install
+    
+    # Correct some file mode bits, thanks cfstras
+    chmod a+x "${pkgdir}/usr/share/urbackup/www/"{css,fonts,js,images,}
+    
+    install -Dm644 "${srcdir}/urbackup-server-${pkgver}"/urbackup-server.service \
+    "${pkgdir}"/usr/lib/systemd/system/urbackup-server.service
+    install -Dm644 "${srcdir}/urbackup-server-${pkgver}"/urbackup-server-firewalld.xml \
+    "${pkgdir}"/usr/lib/firewalld/services/urbackup-server-firewalld.xml
+    install -Dm644 "${srcdir}/urbackup-server-${pkgver}"/logrotate_urbackupsrv \
+    "${pkgdir}"/etc/logrotate.d/urbackupsrv
+    install -Dm644 "${srcdir}/urbackup-server-${pkgver}"/docs/urbackupsrv.1 \
+    "${pkgdir}"/usr/share/man/man1/urbackupsrv.1
+    install -Dm644 "${srcdir}/urbackup-server-${pkgver}"/defaults_server \
+    "${pkgdir}"/etc/default/urbackupsrv
 }
 # vim: ts=2
diff --git a/cryptopp-bytes.patch b/cryptopp-bytes.patch
deleted file mode 100644
index d34e1553313f..000000000000
--- a/cryptopp-bytes.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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