Date: Mon, 16 Feb 2026 21:30:24 +0000 From: Oleksii Samorukov <samm@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: fdeece80d0e6 - main - comms/meshcore-cli: update to 1.4.2 Message-ID: <69938c70.19b63.4d035a62@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by samm: URL: https://cgit.FreeBSD.org/ports/commit/?id=fdeece80d0e665e14a64274598c09ae1b9475592 commit fdeece80d0e665e14a64274598c09ae1b9475592 Author: Oleksii Samorukov <samm@FreeBSD.org> AuthorDate: 2026-02-16 21:29:46 +0000 Commit: Oleksii Samorukov <samm@FreeBSD.org> CommitDate: 2026-02-16 21:29:46 +0000 comms/meshcore-cli: update to 1.4.2 --- comms/meshcore-cli/Makefile | 3 +- comms/meshcore-cli/distinfo | 6 +- .../files/patch-src_meshcore__cli_meshcore__cli.py | 94 ---------------------- 3 files changed, 4 insertions(+), 99 deletions(-) diff --git a/comms/meshcore-cli/Makefile b/comms/meshcore-cli/Makefile index e48afae463ae..93ea8145e5d3 100644 --- a/comms/meshcore-cli/Makefile +++ b/comms/meshcore-cli/Makefile @@ -1,6 +1,5 @@ PORTNAME= meshcore_cli -PORTVERSION= 1.4.1 -PORTREVISION= 1 +PORTVERSION= 1.4.2 CATEGORIES= comms python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/comms/meshcore-cli/distinfo b/comms/meshcore-cli/distinfo index 616838279e80..af2c677310b1 100644 --- a/comms/meshcore-cli/distinfo +++ b/comms/meshcore-cli/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1770763659 -SHA256 (meshcore_cli-1.4.1.tar.gz) = e3b4a2a27b44b07193fe1907eedd20620bfbb7be85ae8302d46859d374133943 -SIZE (meshcore_cli-1.4.1.tar.gz) = 44929 +TIMESTAMP = 1771277214 +SHA256 (meshcore_cli-1.4.2.tar.gz) = 3b5e1451b1c9035f26237574ddab32e6b713ea8998b52bd58c33650ce0921d62 +SIZE (meshcore_cli-1.4.2.tar.gz) = 45272 diff --git a/comms/meshcore-cli/files/patch-src_meshcore__cli_meshcore__cli.py b/comms/meshcore-cli/files/patch-src_meshcore__cli_meshcore__cli.py deleted file mode 100644 index 1e4a332117b6..000000000000 --- a/comms/meshcore-cli/files/patch-src_meshcore__cli_meshcore__cli.py +++ /dev/null @@ -1,94 +0,0 @@ ---- src/meshcore_cli/meshcore_cli.py.orig 2020-02-02 00:00:00 UTC -+++ src/meshcore_cli/meshcore_cli.py -@@ -9,8 +9,6 @@ import time, datetime - import getopt, json, shlex, re - import logging - import requests --from bleak import BleakScanner, BleakClient --from bleak.exc import BleakError, BleakDBusError - import serial.tools.list_ports - from pathlib import Path - import traceback -@@ -27,6 +25,13 @@ from prompt_toolkit.document import Document - from Crypto.Cipher import AES - from Crypto.Hash import HMAC, SHA256 - -+try: -+ from bleak import BleakScanner, BleakClient -+ from bleak.exc import BleakError, BleakDBusError -+ BLEAK_AVAILABLE = True -+except ImportError: -+ BLEAK_AVAILABLE = False -+ - import re - - from meshcore import MeshCore, EventType, logger -@@ -4307,16 +4312,17 @@ async def main(argv): - case "-q": # quiet (turns logger to ERROR only) - quiet = True - case "-l" : -- print("BLE devices:") -- try : -- devices = await BleakScanner.discover(timeout=timeout) -- if len(devices) == 0: -- print(" No ble device found") -- for d in devices : -- if not d.name is None and d.name.startswith("MeshCore-"): -- print(f" {d.address} {d.name}") -- except (BleakError, BleakDBusError): -- print(" No BLE HW") -+ if BLEAK_AVAILABLE: -+ print("BLE devices:") -+ try : -+ devices = await BleakScanner.discover(timeout=timeout) -+ if len(devices) == 0: -+ print(" No ble device found") -+ for d in devices : -+ if not d.name is None and d.name.startswith("MeshCore-"): -+ print(f" {d.address} {d.name}") -+ except (BleakError, BleakDBusError): -+ print(" No BLE HW") - print("\nSerial ports:") - ports = serial.tools.list_ports.comports() - for port, desc, hwid in sorted(ports): -@@ -4325,13 +4331,14 @@ async def main(argv): - case "-S" : - choices = [] - -- try : -- devices = await BleakScanner.discover(timeout=timeout) -- for d in devices: -- if not d.name is None and d.name.startswith("MeshCore-"): -- choices.append(({"type":"ble","device":d}, f"{d.address:<22} {d.name}")) -- except (BleakError, BleakDBusError): -- logger.info("No BLE Device") -+ if BLEAK_AVAILABLE: -+ try : -+ devices = await BleakScanner.discover(timeout=timeout) -+ for d in devices: -+ if not d.name is None and d.name.startswith("MeshCore-"): -+ choices.append(({"type":"ble","device":d}, f"{d.address:<22} {d.name}")) -+ except (BleakError, BleakDBusError): -+ logger.info("No BLE Device") - - ports = serial.tools.list_ports.comports() - for port, desc, hwid in sorted(ports): -@@ -4388,7 +4395,7 @@ async def main(argv): - mc = await MeshCore.create_tcp(host=hostname, port=port, debug=debug, only_error=json_output) - elif not serial_port is None : # connect via serial port - mc = await MeshCore.create_serial(port=serial_port, baudrate=baudrate, debug=debug, only_error=json_output) -- else : #connect via ble -+ elif BLEAK_AVAILABLE : #connect via ble - client = None - if device or address and len(address.split(":")) == 6 : - pass -@@ -4471,6 +4478,9 @@ async def main(argv): - f.write(device.address) - elif not address is None: - f.write(address) -+ -+ if mc is None: -+ return - - handle_message.mc = mc # connect meshcore to handle_message - handle_advert.mc = mchome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69938c70.19b63.4d035a62>