From owner-svn-ports-head@freebsd.org  Mon May  4 14:17:29 2020
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0ED482D131C;
 Mon,  4 May 2020 14:17:29 +0000 (UTC)
 (envelope-from grembo@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 49G4gX6gCyz4GG7;
 Mon,  4 May 2020 14:17:28 +0000 (UTC)
 (envelope-from grembo@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E000E256E1;
 Mon,  4 May 2020 14:17:28 +0000 (UTC)
 (envelope-from grembo@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 044EHSrb019728;
 Mon, 4 May 2020 14:17:28 GMT (envelope-from grembo@FreeBSD.org)
Received: (from grembo@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 044EHSQW019726;
 Mon, 4 May 2020 14:17:28 GMT (envelope-from grembo@FreeBSD.org)
Message-Id: <202005041417.044EHSQW019726@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: grembo set sender to
 grembo@FreeBSD.org using -f
From: Michael Gmelin <grembo@FreeBSD.org>
Date: Mon, 4 May 2020 14:17:28 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r533926 - in head/ports-mgmt/jailaudit: . files
X-SVN-Group: ports-head
X-SVN-Commit-Author: grembo
X-SVN-Commit-Paths: in head/ports-mgmt/jailaudit: . files
X-SVN-Commit-Revision: 533926
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 May 2020 14:17:29 -0000

Author: grembo
Date: Mon May  4 14:17:28 2020
New Revision: 533926
URL: https://svnweb.freebsd.org/changeset/ports/533926

Log:
  Fix VNET jails (and IP-less jails in general)
  
  PR:		245616
  Approved by:	maintainer timeout

Added:
  head/ports-mgmt/jailaudit/files/
  head/ports-mgmt/jailaudit/files/patch-jailaudit   (contents, props changed)
Modified:
  head/ports-mgmt/jailaudit/Makefile

Modified: head/ports-mgmt/jailaudit/Makefile
==============================================================================
--- head/ports-mgmt/jailaudit/Makefile	Mon May  4 13:24:03 2020	(r533925)
+++ head/ports-mgmt/jailaudit/Makefile	Mon May  4 14:17:28 2020	(r533926)
@@ -3,6 +3,7 @@
 
 PORTNAME=	jailaudit
 PORTVERSION=	1.6.0
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	http://outpost.h3q.com/software/jailaudit/
 

Added: head/ports-mgmt/jailaudit/files/patch-jailaudit
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/ports-mgmt/jailaudit/files/patch-jailaudit	Mon May  4 14:17:28 2020	(r533926)
@@ -0,0 +1,20 @@
+--- jailaudit.orig	2019-05-15 18:35:20 UTC
++++ jailaudit
+@@ -37,7 +37,7 @@ PRINT_USAGE () {
+ case ${action} in
+  generate)
+     JLS() {
+-        /usr/sbin/jls | grep -v JID | grep -v '/var/empty$'
++        /usr/sbin/jls jid host.hostname path | grep -v '/var/empty$'
+     }
+ 
+     # exit if no jails are running that we can process
+@@ -85,7 +85,7 @@ case ${action} in
+     done
+ 
+     cd $audit_path
+-    JLS | awk '{print $1" "$3"_"$1}' | xargs -n2 mv
++    JLS | awk '{print $1" "$2"_"$1}' | xargs -n2 mv
+     rm -rf ${tmp_path}/*
+     exit
+  ;;