From owner-svn-ports-all@freebsd.org  Fri Aug 31 20:37:21 2018
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 99031FDBF1A;
 Fri, 31 Aug 2018 20:37:21 +0000 (UTC) (envelope-from brd@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 49B0C84462;
 Fri, 31 Aug 2018 20:37:21 +0000 (UTC) (envelope-from brd@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 0ED7020374;
 Fri, 31 Aug 2018 20:37:21 +0000 (UTC) (envelope-from brd@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7VKbKCw022831;
 Fri, 31 Aug 2018 20:37:20 GMT (envelope-from brd@FreeBSD.org)
Received: (from brd@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7VKbKoK022829;
 Fri, 31 Aug 2018 20:37:20 GMT (envelope-from brd@FreeBSD.org)
Message-Id: <201808312037.w7VKbKoK022829@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: brd set sender to brd@FreeBSD.org
 using -f
From: Brad Davis <brd@FreeBSD.org>
Date: Fri, 31 Aug 2018 20:37:20 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r478609 - in head/sysutils/ezjail: . files
X-SVN-Group: ports-head
X-SVN-Commit-Author: brd
X-SVN-Commit-Paths: in head/sysutils/ezjail: . files
X-SVN-Commit-Revision: 478609
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.27
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Aug 2018 20:37:21 -0000

Author: brd
Date: Fri Aug 31 20:37:20 2018
New Revision: 478609
URL: https://svnweb.freebsd.org/changeset/ports/478609

Log:
  Fix ezjail use of make distribution and the path to snapshots on the mirrors.
  
  PR:		230690
  Approved by:	maintainer timeout

Added:
  head/sysutils/ezjail/files/
  head/sysutils/ezjail/files/patch-ezjail-admin   (contents, props changed)
Modified:
  head/sysutils/ezjail/Makefile

Modified: head/sysutils/ezjail/Makefile
==============================================================================
--- head/sysutils/ezjail/Makefile	Fri Aug 31 20:14:57 2018	(r478608)
+++ head/sysutils/ezjail/Makefile	Fri Aug 31 20:37:20 2018	(r478609)
@@ -2,6 +2,7 @@
 
 PORTNAME=	ezjail
 PORTVERSION=	3.4.2
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://erdgeist.org/arts/software/ezjail/
 

Added: head/sysutils/ezjail/files/patch-ezjail-admin
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/ezjail/files/patch-ezjail-admin	Fri Aug 31 20:37:20 2018	(r478609)
@@ -0,0 +1,20 @@
+--- ezjail-admin.orig	2018-08-17 10:07:06 UTC
++++ ezjail-admin
+@@ -335,7 +335,7 @@ ezjail_queryftpserver () {
+   unset _ret
+   echo -n "Querying your ftp-server... "
+   TIFS=${IFS}; IFS=
+-  for ezjail_path in pub/FreeBSD/releases pub/FreeBSD/snapshot pub/FreeBSD releases snapshots pub/FreeBSD-Archive/old-releases NO; do
++  for ezjail_path in pub/FreeBSD/releases pub/FreeBSD/snapshots pub/FreeBSD releases snapshots pub/FreeBSD-Archive/old-releases NO; do
+     if [ ${ezjail_path} = "NO" ]; then
+       echo "Warning: I am having problems querying the ftp server you specified (${ezjail_disturi})."
+       _ret=1; break
+@@ -1053,7 +1053,7 @@ setup|update)
+ 
+     # make and setup our world, then split basejail and newjail
+     cd "${ezjail_sourcetree}" && env DESTDIR="${ezjail_jailfull}" make ${ezjail_installaction} || exerr "Error: The command 'make ${ezjail_installaction}' failed.\n  Refer to the error report(s) above."
+-    cd "${ezjail_sourcetree}/etc" && env DESTDIR="${ezjail_jailfull}" make distribution || exerr "Error: The command 'make distribution' failed.\n  Refer to the error report(s) above."
++    cd "${ezjail_sourcetree}" && env DESTDIR="${ezjail_jailfull}" make distribution || exerr "Error: The command 'make distribution' failed.\n  Refer to the error report(s) above."
+     ezjail_splitworld
+ 
+   fi # installaction="none"