Updated to stable version 2.0.52

3 files changed, 54 insertions, 59 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ac3021a44a61..55feb83ae66a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,41 +1,35 @@
 pkgbase = burp-backup
 	pkgdesc = A backup and restore program that uses librsync to reduce backup size.
-	pkgver = 1.4.40
-	pkgrel = 2
+	pkgver = 2.0.52
+	pkgrel = 1
 	url = http://burp.grke.org/
 	install = burp.install
 	arch = i686
 	arch = x86_64
 	license = AGPL3
-	depends = librsync
+	makedepends = uthash
 	depends = acl
+	depends = librsync
 	depends = openssl
-	provides = burp-backup14=1.4.40
 	conflicts = burp-backup-dev
 	conflicts = burp-backup-git
-	conflicts = burp-backup14
-	replaces = burp-backup14=1.4.40
 	backup = etc/burp/burp.conf
 	backup = etc/burp/burp-server.conf
 	backup = etc/burp/CA.cnf
-	backup = etc/burp/notify_script
-	backup = etc/burp/ssl_extra_checks_script
-	backup = etc/burp/summary_script
-	backup = etc/burp/timer_script
 	backup = etc/logrotate.d/burp
-	source = http://downloads.sourceforge.net/project/burp/burp-1.4.40/burp-1.4.40.tar.bz2
+	source = http://downloads.sourceforge.net/project/burp/burp-2.0.52/burp-2.0.52.tar.bz2
 	source = burp.install
 	source = burp-server.service
 	source = burp-client.service
 	source = burp-client.timer
 	source = 01-runpath_fix.patch
 	source = readme-archlinux.txt
-	sha256sums = 4108eb45e14740de990d918a2adbb661d88f90de48d6e2e3a6b54fd12b16fa5e
+	sha256sums = 6426858b5f481da6800798d84cb56fe6bf5aaad295ab9ace3d8606b4e960669e
 	sha256sums = 813b5c349f9d0ea1db2fb166531472b098a773aa3d2766d151f175ad17c40351
 	sha256sums = 94e1b5f8cf61c44f84675f685279e0d3376abd61ac1e6e4f5da0dd6b922c481f
 	sha256sums = 7908970e23cfb08554cbf53da1f8f3193a6b6ee076584f797644efab8431bfe3
 	sha256sums = 0310a26e9a0af76f847130019cb865dfa09a5e8f9899bfd6526c69e82d160bf4
-	sha256sums = e6f0ddc1a2de09f03b7ae3bbec7f939a400244ea3f715dec0288d36032480638
+	sha256sums = d37a66f9dcb39a77379a38e9a763e071103036343e35911a28841bf41976eda6
 	sha256sums = e3e633f09d03efa3f2c1e769a2e31f514466ebd97cf6bb5f1ef0761e17abec67
 
 pkgname = burp-backup
diff --git a/01-runpath_fix.patch b/01-runpath_fix.patch
index 84c318447adb..7d677845be9d 100644
--- a/01-runpath_fix.patch
+++ b/01-runpath_fix.patch
@@ -1,12 +1,12 @@
-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)
- 	$(MKDIR) $(DESTDIR)$(sysconfdir)/CA-client
--	$(MKDIR) $(DESTDIR)/var/run
-+	$(MKDIR) $(DESTDIR)/run
- 	$(MKDIR) $(DESTDIR)/var/spool/burp
- 	@if [ ! -d $(DESTDIR)$(sysconfdir)/clientconfdir ] ; then $(MKDIR) $(DESTDIR)$(sysconfdir)/clientconfdir ; cp configs/server/clientconfdir/testclient $(DESTDIR)$(sysconfdir)/clientconfdir/testclient ; fi
- 	@if [ ! -d $(DESTDIR)$(sysconfdir)/clientconfdir/incexc ] ; then $(MKDIR) $(DESTDIR)$(sysconfdir)/clientconfdir/incexc ; cp configs/server/clientconfdir/incexc $(DESTDIR)$(sysconfdir)/clientconfdir/incexc/example ; fi
+diff -aur burp-2.0.32-pristine/Makefile.am burp-2.0.32-new/Makefile.am
+--- burp-2.0.32-pristine/Makefile.am	2016-01-30 23:48:49.000000000 -0600
++++ burp-2.0.32-new/Makefile.am	2016-02-04 21:25:41.568400983 -0600
+@@ -380,7 +380,7 @@
+ 
+ install-data-local:
+ 	$(AM_V_at)$(MKDIR_P) $(DESTDIR)$(localstatedir)/spool/burp
+-	$(AM_V_at)$(MKDIR_P) $(DESTDIR)$(runstatedir)
++	$(AM_V_at)$(MKDIR_P) $(DESTDIR)/run
+ 
+ clean-local: clean-local-check
+ 
diff --git a/PKGBUILD b/PKGBUILD
index d8cd3e1fc7d6..b30f859ebc33 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,17 +3,15 @@
 # Contributor: Rafał Michalski <plum.michalski at gmail dot com>
 pkgname="burp-backup"
 _pkgname="burp"
-pkgver=1.4.40
-pkgrel=2
+pkgver=2.0.52
+pkgrel=1
 pkgdesc="A backup and restore program that uses librsync to reduce backup size."
 arch=('i686' 'x86_64')
 license=("AGPL3")
-depends=('librsync' 'acl' 'openssl')
-makedepends=()
-conflicts=('burp-backup-dev' 'burp-backup-git' 'burp-backup14')
-provides=('burp-backup14=1.4.40')
-replaces=('burp-backup14=1.4.40')
-install=$_pkgname.install
+depends=('acl' 'librsync' 'openssl')
+makedepends=('uthash')
+conflicts=('burp-backup-dev' 'burp-backup-git')
+install="${_pkgname}.install"
 url='http://burp.grke.org/'
 
 source=(
@@ -27,23 +25,19 @@ source=(
 )
 
 sha256sums=(
-  4108eb45e14740de990d918a2adbb661d88f90de48d6e2e3a6b54fd12b16fa5e # burp-${pkgver}.tar.bz2
+  6426858b5f481da6800798d84cb56fe6bf5aaad295ab9ace3d8606b4e960669e # burp-2.0.52.tar.bz2
   813b5c349f9d0ea1db2fb166531472b098a773aa3d2766d151f175ad17c40351 # burp.install
   94e1b5f8cf61c44f84675f685279e0d3376abd61ac1e6e4f5da0dd6b922c481f # burp-server.service
   7908970e23cfb08554cbf53da1f8f3193a6b6ee076584f797644efab8431bfe3 # burp-client.service
   0310a26e9a0af76f847130019cb865dfa09a5e8f9899bfd6526c69e82d160bf4 # burp-client.timer
-  e6f0ddc1a2de09f03b7ae3bbec7f939a400244ea3f715dec0288d36032480638 # runpath_fix.patch change /var/run to /run
-  e3e633f09d03efa3f2c1e769a2e31f514466ebd97cf6bb5f1ef0761e17abec67 # arch linux specific instructions
+  d37a66f9dcb39a77379a38e9a763e071103036343e35911a28841bf41976eda6 # 01-runpath_fix.patch
+  e3e633f09d03efa3f2c1e769a2e31f514466ebd97cf6bb5f1ef0761e17abec67 # readme-archlinux.txt
 )
 
 backup=(
   "etc/burp/burp.conf"
   "etc/burp/burp-server.conf"
   "etc/burp/CA.cnf"
-  "etc/burp/notify_script"
-  "etc/burp/ssl_extra_checks_script"
-  "etc/burp/summary_script"
-  "etc/burp/timer_script"
   "etc/logrotate.d/burp"
 )
 
@@ -53,39 +47,46 @@ prepare() {
 }
 
 build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  ./configure --sbindir=/usr/bin
+  cd "$_pkgname-$pkgver"
+  autoreconf -vif
+  # In the 2.70 version of autotools the ability exists to define "runstatedir"
+  # which will eliminate the need for the patch file. Archlinux is currently at v2.69.
+  # I.E. use "--runstatedir=/run" when 2.70 is released.
+  ./configure --prefix=/usr \
+              --sbindir=/usr/bin \
+              --localstatedir=/var \
+              --sysconfdir=/etc/burp
   make
 }
 
 package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
+  cd "$_pkgname-$pkgver"
+  make DESTDIR="$pkgdir/" install-all
 
   # Setup logrotate
-  mkdir -p $pkgdir/etc/logrotate.d
-  cp debian/logrotate $pkgdir/etc/logrotate.d/burp
+  mkdir -p "$pkgdir/etc/logrotate.d"
+  cp debian/logrotate "$pkgdir/etc/logrotate.d/burp"
 
   # Copy useful user setup files
-  mkdir -p $pkgdir/usr/share/burp/
-  cp debian/burp.cron.d $pkgdir/usr/share/burp/
-  mkdir -p $pkgdir/usr/lib/systemd/system/
-  cp $srcdir/burp-server.service $pkgdir/usr/lib/systemd/system/
-  cp $srcdir/burp-client.service $pkgdir/usr/lib/systemd/system/
-  cp $srcdir/burp-client.timer $pkgdir/usr/lib/systemd/system/
+  mkdir -p "$pkgdir/usr/share/burp/"
+  cp debian/burp.cron.d "$pkgdir/usr/share/burp/"
+  mkdir -p "$pkgdir/usr/lib/systemd/system/"
+  cp "$srcdir/burp-server.service" "$pkgdir/usr/lib/systemd/system/"
+  cp "$srcdir/burp-client.service" "$pkgdir/usr/lib/systemd/system/"
+  cp "$srcdir/burp-client.timer" "$pkgdir/usr/lib/systemd/system/"
 
   # Copy archlinux specific documentation 
-  mkdir -p $pkgdir/usr/share/doc/burp/
-  cp $srcdir/readme-archlinux.txt $pkgdir/usr/share/doc/burp/readme-archlinux.txt
+  mkdir -p "$pkgdir/usr/share/doc/burp/"
+  cp "$srcdir/readme-archlinux.txt" "$pkgdir/usr/share/doc/burp/readme-archlinux.txt"
 
   # Fix permissions
-  mkdir -p $pkgdir/var/spool/burp
-  chmod 0755 $pkgdir/var/spool
-  chmod 0700 $pkgdir/var/spool/burp
-  chmod -R go-rwx $pkgdir/etc/burp
+  mkdir -p "$pkgdir/var/spool/burp"
+  chmod 0755 "$pkgdir/var/spool"
+  chmod 0700 "$pkgdir/var/spool/burp"
+  chmod -R go-rwx "$pkgdir/etc/burp"
 
   # Move "testclient" example to subfolder so it doesn't automatically get added to backup
-  mv $pkgdir/etc/burp/clientconfdir/testclient $pkgdir/etc/burp/clientconfdir/incexc
+  mv "$pkgdir/etc/burp/clientconfdir/testclient" "$pkgdir/etc/burp/clientconfdir/incexc"
 }
 
 # Helpful packaging references: