From 655466fa316338a8b06fdbab28c8ba48d3a2aba0 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Sun, 15 Apr 2007 20:20:53 +0000 Subject: Updated, had to re-write the 'ksrc' patch, but the patch to support recent kernels seems no longer needed... good --- truecrypt/build/truecrypt.SlackBuild | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'truecrypt') diff --git a/truecrypt/build/truecrypt.SlackBuild b/truecrypt/build/truecrypt.SlackBuild index 0ba2f36b..7725d4e4 100755 --- a/truecrypt/build/truecrypt.SlackBuild +++ b/truecrypt/build/truecrypt.SlackBuild @@ -19,6 +19,8 @@ # * Bugfix update. Reworked the SlackBuild too. # 4.2a-2: 14/jan/2007 by Eric Hameleers # * Fix compilation under kernels 2.6.18 and 2.6.19. +# 4.3: 15/apr/2007 by Eric Hameleers +# * Update. # # Run 'sh SlackBuild --cleanup' to build a Slackware package. # The package (.tgz) plus descriptive .txt file are created in /tmp . @@ -29,16 +31,17 @@ # --- INIT --- PRGNAM=truecrypt -VERSION=${VERSION:-4.2a} +VERSION=${VERSION:-4.3} ARCH=${ARCH:-i486} -BUILD=2 +BUILD=1 DOCS="README.1st Readme.txt License.txt userguide.pdf" KVER=${KVER:-$(uname -r)} +KSRC=${KSRC:-/lib/modules/{KVER}/build} SOURCE="${PRGNAM}-${VERSION}-source-code.tar.gz" -PATCH0="${PRGNAM}_ksrc.patch" +PATCH0="${PRGNAM}-${VERSION}_ksrc.patch" PATCH1="${PRGNAM}-4.2a-Dm-target.c--kernel-2.6.18-and-2.6.19.patch" # Where do we look for sources? @@ -135,6 +138,7 @@ cd $TMP/tmp-$PRGNAM echo "Extracting the program tarball(s) for $PRGNAM..." tar -xzvf $SRCDIR/${SOURCE} +mv ${PRGNAM}-${VERSION}-source-code ${PRGNAM}-${VERSION} || true cd ${PRGNAM}-${VERSION} chown -R root.root * @@ -146,9 +150,10 @@ echo "Building ..." cd Linux # Patches first: patch -p0 < $SRCDIR/${PATCH0} 2>&1 | tee $OUTPUT/patch-${PRGNAM}.log -(cd Kernel && patch -p3 < $SRCDIR/${PATCH1} 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log) +#(cd Kernel && patch -p3 < $SRCDIR/${PATCH1} 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log) CFLAGS="$SLKCFLAGS" \ +KERNEL_VER=$KVER KERNEL_SRC=$KSRC \ ./build.sh 2>&1 | tee $OUTPUT/build-${PRGNAM}.log # Run a test @@ -259,12 +264,12 @@ fi # Build the package: cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}_${KVER}-${ARCH}-${BUILD}.tgz \ +makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}_$(echo $KVER | tr - _)-${ARCH}-${BUILD}.tgz \ 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log -(cd $OUTPUT && md5sum ${PRGNAM}-${VERSION}_${KVER}-${ARCH}-${BUILD}.tgz > ${PRGNAM}-${VERSION}_${KVER}-${ARCH}-${BUILD}.tgz.md5) -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}_${KVER}-${ARCH}-${BUILD}.txt +(cd $OUTPUT && md5sum ${PRGNAM}-${VERSION}_$(echo $KVER | tr - _)-${ARCH}-${BUILD}.tgz > ${PRGNAM}-${VERSION}_$(echo $KVER | tr - _)-${ARCH}-${BUILD}.tgz.md5) +cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}_$(echo $KVER | tr - _)-${ARCH}-${BUILD}.txt if [ -f $PKG/install/slack-required ]; then - cat $PKG/install/slack-required > $OUTPUT/${PRGNAM}-${VERSION}_${KVER}-${ARCH}-${BUILD}.dep + cat $PKG/install/slack-required > $OUTPUT/${PRGNAM}-${VERSION}_$(echo $KVER | tr - _)-${ARCH}-${BUILD}.dep fi -- cgit v1.2.3-79-gdb01