autu: Update to 2.2.6-1

4 files changed, 60 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 690b937dbf88..9ae1a6959bd0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu Mar  1 22:00:52 UTC 2018
+# Thu Jun 28 22:36:14 UTC 2018
 pkgbase = urbackup2-client-no-gui
 	pkgdesc = Client/Server network backup for Windows Workgroups and Linux, headless client
-	pkgver = 2.2.5
+	pkgver = 2.2.6
 	pkgrel = 1
 	url = https://www.urbackup.org/
 	arch = i686
@@ -23,7 +23,7 @@ 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.2.5/urbackup-client-2.2.5.tar.gz
+	source = https://hndl.urbackup.org/Client/2.2.6/urbackup-client-2.2.6.tar.gz
 	source = btrfs_create_filesystem_snapshot
 	source = btrfs_remove_filesystem_snapshot
 	source = dattobd_create_filesystem_snapshot
@@ -31,7 +31,9 @@ pkgbase = urbackup2-client-no-gui
 	source = lvm_create_filesystem_snapshot
 	source = lvm_remove_filesystem_snapshot
 	source = defaults_client
-	sha256sums = 125180db455c6dd626e1facae77bad2f92b5f2570adfa7e4beeb922f39586d2c
+	source = cryptopp-bytes.patch
+	source = md5-bytes.patch
+	sha256sums = 95d5a8d4e8016c23171f12340a7fc28cd8d275d6c815604f28e978a4256eff6f
 	sha256sums = 18b5eceb73086b86d904f80e9270df121d06d7c683f93c5449a82e7deb38e0ee
 	sha256sums = 334d9eb67a642d96e04874fd27c1b57d578c35b4cdc768d50db7ac2436f0927c
 	sha256sums = 869e6244efbf6e370938e2e5c94a16c0130f583815ddbd34802578656989048b
@@ -39,6 +41,8 @@ pkgbase = urbackup2-client-no-gui
 	sha256sums = d5b462879e7c80139688c9d20ce1b1fe553386df9459def5e1d093d3a13d71fb
 	sha256sums = 0ffb3bbbf5faf939564681d24786767a4706132f2f081b7a870ecc718a8e9413
 	sha256sums = d77fa6ad67141ae5cb4c3c6953783ce54aaaa3c1f2fe5bb28cd20948ddda12c4
+	sha256sums = 7bd6f9ea3710d5172a2279b7667ca64ed738b73fd707f13336d615f6e7426eda
+	sha256sums = 5d093d1d74cbcdfddce40901015db7353ab7a06e4110244eeac8578a3adf00e8
 
 pkgname = urbackup2-client-no-gui
 
diff --git a/PKGBUILD b/PKGBUILD
index 658c24be3f94..d0509a868226 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 set -u
 pkgname='urbackup2-client-no-gui'
-pkgver='2.2.5'
+pkgver='2.2.6'
 pkgrel='1'
 pkgdesc='Client/Server network backup for Windows Workgroups and Linux, headless client'
 arch=('i686' 'x86_64' 'armv5' 'armv6h' 'armv6' 'armv7h' 'armv7' 'aarch64')
@@ -12,6 +12,7 @@ license=('GPL')
 depends=('crypto++' 'zlib')
 makedepends=('gcc-libs' 'gcc' 'make')
 conflicts=(urbackup{,2}-{client,client-no-gui}) #,server})
+_patches=('cryptopp-bytes.patch' 'md5-bytes.patch')
 _verwatch=("${url}/download.html" '//hndl\.urbackup\.org/Client/[0-9\.]\+/urbackup-client-\([0-9\.]\+\)\.tar\.gz' 'l')
 _scripts=(
   'btrfs_create_filesystem_snapshot'
@@ -23,15 +24,17 @@ _scripts=(
 )
 _srcdir="urbackup-client-${pkgver}.0"
 source=("https://hndl.urbackup.org/Client/${pkgver}/urbackup-client-${pkgver}.tar.gz")
-source+=("${_scripts[@]}" 'defaults_client')
-sha256sums=('125180db455c6dd626e1facae77bad2f92b5f2570adfa7e4beeb922f39586d2c'
+source+=("${_scripts[@]}" 'defaults_client' "${_patches[@]}")
+sha256sums=('95d5a8d4e8016c23171f12340a7fc28cd8d275d6c815604f28e978a4256eff6f'
             '18b5eceb73086b86d904f80e9270df121d06d7c683f93c5449a82e7deb38e0ee'
             '334d9eb67a642d96e04874fd27c1b57d578c35b4cdc768d50db7ac2436f0927c'
             '869e6244efbf6e370938e2e5c94a16c0130f583815ddbd34802578656989048b'
             '23d6bdad352d33fe41acd50e0114f986cd4324c2c65ca16cea365cb99d90addd'
             'd5b462879e7c80139688c9d20ce1b1fe553386df9459def5e1d093d3a13d71fb'
             '0ffb3bbbf5faf939564681d24786767a4706132f2f081b7a870ecc718a8e9413'
-            'd77fa6ad67141ae5cb4c3c6953783ce54aaaa3c1f2fe5bb28cd20948ddda12c4')
+            'd77fa6ad67141ae5cb4c3c6953783ce54aaaa3c1f2fe5bb28cd20948ddda12c4'
+            '7bd6f9ea3710d5172a2279b7667ca64ed738b73fd707f13336d615f6e7426eda'
+            '5d093d1d74cbcdfddce40901015db7353ab7a06e4110244eeac8578a3adf00e8')
 
 # These allow server and client to be installed on the same machine
 _oldsig='urbackup_ecdsa409k1.pub'
@@ -42,18 +45,14 @@ _newver='version_client.txt'
 prepare() {
   set -u
   cd "${_srcdir}"
+
+  patch -d'cryptoplugin' -p0 -i "${srcdir}/cryptopp-bytes.patch"
+  patch -p0 -i "${srcdir}/md5-bytes.patch"
+
   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)
-    using byte = CryptoPP::byte;
-#else
-    typedef unsigned char byte;
-#endif
-EOF
   set +u
 }
 
diff --git a/cryptopp-bytes.patch b/cryptopp-bytes.patch
new file mode 100644
index 000000000000..d34e1553313f
--- /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 000000000000..d4b88fe7dfed
--- /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