From 24668b013c411b3d1e0ecf2f6081e7dc1da7adf9 Mon Sep 17 00:00:00 2001
From: Alejandro Mery <amery@geeks.cl>
Date: Tue, 7 Apr 2009 06:49:18 -0400
Subject: [PATCH] squashfs-tools: Updated (3.3 -> 3.4) - cleaned kernel
 extension magic

---
 filesystem/squashfs-tools/pkg_linux_pre.conf  | 51 ++++++++++---------
 filesystem/squashfs-tools/squashfs-tools.desc |  6 +--
 2 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/filesystem/squashfs-tools/pkg_linux_pre.conf b/filesystem/squashfs-tools/pkg_linux_pre.conf
index 2220ccc69..64f9c94d7 100644
--- a/filesystem/squashfs-tools/pkg_linux_pre.conf
+++ b/filesystem/squashfs-tools/pkg_linux_pre.conf
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../squashfs-tools/pkg_linux_pre.conf
-# Copyright (C) 2006 - 2007 The OpenSDE Project
+# Copyright (C) 2006 - 2009 The OpenSDE Project
 #
 # More information can be found in the files COPYING and README.
 #
@@ -12,32 +12,37 @@
 # GNU General Public License can be found in the file COPYING.
 # --- SDE-COPYRIGHT-NOTE-END ---
 
-sqfs_ver=$( pkgdesc ver squashfs-tools )
-echo_status "Including SquashFS (${sqfs_ver}) support."
-
 hook_add prepatch 5 'squashfs_patch'
 squashfs_patch() {
+	local sqfs_ver=$( pkgdesc ver squashfs-tools )
 	local lx_ver= sqfs_patch= sqfs_patch_base=
-	local x=
+	local ver3=$(echo "$ver" | cut -d. -f1-3)
 
-	tar -v $taropt $( match_source_file -p squashfs squashfs-tools ) -C $builddir
-	sqfs_patch_base=$builddir/squashfs${sqfs_ver}/kernel-patches
-	# full version
-	lx_ver="$ver"
-	if [ ! -d $sqfs_patch_base/linux-${lx_ver}/ ]; then
-		# just three elements
-		lx_ver=$( echo "$lx_ver" | cut -d. -f1-3 )
-		if [ ! -d $sqfs_patch_base/linux-${lx_ver}/ ]; then
-			# ok, the last for this tree
-			lx_ver=$( echo "$lx_ver" | cut -d. -f1-2 )
-			sqfs_patch=$sqfs_patch_base/linux-${lx_ver}.
-			lx_ver=$lx_ver.$( ls -1d ${sqfs_patch}* | sed -e "s,^${sqfs_patch},," | sort -n | tail -n 1 )
-			echo_warning "SquashFS patch for $ver was not found, trying $lx_ver instead."
-		fi
-	fi
+	tar -v $taropt "$(match_source_file -p squashfs squashfs-tools)" -C "$builddir"
+	sqfs_patch_base="$builddir/squashfs${sqfs_ver}/kernel-patches/linux-"
+
+	# known mappings
+	case "$ver3" in
+	2.6.27)		lx_ver="2.6.27-rc4" ;;
+	*)		for lx_ver in $ver $ver3 ''; do
+				[ ! -d "${sqfs_patch_base}${lx_ver}/" ] || break
+			done
+			if [ -z "$lx_ver" ]; then
+				lx_ver=$(ls -1d "${sqfs_patch_base}$ver3"[-.]* |
+					sed -e "s,^${sqfs_patch_base},," |
+					sort -n | tail -n 1)
+			fi
+		;;
+	esac
 
-	sqfs_patch=$builddir/squashfs-${sqfs_ver}-${lx_ver}-patch
-	cp -v $( ls -1d $sqfs_patch_base/linux-$lx_ver/squashfs*-patch ) $sqfs_patch
-	var_append patchfiles ' ' "$sqfs_patch"
+	if [ -z "$lx_ver" ]; then
+		echo_warning "SquashFS $sqfs_ver patch for $ver not found, skipping."
+	else
+		echo_status "SquashFS $sqfs_ver: using patch for Linux $lx_ver."
+
+		sqfs_patch="$builddir/squashfs-${sqfs_ver}-${lx_ver}.patch"
+		cp -v $(ls -1d "${sqfs_patch_base}$lx_ver"/squashfs*-patch) $sqfs_patch
+		var_append patchfiles ' ' "$sqfs_patch"
+	fi
 }
 
diff --git a/filesystem/squashfs-tools/squashfs-tools.desc b/filesystem/squashfs-tools/squashfs-tools.desc
index c91f88b5e..7967c4277 100644
--- a/filesystem/squashfs-tools/squashfs-tools.desc
+++ b/filesystem/squashfs-tools/squashfs-tools.desc
@@ -2,7 +2,7 @@
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY]
 [COPY] Filename: package/.../squashfs-tools/squashfs-tools.desc
-[COPY] Copyright (C) 2006 - 2008 The OpenSDE Project
+[COPY] Copyright (C) 2006 - 2009 The OpenSDE Project
 [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
 [COPY] Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY]
@@ -31,8 +31,8 @@
 
 [L] GPL
 [S] Stable
-[V] 3.3
+[V] 3.4
 [P] X 0?---5---- 106.100
 
-[D] 1559199216 squashfs3.3.tar.gz http://dl.sourceforge.net/sourceforge/squashfs/
+[D] 3651130856 squashfs3.4.tar.gz http://dl.sourceforge.net/sourceforge/squashfs/