PKGBUILD cleanup, systemd service

2 files changed, 51 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 11ce41b6981c..e51665fc8d44 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,10 @@
+# Generated by mksrcinfo v8
+# Mon Jan 18 00:18:08 UTC 2016
 pkgbase = burp-backup-git
-	pkgdesc = Burp is a backup and restore program. It uses librsync in order to save on the amount of space that is used by each backup. Builts from Git-master
-	pkgver = 2.0.16.r0.g2aacabd
-	pkgrel = 2
-	url = http://burp.grke.org/
+	pkgdesc = Burp is a backup and restore program. It uses librsync in order to save on the amount of space that is used by each backup.
+	pkgver = 2.0.30.r48.g1892559
+	pkgrel = 1
+	url = http://burp.grke.org/1
 	arch = any
 	license = AGPLv3
 	makedepends = uthash
diff --git a/PKGBUILD b/PKGBUILD
index 6a0a0db37381..7d3b90c1bdc0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,10 @@
-# Maintainer: icaruseffect <icaruseffect at posteo dot net>
+# Maintainer: brent s. <bts[at]square-r00t[dot]net>
+# Past maintainer: icaruseffect <icaruseffect at posteo dot net>
 pkgname="burp-backup-git"
 _pkgname="burp"
-pkgver=2.0.16.r0.g2aacabd
-pkgrel=2
-pkgdesc="Burp is a backup and restore program. It uses librsync in order to save on the amount of space that is used by each backup. Builts from Git-master"
+pkgver=2.0.30.r48.g1892559
+pkgrel=1
+pkgdesc="Burp is a backup and restore program. It uses librsync in order to save on the amount of space that is used by each backup."
 arch=('any')
 license=('AGPLv3')
 depends=('librsync' 'openssl')
@@ -11,33 +12,42 @@ makedepends=('uthash' 'git')
 conflicts=('burp-backup' 'burp-backup-dev')
 provides=(burp-backup)
 
-url='http://burp.grke.org/'
+url='http://burp.grke.org/'1
 source=(
         'burp::git+https://github.com/grke/burp.git#branch=master'
         'burp.service'
         )
 
 sha256sums=(
-        'SKIP' #git source
-        'e598b81d6d3dff2d336cf87191d52a7f336adc497c818742424fea73070cef24' # burp.service
+        'SKIP'
+        'e598b81d6d3dff2d336cf87191d52a7f336adc497c818742424fea73070cef24'
         ) 
 
 pkgver() {
-  cd "$srcdir/$_pkgname"
+  cd "${srcdir}/${_pkgname}"
   git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-prepare() {
-  cd "$srcdir/$_pkgname"
-  sed -i 's/\/var\/run/\/run/' Makefile.in
-}
-
 build() {
-  cd "$srcdir/$_pkgname"
-  ./configure --sbindir=/usr/bin || return 1
+  cd "${srcdir}/${_pkgname}"
+  autoreconf -vif
+  ./configure --prefix=/usr --sysconfdir=/etc/burp --localstatedir=/ --sbindir=/usr/bin || return 1
+
+  cd configs
+  for i in client/burp.conf.in server/burp.conf.in certs/CA/CA.cnf.in;
+  do
+    sed -i \
+	-e 's/@sysconfdir@/\/etc\/burp/g' \
+	-e 's/@sbindir@/\/usr\/bin/g' \
+	-e 's/@scriptdir@/\/usr\/share\/burp/g' \
+	-e 's/@runstatedir@/\/run/g' \
+	-e 's/@server_address@/127.0.0.1/g' ${i}
+  done
+  find certs/ -type d -exec chmod 750 '{}' \;
+  find certs/ -type f -exec chmod 640 '{}' \;
 }
 
-backup=(  'etc/burp/burp.conf'
+backup=('etc/burp/burp.conf'
   'etc/burp/burp-server.conf'
   'etc/cron.d/burp'
   'etc/burp/CA-client'
@@ -45,28 +55,31 @@ backup=(  'etc/burp/burp.conf'
 )
 
 package() {
+  cd "${srcdir}/${_pkgname}"
+
+ # cron.d logrotate
+  mkdir -p ${pkgdir}/etc/cron.d
+  cp debian/burp.cron.d ${pkgdir}/etc/cron.d/burp
+  mkdir -p ${pkgdir}/etc/logrotate.d
+  cp debian/logrotate ${pkgdir}/etc/logrotate.d/burp
+  mkdir -p ${pkgdir}/etc/burp
 
-  cd "$srcdir/$_pkgname"
   make || return 1
-  make DESTDIR="$pkgdir/" install
+  make DESTDIR="${pkgdir}" install
   
  # install systemd service
-  mkdir -p $pkgdir/usr/lib/systemd/system
+  mkdir -p ${pkgdir}/usr/lib/systemd/system
   cp ../burp.service $pkgdir/usr/lib/systemd/system
 
- # cron.d logrotate
-  mkdir $pkgdir/etc/cron.d
-  cp debian/burp.cron.d $pkgdir/etc/cron.d/burp
-  mkdir $pkgdir/etc/logrotate.d
-  cp debian/logrotate $pkgdir/etc/logrotate.d/burp
-
+ # fix permissions, install files
+  mkdir -p ${pkgdir}/var/spool/burp
+  chmod 755 ${pkgdir}/var/spool
+  chmod 700 ${pkgdir}/var/spool/burp
 
- # fix permissions
-  mkdir -p $pkgdir/var/spool/burp
-  chmod 755 $pkgdir/var/spool
-  chmod 0600 $pkgdir/etc/burp/burp.conf
-  chmod 0600 $pkgdir/etc/burp/burp-server.conf
-  chmod 0700 $pkgdir/etc/burp/clientconfdir
-  chmod 0700 $pkgdir/var/spool/burp
+  install -D -m 0600 configs/client/burp.conf.in ${pkgdir}/etc/burp/burp.conf
+  install -D -m 0600 configs/server/burp.conf.in ${pkgdir}/etc/burp/burp-server.conf
+  rsync -a configs/server/clientconfdir ${pkgdir}/etc/burp/.
+  chmod 0700 configs/server/clientconfdir ${pkgdir}/etc/burp/clientconfdir
+  install -D -m 0600 configs/certs/CA/CA.cnf.in ${pkgdir}/etc/burp/CA.cnf
   
 }