updating to 0.12 (per git releases), removing init support, adding systemd support

4 files changed, 59 insertions, 65 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1410204474d8..20a5bb14fdb5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Sun Jan 17 11:36:55 UTC 2016
 pkgbase = boxbackup-server
 	pkgdesc = An open source, completely automatic on-line backup system for UNIX.
-	pkgver = 0.11.1
+	pkgver = 0.12
 	pkgrel = 1
 	url = http://boxbackup.org
 	arch = i686
@@ -10,10 +12,10 @@ pkgbase = boxbackup-server
 	depends = perl
 	depends = zlib
 	backup = etc/boxbackup/bbstored.conf
-	source = http://www.boxbackup.org/svn/box/packages/boxbackup-0.11.1.tgz
-	source = bbserver
-	md5sums = c4c4786a918a9c026f80833614c40a6b
-	md5sums = 7a85ba0caf36febfb8e6871c45aa108e
+	source = https://github.com/boxbackup/boxbackup/archive/0.12.tar.gz
+	source = bbserver.service
+	md5sums = 268bec094ab71d491de497e766c45c87
+	md5sums = 1033a1c918190c524bd03aa37da1d3a6
 
 pkgname = boxbackup-server
 
diff --git a/PKGBUILD b/PKGBUILD
index 671bdec01775..0c30b264406b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,10 @@
-# Contributor: Andreas Schrafl <aschrafl@jetnet.ch>
+# Maintainer: brent s. <bts[at]square-r00t[dot]net>
+# Past contributor: Andreas Schrafl <aschrafl@jetnet.ch>
 # based on the work of Jaroslav Lichtblau <tu@dragonlord.cz>
 # based on the work of KyAnh, http://kyanh.net/ <xkyanh@gmail.com>
 
 pkgname=boxbackup-server
-pkgver=0.11.1
+pkgver=0.12
 pkgrel=1
 pkgdesc="An open source, completely automatic on-line backup system for UNIX."
 arch=('i686' 'x86_64')
@@ -11,32 +12,47 @@ url="http://boxbackup.org"
 license=('BSD')
 depends=('openssl' 'perl' 'zlib')
 backup=('etc/boxbackup/bbstored.conf')
-source=(http://www.boxbackup.org/svn/box/packages/boxbackup-${pkgver}.tgz  bbserver)
+source=(https://github.com/boxbackup/boxbackup/archive/${pkgver}.tar.gz bbserver.service)
 
-md5sums=('c4c4786a918a9c026f80833614c40a6b'
-         '7a85ba0caf36febfb8e6871c45aa108e')
+md5sums=('268bec094ab71d491de497e766c45c87'
+         '1033a1c918190c524bd03aa37da1d3a6')
 
-package() {
-	cd ${srcdir}/boxbackup-${pkgver}
-
-	./configure
+build() {
+	export MAKEFLAGS="-j1"
+	cd boxbackup-${pkgver}
 
-	make -j1 build-backup-server
+	./bootstrap
+	./configure --prefix=/usr --mandir=/usr/share/man --sbindir=/usr/bin
 
-    cp ${srcdir}/boxbackup-${pkgver}/release/bin/bbstored/bbstored ${srcdir}/boxbackup-${pkgver}/parcels/boxbackup-${pkgver}-backup-server-linux-gnu/bbstored
-    cp ${srcdir}/boxbackup-${pkgver}/release/bin/bbstoreaccounts/bbstoreaccounts ${srcdir}/boxbackup-${pkgver}/parcels/boxbackup-${pkgver}-backup-server-linux-gnu/bbstoreaccounts
+	make
+}
 
-  for f in \
-    bbstored \
-    bbstoreaccounts \
-    bbstored-certs \
-    bbstored-config \
-    raidfile-config ;\
-  do
-      install -D -m755 \
-        ${srcdir}/boxbackup-$pkgver/parcels/boxbackup-$pkgver-backup-server-linux-gnu/$f \
-        ${pkgdir}/usr/bin/$f
-  done
+package() {
 
-   install -D -m755 "${srcdir}/bbserver" "${pkgdir}/etc/rc.d/bbserver"
+	## their script kind of sucks. so let's do this manually.
+	cd ${srcdir}/boxbackup-${pkgver}/parcels/boxbackup-0.12-backup-server-linux-gnu/
+	#export DESTDIR=${pkgdir}/${pkgname}
+	#make install-backup-server
+
+	install -D bbstored ${pkgdir}/usr/bin/bbstored
+	install -D bbstoreaccounts ${pkgdir}/usr/bin/bbstoreaccounts
+	install -D bbstored-certs ${pkgdir}/usr/bin/bbstored-certs
+	install -D bbstored-config ${pkgdir}/usr/bin/bbstored-config
+	install -D raidfile-config ${pkgdir}/usr/bin/raidfile-config
+	install -D docs/bbstored.html ${pkgdir}/usr/share/doc/${pkgname}/bbstored.html
+	install -D docs/bbstoreaccounts.html ${pkgdir}/usr/share/doc/${pkgname}/bbstoreaccounts.html
+	install -D docs/bbstored-certs.html ${pkgdir}/usr/share/doc/${pkgname}/bbstored-certs.html
+	install -D docs/bbstored-config.html ${pkgdir}/usr/share/doc/${pkgname}/bbstored-config.html
+	install -D docs/raidfile-config.html ${pkgdir}/usr/share/doc/${pkgname}/raidfile-config.html
+	install -D docs/bbstored.conf.html ${pkgdir}/usr/share/doc/${pkgname}/bbstored.conf.html
+	install -D docs/raidfile.conf.html ${pkgdir}/usr/share/doc/${pkgname}/raidfile.conf.html
+	install -D bbstored.8.gz ${pkgdir}/usr/man/man8/bbstored.8.gz
+	install -D bbstoreaccounts.8.gz ${pkgdir}/usr/man/man8/bbstoreaccounts.8.gz
+	install -D bbstored-certs.8.gz ${pkgdir}/usr/man/man8/bbstored-certs.8.gz
+	install -D bbstored-config.8.gz ${pkgdir}/usr/man/man8/bbstored-config.8.gz
+	install -D raidfile-config.8.gz ${pkgdir}/usr/man/man8/raidfile-config.8.gz
+	install -D bbstored.conf.5.gz ${pkgdir}/usr/man/man5/bbstored.conf.5.gz
+	install -D raidfile.conf.5.gz ${pkgdir}/usr/man/man5/raidfile.conf.5.gz
+
+	install -D -m644 "${srcdir}/bbserver.service" "${pkgdir}/usr/lib/systemd/system/bbserver.service"
 }
diff --git a/bbserver b/bbserver
deleted file mode 100644
index 0a0ac94f1791..000000000000
--- a/bbserver
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID  /usr/bin/bbstored`
-case "$1" in
-  start)
-    stat_busy "Starting BoxBackup Server"
-    [ -z "$PID" ] && /usr/bin/bbstored
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon bbserver
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping BoxBackup Server"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon bbserver
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/bbserver.service b/bbserver.service
new file mode 100644
index 000000000000..9762d1b4b792
--- /dev/null
+++ b/bbserver.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Box Backup Server
+Wants=network.target
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/bbstored -F -c /etc/boxbackup/bbstored.conf
+KillMode=process
+Restart=always
+
+[Install]
+WantedBy=multi-user.target