svn commit: r478609 - in head/sysutils/ezjail: . files

[Brad Davis]

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"