Update to 1.2.8

  - Renaming active BE is now supported via 'zfs rename -u'.
  - All zfs options are now quoted

7 files changed, 50 insertions, 138 deletions

diff --git a/sysutils/beadm-devel/Makefile b/sysutils/beadm-devel/Makefile
index 62c0ce6de053..6a2e374634d4 100644
--- a/sysutils/beadm-devel/Makefile
+++ b/sysutils/beadm-devel/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	beadm
-PORTVERSION=	1.2.99.20180121
+PORTVERSION=	1.2.99.20180630
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	-devel
 MASTER_SITES=	GH \
@@ -15,7 +15,7 @@ LICENSE=	BSD2CLAUSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	vermaden
-GH_TAGNAME=	e55f535b589fb2df4e65e51482e29337b564b756
+GH_TAGNAME=	25fdbf6ef0866dd9d46a32d5879d9e509ecf4025
 
 NO_BUILD=	YES
 
diff --git a/sysutils/beadm-devel/distinfo b/sysutils/beadm-devel/distinfo
index d4f938c09a23..ffca4b92b063 100644
--- a/sysutils/beadm-devel/distinfo
+++ b/sysutils/beadm-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1516655444
-SHA256 (vermaden-beadm-1.2.99.20180121-e55f535b589fb2df4e65e51482e29337b564b756_GH0.tar.gz) = 08b658266cbb1ecb1d7b473303474c3189b0545783fdb76f7b664e9129e429a4
-SIZE (vermaden-beadm-1.2.99.20180121-e55f535b589fb2df4e65e51482e29337b564b756_GH0.tar.gz) = 15408
+TIMESTAMP = 1530392208
+SHA256 (vermaden-beadm-1.2.99.20180630-25fdbf6ef0866dd9d46a32d5879d9e509ecf4025_GH0.tar.gz) = 61e0b5fdb36c1a51749b9cd57862cdcefffc98fe6cea0bb1e1e8c4fa4c37a47f
+SIZE (vermaden-beadm-1.2.99.20180630-25fdbf6ef0866dd9d46a32d5879d9e509ecf4025_GH0.tar.gz) = 15387
diff --git a/sysutils/beadm-devel/files/patch-beadm.1 b/sysutils/beadm-devel/files/patch-beadm.1
new file mode 100644
index 000000000000..dc0dc69049b2
--- /dev/null
+++ b/sysutils/beadm-devel/files/patch-beadm.1
@@ -0,0 +1,30 @@
+commit 25a066def7cddd0f9178d07531b1f18703308db0
+Author: Alan Somers <asomers@gmail.com>
+Date:   Wed Sep 6 09:17:00 2017 -0600
+
+    Fix indentation in man page
+
+--- beadm.1.orig	2018-06-13 03:53:03 UTC
++++ beadm.1
+@@ -89,9 +89,11 @@ If the -e param is specified, the new environment will
+ Creates a snapshot of the existing boot environment named
+ .Ar beName .
+ .Pp
+-.It
+-.Ic destroy Op Fl F
++.It Xo
++.Ic destroy
++.Op Fl F
+ .Ao Ar beName | beName@snapshot Ac
++.Xc
+ .Pp
+ Destroys the given
+ .Ar beName
+@@ -151,6 +153,7 @@ will force the unmount if busy.
+ .Pp
+ .It Ic version
+ List the beadm version and exit.
++.El
+ .Sh EXAMPLES
+ .Bl -bullet
+ .It
diff --git a/sysutils/beadm/Makefile b/sysutils/beadm/Makefile
index a6e658521607..5faa00975bc0 100644
--- a/sysutils/beadm/Makefile
+++ b/sysutils/beadm/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	beadm
-PORTVERSION=	1.2.7
-PORTREVISION=	4
+PORTVERSION=	1.2.8
+PORTREVISION=	0
 CATEGORIES=	sysutils
 MASTER_SITES=	GH \
 		http://mirror.shatow.net/freebsd/${PORTNAME}/ \
diff --git a/sysutils/beadm/distinfo b/sysutils/beadm/distinfo
index e9206f562605..12071c961df5 100644
--- a/sysutils/beadm/distinfo
+++ b/sysutils/beadm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499152765
-SHA256 (vermaden-beadm-1.2.7_GH0.tar.gz) = 6982b4d495d954d971470a1b3bcc8bf886e0a412fdf70c034dbaf74f9216f866
-SIZE (vermaden-beadm-1.2.7_GH0.tar.gz) = 14924
+TIMESTAMP = 1530392877
+SHA256 (vermaden-beadm-1.2.8_GH0.tar.gz) = 6fd52954f7d4f55ad80d5838bdbd92992fc54210832ab3f18afd4ffc5542bc28
+SIZE (vermaden-beadm-1.2.8_GH0.tar.gz) = 15385
diff --git a/sysutils/beadm/files/patch-beadm b/sysutils/beadm/files/patch-beadm
deleted file mode 100644
index 56b3f77b2f2e..000000000000
--- a/sysutils/beadm/files/patch-beadm
+++ /dev/null
@@ -1,126 +0,0 @@
---- beadm.orig	2017-01-13 23:25:44 UTC
-+++ beadm
-@@ -128,6 +128,24 @@ __be_new() { # 1=SOURCE 2=TARGET
-   unset NAME_NEW
-   unset NAME_SANITY
-   local SOURCE=$( echo ${1} | cut -d '@' -f 1 )
-+  local ENTROPY=0
-+  # secure current /boot/entropy file
-+  if [ -f /boot/entropy ]
-+  then
-+    if ! cp -p /boot/entropy /boot/entropy.OLD 1> /dev/null 2> /dev/null
-+    then
-+      echo "ERROR: Can not copy current '/boot/entropy' file"
-+      exit 1
-+    fi
-+    ENTROPY=1
-+  fi
-+  # create new /boot/entropy file that would be used in new boot environment
-+  if ! dd if=/dev/random of=/boot/entropy bs=4096 count=1 1> /dev/null 2> /dev/null
-+  then
-+    echo "ERROR: Can not generate new '/boot/entropy' file"
-+    exit 1
-+  fi
-+  # create snapshot that will be used as a base for new boot environment
-   if __be_snapshot ${1}
-   then
-     # create boot environment from snapshot
-@@ -138,6 +156,13 @@ __be_new() { # 1=SOURCE 2=TARGET
-           if ! zfs list -H -o name ${FS}@${SNAPSHOT} 1> /dev/null 2> /dev/null
-           then
-             echo "ERROR: Child snapshot '${FS}@${SNAPSHOT}' does not exist"
-+            if [ ${ENTROPY} -ne 0 ]
-+            then
-+              if ! mv /boot/entropy.OLD /boot/entropy 1> /dev/null 2> /dev/null
-+              then
-+                echo "WARNING: Can not bring back original '/boot/entropy' file"
-+              fi
-+            fi
-             exit 1
-           fi
-         done
-@@ -146,6 +171,13 @@ __be_new() { # 1=SOURCE 2=TARGET
-     if zfs list -H -o name ${1}@${2##*/} 1> /dev/null 2> /dev/null
-     then
-       echo "ERROR: Snapshot '${1}@${2##*/}' already exists"
-+      if [ ${ENTROPY} -ne 0 ]
-+      then
-+        if ! mv /boot/entropy.OLD /boot/entropy 1> /dev/null 2> /dev/null
-+        then
-+          echo "WARNING: Can not bring back original '/boot/entropy' file"
-+        fi
-+      fi
-       exit 1
-     fi
-     # snapshot format
-@@ -153,9 +185,25 @@ __be_new() { # 1=SOURCE 2=TARGET
-     if ! zfs snapshot -r ${1}@${FMT} 1> /dev/null 2> /dev/null
-     then
-       echo "ERROR: Cannot create snapshot '${1}@${FMT}'"
-+      if [ ${ENTROPY} -ne 0 ]
-+      then
-+        if ! mv /boot/entropy.OLD /boot/entropy 1> /dev/null 2> /dev/null
-+        then
-+          echo "WARNING: Can not bring back original '/boot/entropy' file"
-+        fi
-+      fi
-       exit 1
-     fi
-   fi
-+  # bring back secured /boot/entropy.OLD file
-+  if [ -f /boot/entropy.OLD ]
-+  then
-+    if ! mv /boot/entropy.OLD /boot/entropy 1> /dev/null 2> /dev/null
-+    then
-+      echo "WARNING: Can not bring back original '/boot/entropy' file"
-+    fi
-+  fi
-+  unset ENTROPY
-   # clone properties of source boot environment
-   zfs list -H -o name -r ${SOURCE} \
-     | grep -v '@' \
-@@ -303,7 +351,7 @@ case ${1} in
-         while(CMD_ZFS_LIST BENAME_BEGINS_WITH | getline) {
-           if($1 != BENAME_BEGINS_WITH) {
-             FSNAME = $1
--            FSNAMES[length(FSNAME) + 1] = FSNAME
-+            FSNAMES[length(FSNAMES) + 1] = FSNAME
-             USED              = __normalize($2)
-             USEDBYDATASET     = __normalize($3)
-             USEDBYSNAPSHOTS   = __normalize($4)
-@@ -492,6 +540,7 @@ case ${1} in
-         fi
-       fi
-       # do not change root (/) mounted boot environment mountpoint
-+      HAVE_ZFSBE=0
-       if [ "${ROOTFS}" != "${POOL}/${BEDS}/${2}" ]
-       then
-         TMPMNT=$( mktemp -d -t BE-${2} )
-@@ -519,6 +568,9 @@ EOF
-         else
-           TMPMNT=${MOUNT}
-         fi
-+        if [ -f ${TMPMNT}/etc/rc.d/zfsbe ]; then
-+          HAVE_ZFSBE=1
-+        fi
-         if [ -f /boot/zfs/zpool.cache ]
-         then
-           cp /boot/zfs/zpool.cache ${TMPMNT}/boot/zfs/zpool.cache
-@@ -555,11 +607,16 @@ EOF
-           zfs set canmount=noauto ${NAME}
-         done
-     # enable automatic mount for active boot environment and promote it
-+    if [ ${HAVE_ZFSBE} -eq 1 ]; then
-+      ZFSBE_CANMOUNT=noauto
-+    else
-+      ZFSBE_CANMOUNT=on
-+    fi
-     echo "${ZFS_LIST}" \
-       | grep -E "^${POOL}/${BEDS}/${2}(/|$)" \
-       | while read NAME
-         do
--          zfs set canmount=on ${NAME}
-+          zfs set canmount=${ZFSBE_CANMOUNT} ${NAME}
-           while __be_clone ${NAME}
-           do
-             zfs promote ${NAME}
diff --git a/sysutils/beadm/files/patch-beadm.1 b/sysutils/beadm/files/patch-beadm.1
index e368213c3715..dc0dc69049b2 100644
--- a/sysutils/beadm/files/patch-beadm.1
+++ b/sysutils/beadm/files/patch-beadm.1
@@ -4,9 +4,9 @@ Date:   Wed Sep 6 09:17:00 2017 -0600
 
     Fix indentation in man page
 
---- beadm.1.orig	2017-01-13 23:25:44 UTC
+--- beadm.1.orig	2018-06-13 03:53:03 UTC
 +++ beadm.1
-@@ -87,9 +87,11 @@ If the -e param is specified, the new environment will
+@@ -89,9 +89,11 @@ If the -e param is specified, the new environment will
  Creates a snapshot of the existing boot environment named
  .Ar beName .
  .Pp
@@ -20,3 +20,11 @@ Date:   Wed Sep 6 09:17:00 2017 -0600
  .Pp
  Destroys the given
  .Ar beName
+@@ -151,6 +153,7 @@ will force the unmount if busy.
+ .Pp
+ .It Ic version
+ List the beadm version and exit.
++.El
+ .Sh EXAMPLES
+ .Bl -bullet
+ .It