git: e054fbd8def0 - main - sysutils/iocell: Allow for creating/keeping bridge interfaces

From: Juraj Lutter <otis_at_FreeBSD.org>
Date: Sat, 17 Sep 2022 09:34:25 UTC
The branch main has been updated by otis:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e054fbd8def0d2fd3ec58f5a12a5ccab34f40fb4

commit e054fbd8def0d2fd3ec58f5a12a5ccab34f40fb4
Author:     Juraj Lutter <otis@FreeBSD.org>
AuthorDate: 2022-08-24 08:49:31 +0000
Commit:     Juraj Lutter <otis@FreeBSD.org>
CommitDate: 2022-09-17 09:31:27 +0000

    sysutils/iocell: Allow for creating/keeping bridge interfaces
    
    Add pull request #40 that allows for new jail parameters:
    
      - createbridge (default on)
      - keepbridge (default off)
    
    createbridge controls whether the default bridge interfaces (bridge0
    and bridge1) are created on jail startup if they do not exist.
    
    keepbridge controls whether the bridge0 and bridge1 interfaces will
    be destroyed on jail shutdown if they are not longer used.
    
    Both these options prevents bridge interfaces manipulation in case
    when they are being managed outside iocell.
    
    PR:                     266015
    Approved by:            robak (maintainer timeout)
    Differential Revision:  https://reviews.freebsd.org/D36325
---
 sysutils/iocell/Makefile | 11 ++++++-----
 sysutils/iocell/distinfo |  4 +++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/sysutils/iocell/Makefile b/sysutils/iocell/Makefile
index b2c5bcb70711..582a2feb515a 100644
--- a/sysutils/iocell/Makefile
+++ b/sysutils/iocell/Makefile
@@ -1,11 +1,14 @@
 PORTNAME=	iocell
 PORTVERSION=	2.1.2
-DISTVERSIONPREFIX=v
-PORTREVISION=	1
+DISTVERSIONPREFIX=	v
+PORTREVISION=	2
 CATEGORIES=	sysutils
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/pull/
-PATCHFILES+=	37.patch:-p1 # https://github.com/bartekrutkowski/iocell/pull/37
+# https://github.com/bartekrutkowski/iocell/pull/37
+# https://github.com/bartekrutkowski/iocell/pull/40
+PATCHFILES+=	37.patch:-p1 \
+		40.patch:-p1
 
 MAINTAINER=	robak@FreeBSD.org
 COMMENT=	Feature rich Jail containers manager (iocage fork)
@@ -16,8 +19,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	uclcmd:devel/uclcmd
 
-CONFLICTS=	iocage
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	bartekrutkowski
 
diff --git a/sysutils/iocell/distinfo b/sysutils/iocell/distinfo
index 168b66468bb5..55e798832bf4 100644
--- a/sysutils/iocell/distinfo
+++ b/sysutils/iocell/distinfo
@@ -1,5 +1,7 @@
-TIMESTAMP = 1613421536
+TIMESTAMP = 1661329409
 SHA256 (bartekrutkowski-iocell-v2.1.2_GH0.tar.gz) = 36f98ec1f55f444913bb5154b51549e85fb34e04e372d4fe34bb8be2c5f7ed36
 SIZE (bartekrutkowski-iocell-v2.1.2_GH0.tar.gz) = 372737
 SHA256 (37.patch) = 9bacb2e7fa1b6de7dac753d23594087951733968f1723501096cb71131e811e8
 SIZE (37.patch) = 4538
+SHA256 (40.patch) = 8a0b62c42cb5970f83adafa76cae868f4c537617a69e443cb6950e101012a7e8
+SIZE (40.patch) = 7536