diff -Naur tinderbox-3.4.1.orig/etc/env/GLOBAL tinderbox-3.4.1/etc/env/GLOBAL --- tinderbox-3.4.1.orig/etc/env/GLOBAL 1970-01-01 01:00:00.000000000 +0100 +++ tinderbox-3.4.1/etc/env/GLOBAL 2012-01-26 14:47:48.440707795 +0100 @@ -0,0 +1,3 @@ +# Only for 8, 9 and HEAD +PKGSUFFIX=.txz +PKG_SUFX=.txz diff -Naur tinderbox-3.4.1.orig/lib/buildscript tinderbox-3.4.1/lib/buildscript --- tinderbox-3.4.1.orig/lib/buildscript 2012-01-26 14:44:42.382709959 +0100 +++ tinderbox-3.4.1/lib/buildscript 2012-01-26 14:45:34.439708663 +0100 @@ -37,6 +37,7 @@ echo "pkg_add $i" base=$(basename $i .tgz) base=$(basename $base .tbz) + base=$(basename $base .txz) if pkg_info -q -e $base; then echo "skipping $base, already added" else @@ -64,6 +65,7 @@ for i in $pkgs; do base=$(basename $i .tgz) base=$(basename $base .tbz) + base=$(basename $base .txz) if [ -s /var/db/pkg/${base}/+REQUIRED_BY ]; then recursion=1 nextpkg="${base} ${nextpkg}" diff -Naur tinderbox-3.4.1.orig/webui/core/TinderboxDS.php tinderbox-3.4.1/webui/core/TinderboxDS.php --- tinderbox-3.4.1.orig/webui/core/TinderboxDS.php 2012-01-26 14:44:42.390709806 +0100 +++ tinderbox-3.4.1/webui/core/TinderboxDS.php 2012-01-26 14:46:02.802707502 +0100 @@ -968,9 +968,12 @@ if (substr($jail->getName(), 0, 1) <= "4") { $this->packageSuffixCache[$jail_id] = ".tgz"; return ".tgz"; + } elseif ( substr( $jail->getName(), 0, 1 ) <= "7" ) { + $this->packageSuffixCache[$jail_id] = ".tbz"; + return ".tbz"; } else { - $this->packageSuffixCache[$jail_id] = ".tbz"; - return ".tbz"; + $this->packageSuffixCache[$jail_id] = ".txz"; + return ".txz"; } }