Update to 1.1.16, installs with server

2 files changed, 33 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dd5eb8f5fd0f..ca3105c4a46f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri Feb 17 02:01:01 UTC 2017
+# Sun Aug 13 22:01:28 UTC 2017
 pkgbase = urbackup2-client-no-gui
-	pkgdesc = Client Server backup system
-	pkgver = 2.1.14
+	pkgdesc = client server backup system
+	pkgver = 2.1.16
 	pkgrel = 1
 	url = https://www.urbackup.org/
 	arch = i686
@@ -21,11 +21,9 @@ pkgbase = urbackup2-client-no-gui
 	depends = zlib
 	conflicts = urbackup-client
 	conflicts = urbackup-client-no-gui
-	conflicts = urbackup-server
 	conflicts = urbackup2-client
 	conflicts = urbackup2-client-no-gui
-	conflicts = urbackup2-server
-	source = https://hndl.urbackup.org/Client/2.1.14/urbackup-client-2.1.14.tar.gz
+	source = https://hndl.urbackup.org/Client/2.1.16/urbackup-client-2.1.16.tar.gz
 	source = defaults_client
 	source = btrfs_create_filesystem_snapshot
 	source = btrfs_remove_filesystem_snapshot
@@ -33,7 +31,7 @@ pkgbase = urbackup2-client-no-gui
 	source = dattobd_remove_filesystem_snapshot
 	source = lvm_create_filesystem_snapshot
 	source = lvm_remove_filesystem_snapshot
-	sha256sums = 985cbb6a4344d255f01c29fc20cca50c067b5e852d6cddde4dba727c7e15648a
+	sha256sums = a987c2f1ae4b0b6cf8b396b70de48cfd1aa5361464be7480b6084f13195819d5
 	sha256sums = d77fa6ad67141ae5cb4c3c6953783ce54aaaa3c1f2fe5bb28cd20948ddda12c4
 	sha256sums = 18b5eceb73086b86d904f80e9270df121d06d7c683f93c5449a82e7deb38e0ee
 	sha256sums = 334d9eb67a642d96e04874fd27c1b57d578c35b4cdc768d50db7ac2436f0927c
diff --git a/PKGBUILD b/PKGBUILD
index cc5705ce4032..812c77208392 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,17 +1,17 @@
-# Maintainer: Chris Severance aur.severach AatT spamgourmet.com
+# Maintainer:  Chris Severance aur.severach AatT spamgourmet.com
 # Contributor: K0n24d <konrad AT knauber DOT net>
 
 set -u
 pkgname='urbackup2-client-no-gui'
-pkgver=2.1.14
-pkgrel=1
-pkgdesc='Client Server backup system'
+pkgver='2.1.16'
+pkgrel='1'
+pkgdesc='client server backup system'
 arch=('i686' 'x86_64' 'armv5' 'armv6h' 'armv6' 'armv7h' 'armv7' 'aarch64')
 url='https://www.urbackup.org/'
 license=('GPL')
 depends=('crypto++' 'zlib')
 makedepends=('gcc-libs' 'gcc' 'make')
-conflicts=(urbackup{,2}-{client,client-no-gui,server})
+conflicts=(urbackup{,2}-{client,client-no-gui}) #,server})
 _verwatch=("${url}/download.html" '//hndl\.urbackup\.org/Client/[0-9\.]\+/urbackup-client-\([0-9\.]\+\)\.tar\.gz' 'l')
 _scripts=(
   'btrfs_create_filesystem_snapshot'
@@ -21,12 +21,13 @@ _scripts=(
   'lvm_create_filesystem_snapshot'
   '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=('985cbb6a4344d255f01c29fc20cca50c067b5e852d6cddde4dba727c7e15648a'
+sha256sums=('a987c2f1ae4b0b6cf8b396b70de48cfd1aa5361464be7480b6084f13195819d5'
             'd77fa6ad67141ae5cb4c3c6953783ce54aaaa3c1f2fe5bb28cd20948ddda12c4'
             '18b5eceb73086b86d904f80e9270df121d06d7c683f93c5449a82e7deb38e0ee'
             '334d9eb67a642d96e04874fd27c1b57d578c35b4cdc768d50db7ac2436f0927c'
@@ -35,27 +36,37 @@ sha256sums=('985cbb6a4344d255f01c29fc20cca50c067b5e852d6cddde4dba727c7e15648a'
             'd5b462879e7c80139688c9d20ce1b1fe553386df9459def5e1d093d3a13d71fb'
             '0ffb3bbbf5faf939564681d24786767a4706132f2f081b7a870ecc718a8e9413')
 
+# These allow server and client to be installed on the same machine
+_oldsig='urbackup_ecdsa409k1.pub'
+_newsig='urbackup_client_ecdsa409k1.pub'
+_oldver='version.txt'
+_newver='version_client.txt'
+
 prepare() {
   set -u
-  cd "urbackup-client-${pkgver}.0"
-  CFLAGS='-march=native -O2 -pipe -fstack-protector-strong' \
-  CXXFLAGS="${CFLAGS} -ansi" \
-  ./configure --prefix='/usr' --sbindir='/usr/bin' --localstatedir='/var' --sysconfdir='/etc' --enable-headless
+  cd "${_srcdir}"
+  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'
   set +u
 }
 
 build() {
   set -u
-  cd "urbackup-client-${pkgver}.0"
+  cd "${_srcdir}"
+  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))
-  make -s -j "${_nproc}"
+  nice make -s -j "${_nproc}"
   set +u
 }
 
 package() {
   set -u
-  cd "urbackup-client-${pkgver}.0"
-  make DESTDIR="${pkgdir}" install
+  cd "${_srcdir}"
+  make -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/"
@@ -63,6 +74,9 @@ package() {
   cd "${srcdir}"
   install -Dpm644 'defaults_client' "${pkgdir}/etc/default/urbackupclient"
   install -Dpm700 "${_scripts[@]}" -t "${pkgdir}/usr/share/urbackup/"
+
+  mv "${pkgdir}/usr/share/urbackup/${_oldsig}" "${pkgdir}/usr/share/urbackup/${_newsig}"
+  mv "${pkgdir}/var/urbackup/${_oldver}" "${pkgdir}/var/urbackup/${_newver}"
   set +u
 }
 set +u