From 265a804d86e1729599f954cb554070f683ba28af Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Sat, 13 Oct 2007 20:57:44 +0000
Subject: Support kernels >=2.6.23 ; add one more doc file

---
 truecrypt/build/truecrypt.SlackBuild | 41 ++++++++++++++----------------------
 1 file changed, 16 insertions(+), 25 deletions(-)

(limited to 'truecrypt')

diff --git a/truecrypt/build/truecrypt.SlackBuild b/truecrypt/build/truecrypt.SlackBuild
index a395d305..3df97827 100755
--- a/truecrypt/build/truecrypt.SlackBuild
+++ b/truecrypt/build/truecrypt.SlackBuild
@@ -44,6 +44,8 @@
 # 4.3a-2:    26/may/2007 by Eric Hameleers <alien@slackware.com>
 #            * Device-mapper is part of a Slackware 12 install, so don't
 #              list it as a dependency.
+# 4.3a-3:    13/oct/2007 by Eric Hameleers <alien@slackware.com>
+#            * Add patch to support kernel >= 2.6.23
 # 
 # Run 'sh SlackBuild --cleanup' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -56,9 +58,9 @@
 PRGNAM=truecrypt
 VERSION=${VERSION:-4.3a}
 ARCH=${ARCH:-i486}
-BUILD=2
+BUILD=3
 
-DOCS="README.1st Readme.txt License.txt userguide.pdf"
+DOCS="README.1st Release/Readme.txt INSTALL License.txt userguide.pdf"
 
 KVER=${KVER:-$(uname -r)}
 KSRC=${KSRC:-/lib/modules/{KVER}/build}
@@ -67,6 +69,7 @@ SLACKMAJ=$( cat /etc/slackware-version | cut -f2 -d\  | cut -f1 -d. )
 
 SOURCE="${PRGNAM}-${VERSION}-source-code.tar.gz"
 PATCH0="${PRGNAM}-${VERSION}_ksrc.patch"
+PATCH1="${PRGNAM}-${VERSION}_kernel_2.6.23.patch"
 
 # Where do we look for sources?
 CWD=$(pwd)
@@ -122,34 +125,17 @@ case "$ARCH" in
              ;;
 esac
 
-if [ ! -d $TMP/tmp-$PRGNAM ]; then
-  mkdir -p $TMP/tmp-$PRGNAM # location to build the source
-elif [ "$P1" != "--oldbuild" ]; then
-  # If the "--oldbuild" parameter is present, we keep
-  #  the old build files and continue;
-  # By default we remove the remnants of previous build and continue:
-  rm -rf $TMP/tmp-$PRGNAM/*
-fi
-
-if [ "$PKG" = "" -o "$PKG" = "/" ] ; then
-  echo "Please provide a sane value for the variable 'PKG'."
-  exit 1
-elif [ ! -d $PKG ]; then
-  mkdir -p $PKG  # place for the package to be built
-else
-  rm -rf $PKG/*  # We always erase old package's contents:
-fi
-
-if [ ! -d $OUTPUT ]; then
-  mkdir -p $OUTPUT  # place for the package to be saved
-fi
+mkdir -p $TMP/tmp-$PRGNAM # location to build the source
+rm -rf $TMP/tmp-$PRGNAM/* # remove the remnants of previous build
+mkdir -p $PKG     # place for the package to be built
+rm -rf $PKG/*     # We always erase old package's contents:
+mkdir -p $OUTPUT  # place for the package to be saved
 
 if ! [ -f ${SRCDIR}/${SOURCE} ]; then
   echo "File '${SOURCE}' not available... aborting the build."
   exit 1
 fi
 
-
 # --- PACKAGE BUILDING ---
 
 echo "++"
@@ -162,16 +148,21 @@ echo "Extracting the program tarball(s) for $PRGNAM..."
 tar -xzvf $SRCDIR/${SOURCE}
 mv ${PRGNAM}-${VERSION}-source-code ${PRGNAM}-${VERSION} || true
 cd ${PRGNAM}-${VERSION}
-
+# Support kernels >= 2.6.23 :
 chown -R root.root *
 find . -perm 777 -exec chmod 755 {} \;
 find . -exec chmod +r {} \;
 
 echo "Building ..."
 
+# Small doc filename clash:
+mv -f Readme.txt INSTALL
+
 cd Linux
 # Patches first:
+# More compilation error output:
 patch -p0 < $SRCDIR/${PATCH0} 2>&1 | tee $OUTPUT/patch-${PRGNAM}.log
+patch -p1 < ${SRCDIR}/${PATCH1} 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
 
 CFLAGS="$SLKCFLAGS" \
 KERNEL_VER=$KVER KERNEL_SRC=$KSRC \
-- 
cgit v1.2.3