sysutils/pot: Update to 0.11.1

Changes: https://github.com/pizzamig/pot/releases

5 files changed, 78 insertions, 27 deletions

diff --git a/sysutils/pot/Makefile b/sysutils/pot/Makefile
index df9b99dc99fe..a99dc16c7b6f 100644
--- a/sysutils/pot/Makefile
+++ b/sysutils/pot/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	pot
-PORTVERSION=	0.10.4
-PORTREVISION=	1
+PORTVERSION=	0.11.1
+PORTREVISION=	0
 CATEGORIES=	sysutils
 
 MAINTAINER=	pizzamig@FreeBSD.org
@@ -16,7 +16,7 @@ RUN_DEPENDS=	potnet:sysutils/potnet \
 	ncat:security/nmap \
 	${LOCALBASE}/share/freebsd/MANIFESTS/amd64-amd64-11.2-RELEASE:misc/freebsd-release-manifests
 
-USE_RC_SUBR=	pot
+USE_RC_SUBR=	pot pot_early
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	pizzamig
diff --git a/sysutils/pot/distinfo b/sysutils/pot/distinfo
index a72e79c0ca8f..9d922eb4455b 100644
--- a/sysutils/pot/distinfo
+++ b/sysutils/pot/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1582539340
-SHA256 (pizzamig-pot-0.10.4_GH0.tar.gz) = 767abb10f41936487f53e69d7f03b64136733e4570f7ee51202d0813680aca4b
-SIZE (pizzamig-pot-0.10.4_GH0.tar.gz) = 150694
+TIMESTAMP = 1587327646
+SHA256 (pizzamig-pot-0.11.1_GH0.tar.gz) = 76b4acd2ac37f35ce533208e6fc51625542adf69e95aa6b02b12a97485eaa106
+SIZE (pizzamig-pot-0.11.1_GH0.tar.gz) = 152172
diff --git a/sysutils/pot/files/pot.in b/sysutils/pot/files/pot.in
index eac1d01b6066..8669ea7836e1 100644
--- a/sysutils/pot/files/pot.in
+++ b/sysutils/pot/files/pot.in
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 # PROVIDE: pot
-# REQUIRE: NETWORKING syslogd pf
-# BEFORE: ntpdate
+# REQUIRE: NETWORKING LOGIN FILESYSTEM
+# BEFORE: securelevel
 # KEYWORD: shutdown nojail
 
 . /etc/rc.subr
@@ -17,44 +17,49 @@ start_cmd="pot_start"
 stop_cmd="pot_stop"
 restart_cmd="pot_restart"
 status_cmd="pot_status"
-start_precmd="pot_deprecated_start"
-stop_postcmd="pot_deprecated_stop"
 
 load_rc_config $name
 : ${pot_enable:=NO}
-: ${pot_list:=""}
 
-pot_deprecated_start()
+pot_start()
 {
-	if [ -n "$pot_list" ]; then
-		echo "pot_list is deprecated! please use pot set-attr to set the start-at-boot attribute to your pot"
-	fi
+	local _pname _dyn_pot_list _start
+	_dyn_pot_list=$(%%PREFIX%%/bin/pot ls -q)
+	for _pname in $_dyn_pot_list ; do
+		if [ "$( %%PREFIX%%/bin/pot get-attr -p "$_pname" -A start-at-boot -q )" = "YES" ]; then
+			%%PREFIX%%/bin/pot start "$_pname"
+		fi
+	done
 }
 
-pot_deprecated_stop()
+pot_stop()
 {
-	if [ -n "$pot_list" ]; then
-		echo "pot_list is deprecated! please use pot set-attr to set the start-at-boot attribute to your pot"
-	fi
+	local _pname _dyn_pot_list _start
+	_dyn_pot_list=$(%%PREFIX%%/bin/pot ls -q)
+	for _pname in $_dyn_pot_list ; do
+		if [ "$( %%PREFIX%%/bin/pot get-attr -p "$_pname" -A start-at-boot -q )" = "YES" ]; then
+			%%PREFIX%%/bin/pot stop "$_pname"
+		fi
+	done
 }
 
-pot_start()
+pot_early_start()
 {
 	local _pname _dyn_pot_list _start
 	_dyn_pot_list=$(%%PREFIX%%/bin/pot ls -q)
 	for _pname in $_dyn_pot_list ; do
-		if _start=$( %%PREFIX%%/bin/pot get-attr -p "$_pname" -A start-at-boot -q ) && [ "$_start" = "YES" ]; then
+		if [ "$( %%PREFIX%%/bin/pot get-attr -p "$_pname" -A early-start-at-boot -q )" = "YES" ]; then
 			%%PREFIX%%/bin/pot start "$_pname"
 		fi
 	done
 }
 
-pot_stop()
+pot_early_stop()
 {
 	local _pname _dyn_pot_list _start
 	_dyn_pot_list=$(%%PREFIX%%/bin/pot ls -q)
 	for _pname in $_dyn_pot_list ; do
-		if _start=$( %%PREFIX%%/bin/pot get-attr -p "$_pname" -A start-at-boot -q ) && [ "$_start" = "YES" ]; then
+		if [ "$( %%PREFIX%%/bin/pot get-attr -p "$_pname" -A early-start-at-boot -q )" = "YES" ]; then
 			%%PREFIX%%/bin/pot stop "$_pname"
 		fi
 	done
@@ -63,17 +68,18 @@ pot_stop()
 pot_restart()
 {
 	pot_stop
-	pot_deprecated_stop
+	pot_early_stop
 	sleep 5
+	pot_early_start
 	pot_start
-	pot_deprecated_start
 }
 
 pot_status()
 {
-	local _pname _dyn_pot_list _start
+	local _pname _dyn_pot_list
 	for _pname in $_dyn_pot_list ; do
-		if _start=$( %%PREFIX%%/bin/pot get-attr -p "$_pname" -A start-at-boot -q ) && [ "$_start" = "YES" ]; then
+		if [ "$( %%PREFIX%%/bin/pot get-attr -p "$_pname" -A early-start-at-boot -q )" = "YES" ] ||
+		   [ "$( %%PREFIX%%/bin/pot get-attr -p "$_pname" -A start-at-boot -q )" = "YES" ]; then
 			if %%PREFIX%%/bin/pot info -qrp "$_pname" ; then
 				echo "pot $_pname is up and running"
 			else
diff --git a/sysutils/pot/files/pot_early.in b/sysutils/pot/files/pot_early.in
new file mode 100644
index 000000000000..448ab5d1f3e5
--- /dev/null
+++ b/sysutils/pot/files/pot_early.in
@@ -0,0 +1,44 @@
+#!/bin/sh
+# $FreeBSD$
+
+# PROVIDE: pot_early
+# REQUIRE: NETWORKING syslogd pf
+# BEFORE: ntpdate
+# KEYWORD: shutdown nojail
+
+. /etc/rc.subr
+
+PATH=$PATH:/usr/local/bin
+name="pot_early"
+desc="Pot containers - early start"
+procname="pot"
+rcvar=pot_enable
+start_cmd="pot_early_start"
+stop_cmd="pot_early_stop"
+
+load_rc_config $name
+: ${pot_enable:=NO}
+
+pot_early_start()
+{
+	local _pname _dyn_pot_list _start
+	_dyn_pot_list=$(%%PREFIX%%/bin/pot ls -q)
+	for _pname in $_dyn_pot_list ; do
+		if [ "$( %%PREFIX%%/bin/pot get-attr -p "$_pname" -A early-start-at-boot -q )" = "YES" ]; then
+			%%PREFIX%%/bin/pot start "$_pname"
+		fi
+	done
+}
+
+pot_early_stop()
+{
+	local _pname _dyn_pot_list _start
+	_dyn_pot_list=$(%%PREFIX%%/bin/pot ls -q)
+	for _pname in $_dyn_pot_list ; do
+		if [ "$( %%PREFIX%%/bin/pot get-attr -p "$_pname" -A early-start-at-boot -q )" = "YES" ]; then
+			%%PREFIX%%/bin/pot stop "$_pname"
+		fi
+	done
+}
+
+run_rc_command "$1"
diff --git a/sysutils/pot/pkg-plist b/sysutils/pot/pkg-plist
index 76a630903e9c..0a6296d82726 100644
--- a/sysutils/pot/pkg-plist
+++ b/sysutils/pot/pkg-plist
@@ -28,6 +28,7 @@ bin/pot
 %%DATADIR%%/init.sh
 %%DATADIR%%/list.sh
 %%DATADIR%%/mount-in.sh
+%%DATADIR%%/network.sh
 %%DATADIR%%/prepare.sh
 %%DATADIR%%/prune.sh
 %%DATADIR%%/ps.sh