From ce9f8855e26dccfdcbcdff5f784ae7e0f4facf12 Mon Sep 17 00:00:00 2001
From: Jan-Piet Mens <jpmens@gmail.com>
Date: Wed, 27 Jan 2016 11:14:47 +0100
Subject: [PATCH] fix debian8 packaging

---
 etc/debian/fpm-make.sh | 38 ++++++++++++++++++--------------------
 etc/debian/postinst    | 20 +++++++++++++-------
 2 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/etc/debian/fpm-make.sh b/etc/debian/fpm-make.sh
index 42d97ef..e8ba7ea 100755
--- a/etc/debian/fpm-make.sh
+++ b/etc/debian/fpm-make.sh
@@ -2,34 +2,32 @@
 
 set -e
 
-if [ ! -f version.h ]; then
-	echo "$0 must be run from recorder source tree" >&2
-	exit 2
-fi
-
 tempdir=$(mktemp -d /tmp/ot-XXX)
 
 make install DESTDIR=$tempdir
 
 name="ot-recorder"
 version=$(awk '{print $NF;}' version.h | sed -e 's/"//g' )
-arch=x86_64
+arch=$(uname -m)
 debfile="/tmp/${name}_${version}_${arch}.deb"
 
 rm -f "${debfile}"
 
 fpm -s dir \
-	-t deb \
-	-n ${name} \
-	-v ${version} \
-	--vendor "OwnTracks.org" \
-	-a all \
-	--maintainer 'jpmens@gmail.com' \
-	-C $tempdir \
-	-p ${debfile} \
-	-d "libmosquitto1" \
-	-d "libcurl3" \
-	-d "liblua5.2" \
-	--post-install etc/debian/postinst \
-	usr var
-
+        -t deb \
+        -n ${name} \
+        -v ${version} \
+        --vendor "OwnTracks.org" \
+        -a native \
+        --maintainer 'jpmens@gmail.com' \
+        --description "A lightweight back-end for consuming OwnTracks data from an MQTT broker" \
+        --license "https://github.com/owntracks/recorder/blob/master/LICENSE" \
+        --url "http://owntracks.org" \
+        -C $tempdir \
+        -p ${debfile} \
+        -d "libcurl3" \
+        -d "libmosquitto1" \
+        -d "liblua5.2-0" \
+	-d "libsodium13" \
+        --post-install etc/debian/postinst \
+        usr var
diff --git a/etc/debian/postinst b/etc/debian/postinst
index 2861317..cc7fd61 100644
--- a/etc/debian/postinst
+++ b/etc/debian/postinst
@@ -1,17 +1,23 @@
 #!/bin/sh
+# postinstall for DEB8
 #
+# Create owntracks user & group
+# binaries are setuid to owntracks
+# storage belongs to owntracks:owntracks
 
 set -e
 
 case "$1" in
     configure)
-	getent group owntracks > /dev/null || /usr/sbin/groupadd -r owntracks
-	chgrp owntracks /var/spool/owntracks/recorder/store
-	chgrp owntracks /var/spool/owntracks/recorder/store/ghash
-	chgrp owntracks /usr/local/bin/ocat /usr/local/sbin/ot-recorder
-	chmod 3755 /usr/local/bin/ocat /usr/local/sbin/ot-recorder
-	/usr/local/bin/ocat --load=luadb < /dev/null
-	/usr/local/bin/ocat --load=topic2tid < /dev/null
+        getent group owntracks > /dev/null || /usr/sbin/groupadd --system owntracks
+        getent passwd owntracks > /dev/null || adduser --system --disabled-password --disabled-login --ingroup owntracks --no-create-home owntracks
+        mkdir -p /var/spool/owntracks/recorder/store/last
+        mkdir -p /var/spool/owntracks/recorder/store/ghash
+        chown -R owntracks:owntracks /var/spool/owntracks/recorder/store
+        chgrp owntracks /var/spool/owntracks/recorder/store/ghash
+        chown owntracks:owntracks /usr/local/bin/ocat /usr/local/sbin/ot-recorder
+        chmod 4111 /usr/local/bin/ocat /usr/local/sbin/ot-recorder
+        /usr/local/sbin/ot-recorder --initialize
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)