From nobody Wed Oct 25 17:00:02 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFwCR04Wrz4xlhY; Wed, 25 Oct 2023 17:00:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SFwCQ6Zm4z4drc; Wed, 25 Oct 2023 17:00:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698253202; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5C1gc6hmjZJHjFPVwQxWVVmrjRBbWPona7MVrZUDxz4=; b=GwbxQN9JkwNhmauYE953wCA0ydUkG5y/eFKmHfdZIR634uv5dYSom/qQ6LTVM6LnIKFfC/ AdfPeovg4Fv/huZycCQxKQgRmkkULDCt2KZx3C/yA9F3OWK3mbztWoXAZ09a7AUrza20v7 4+IkseOsyTn39Mp+B4L7JscQJ/S1na44UYYV/5kscjlbq56XYAyMohtPhA0tXfktfVWyJy QzFW0pCpTQ6PhGa50lmec9GckV16jwuj0iwiqabzqwEHAYfuqg//neYvYSU9QxXmRGvoDh UG6eghZIYg4SaiP1tflqFPh1jdiFxTMipjr4+6q7tOr0L+zGyksSACBY/VyBAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698253202; a=rsa-sha256; cv=none; b=ltdW8J31R/La3HEJnWwioSH/UrDNFTs+3+QRb4d6Q6gx/ujMKIcTHQSDq1O0/8E5CqQy/J buUfReNDlb2T7omcoUnSs1wJHP5M4T0KtYtKchE0+ptCVy2nhLC80EsQsbWvjb7O5r9Gwb OibeXf6ohzlzAbKe3pLVs5gIsuFg4FNQh7nZeeelbgBIs+C4PYHgQCS5iHFRTJLekaUyeq PPoIk7YpE7TMWQKFNuxWiwUwqfnJYdBQWKFjj2gEK00zxrQGu14CstS9QVxGBAzYVM7DHe byDPdWFg2JxARV/K7ke5takYdiLq9QdCRponr4koaSv3panY44X7shFOyk990A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698253202; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5C1gc6hmjZJHjFPVwQxWVVmrjRBbWPona7MVrZUDxz4=; b=fUz1zt5FcbGWMOQ6pyK6oq3ExaZO62VaeSrLfHWcskfLibeIHIQzOxxf2wxU0tHiojDvhC pCkkJQjL6mKw5LtqG3beU2bkbTauaHNjDV0mPODYoJ+vkiZIJXQxaiP2gdwbgSxuddQ+OO irwf9C9mkebTsdqSBU5YYnDXbJRkQrXyE0HAowuKuSpW53+LU8oqLUth8+gmkmpjoeFkEX X7Osw226kBEvzlYZ+FL3Io1Rcj99U9CdQk/C2wiAnD0ywVzJMzJvVICTjSdcvPGt+zrzhT 9ZA/ooQIWch2d2YNKluPoKBLlad75PnTuMvKEEYRJxfRE14MMAwf1uRYUu9Tsw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFwCQ5QGqz1Bry; Wed, 25 Oct 2023 17:00:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39PH024S025547; Wed, 25 Oct 2023 17:00:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39PH02hc025539; Wed, 25 Oct 2023 17:00:02 GMT (envelope-from git) Date: Wed, 25 Oct 2023 17:00:02 GMT Message-Id: <202310251700.39PH02hc025539@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dan Langille Subject: git: ca597a4f5792 - main - www/ot-recorder: Update to 0.9.6 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dvl X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ca597a4f5792d054d10153c7d0339d34a70e82e4 Auto-Submitted: auto-generated The branch main has been updated by dvl: URL: https://cgit.FreeBSD.org/ports/commit/?id=ca597a4f5792d054d10153c7d0339d34a70e82e4 commit ca597a4f5792d054d10153c7d0339d34a70e82e4 Author: Dan Langille AuthorDate: 2023-10-25 15:42:42 +0000 Commit: Dan Langille CommitDate: 2023-10-25 16:07:18 +0000 www/ot-recorder: Update to 0.9.6 While here, alter the incoming etc/ot-recorder/ot-recorder.conf.sample file so the value of OTR_STORAGEDIR matches the patch we apply to config.mk.in --- www/ot-recorder/Makefile | 2 +- www/ot-recorder/distinfo | 6 +++--- www/ot-recorder/files/patch-config.mk.in | 22 ++++++---------------- .../files/patch-etc_ot-recorder.default | 11 +++++++++++ 4 files changed, 21 insertions(+), 20 deletions(-) diff --git a/www/ot-recorder/Makefile b/www/ot-recorder/Makefile index 2fe9cd4fac3b..aa8532f9002f 100644 --- a/www/ot-recorder/Makefile +++ b/www/ot-recorder/Makefile @@ -1,5 +1,5 @@ PORTNAME= ot-recorder -PORTVERSION= 0.9.2 +PORTVERSION= 0.9.6 CATEGORIES= www MAINTAINER= dvl@FreeBSD.org diff --git a/www/ot-recorder/distinfo b/www/ot-recorder/distinfo index 2f6325b98900..f0623894f153 100644 --- a/www/ot-recorder/distinfo +++ b/www/ot-recorder/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1670173683 -SHA256 (owntracks-recorder-0.9.2_GH0.tar.gz) = d3632895e46c36c1e484c021958e7bfee3b8977942ab28e7d47cf69c974f988e -SIZE (owntracks-recorder-0.9.2_GH0.tar.gz) = 3306898 +TIMESTAMP = 1698236446 +SHA256 (owntracks-recorder-0.9.6_GH0.tar.gz) = 73bb2f6217a7c2aeabae4894f0b3499ce74f8d3b153c4ec3fa3b87358c3692fe +SIZE (owntracks-recorder-0.9.6_GH0.tar.gz) = 3308976 diff --git a/www/ot-recorder/files/patch-config.mk.in b/www/ot-recorder/files/patch-config.mk.in index 8b43ee7368c9..85aabb07a25e 100644 --- a/www/ot-recorder/files/patch-config.mk.in +++ b/www/ot-recorder/files/patch-config.mk.in @@ -1,31 +1,21 @@ ---- config.mk.in.orig 2022-09-29 12:04:51 UTC +--- config.mk.in.orig 2023-10-24 13:44:06 UTC +++ config.mk.in -@@ -13,17 +13,19 @@ - # $ cd /usr/ports/devel/libconfig; make install - # $ cd /usr/ports/net/mosquitto; make install - # $ cd /usr/ports/devel/gmake; make install -+# $ cd /usr/ports/devel/pkgconf; make install -+# $ cd /usr/ports/misc/e2fsprogs-libuuid; make install - # - # Or as a package: - # --# $ sudo pkg install lmdb curl libconfig mosquitto gmake -+# $ sudo pkg install pkgconf lmdb curl libconfig mosquitto gmake e2fsprogs-libuuid +@@ -22,10 +22,10 @@ # # Uncomment the following lines and replace "no" with "yes": # -# CC = clang -# CFLAGS += -I/usr/local/include --# MORELIBS += -L /usr/local/lib +-# MORELIBS += -L /usr/local/lib -luuid -FREEBSD ?= no +CC = clang +CFLAGS += -I/usr/local/include +MORELIBS += -L /usr/local/lib -luuid -+FREEBSD ?= YES ++FREEBSD ?= yes # # Now build recorder with the "gmake" command: # -@@ -61,10 +63,10 @@ WITH_GREENWICH ?= no +@@ -63,10 +63,10 @@ WITH_GREENWICH ?= no # Where should the recorder store its data? This directory must # exist and be writeable by recorder (and readable by ocat) @@ -38,7 +28,7 @@ # Define the precision for reverse-geo lookups. The higher # the number, the more granular reverse-geo will be: -@@ -87,7 +89,7 @@ GHASHPREC = 7 +@@ -89,7 +89,7 @@ GHASHPREC = 7 JSON_INDENT ?= no # Location of optional default configuration file diff --git a/www/ot-recorder/files/patch-etc_ot-recorder.default b/www/ot-recorder/files/patch-etc_ot-recorder.default new file mode 100644 index 000000000000..ea5eff11a905 --- /dev/null +++ b/www/ot-recorder/files/patch-etc_ot-recorder.default @@ -0,0 +1,11 @@ +--- etc/ot-recorder.default.orig 2023-10-25 15:22:53 UTC ++++ etc/ot-recorder.default +@@ -9,7 +9,7 @@ + # Storage directory + # + +-# OTR_STORAGEDIR="/var/spool/owntracks/recorder/store" ++# OTR_STORAGEDIR="/var/db/owntracks/recorder/store" + + # ----------------------------------------------------- + # Address or hostname of the MQTT broker