From d8179ff6e45f5b498447e71ac6d0d849360a9a94 Mon Sep 17 00:00:00 2001
From: CyberLeo <cyberleo@cyberleo.net>
Date: Tue, 9 Dec 2014 21:03:02 -0600
Subject: [PATCH] ports-mgmt/poudriere: now supports tarball method natively

---
 .../patch-jail_create_from_tarball.patch      | 47 -------------------
 1 file changed, 47 deletions(-)
 delete mode 100644 cdn/ports/ports-mgmt/poudriere/files/patch-jail_create_from_tarball.patch

diff --git a/cdn/ports/ports-mgmt/poudriere/files/patch-jail_create_from_tarball.patch b/cdn/ports/ports-mgmt/poudriere/files/patch-jail_create_from_tarball.patch
deleted file mode 100644
index 97e475d..0000000
--- a/cdn/ports/ports-mgmt/poudriere/files/patch-jail_create_from_tarball.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- src/share/poudriere/jail.sh.orig	2013-11-19 17:51:26.000000000 -0600
-+++ src/share/poudriere/jail.sh	2014-01-18 07:10:30.725703777 -0600
-@@ -55,6 +55,7 @@
-                      Other possible method are: \"allbsd\" retrieve a
-                      snapshot from allbsd.org's website or \"ftp-archive\"
-                      for old releases that're no longer available on \"ftp\".
-+                     Can also be \"tarball\" or \"tarball:/full/path/to/txz\".
-     -p tree       -- Specify which ports tree the jail to start/stop with
-     -P patch      -- Specify a patch file to apply to the source before committing.
-     -t version    -- version to upgrade to
-@@ -165,6 +166,9 @@
- 	allbsd|gjb)
- 		err 1 "Upgrade is not supported with allbsd, to upgrade, please delete and recreate the jail"
- 		;;
-+	tarball*)
-+		err 1 "Upgrade is not supported with tarball; to upgrade, please delete and recreate the jail"
-+		;;
- 	*)
- 		err 1 "Unsupported method"
- 		;;
-@@ -363,6 +367,13 @@
- 	echo " done"
- }
- 
-+install_from_tarball() {
-+	: ${TARBALL=/usr/obj/${VERSION}-${ARCH}.txz}
-+	msg "Installing ${VERSION} ${ARCH} from ${TARBALL} ..."
-+	tar -xpf ${TARBALL} -C ${JAILMNT}/ || err 1 " fail"
-+	echo " done"
-+}
-+
- create_jail() {
- 	jail_exists ${JAILNAME} && err 2 "The jail ${JAILNAME} already exists"
- 
-@@ -382,6 +393,11 @@
- 	fi
- 
- 	case ${METHOD} in
-+	tarball*)
-+		FCT=install_from_tarball
-+		TARBALL=${METHOD##*:}
-+		METHOD=${METHOD%%:*}
-+		;;
- 	ftp|http|gjb|ftp-archive)
- 		FCT=install_from_ftp
- 		;;
-
-- 
2.45.0