Update to 2.2.5

2 files changed, 25 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 55fc31f0fe8d..690b937dbf88 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Wed Feb  7 23:52:02 UTC 2018
+# Thu Mar  1 22:00:52 UTC 2018
 pkgbase = urbackup2-client-no-gui
-	pkgdesc = client server backup system
-	pkgver = 2.1.17
-	pkgrel = 2
+	pkgdesc = Client/Server network backup for Windows Workgroups and Linux, headless client
+	pkgver = 2.2.5
+	pkgrel = 1
 	url = https://www.urbackup.org/
 	arch = i686
 	arch = x86_64
@@ -23,22 +23,22 @@ pkgbase = urbackup2-client-no-gui
 	conflicts = urbackup-client-no-gui
 	conflicts = urbackup2-client
 	conflicts = urbackup2-client-no-gui
-	source = https://hndl.urbackup.org/Client/2.1.17/urbackup-client-2.1.17.tar.gz
-	source = defaults_client
+	source = https://hndl.urbackup.org/Client/2.2.5/urbackup-client-2.2.5.tar.gz
 	source = btrfs_create_filesystem_snapshot
 	source = btrfs_remove_filesystem_snapshot
 	source = dattobd_create_filesystem_snapshot
 	source = dattobd_remove_filesystem_snapshot
 	source = lvm_create_filesystem_snapshot
 	source = lvm_remove_filesystem_snapshot
-	sha256sums = a3846a0ff0259abf5e6fe43a0f583607f1977c71ca7820f8f4d41bf64aa2b7f0
-	sha256sums = d77fa6ad67141ae5cb4c3c6953783ce54aaaa3c1f2fe5bb28cd20948ddda12c4
+	source = defaults_client
+	sha256sums = 125180db455c6dd626e1facae77bad2f92b5f2570adfa7e4beeb922f39586d2c
 	sha256sums = 18b5eceb73086b86d904f80e9270df121d06d7c683f93c5449a82e7deb38e0ee
 	sha256sums = 334d9eb67a642d96e04874fd27c1b57d578c35b4cdc768d50db7ac2436f0927c
 	sha256sums = 869e6244efbf6e370938e2e5c94a16c0130f583815ddbd34802578656989048b
 	sha256sums = 23d6bdad352d33fe41acd50e0114f986cd4324c2c65ca16cea365cb99d90addd
 	sha256sums = d5b462879e7c80139688c9d20ce1b1fe553386df9459def5e1d093d3a13d71fb
 	sha256sums = 0ffb3bbbf5faf939564681d24786767a4706132f2f081b7a870ecc718a8e9413
+	sha256sums = d77fa6ad67141ae5cb4c3c6953783ce54aaaa3c1f2fe5bb28cd20948ddda12c4
 
 pkgname = urbackup2-client-no-gui
 
diff --git a/PKGBUILD b/PKGBUILD
index 260c6d8c4a35..658c24be3f94 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,9 @@
 
 set -u
 pkgname='urbackup2-client-no-gui'
-pkgver='2.1.17'
-pkgrel='2'
-pkgdesc='client server backup system'
+pkgver='2.2.5'
+pkgrel='1'
+pkgdesc='Client/Server network backup for Windows Workgroups and Linux, headless client'
 arch=('i686' 'x86_64' 'armv5' 'armv6h' 'armv6' 'armv7h' 'armv7' 'aarch64')
 url='https://www.urbackup.org/'
 license=('GPL')
@@ -22,19 +22,16 @@ _scripts=(
   'lvm_remove_filesystem_snapshot'
 )
 _srcdir="urbackup-client-${pkgver}.0"
-source=(
-  "https://hndl.urbackup.org/Client/${pkgver}/urbackup-client-${pkgver}.tar.gz"
-  'defaults_client'
-  "${_scripts[@]}"
-)
-sha256sums=('a3846a0ff0259abf5e6fe43a0f583607f1977c71ca7820f8f4d41bf64aa2b7f0'
-            'd77fa6ad67141ae5cb4c3c6953783ce54aaaa3c1f2fe5bb28cd20948ddda12c4'
+source=("https://hndl.urbackup.org/Client/${pkgver}/urbackup-client-${pkgver}.tar.gz")
+source+=("${_scripts[@]}" 'defaults_client')
+sha256sums=('125180db455c6dd626e1facae77bad2f92b5f2570adfa7e4beeb922f39586d2c'
             '18b5eceb73086b86d904f80e9270df121d06d7c683f93c5449a82e7deb38e0ee'
             '334d9eb67a642d96e04874fd27c1b57d578c35b4cdc768d50db7ac2436f0927c'
             '869e6244efbf6e370938e2e5c94a16c0130f583815ddbd34802578656989048b'
             '23d6bdad352d33fe41acd50e0114f986cd4324c2c65ca16cea365cb99d90addd'
             'd5b462879e7c80139688c9d20ce1b1fe553386df9459def5e1d093d3a13d71fb'
-            '0ffb3bbbf5faf939564681d24786767a4706132f2f081b7a870ecc718a8e9413')
+            '0ffb3bbbf5faf939564681d24786767a4706132f2f081b7a870ecc718a8e9413'
+            'd77fa6ad67141ae5cb4c3c6953783ce54aaaa3c1f2fe5bb28cd20948ddda12c4')
 
 # These allow server and client to be installed on the same machine
 _oldsig='urbackup_ecdsa409k1.pub'
@@ -48,6 +45,7 @@ prepare() {
   sed -e "s:\"${_oldsig}\":\"${_newsig}\":g" -i 'urbackupclient/ClientService.cpp'
   sed -e "s:\"${_oldver}\":\"${_newver}\":g" -i 'client/main.cpp' 'client/Info.cpp' 'urbackupclient/ClientServiceCMD.cpp' 'urbackupclient/ClientService.cpp'
 
+  sed -e 's:byte digest:unsigned char digest:g' -i 'md5.h'
   cat >> 'cryptoplugin/cryptopp_inc.h' <<EOF
 
 #if (CRYPTOPP_VERSION >= 600) && (__cplusplus >= 201103L)
@@ -62,20 +60,25 @@ EOF
 build() {
   set -u
   cd "${_srcdir}"
+  local _makeopts=()
+  if [ -z "${MAKEFLAGS:-}" ] || [ "${MAKEFLAGS//-j/}" = "${MAKEFLAGS}" ]; then
+    local _nproc="$(nproc)"; _nproc=$((_nproc>8?8:_nproc))
+    _makeopts=(-j "${_nproc}")
+  fi
   if [ ! -s 'Makefile' ]; then
     #CFLAGS='-march=native -O2 -pipe -fstack-protector-strong' \\
     #CXXFLAGS="${CFLAGS} -ansi" \\
     ./configure --prefix='/usr' --sbindir='/usr/bin' --localstatedir='/var' --sysconfdir='/etc' --enable-headless
   fi
-  local _nproc="$(nproc)"; _nproc=$((_nproc>8?8:_nproc))
-  nice make -s -j "${_nproc}"
+  nice make -s "${_makeopts[@]}"
   set +u
 }
 
 package() {
   set -u
   cd "${_srcdir}"
-  make -j1 DESTDIR="${pkgdir}" install
+
+  make -s -j1 DESTDIR="${pkgdir}" install
 
   install -Dpm644 'urbackupclientbackend-debian.service' "${pkgdir}/usr/lib/systemd/system/urbackupclientbackend.service"
   install -Dpm644 'docs/urbackupclientbackend.1' -t "${pkgdir}/usr/share/man/man1/"