From nobody Thu Nov 7 19:04:30 2024 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 4Xks2647Mbz5cQ3r; Thu, 07 Nov 2024 19:04:30 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xks263BlXz4dmt; Thu, 7 Nov 2024 19:04:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731006270; 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=prz/TZVoAeC0ijm4cuwm7fm3W5SpFB93opSsiWX/bmU=; b=ASHqu/loKFX8FukjpRLBEYTJZ2oKv13r0dnOE6/8Uf/ldTJxzLt7SRtAVGx/wbJYLlloV+ Bs+mCnbdq2aElqCob4eggEq+HXXW8drj75wSixjaVlX1pgZIkQm5mnB/4LO4g82K4dvKgd iXfPwIQ5TLXR7yGZ5JR5Ilvf4afl8UWQxM+6LRxTqOynZl4Xswh42MIprvncslW0y0xgdv skKtAn30MumFC45WVu4RrnJuy0q2CwwEvCKMughhBWZEdBuxQaTKWL72RwwZ6+Swvnp8ib W7W3fc/U5aqcLiL0G3cjthcQahijlJ/E52a4rQi+HvmmHifKyCnbfTHJeK70Ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731006270; 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=prz/TZVoAeC0ijm4cuwm7fm3W5SpFB93opSsiWX/bmU=; b=gMqKeE/6TSvdz1R2Y1trG2W+8bWFF30JBIrcGToXZDxGa1x2ZpQv6e/jjZlYeJpIvtMjQY 95EEC7RGCvXP79amB/wsm1VUKjvRstK8Nt4GMePUqkZnxqR4rhrYJuQ+V04ymW5mS36qLu rtCkMVvHau3EwN7TPzKZbREtTjUzwXHtkhXxte0ckZyt7NioRjQEdTIfuWhwWszVl9p/bl TJZdzuDAeOvE6Yu4TqP9RqZB7NdSTSXRvvVkT6m9OpFXAiZ8wb2SCDkuZB7cL8Z4M13/OY lQBdWGLN9RuKDc8qAaTj5IY1xe4wsNOqm1FwWJeyh5cFD8+dEN0sIzZmQeEwiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731006270; a=rsa-sha256; cv=none; b=qo5ee8D61114XRd4ejPMRi5Vz1GG8x1JjEtSIYvuw7Hp4s2Fdk9mfha5bpAI/piym5TVXX ECan0mXNYaAwM6JtXMAnoQCX3Yu3Mku97NIZLYflqQbllU30YNwb2TLaHe4++cQQbqW3Wb eV1FvgguaLrF73NP2YBlkKjSB+ZIBkQO+zzoA9SQyAHqFptN9CvmgF8xQibPsHuV9ISx3N 0v/+Hs+KgX0OaD2/n1oCt6qT3LUrkIK/H/0/1ZurNTb+7NwQsLW5oJ9Uj3U7Jn1A9un16n 8KDACRBLsFL6mZ6t4+XEcdqA2J4Jk1PhbafQgmmT4hV6opYYhZLHQKWWhUbPKw== 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 4Xks262gwRzxl4; Thu, 7 Nov 2024 19:04:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A7J4Ult052602; Thu, 7 Nov 2024 19:04:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A7J4Uqb052599; Thu, 7 Nov 2024 19:04:30 GMT (envelope-from git) Date: Thu, 7 Nov 2024 19:04:30 GMT Message-Id: <202411071904.4A7J4Uqb052599@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernard Spil Subject: git: 4093fb3d498b - main - www/butterfly: Update to 3.2.5 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4093fb3d498bf0471fad14fc002462c1da6e4082 Auto-Submitted: auto-generated The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=4093fb3d498bf0471fad14fc002462c1da6e4082 commit 4093fb3d498bf0471fad14fc002462c1da6e4082 Author: Bernard Spil AuthorDate: 2024-11-07 19:03:35 +0000 Commit: Bernard Spil CommitDate: 2024-11-07 19:03:35 +0000 www/butterfly: Update to 3.2.5 PR: 282260 Approved by: maintainer timeout --- www/butterfly/Makefile | 5 ++--- www/butterfly/distinfo | 6 +++--- www/butterfly/files/butterfly.in | 7 ++++--- www/butterfly/files/patch-butterfly.server.py | 29 --------------------------- www/butterfly/files/pkg-message.in | 4 ++++ 5 files changed, 13 insertions(+), 38 deletions(-) diff --git a/www/butterfly/Makefile b/www/butterfly/Makefile index 264023296837..eaa0190ad4ea 100644 --- a/www/butterfly/Makefile +++ b/www/butterfly/Makefile @@ -1,12 +1,11 @@ PORTNAME= butterfly -PORTVERSION= 2.0.1 -PORTREVISION= 1 +PORTVERSION= 3.2.5 CATEGORIES= www MASTER_SITES= PYPI MAINTAINER= yuri@FreeBSD.org COMMENT= Web terminal based on websocket and tornado -WWW= https://pypi.org/project/butterfly/ +WWW= https://github.com/paradoxxxzero/butterfly LICENSE= GPLv3 diff --git a/www/butterfly/distinfo b/www/butterfly/distinfo index 5d436f2632d4..de19dfa3aa43 100644 --- a/www/butterfly/distinfo +++ b/www/butterfly/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1486684509 -SHA256 (butterfly-2.0.1.tar.gz) = 93ecdef71b62e1809a48a706ac2ae86fdbeea6d722970cda99969bccad8ba7ef -SIZE (butterfly-2.0.1.tar.gz) = 1042304 +TIMESTAMP = 1726561438 +SHA256 (butterfly-3.2.5.tar.gz) = 65d2bed2cbb6df21fe495ff52c9fa60ed8978c29443c7568d5f57612060fb55b +SIZE (butterfly-3.2.5.tar.gz) = 1044297 diff --git a/www/butterfly/files/butterfly.in b/www/butterfly/files/butterfly.in index 561358c297b2..b22ee304ab79 100644 --- a/www/butterfly/files/butterfly.in +++ b/www/butterfly/files/butterfly.in @@ -11,6 +11,7 @@ : ${butterfly_enable="NO"} : ${butterfly_user="root"} : ${butterfly_args="--unsecure"} +: ${butterfly_hostname="localhost"} . /etc/rc.subr @@ -23,11 +24,11 @@ load_rc_config $name start_butterfly() { echo "Starting ${name}." - if ! [ -r %%ETCDIR%%/ssl/butterfly_localhost.crt -a %%ETCDIR%%/ssl/butterfly_localhost.key -a %%ETCDIR%%/ssl/butterfly_ca.crt ]; then - %%PREFIX%%/bin/butterfly.server.py --generate-certs --host=localhost && + if ! [ -r %%ETCDIR%%/ssl/butterfly_${butterfly_hostname}.crt -a %%ETCDIR%%/ssl/butterfly_${butterfly_hostname}.key -a %%ETCDIR%%/ssl/butterfly_ca.crt ]; then + %%PREFIX%%/bin/butterfly.server.py --generate-certs --host=${butterfly_hostname} && echo "${name}: generated the ssl certificate in %%ETCDIR%%/ssl" fi - daemon -p $pidfile -u ${butterfly_user} %%PREFIX%%/bin/butterfly.server.py ${butterfly_args} >/var/log/${name}.log 2>&1 + daemon -p $pidfile -u ${butterfly_user} %%PREFIX%%/bin/butterfly.server.py ${butterfly_args} --host=${butterfly_hostname} >/var/log/${name}.log 2>&1 } command="%%PYTHON_CMD%%" diff --git a/www/butterfly/files/patch-butterfly.server.py b/www/butterfly/files/patch-butterfly.server.py deleted file mode 100644 index 83c065d53d70..000000000000 --- a/www/butterfly/files/patch-butterfly.server.py +++ /dev/null @@ -1,29 +0,0 @@ ---- butterfly.server.py.orig 2017-02-10 00:08:34 UTC -+++ butterfly.server.py -@@ -20,7 +20,7 @@ - import tornado.options - import tornado.ioloop - import tornado.httpserver --import tornado_systemd -+#import tornado_systemd - import logging - import webbrowser - import uuid -@@ -295,13 +295,13 @@ else: - from butterfly import application - application.butterfly_dir = butterfly_dir - log.info('Starting server') --http_server = tornado_systemd.SystemdHTTPServer( -+http_server = tornado.httpserver.HTTPServer( - application, ssl_options=ssl_opts) - http_server.listen(port, address=host) - --if http_server.systemd: -- os.environ.pop('LISTEN_PID') -- os.environ.pop('LISTEN_FDS') -+#if http_server.systemd: -+# os.environ.pop('LISTEN_PID') -+# os.environ.pop('LISTEN_FDS') - - log.info('Starting loop') - diff --git a/www/butterfly/files/pkg-message.in b/www/butterfly/files/pkg-message.in index 6744dfce7b8a..b272dd421008 100644 --- a/www/butterfly/files/pkg-message.in +++ b/www/butterfly/files/pkg-message.in @@ -13,6 +13,10 @@ http://localhost:57575 The port and other parameters can be configured in %%ETCDIR%%/butterfly.conf + +By default, the daemon runs "unsecure" and as root, the default +hostname used is "localhost". Set butterfly_user, butterfly_args, +and butterfly_hostname butterfly_user rc variables to adjust. EOM } ]