sysutils/beadm: sync with upstream

Taken from: HardenedBSD
snape7997 · Jul 11, 2017 · b43c0d1 · b43c0d1
1 parent f828e60
commit b43c0d1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/sysutils/beadm/Makefile b/sysutils/beadm/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	beadm
 PORTVERSION=	1.2.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	GH \
 		http://mirror.shatow.net/freebsd/${PORTNAME}/ \

diff --git a/sysutils/beadm/files/patch-beadm b/sysutils/beadm/files/patch-beadm
@@ -1,7 +1,5 @@
-diff --git beadm beadm
-index 6a0e397..f817e40 100755
---- beadm
-+++ beadm
+--- beadm.orig	2017-01-13 15:25:44.000000000 -0800
++++ beadm	2017-07-08 09:45:40.962588000 -0700
 @@ -128,6 +128,24 @@ __be_new() { # 1=SOURCE 2=TARGET
    unset NAME_NEW
    unset NAME_SANITY
@@ -81,3 +79,12 @@ index 6a0e397..f817e40 100755
    # 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)