release 0.9.2

6 files changed, 145 insertions, 56 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a18eec362c61..7a777b679687 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,26 @@
-# Generated by mksrcinfo v8
-# Sun Mar  3 13:54:43 UTC 2019
 pkgbase = owntracks-recorder
 	pkgdesc = Lightweight program for storing and accessing location data published via MQTT (or HTTP) by the OwnTracks apps.
-	pkgver = 0.8.4
+	pkgver = 0.9.2
 	pkgrel = 1
 	url = https://github.com/owntracks/recorder
+	install = install.sh
 	arch = i686
+	arch = pentium4
 	arch = x86_64
 	license = GPL
+	makedepends = coreutils
+	makedepends = curl
 	makedepends = libconfig
+	makedepends = libsodium
+	makedepends = lua
 	makedepends = mosquitto
-	makedepends = curl
+	depends = curl
 	depends = libconfig
+	depends = libsodium
+	depends = lua
 	depends = mosquitto
-	depends = curl
-	backup = etc/default/ot-recorder
-	source = https://github.com/owntracks/recorder/archive/0.8.4.tar.gz
-	source = truncation_error.patch
-	sha256sums = cdf4ced2563bdd26717b65aef18990d2d5c25ada231bf1293aab65f279fc8bff
-	sha256sums = e5bdc4a566c6bf86f2a40cfdcc6f0688ca71edd79fd191d17c4ac0c50970e142
+	backup = etc/owntracks-recorder.conf
+	source = owntracks-recorder-0.9.2.tar.gz::https://github.com/owntracks/recorder/archive/refs/tags/0.9.2.tar.gz
+	sha256sums = d3632895e46c36c1e484c021958e7bfee3b8977942ab28e7d47cf69c974f988e
 
 pkgname = owntracks-recorder
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..13d25006d8c8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/owntracks-recorder-*tar*
+/pkg
+/src
diff --git a/PKGBUILD b/PKGBUILD
index bde26c8a5b77..d670282482c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,45 +1,83 @@
-# Package build for owntracks-recorder (https://github.com/owntracks/recorder)
-# Maintainer: Sven Klomp <mail at klomp dot eu>
-
-pkgdesc='Lightweight program for storing and accessing location data published via MQTT (or HTTP) by the OwnTracks apps.'
-pkgname=('owntracks-recorder')
-pkgver=0.8.4
+# Maintainer: Iván Zaera Avellón <ivan dot zaera at protonmail dot com>
+pkgname=owntracks-recorder
+pkgver=0.9.2
 pkgrel=1
-arch=('i686' 'x86_64')
+pkgdesc='Lightweight program for storing and accessing location data published via MQTT (or HTTP) by the OwnTracks apps.'
+arch=('i686' 'pentium4' 'x86_64')
+url='https://github.com/owntracks/recorder'
 license=('GPL')
-url="https://github.com/owntracks/recorder"
-makedepends=('libconfig' 'mosquitto' 'curl')
-depends=('libconfig' 'mosquitto' 'curl')
-source=("https://github.com/owntracks/recorder/archive/${pkgver}.tar.gz" "truncation_error.patch")
-sha256sums=('cdf4ced2563bdd26717b65aef18990d2d5c25ada231bf1293aab65f279fc8bff'
-  'e5bdc4a566c6bf86f2a40cfdcc6f0688ca71edd79fd191d17c4ac0c50970e142')
-
-backup=(etc/default/ot-recorder)
-
-prepare() {
-	cd "${srcdir}/recorder-${pkgver}"
-        patch -Np2 -i "${srcdir}/truncation_error.patch"
-}
+depends=(
+	'curl'
+	'libconfig'
+	'libsodium'
+	'lua'
+	'mosquitto'
+)
+makedepends=(
+	'coreutils'
+	'curl'
+	'libconfig'
+	'libsodium'
+	'lua'
+	'mosquitto'
+)
+backup=(
+	'etc/owntracks-recorder.conf'
+)
+install='install.sh'
+source=(
+	"$pkgname-$pkgver.tar.gz::https://github.com/owntracks/recorder/archive/refs/tags/$pkgver.tar.gz"
+)
+sha256sums=("d3632895e46c36c1e484c021958e7bfee3b8977942ab28e7d47cf69c974f988e")
 
 build() {
 	cd "${srcdir}/recorder-${pkgver}"
-	cp config.mk.in config.mk || exit 1
-	sed -i 's#/usr/local#/usr/#g' config.mk
-	sed -i 's#/var/spool/owntracks/recorder/htdocs#/usr/share/webapps/ot-recorder#g' config.mk
-	export CFLAGS+=' -Wno-maybe-uninitialized -Wno-unused-result '
-	make || exit 1
+
+	cp config.mk.in config.mk
+	sed -i 's#INSTALLDIR = /usr/local#INSTALLDIR = /usr#g'                                                         config.mk
+	sed -i 's#WITH_LUA ?= no#WITH_LUA ?= yes#g'                                                                    config.mk
+	sed -i 's#WITH_ENCRYPT ?= no#WITH_ENCRYPT ?= yes#g'                                                            config.mk
+	sed -i 's#STORAGEDEFAULT = /var/spool/owntracks/recorder/store#STORAGEDEFAULT = /var/lib/owntracks-recorder#g' config.mk
+	sed -i 's#DOCROOT = /var/spool/owntracks/recorder/htdocs#DOCROOT = /usr/share/webapps/owntracks-recorder#g'    config.mk
+	sed -i 's#CONFIGFILE = /etc/default/ot-recorder#CONFIGFILE = /etc/owntracks-recorder.conf#g'                   config.mk
+
+	make
 }
 
 package() {
-	install -D -m644 "${srcdir}/recorder-${pkgver}/etc/ot-recorder.default" "${pkgdir}/etc/default/ot-recorder"
-        install -D -m644 "${srcdir}/recorder-${pkgver}/etc/ot-recorder.service" "${pkgdir}/usr/lib/systemd/system/ot-recorder.service"
+	cd "${srcdir}/recorder-${pkgver}"
 
-	mkdir -p "${pkgdir}/var/spool/owntracks/recorder/store"
-	mkdir -p "${pkgdir}/usr/share/webapps/ot-recorder"
+	# Make installation
+	DESTDIR="${pkgdir}" make install
 
-	cd "${srcdir}/recorder-${pkgver}"
-	make DESTDIR="${pkgdir}/" install -Wno-format-truncation
-	mv "${pkgdir}/usr/sbin/ot-recorder" "${pkgdir}/usr/bin"
-	rm -r "${pkgdir}/usr/sbin/"
-}
+	# Copy systemd service file
+	install -D -m644 etc/ot-recorder.service "${pkgdir}/usr/lib/systemd/system/owntracks-recorder.service"
+
+	cd "${pkgdir}"
+
+	# Move ot-recorder out of /usr/sbin
+	mkdir -p usr/bin
+	mv 'usr/sbin/ot-recorder' usr/bin/ot-recorder
+	rm -rf usr/sbin
 
+	# Make systemd create ot-recorder user
+	mkdir -p usr/lib/sysusers.d
+	echo 'u ot-recorder - "OwnTracks Recorder"' > usr/lib/sysusers.d/owntracks-recorder.conf
+
+	# Configure file/folder permissions
+	mkdir -p usr/lib/tmpfiles.d
+	echo 'd /var/lib/owntracks-recorder  0750 ot-recorder ot-recorder'  > usr/lib/tmpfiles.d/owntracks-recorder.conf
+	echo 'Z /var/lib/owntracks-recorder  0750 ot-recorder ot-recorder' >> usr/lib/tmpfiles.d/owntracks-recorder.conf
+	echo 'z /etc/owntracks-recorder.conf 0640 root        ot-recorder' >> usr/lib/tmpfiles.d/owntracks-recorder.conf
+	rm -rf var
+
+	# Tune owntracks-recorder.conf
+	sed -i 's#OTR_STORAGEDIR="/var/spool/owntracks/recorder/store"#OTR_STORAGEDIR="/var/lib/owntracks-recorder"#g' etc/owntracks-recorder.conf
+	sed -i 's%# OTR_PORT=1883%OTR_PORT=0%g' etc/owntracks-recorder.conf
+
+	# Tune owntracks-recorder.service
+	sed -i 's%# /etc/systemd/system/ot-recorder.service%%g'                      usr/lib/systemd/system/owntracks-recorder.service
+	sed -i 's#ExecStartPre=/bin/sleep 15#Environment="OTR_LMDBSIZE=104857600"#g' usr/lib/systemd/system/owntracks-recorder.service
+	sed -i 's#User=owntracks#User=ot-recorder#g'                                 usr/lib/systemd/system/owntracks-recorder.service
+	sed -i 's#WorkingDirectory=/#WorkingDirectory=/var/lib/owntracks-recorder#g' usr/lib/systemd/system/owntracks-recorder.service
+}
diff --git a/install.sh b/install.sh
new file mode 100644
index 000000000000..9da963793bc1
--- /dev/null
+++ b/install.sh
@@ -0,0 +1,9 @@
+post_install() {
+	echo "Initializing OwnTracks database..."
+	ot-recorder --initialize
+}
+
+post_upgrade() {
+	echo "Upgrading OwnTracks database..."
+	ot-recorder --initialize
+}
diff --git a/release b/release
new file mode 100755
index 000000000000..646324bf098d
--- /dev/null
+++ b/release
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+VERSION="$1"
+
+if [ -z "$VERSION" ]
+then
+	echo Please provide version number as first argument to the script
+	exit 1
+fi
+
+echo == Cleaning up things...
+rm -rf pkg
+rm -rf src
+rm -f owntracks-recorder-*.tar.gz
+rm -f owntracks-recorder-*.zst
+
+echo == Changing pkgver in PKGBUILD...
+sed -i "s/^pkgver=.*$/pkgver=$VERSION/" PKGBUILD
+
+echo == Downloading source to compute SHA256...
+touch install.sh # Need to do this in case it doesn't exist
+makepkg --verifysource --skipchecksums
+SHA256=$(sha256sum owntracks-recorder-${VERSION}.tar.gz | awk '{print $1}')
+echo SHA256=$SHA256
+
+echo == Changing sha256sums in PKGBUILD...
+sed -i "s/^sha256sums=.*$/sha256sums=\(\"${SHA256}\"\)/" PKGBUILD
+
+echo == Checking package build...
+if ! makepkg -frs
+then
+	echo
+	echo "PACKAGE BUILD FAILED !!!"
+	echo
+	exit 1
+fi
+
+echo == Generating .SRCINFO file...
+makepkg --printsrcinfo > .SRCINFO
+
+echo == Creating release commit...
+git add .
+git commit -m "release $VERSION"
+
+echo
+echo The release commit is ready.
+echo Please check that it is correct, then run 'git push' when ready
+echo
diff --git a/truncation_error.patch b/truncation_error.patch
deleted file mode 100644
index d4b657fb672e..000000000000
--- a/truncation_error.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ura src/recorder-0.7.6/Makefile src/recorder-0.7.6-patched/Makefile
---- src/recorder-0.7.6/Makefile	2018-06-15 22:14:23.718857468 +0200
-+++ src/recorder-0.7.6-patched/Makefile	2018-06-15 22:16:21.138862486 +0200
-@@ -1,6 +1,6 @@
- include config.mk
- 
--CFLAGS	+=-Wall -Werror
-+CFLAGS	+=-Wall -Werror -Wno-format-truncation
- LIBS	= $(MORELIBS) -lm
- LIBS 	+= -lcurl -lconfig
-