www/butterfly: Update to 3.2.5

PR:		282260
Approved by:	maintainer timeout

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
 }
 ]