diff options
| author | Brad Davis <brd@FreeBSD.org> | 2018-08-31 20:37:20 +0000 |
|---|---|---|
| committer | Brad Davis <brd@FreeBSD.org> | 2018-08-31 20:37:20 +0000 |
| commit | 236c9afbd3e165fb4eecb285315ca9e6f92e1219 (patch) | |
| tree | 8fac8c1e977b1e8e91c85e929eac214c8216d6c1 | |
| parent | aedca5645a4a5200098252abd2d281970e5c10b3 (diff) | |
Fix ezjail use of make distribution and the path to snapshots on the mirrors.
PR: 230690
Approved by: maintainer timeout
Notes
Notes:
svn path=/head/; revision=478609
| -rw-r--r-- | sysutils/ezjail/Makefile | 1 | ||||
| -rw-r--r-- | sysutils/ezjail/files/patch-ezjail-admin | 20 |
2 files changed, 21 insertions, 0 deletions
diff --git a/sysutils/ezjail/Makefile b/sysutils/ezjail/Makefile index 4799dac819cf..50fe326ea6e5 100644 --- a/sysutils/ezjail/Makefile +++ b/sysutils/ezjail/Makefile @@ -2,6 +2,7 @@ PORTNAME= ezjail PORTVERSION= 3.4.2 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://erdgeist.org/arts/software/ezjail/ diff --git a/sysutils/ezjail/files/patch-ezjail-admin b/sysutils/ezjail/files/patch-ezjail-admin new file mode 100644 index 000000000000..a232986f014e --- /dev/null +++ b/sysutils/ezjail/files/patch-ezjail-admin @@ -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" |