From 9cd7e710ac676c1a318d09e665ca3558bb5c5323 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 29 Oct 2022 16:01:29 +0100 Subject: gentoo auto-resync : 29:10:2022 - 16:01:29 --- .../files/owntracks-recorder-build.patch | 119 --------------------- .../files/owntracks-recorder-no-mqtt.patch | 42 -------- 2 files changed, 161 deletions(-) delete mode 100644 sci-geosciences/owntracks-recorder/files/owntracks-recorder-build.patch delete mode 100644 sci-geosciences/owntracks-recorder/files/owntracks-recorder-no-mqtt.patch (limited to 'sci-geosciences/owntracks-recorder/files') 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 -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 - -- cgit v1.2.3