Updated to latest stable version (1.4.40).

4 files changed, 18 insertions, 62 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b455e5c77893..24515dbf2ae0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = burp-backup
 	pkgdesc = A backup and restore program that uses librsync to reduce backup size.
-	pkgver = 1.3.48
-	pkgrel = 12
+	pkgver = 1.4.40
+	pkgrel = 1
 	url = http://burp.grke.org/
 	install = burp.install
 	arch = i686
@@ -17,21 +17,19 @@ pkgbase = burp-backup
 	backup = etc/burp/burp-server.conf
 	backup = etc/burp/CA.cnf
 	backup = etc/logrotate.d/burp
-	source = http://downloads.sourceforge.net/project/burp/burp-1.3.48/burp-1.3.48.tar.bz2
+	source = http://downloads.sourceforge.net/project/burp/burp-1.4.40/burp-1.4.40.tar.bz2
 	source = burp.install
 	source = burp-server.service
 	source = burp-client.service
 	source = burp-client.timer
-	source = 01-libsync_fix.patch
-	source = 02-runpath_fix.patch
+	source = 01-runpath_fix.patch
 	source = readme-archlinux.txt
-	sha256sums = bb456c208998d2f5806828357934e794cd9675448cb6545473364fd9e6d73509
+	sha256sums = 4108eb45e14740de990d918a2adbb661d88f90de48d6e2e3a6b54fd12b16fa5e
 	sha256sums = 813b5c349f9d0ea1db2fb166531472b098a773aa3d2766d151f175ad17c40351
 	sha256sums = 94e1b5f8cf61c44f84675f685279e0d3376abd61ac1e6e4f5da0dd6b922c481f
 	sha256sums = 7908970e23cfb08554cbf53da1f8f3193a6b6ee076584f797644efab8431bfe3
 	sha256sums = 0310a26e9a0af76f847130019cb865dfa09a5e8f9899bfd6526c69e82d160bf4
-	sha256sums = 5dbd7bda6a45a3a8ff49cabe45f644d9761f827541624ac98457fbde421a6465
-	sha256sums = 0014c838d672c803c68c57a24ea84e12c5c7e6145b7974cf8e20db4ccb1bdb1c
+	sha256sums = e6f0ddc1a2de09f03b7ae3bbec7f939a400244ea3f715dec0288d36032480638
 	sha256sums = e3e633f09d03efa3f2c1e769a2e31f514466ebd97cf6bb5f1ef0761e17abec67
 
 pkgname = burp-backup
diff --git a/01-libsync_fix.patch b/01-libsync_fix.patch
deleted file mode 100644
index 9f857e13a29f..000000000000
--- a/01-libsync_fix.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -aur burp.pristine/src/backup_phase2_server.c burp.new/src/backup_phase2_server.c
---- burp.pristine/src/backup_phase2_server.c	2014-01-27 10:55:47.000000000 +0000
-+++ burp.new/src/backup_phase2_server.c	2015-03-29 14:30:45.905800143 +0000
-@@ -480,7 +480,11 @@
- 	free(curpath);
- 
- 	blocklen=get_librsync_block_len(cb->endfile);
-+ #ifdef RS_DEFAULT_STRONG_LEN
- 	if(!(p1b->sigjob=rs_sig_begin(blocklen, RS_DEFAULT_STRONG_LEN)))
-+ #else
-+        if(!(p1b->sigjob=rs_sig_begin(blocklen, 8, RS_MD4_SIG_MAGIC)))
-+ #endif
- 	{
- 		logp("could not start signature job.\n");
- 		return -1;
-diff -aur burp.pristine/src/backup_phase4_server.c burp.new/src/backup_phase4_server.c
---- burp.pristine/src/backup_phase4_server.c	2014-01-27 10:56:18.000000000 +0000
-+++ burp.new/src/backup_phase4_server.c	2015-03-29 14:30:45.905800143 +0000
-@@ -38,7 +38,7 @@
- 	}
- 	result=rs_sig_gzfile(dstfp, dstzp, sigp,
- 		get_librsync_block_len(endfile),
--		RS_DEFAULT_STRONG_LEN, NULL, cntr);
-+		8, NULL, cntr);
- 	gzclose_fp(&dstzp);
- 	close_fp(&dstfp);
- 	if(close_fp(&sigp))
-diff -aur burp.pristine/src/rs_buf.c burp.new/src/rs_buf.c
---- burp.pristine/src/rs_buf.c	2014-01-27 10:55:47.000000000 +0000
-+++ burp.new/src/rs_buf.c	2015-03-29 14:30:45.905800143 +0000
-@@ -497,7 +497,7 @@
-     rs_job_t        *job;
-     rs_result       r;
- 
--    job = rs_sig_begin(new_block_len, strong_len);
-+    job = rs_sig_begin(new_block_len, strong_len, RS_MD4_SIG_MAGIC);
-     r = rs_whole_gzrun(job, old_file, old_zfile, sig_file, NULL, cntr);
- /*
-     if (stats)
diff --git a/02-runpath_fix.patch b/01-runpath_fix.patch
index c10107fc72f0..84c318447adb 100644
--- a/02-runpath_fix.patch
+++ b/01-runpath_fix.patch
@@ -1,6 +1,6 @@
-diff -aur burp.pristine/Makefile.in burp.new/Makefile.in
---- burp.pristine/Makefile.in	2014-01-27 10:55:47.000000000 +0000
-+++ burp.new/Makefile.in	2015-03-29 13:30:33.141852508 +0000
+diff -aur burp-1.4.40-pristine/Makefile.in burp-1.4.40-new/Makefile.in
+--- burp-1.4.40-pristine/Makefile.in	2015-07-01 06:45:08.000000000 -0500
++++ burp-1.4.40-new/Makefile.in	2015-10-06 20:04:31.835433112 -0500
 @@ -90,7 +90,7 @@
  	$(MKDIR) $(DESTDIR)$(sbindir)
  	$(MKDIR) $(DESTDIR)$(sysconfdir)
diff --git a/PKGBUILD b/PKGBUILD
index e4046c03eb12..39618ce49a80 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: Rafał Michalski <plum.michalski at gmail dot com>
 pkgname="burp-backup"
 _pkgname="burp"
-pkgver=1.3.48
-pkgrel=12
+pkgver=1.4.40
+pkgrel=1
 pkgdesc="A backup and restore program that uses librsync to reduce backup size."
 arch=('i686' 'x86_64')
 license=("AGPL3")
@@ -19,19 +19,17 @@ source=(
   "burp-server.service"
   "burp-client.service"
   "burp-client.timer"
-  "01-libsync_fix.patch"
-  "02-runpath_fix.patch"
+  "01-runpath_fix.patch"
   "readme-archlinux.txt"
 )
 
 sha256sums=(
-  bb456c208998d2f5806828357934e794cd9675448cb6545473364fd9e6d73509 # burp-${pkgver}.tar.bz2
+  4108eb45e14740de990d918a2adbb661d88f90de48d6e2e3a6b54fd12b16fa5e # burp-${pkgver}.tar.bz2
   813b5c349f9d0ea1db2fb166531472b098a773aa3d2766d151f175ad17c40351 # burp.install
   94e1b5f8cf61c44f84675f685279e0d3376abd61ac1e6e4f5da0dd6b922c481f # burp-server.service
   7908970e23cfb08554cbf53da1f8f3193a6b6ee076584f797644efab8431bfe3 # burp-client.service
   0310a26e9a0af76f847130019cb865dfa09a5e8f9899bfd6526c69e82d160bf4 # burp-client.timer
-  5dbd7bda6a45a3a8ff49cabe45f644d9761f827541624ac98457fbde421a6465 # libsync_fix.patch https://github.com/grke/burp/issues/273
-  0014c838d672c803c68c57a24ea84e12c5c7e6145b7974cf8e20db4ccb1bdb1c # runpath_fix.patch change /var/run to /run
+  e6f0ddc1a2de09f03b7ae3bbec7f939a400244ea3f715dec0288d36032480638 # runpath_fix.patch change /var/run to /run
   e3e633f09d03efa3f2c1e769a2e31f514466ebd97cf6bb5f1ef0761e17abec67 # arch linux specific instructions
 )
 
@@ -43,19 +41,18 @@ backup=(
 )
 
 prepare() {
-  cd "$srcdir/$_pkgname"
-  patch -Np1 -i ../01-libsync_fix.patch
-  patch -Np1 -i ../02-runpath_fix.patch
+  cd "$srcdir/$_pkgname-$pkgver"
+  patch -Np1 -i ../01-runpath_fix.patch
 }
 
 build() {
-  cd "$srcdir/$_pkgname"
+  cd "$srcdir/$_pkgname-$pkgver"
   ./configure --sbindir=/usr/bin
   make
 }
 
 package() {
-  cd "$srcdir/$_pkgname"
+  cd "$srcdir/$_pkgname-$pkgver"
   make DESTDIR="$pkgdir/" install
 
   # Setup logrotate