burp 2.4.0

6 files changed, 17 insertions, 77 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f5a08137ba56..b7f1adb6bc2d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = burp-backup
 	pkgdesc = A backup and restore program that uses librsync to reduce backup size.
-	pkgver = 2.2.18
+	pkgver = 2.4.0
 	pkgrel = 1
 	url = https://burp.grke.org/
 	install = burp.install
@@ -17,20 +17,13 @@ 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-2.2.18/burp-2.2.18.tar.bz2
+	source = https://github.com/grke/burp/releases/download/2.4.0/burp-2.4.0.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 = 9c0c5298d8c2995d30d4e1a63d2882662e7056ce2b0cee1f65d7d0a6775c0f81
+	source = https://github.com/grke/burp/commit/1d6c931af7c11f164cf7ad3479781e8f03413496.patch
+	sha256sums = 1f88d325f59c6191908d13ac764db5ee56b478fbea30244ae839383b9f9d2832
 	sha256sums = 813b5c349f9d0ea1db2fb166531472b098a773aa3d2766d151f175ad17c40351
-	sha256sums = 94e1b5f8cf61c44f84675f685279e0d3376abd61ac1e6e4f5da0dd6b922c481f
-	sha256sums = 7908970e23cfb08554cbf53da1f8f3193a6b6ee076584f797644efab8431bfe3
-	sha256sums = 0310a26e9a0af76f847130019cb865dfa09a5e8f9899bfd6526c69e82d160bf4
-	sha256sums = 6a612f083f512e5293c34db10bbfa0af5c4a4ca74b2ba83fd9bfdb9435f3a69c
 	sha256sums = e3e633f09d03efa3f2c1e769a2e31f514466ebd97cf6bb5f1ef0761e17abec67
+	sha256sums = SKIP
 
 pkgname = burp-backup
-
diff --git a/01-runpath_fix.patch b/01-runpath_fix.patch
deleted file mode 100644
index 5ff663ba2568..000000000000
--- a/01-runpath_fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ura burp-2.1.32-pristine/Makefile.am burp-2.1.32-new/Makefile.am
---- burp-2.1.32-pristine/Makefile.am	2018-03-30 05:49:49.000000000 +0200
-+++ burp-2.1.32-new/Makefile.am	2018-04-04 21:23:02.952566608 +0200
-@@ -419,7 +419,7 @@
- 
- install-data-local:
- 	$(AM_V_at)$(MKDIR_P) $(DESTDIR)$(localstatedir)/spool/$(PACKAGE_TARNAME)
--	$(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 9e25b31fd081..9a16cdb1064b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Rafał Michalski <plum.michalski at gmail dot com>
 pkgname="burp-backup"
 _pkgname="burp"
-pkgver=2.2.18
+pkgver=2.4.0
 pkgrel=1
 pkgdesc="A backup and restore program that uses librsync to reduce backup size."
 arch=('i686' 'x86_64')
@@ -15,23 +15,17 @@ install="${_pkgname}.install"
 url='https://burp.grke.org/'
 
 source=(
-  "http://downloads.sourceforge.net/project/${_pkgname}/${_pkgname}-${pkgver}/${_pkgname}-${pkgver}.tar.bz2"
+  "https://github.com/grke/${_pkgname}/releases/download/${pkgver}/${_pkgname}-${pkgver}.tar.bz2"
   "burp.install"
-  "burp-server.service"
-  "burp-client.service"
-  "burp-client.timer"
-  "01-runpath_fix.patch"
   "readme-archlinux.txt"
+  "https://github.com/grke/burp/commit/1d6c931af7c11f164cf7ad3479781e8f03413496.patch"
 )
 
 sha256sums=(
-  9c0c5298d8c2995d30d4e1a63d2882662e7056ce2b0cee1f65d7d0a6775c0f81 # burp-2.2.18.tar.bz2
+  1f88d325f59c6191908d13ac764db5ee56b478fbea30244ae839383b9f9d2832 # burp-2.4.0.tar.bz2
   813b5c349f9d0ea1db2fb166531472b098a773aa3d2766d151f175ad17c40351 # burp.install
-  94e1b5f8cf61c44f84675f685279e0d3376abd61ac1e6e4f5da0dd6b922c481f # burp-server.service
-  7908970e23cfb08554cbf53da1f8f3193a6b6ee076584f797644efab8431bfe3 # burp-client.service
-  0310a26e9a0af76f847130019cb865dfa09a5e8f9899bfd6526c69e82d160bf4 # burp-client.timer
-  6a612f083f512e5293c34db10bbfa0af5c4a4ca74b2ba83fd9bfdb9435f3a69c # 01-runpath_fix.patch
   e3e633f09d03efa3f2c1e769a2e31f514466ebd97cf6bb5f1ef0761e17abec67 # readme-archlinux.txt
+  SKIP
 )
 
 backup=(
@@ -42,18 +36,16 @@ backup=(
 )
 
 prepare() {
+  patch -d "$srcdir/$_pkgname-$pkgver" -p1 < 1d6c931af7c11f164cf7ad3479781e8f03413496.patch
   cd "$srcdir/$_pkgname-$pkgver"
-  patch -Np1 -i ../01-runpath_fix.patch
 }
 
 build() {
   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 \
+              --runstatedir=/run \
               --localstatedir=/var \
               --sysconfdir=/etc/burp
   make
@@ -63,17 +55,14 @@ package() {
   cd "$_pkgname-$pkgver"
   make DESTDIR="$pkgdir/" install-all
 
-  # Setup logrotate
-  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/"
+  cp -r configs "$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/"
+  cp "systemd/burp-server.service" "$pkgdir/usr/lib/systemd/system/"
+  cp "systemd/burp-server-unprivileged.service" "$pkgdir/usr/lib/systemd/system/"
+  cp "systemd/burp-client.service" "$pkgdir/usr/lib/systemd/system/"
+  cp "systemd/burp-client.timer" "$pkgdir/usr/lib/systemd/system/"
 
   # Copy archlinux specific documentation 
   mkdir -p "$pkgdir/usr/share/doc/burp/"
diff --git a/burp-client.service b/burp-client.service
deleted file mode 100644
index 335b95eb41bf..000000000000
--- a/burp-client.service
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Burp backup client
-
-[Service]
-Type=simple
-ExecStart=/usr/sbin/burp -a t
-SuccessExitStatus=3
diff --git a/burp-client.timer b/burp-client.timer
deleted file mode 100644
index e7d5caa8bfc4..000000000000
--- a/burp-client.timer
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Checks every 20 minutes whether a backup is needed.
-
-[Timer]
-# Time to wait after booting before we run first time
-OnBootSec=5min
-# Time between running each consecutive time
-OnUnitActiveSec=20min
-Unit=burp-client.service
-
-[Install]
-WantedBy=multi-user.target
diff --git a/burp-server.service b/burp-server.service
deleted file mode 100644
index adf8a51ecddb..000000000000
--- a/burp-server.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Burp backup and restore server.
-
-[Service]
-User=root
-Type=forking
-KillMode=process
-ExecStart=/usr/sbin/burp -c /etc/burp/burp-server.conf
-
-[Install]
-WantedBy=multi-user.target