From nobody Mon Jul 24 15:30:46 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 4R8kdL60dCz4ndtm; Mon, 24 Jul 2023 15:30:46 +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 4R8kdL56twz3R6R; Mon, 24 Jul 2023 15:30:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690212646; 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=vlX0dofCIRrRa7yO7BZIkZZXG8rFVGTy61LD18Uogvw=; b=GG3MY2CmRW5UPT5xzZ0D5p1+5Y9THaUABbaff61AUEWW3m2mJJyVJsYQiefR3KvtcTFF7h Qre/RqZRahGwK2ciV6hjC1e19FqA5Y7tt0DqleFGyJtMzJCR6WZWCnt3k2nsFQxDIZU/Jh xAZVEp4oSGP1uyvTZajoG8WiktAMyUx2HjzFTn1TnN2dNgxVuVfqb8NXeZutHTJ4RDIcvQ /GrxyrNVO6dJcDklYo2PCM2cDYHGodZ13bYztzhX/iIOJJJ+7AgZVG+N96PcDIG6u/vnyb NJFO96i6NYeCGBKTSkHgSNfhZUaw8vISCH0h5Zmqt6zEtApm5zIF11wutmYfSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690212646; 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=vlX0dofCIRrRa7yO7BZIkZZXG8rFVGTy61LD18Uogvw=; b=lEe4vCLOJ1B9hYUin0laA276vGMwYLB2EqUqVRzO8//fz7/W2rUEeWoRL87UBRGYMH7TVY Mz+E+epjdsZew3hCFa/X8LIXQsmyfdXd8nK1GNlYSDh1GtpfOSDdbwJqBqGYYmp7IBQkKM F80r6wHHHM01W71Sr8S9j4HyrIKeTV0nV6caLGmX8u9lIbahYv2G0nlt8muEtt6qHpGO+r I2q6dzmwlgfcIZ4TBGzKZ9KzFlYiVWlUnqOkZysGR2GQzPqlDHN+qI7e5CGnpoITxWE5VQ 0xw87IZHC4jFIPLhjO4qcsEg5a6C0O9lD3JI/BHaP/0rS2ttA/E/UeHvHKBmNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690212646; a=rsa-sha256; cv=none; b=Ri7aLt0mxZ+jAXpxscVH4hVSmi7KZC6S3wVpzsBUtUdmYU3GBgaa+HRLlIREp9yEwGnORh m2gAcIPPDtUO2V5RRNOdAiWFUqAWj3a+oCcyB90J0ix7OxmN/aouckgZvudpMxUobi2kgj DLg+9egS1QfQSjWLLxXNR54kkFEMD1UKZSV6VY20y5p9Kpx5/eD7absdocCaFeMxCPW7mU w+ErxNmdshmnhclJSOl5RfTOSqJV29ZifmXX89Ir7w7lQR+FNMJfFellxUDOTUSTWbRtHQ B0OfSgn78xmEi/yxGKsrkKteS8wfeIAw3koMSIDDUHZPDaZ9J+nfEilkimKFXQ== 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 4R8kdL4BgszNGY; Mon, 24 Jul 2023 15:30:46 +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 36OFUkYQ055891; Mon, 24 Jul 2023 15:30:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36OFUkhI055890; Mon, 24 Jul 2023 15:30:46 GMT (envelope-from git) Date: Mon, 24 Jul 2023 15:30:46 GMT Message-Id: <202307241530.36OFUkhI055890@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: 20a8f6675565 - main - net/rustdesk-server: Correct location of runtime database files 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: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 20a8f667556567f3392f08c539f20bef64ab6098 Auto-Submitted: auto-generated The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=20a8f667556567f3392f08c539f20bef64ab6098 commit 20a8f667556567f3392f08c539f20bef64ab6098 Author: Guido Falsi AuthorDate: 2023-07-24 15:29:18 +0000 Commit: Guido Falsi CommitDate: 2023-07-24 15:29:18 +0000 net/rustdesk-server: Correct location of runtime database files Fix rustdesk-server startup scripts to use /var/db/rustdesk-server by default to store its files. These files need to be preserved across reboots, so /var/run is the wrong place. Added pkg-message to inform users. While here, fix some issues with comments referencing a different software and update the declared defaults. Reported by: Victor Tschetter https://github.com/rustdesk/rustdesk-server/issues/288 MFH: 2023Q3 --- net/rustdesk-server/Makefile | 2 +- net/rustdesk-server/files/rustdesk-hbbr.in | 8 ++++---- net/rustdesk-server/files/rustdesk-hbbs.in | 8 ++++---- net/rustdesk-server/pkg-message | 13 +++++++++++++ 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/net/rustdesk-server/Makefile b/net/rustdesk-server/Makefile index ccbaf593523e..6dc797eb282a 100644 --- a/net/rustdesk-server/Makefile +++ b/net/rustdesk-server/Makefile @@ -1,6 +1,6 @@ PORTNAME= rustdesk-server DISTVERSION= 1.1.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MAINTAINER= madpilot@FreeBSD.org diff --git a/net/rustdesk-server/files/rustdesk-hbbr.in b/net/rustdesk-server/files/rustdesk-hbbr.in index 434f93c8f814..a04a4849e949 100644 --- a/net/rustdesk-server/files/rustdesk-hbbr.in +++ b/net/rustdesk-server/files/rustdesk-hbbr.in @@ -8,9 +8,9 @@ # to enable this service: # # rustdesk_hbbr_enable (bool): Set to NO by default. -# Set it to YES to enable nfs-exporter. -# rustdesk_hbbr_args (string): Set extra arguments to pass to nfs-exporter -# Default is "". +# Set it to YES to enable rustdesk_hbbr. +# rustdesk_hbbr_args (string): Set extra arguments to pass to rustdesk_hbbr +# Default is "-k _". # rustdesk_hbbr_user (string): Set user that rustdesk_hbbr will run under # Default is "rustdesk". # rustdesk_hbbr_group (string): Set group that rustdesk_hbbr will run under @@ -32,7 +32,7 @@ load_rc_config $name pidfile=/var/run/rustdesk_hbbr.pid command=/usr/sbin/daemon procname=%%PREFIX%%/bin/hbbr -rustdesk_hbbr_chdir=/var/run/rustdesk-server +rustdesk_hbbr_chdir=/var/db/rustdesk-server command_args="-p ${pidfile} -T ${name} ${procname} ${rustdesk_hbbr_args}" # Command to log directly to file #command_args="-P ${pidfile} -H -o /var/log/rustdesk-hbbr.log ${procname} ${rustdesk_hbbr_args}" diff --git a/net/rustdesk-server/files/rustdesk-hbbs.in b/net/rustdesk-server/files/rustdesk-hbbs.in index f11215a644dd..0838f2708ad8 100644 --- a/net/rustdesk-server/files/rustdesk-hbbs.in +++ b/net/rustdesk-server/files/rustdesk-hbbs.in @@ -8,11 +8,11 @@ # to enable this service: # # rustdesk_hbbs_enable (bool): Set to NO by default. -# Set it to YES to enable nfs-exporter. +# Set it to YES to enable rustdesk_hbbs. # rustdesk_hbbs_ip (string): Set server IP address # Default is "127.0.0.1". -# rustdesk_hbbs_args (string): Set extra arguments to pass to nfs-exporter -# Default is "". +# rustdesk_hbbs_args (string): Set extra arguments to pass to rustdesk_hbbs +# Default is "-r ${rustdesk_hbbs_ip} -k _". # rustdesk_hbbs_user (string): Set user that rustdesk_hbbs will run under # Default is "rustdesk". # rustdesk_hbbs_group (string): Set group that rustdesk_hbbs will run under @@ -35,7 +35,7 @@ load_rc_config $name pidfile=/var/run/rustdesk_hbbs.pid command=/usr/sbin/daemon procname=%%PREFIX%%/bin/hbbs -rustdesk_hbbs_chdir=/var/run/rustdesk-server +rustdesk_hbbs_chdir=/var/db/rustdesk-server command_args="-p ${pidfile} -T ${name} ${procname} ${rustdesk_hbbs_args}" # Command to log directly to file #command_args="-P ${pidfile} -H -o /var/log/rustdesk-hbbs.log ${procname} ${rustdesk_hbbs_args}" diff --git a/net/rustdesk-server/pkg-message b/net/rustdesk-server/pkg-message new file mode 100644 index 000000000000..b2fd8f491105 --- /dev/null +++ b/net/rustdesk-server/pkg-message @@ -0,0 +1,13 @@ +[ +{ type: upgrade + maximum_version: "1.1.8_3" + message: <