From nobody Mon Jul 24 15:33:26 2023 X-Original-To: dev-commits-ports-all@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 4R8khR1Wr9z4nhRX; Mon, 24 Jul 2023 15:33:27 +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 4R8khR0smLz3j5N; Mon, 24 Jul 2023 15:33:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690212807; 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=jCnXhtO/J5GlgUMmoVJx9jD7UBDEOX3CvkXHSAn3/eA=; b=QkTmBF3vzIbVh3USdo0yrOteTc66NQHfuF65ObsDfcpq2kbuRXIsbaQcFDAGrCiNtbu2vn RMQ0bLQJu0nod0mBFjc1SKG19mxX4oRNM2qGN7HUzwquPfOFLYhKEub6KaLdBJFkeLnFqp Bs7ffDhdGyTjD7984lJm/uO6Hc52hcTErTJI3Ue4z9H7mLSbaCxSE9yIg2fBTH54Z6DFuK r4KFTUK2aMxfDiHU3nzAoBDT73Kqo/wUPIUcUhvqigCAU1XUVJa9IZS+L9DrR2q2OaeOFl wjoUUOCVfXOEwpecumrJDETJWPomOvyaAIbYNKwCM0h6IGqwpgeExpMgZLmBwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690212807; 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=jCnXhtO/J5GlgUMmoVJx9jD7UBDEOX3CvkXHSAn3/eA=; b=RFzX1h58YzW+gZH4PH4ujuEG4tA8AY67wWk58lCBZtd7Jfwkuqnq0hmkE3m2scULOu6h6q qc9e5wadvDjzF6KOItdx+LM+otEZsvVq647jv7uLn3L8dfxnsdzWUOIrp7cttRHybJyqHq 5uIC53r2ghPVvmwzKuGB3g1oZLDd9cNGA5Qj0rOAg4yu+KY11xJq1Q92W3zfesT5fmTvPn mxEA5g1H1ATStZ2xGMbhqIc2o0DloRMTapuBibCAbVHhwAowcYvaTJpOaBWVRrKivPXCbY Po6bJA42VlzHWseEBikJfUKh0119FA6+wE4H/vV45txcEG9se1GEQsUcshcQNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690212807; a=rsa-sha256; cv=none; b=l6H9Tk8nZpmJFarxL9YbknZ2g8gRZV5L1JvrhSA/rL2GC/25xNfInAFBlBpzv1KCCAU5FP 7wFFtVN104GPsM5A2ydcIS/V+1risMG0wj4rcTHGt2uN7fTvq1p1sRIqykuwgRqdkd7SC/ AAsDFjFvAUTk0cCi9Fe/uNLGJAAPcfz/xdIPP8bKrJ+rxZJGl+OZZPlIXBH446hEut1QnQ trxHLA8troLxWoYH2KxdX1nMCngWjagIArJthGxz9F/xqtNYUecXplExxYuB4fx7z+gJOP qNa+oPqdkEYp7LnX991OwxrRnbgEwqh3UU/bMjO7ZHcP9y16R43kOapT2MYvjg== 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 4R8khQ72fZzNY3; Mon, 24 Jul 2023 15:33:26 +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 36OFXQgX063285; Mon, 24 Jul 2023 15:33:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36OFXQ7e063284; Mon, 24 Jul 2023 15:33:26 GMT (envelope-from git) Date: Mon, 24 Jul 2023 15:33:26 GMT Message-Id: <202307241533.36OFXQ7e063284@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Guido Falsi Subject: git: aea7e922bb7d - 2023Q3 - net/rustdesk-server: Correct location of runtime database files List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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/2023Q3 X-Git-Reftype: branch X-Git-Commit: aea7e922bb7d26019fc60520ea185d7ae74c9122 Auto-Submitted: auto-generated The branch 2023Q3 has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=aea7e922bb7d26019fc60520ea185d7ae74c9122 commit aea7e922bb7d26019fc60520ea185d7ae74c9122 Author: Guido Falsi AuthorDate: 2023-07-24 15:29:18 +0000 Commit: Guido Falsi CommitDate: 2023-07-24 15:32:36 +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 (cherry picked from commit 20a8f667556567f3392f08c539f20bef64ab6098) --- 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 58a9c15c24ce..6dc797eb282a 100644 --- a/net/rustdesk-server/Makefile +++ b/net/rustdesk-server/Makefile @@ -1,6 +1,6 @@ PORTNAME= rustdesk-server DISTVERSION= 1.1.8 -PORTREVISION= 1 +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: <