sci-geosciences/owntracks-recorder: Bump to 0.9.2, drop old 0.9.1

Signed-off-by: James Le Cuirot <chewi@gentoo.org>

4 files changed, 1 insertions, 167 deletions

diff --git a/sci-geosciences/owntracks-recorder/Manifest b/sci-geosciences/owntracks-recorder/Manifest
index b001a519ba3b..eab0b1dd9a59 100644
--- a/sci-geosciences/owntracks-recorder/Manifest
+++ b/sci-geosciences/owntracks-recorder/Manifest
@@ -1 +1 @@
-DIST owntracks-recorder-0.9.1.tar.gz 3306544 BLAKE2B 982764f6319bb9ae530d4eaf95679b26d98f64bb1b1a4c3c461cb3c17e76f27058836bc21bb014f16a37825636c34f6b90bec8890587b957a1741d27737812d5 SHA512 4a31acf648d7b9520eb7c08bbe318c2a63f2cd416f939a5ef7a052f9ab2dcfbdac1a69e71d02efbfa108ed2b5ee26019491845053344c37cc52c62d654075ee1
+DIST owntracks-recorder-0.9.2.tar.gz 3306898 BLAKE2B ca42400242a076459cf8e315f9282b03c727229e29bbffe522042e8b3bb965fdfc9ae1a2ef31e436ffb23369b26ac4e640428ce09c64386740804ed4c7baedde SHA512 73cfa32b9719e1a027948f0ed8359bf4cf46c5d0b15fee78d263d38a7093053af7d0b227ba59269e9bfbe323488a3e437d6ad1e17f11982a3d09083685292b1d
diff --git a/sci-geosciences/owntracks-recorder/files/owntracks-recorder-build.patch b/sci-geosciences/owntracks-recorder/files/owntracks-recorder-build.patch
deleted file mode 100644
index 0209e73cef50..000000000000
--- a/sci-geosciences/owntracks-recorder/files/owntracks-recorder-build.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-https://github.com/owntracks/recorder/pull/402
-
-diff --git a/Makefile b/Makefile
-index f2b9a41..546dd58 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,6 +1,6 @@
- include config.mk
-
--CFLAGS	+=-Wall -Werror -DNS_ENABLE_IPV6
-+CFLAGS	+= -Wall -DNS_ENABLE_IPV6
- LIBS	= $(MORELIBS) -lm
- LIBS 	+= -lcurl -lconfig
-
-@@ -23,10 +23,18 @@ CFLAGS += -DGHASHPREC=$(GHASHPREC)
- LIBS += -llmdb
- LIBS += -lpthread
-
-+define CPP_CONDITION
-+printf '#if $(1) \n
-+true \n
-+#else \n
-+#error false \n
-+#endif' | $(CPP) -P - >/dev/null 2>&1 && echo yes
-+endef
-+
- ifeq ($(WITH_MQTT),yes)
- 	CFLAGS += -DWITH_MQTT=1
--	CFLAGS += $(MOSQUITTO_INC)
--	LIBS += $(MOSQUITTO_LIB) -lmosquitto -lm
-+	CFLAGS += $(MOSQUITTO_CFLAGS)
-+	LIBS += $(MOSQUITTO_LIBS) -lm
- endif
-
- ifeq ($(WITH_PING),yes)
-@@ -56,6 +64,12 @@ endif
- ifeq ($(WITH_TOURS),yes)
- 	CFLAGS += -DWITH_TOURS
- 	OTR_EXTRA_OBJS +=
-+
-+	# Debian requires uuid-dev
-+	# RHEL/CentOS needs libuuid-devel
-+	ifeq ($(shell $(call CPP_CONDITION,__linux__)),yes)
-+		LIBS += -luuid
-+	endif
- endif
-
- ifeq ($(WITH_GREENWICH),yes)
-@@ -77,14 +91,16 @@ TARGETS += ot-recorder ocat
- GIT_VERSION := $(shell git describe --long --abbrev=10 --dirty --tags 2>/dev/null || echo "tarball")
- CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
-
-+PKG_CONFIG ?= pkg-config
-+
- all: $(TARGETS)
-
- ot-recorder: recorder.o $(OTR_OBJS) $(OTR_EXTRA_OBJS)
--	$(CC) $(CFLAGS) -o ot-recorder recorder.o $(OTR_OBJS) $(OTR_EXTRA_OBJS) $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o ot-recorder recorder.o $(OTR_OBJS) $(OTR_EXTRA_OBJS) $(LIBS)
- 	if test -r codesign.sh; then /bin/sh codesign.sh; fi
-
- ocat: ocat.o $(OTR_OBJS)
--	$(CC) $(CFLAGS) -o ocat ocat.o $(OTR_OBJS) $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o ocat ocat.o $(OTR_OBJS) $(LIBS)
-
- $(OTR_OBJS): config.mk Makefile
-
-@@ -114,8 +130,8 @@ install: ot-recorder ocat
- 	mkdir -p $(DESTDIR)$(INSTALLDIR)/bin
- 	mkdir -p $(DESTDIR)$(INSTALLDIR)/sbin
- 	mkdir -p $(DESTDIR)$(DOCROOT)
--	mkdir -p $(DESTDIR)$(STORAGEDEFAULT)/last
--	cp -R docroot/* $(DESTDIR)$(DOCROOT)/
-+	mkdir -p $(DESTDIR)$(STORAGEDEFAULT)
-+	cd docroot && find ! -type d ! -name .gitignore -exec install -m0644 -D {} $(DESTDIR)$(DOCROOT)/{} \;
- 	install -m 0755 ot-recorder $(DESTDIR)$(INSTALLDIR)/sbin
- 	install -m 0755 ocat $(DESTDIR)$(INSTALLDIR)/bin
- 	mkdir -p `dirname $(DESTDIR)/$(CONFIGFILE)`
-diff --git a/config.mk.in b/config.mk.in
-index 6fd674d..9def768 100644
---- a/config.mk.in
-+++ b/config.mk.in
-@@ -40,7 +40,7 @@ WITH_MQTT ?= yes
- WITH_HTTP ?= yes
-
- # Do you want recorder support for shared views? Requires WITH_HTTP
--# also requires -luuid on Linux (see below at MORELIBS)
-+# also requires -luuid on Linux.
- WITH_TOURS ?= yes
-
- # Do you have Lua libraries installed and want the Lua hook integration?
-@@ -90,12 +90,8 @@ JSON_INDENT ?= no
- CONFIGFILE = /etc/default/ot-recorder
-
- # Optionally specify the path to the Mosquitto libs, include here
--MOSQUITTO_INC = -I/usr/include
--MOSQUITTO_LIB = -L/usr/lib
--
--# Debian requires uuid-dev
--# RHEL/CentOS needs libuuid-devel
--MORELIBS += -luuid # -lssl
-+MOSQUITTO_CFLAGS = `$(PKG_CONFIG) --cflags libmosquitto`
-+MOSQUITTO_LIBS   = `$(PKG_CONFIG) --libs libmosquitto`
-
- # Milliseconds (ms) timeout for reverse geocoding
- GEOCODE_TIMEOUT = 4000
-@@ -105,8 +101,8 @@ GEOCODE_TIMEOUT = 4000
- # and in particular could require you to add the lua+version (e.g lua-5.2)
- # to both pkg-config invocations
-
--LUA_CFLAGS = `pkg-config --cflags lua`
--LUA_LIBS   = `pkg-config --libs lua`
-+LUA_CFLAGS = `$(PKG_CONFIG) --cflags lua`
-+LUA_LIBS   = `$(PKG_CONFIG) --libs lua`
-
--SODIUM_CFLAGS = `pkg-config --cflags libsodium`
--SODIUM_LIBS   = `pkg-config --libs libsodium`
-+SODIUM_CFLAGS = `$(PKG_CONFIG) --cflags libsodium`
-+SODIUM_LIBS   = `$(PKG_CONFIG) --libs libsodium`
diff --git a/sci-geosciences/owntracks-recorder/files/owntracks-recorder-no-mqtt.patch b/sci-geosciences/owntracks-recorder/files/owntracks-recorder-no-mqtt.patch
deleted file mode 100644
index e10c160854a7..000000000000
--- a/sci-geosciences/owntracks-recorder/files/owntracks-recorder-no-mqtt.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 2fe60c9684f93b67f549ed3d70f883a9a098fc7b Mon Sep 17 00:00:00 2001
-From: Jan-Piet Mens <jp@mens.de>
-Date: Fri, 23 Sep 2022 22:10:48 +0200
-Subject: [PATCH] FIX: now compiles without MQTT 	addresses #401
-
----
- recorder.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/recorder.c b/recorder.c
-index 12fa921..c65acef 100644
---- a/recorder.c
-+++ b/recorder.c
-@@ -494,10 +494,12 @@ void do_request(struct udata *ud, UT_string *username, UT_string *device, char *
- 			return;
- 		}
- 
-+#ifdef WITH_MQTT
- 		if ((js = json_stringify(resp, "  ")) != NULL) {
- 			publish(ud, UB(fulltopic), js);
- 			free(js);
- 		}
-+#endif
- 		json_delete(resp);
- 
- 	} else if (strcmp(request_type, "tours") == 0) {
-@@ -558,10 +560,12 @@ void do_request(struct udata *ud, UT_string *username, UT_string *device, char *
- 			return;
- 		}
- 
-+#ifdef WITH_MQTT
- 		if ((js = json_stringify(resp, "  ")) != NULL) {
- 			publish(ud, UB(fulltopic), js);
- 			free(js);
- 		}
-+#endif
- 
- 		json_delete(resp);
- 
--- 
-2.37.2
-
diff --git a/sci-geosciences/owntracks-recorder/owntracks-recorder-0.9.1.ebuild b/sci-geosciences/owntracks-recorder/owntracks-recorder-0.9.2.ebuild
index 6785c2d421e4..5e2e673d0754 100644
--- a/sci-geosciences/owntracks-recorder/owntracks-recorder-0.9.1.ebuild
+++ b/sci-geosciences/owntracks-recorder/owntracks-recorder-0.9.2.ebuild
@@ -47,11 +47,6 @@ BDEPEND="
 
 S="${WORKDIR}/${P#*-}"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-no-mqtt.patch
-	"${FILESDIR}"/${PN}-build.patch
-)
-
 pkg_setup() {
 	use lua && lua-single_pkg_setup
 }