Updated for Slackware 12.0

1 files changed, 187 insertions, 106 deletions

diff --git a/partimage/build/partimage.SlackBuild b/partimage/build/partimage.SlackBuild
index b4ca6385..ce9b9000 100755
--- a/partimage/build/partimage.SlackBuild
+++ b/partimage/build/partimage.SlackBuild
@@ -1,40 +1,58 @@
 #!/bin/sh
 # $Id$
-# Copyright (c) 2006 Eric Hameleers <alien@slackware.com>
-# Distributed under the terms of the GNU General Public License, Version 2
+# Copyright (c) 2005,2006,2008 Eric Hameleers <alien@slackware.com>
+# All rights reserved.
+#
+#   Permission to use, copy, modify, and distribute this software for
+#   any purpose with or without fee is hereby granted, provided that
+#   the above copyright notice and this permission notice appear in all
+#   copies.
+#
+#   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+#   WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+#   IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
+#   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+#   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+#   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+#   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+#   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+#   SUCH DAMAGE.
 # -----------------------------------------------------------------------------
 #
 # Slackware SlackBuild script 
 # ===========================
-# By:        Eric Hameleers <alien@slackware.com>
-# For:       partimage
-# URL:       http://partimage.org/
-# Needs:     
-# Changelog:
+# By:         Eric Hameleers <alien@slackware.com>
+# For:        partimage
+# Descr:      make disk image backups
+# URL:        http://partimage.org/
+# Needs:      newt, slang (static version!)
+# Changelog:  
 # 0.6.4-1:   07/aug/2005 by Eric Hameleers <alien@sox.homeip.net>
 #            * Initial build.
 # 0.6.4-2:   08/aug/2005 by Eric Hameleers <alien@sox.homeip.net>
 #            * Forgot to set partimag ownership in /etc/partimaged;
 #              Also added an easy way for the package to be re-built witout
 #              SSL or client-logins (look for USESSL and USERLOGONS below).
+# 0.6.6-1:    26/Jan/2008 by Eric Hameleers <alien@slackware.com>
+#             * Update. Slackware 12.0 no longer comes with the static
+#               library for libslang, so a recompile of the slang package
+#               was needed.
 # 
-# Run 'sh SlackBuild --cleanup' to build a Slackware package.
+# Run 'sh partimage.SlackBuild --cleanup' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
 # Install using 'installpkg'. 
 #
 # -----------------------------------------------------------------------------
 
-# --- INIT ---
 # Set initial variables:
-CWD=`pwd`
-if [ "$TMP" = "" ]; then
-  TMP=/tmp
-fi
 
 PRGNAM=partimage
-VERSION=0.6.4
+VERSION=${VERSION:-0.6.6}
 ARCH=${ARCH:-i486}
-BUILD=2
+BUILD=${BUILD:-1}
 
 # Define the behaviour of the partimage binaries:
 # Define 'USESSL=no' if you don't want mandatory SSL connections between client
@@ -44,25 +62,93 @@ BUILD=2
 USESSL=yes
 USERLOGONS=yes
 
-if [ "$ARCH" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
-elif [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2"
-fi
+# Where do we look for sources?
+CWD=$(pwd)
+SRCDIR=$(dirname $0)
+[ "${SRCDIR:0:1}" == "." ] && SRCDIR=${CWD}/${SRCDIR}
 
+# Place to build (TMP) package (PKG) and output (OUTPUT) the program:
+TMP=${TMP:-/tmp/build}
 PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+# Input URL: http://downloads.sourceforge.net/partimage/partimage-0.6.6.tar.bz2
+SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.bz2"
+SRCURL="http://downloads.sourceforge.net/${PRGNAM}/${PRGNAM}-${VERSION}.tar.bz2"
+
+##
+## --- with a little luck, you won't have to edit below this point --- ##
+##
+
+# Exit the script on errors:
+set -e
+trap 'echo "$0 FAILED at line ${LINENO}" | tee $OUTPUT/error-${PRGNAM}.log' ERR
+# Catch unitialized variables:
+set -u
+P1=${1:-1}
+
+# Slackware 11 and up need other option (gcc > 3.3.x)
+if [ $(gcc -dumpversion | tr -d  '.' |cut -c 1-2) -gt 33 ]; then
+  MOPT=tune
+else
+  MOPT=cpu
+fi
 
-if [ ! -d $TMP/tmp-$PRGNAM ]; then
-  mkdir -p $TMP/tmp-$PRGNAM # location to build the source
+case "$ARCH" in
+  i386)      SLKCFLAGS="-O2 -march=i386 -m${MOPT}=i686"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
+  i486)      SLKCFLAGS="-O2 -march=i486 -m${MOPT}=i686"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
+  s390)      SLKCFLAGS="-O2"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
+  powerpc)   SLKCFLAGS="-O2"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
+  x86_64)    SLKCFLAGS="-O2 -fPIC"
+             SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64"
+             ;;
+  athlon-xp) SLKCFLAGS="-march=athlon-xp -O3 -pipe -fomit-frame-pointer"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
+esac
+
+# Create working directories:
+mkdir -p $OUTPUT          # place for the package to be saved
+mkdir -p $TMP/tmp-$PRGNAM # location to build the source
+mkdir -p $PKG             # place for the package to be built
+rm -rf $PKG/*             # always erase old package's contents
+if [ "$P1" != "--oldbuild" ]; then
+  # Use the "--oldbuild" parameter to keep old build files and continue;
+  # By default we remove the remnants of previous build and continue.
+  rm -rf $TMP/tmp-$PRGNAM/*
 fi
-if [ ! -d $PKG ]; then
-  mkdir -p $PKG # place for the package to be built
+
+# Source file availability:
+if ! [ -f ${SOURCE} ]; then
+  if ! [ "x${SRCURL}" == "x" ]; then
+    # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT
+    [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/$(basename $SOURCE)"
+    echo "Source '$(basename ${SOURCE})' not available yet..."
+    echo "Will download file to $(dirname $SOURCE)"
+    wget -nv -T 20 -O "${SOURCE}" "${SRCURL}" || true
+    if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then
+      echo "Downloading '$(basename ${SOURCE})' failed... aborting the build."
+      mv -f "${SOURCE}" "${SOURCE}".FAIL
+      exit 1
+    fi
+  else
+    echo "File '$(basename ${SOURCE})' not available... aborting the build."
+    exit 1
+  fi
 fi
 
+if [ "$P1" == "--download" ]; then
+  echo "Download complete."
+  exit 0
+fi
 
 # --- PACKAGE BUILDING ---
 
@@ -70,115 +156,110 @@ echo "++"
 echo "|| $PRGNAM-$VERSION"
 echo "++"
 
-rm -rf $PKG/*
-
-cd $PKG
-
 # Explode the package framework:
-if [ -f $CWD/_$PRGNAM.tar.gz ]; then
-  explodepkg $CWD/_$PRGNAM.tar.gz
+if [ -f $SRCDIR/_$PRGNAM.tar.gz ]; then
+  cd $PKG
+  explodepkg $SRCDIR/_$PRGNAM.tar.gz
+  cd -
 fi
 
 cd $TMP/tmp-$PRGNAM
-
-
-# --- TARBALL EXTRACTION,PATCH,MODIFY ---
-
-echo "Extracting the program tarball for $PRGNAM..."
-tar -xjvf $CWD/${PRGNAM}-${VERSION}.tar.bz2
-
+echo "Extracting the source archive(s) for $PRGNAM..."
+if $(file ${SOURCE} | grep -q ": bzip2"); then
+  tar -xjvf ${SOURCE}
+elif $(file ${SOURCE} | grep -q ": gzip"); then
+  tar -xzvf ${SOURCE}
+fi
 cd ${PRGNAM}-${VERSION}
-patch -p0 < $CWD/partimage_makefile.patch
-
-cp $CWD/mkinstalldirs .
-chmod +x mkinstalldirs
-
-chown -R root.root *
-find . -perm 777 -exec chmod 755 {} \;
+patch -p0 < $SRCDIR/partimage_makefile.patch \
+  2>&1 | tee $OUTPUT/patch-${PRGNAM}.log
+chown -R root:root .
+chmod -R u+w,go+r-w,a-s .
 
+[ "$USERLOGONS" = "no" ] && CONFIGLOGON="--disable-login" ||   CONFIGLOGON=""
 
-# --- BUILDING ---
+# The libdl functions are apparently only available from shared libraries.
+# When linking against libcrypto.a the libdl shared lib should be mentioned
+# after that, and partimaged's configure command places '-ldl' too early
+# in the commandline:
+sed -i -e "s/libcrypto.a/libcrypto.a -ldl/g" configure
 
 echo Building ...
-
-[ "$USERLOGONS" = "no" ] && CONFIGLOGON="--disable-login" ||   CONFIGLOGON=""
-
+LDFLAGS="$SLKLDFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
 CFLAGS="$SLKCFLAGS" \
 ./configure --prefix=/usr \
+            --libdir=/usr/lib${LIBDIRSUFFIX} \
             --localstatedir=/var \
             --sysconfdir=/etc \
+            --mandir=/usr/man \
             --enable-all-static \
             --enable-ssl=${USESSL} \
             ${CONFIGLOGON} \
-            2>&1 | tee $CWD/configure-${PRGNAM}.log
-make 2>&1 | tee $CWD/make-${PRGNAM}.log
+            --program-prefix="" \
+            --program-suffix="" \
+            --build=$ARCH-slackware-linux \
+            2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
+make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
 
-#
 # Install all the needed stuff to the package dir
-#
-# Use installwatch if available:
-which installwatch > /dev/null 2>&1
-if [ $? == 0 ]; then
-  installwatch -o $CWD/install-${PRGNAM}.log make DESTDIR=$PKG install
+# Use installwatch if available, to produce a logfile of the installation
+# process that is more easily readable:
+if $(which installwatch > /dev/null 2>&1); then
+  installwatch -o $OUTPUT/install-${PRGNAM}.log make DESTDIR=$PKG install
 else
-  make DESTDIR=$PKG install 2>&1 |tee $CWD/install-${PRGNAM}.log
+  make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
 fi
 
-
-# --- DOCUMENTATION ---
-
-DOCS="AUTHORS BOOT* BUGS COPYING ChangeLog FORMAT FUTURE INSTALL PACKAGES \
-        README* ROADMAP SURVEY TESTS THANKS TODO \
-        $CWD/00README.slackware $CWD/makecertificate.sh"
-
+# Add documentation:
+DOCS="ABOUT-NLS AUTHORS BOOT* BUGS COPYING ChangeLog FORMAT FUTURE INSTALL \
+      PACKAGES README* ROADMAP SURVEY TESTS THANKS TODO \
+      $SRCDIR/00README.slackware $SRCDIR/makecertificate.sh"
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS \
-      $PKG/usr/doc/$PRGNAM-$VERSION
-chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/*
-
-# Move incorrectly installed man pages, if any
-[ -d $PKG/usr/share/man ] && \
-  mv $PKG/usr/share/man $PKG/usr/ && rmdir $PKG/usr/share
-# Compress the man page(s)
-[ -d $PKG/usr/man ] && find $PKG/usr/man -type f -exec gzip -9f {} \;
-
-# Strip binaries
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
-
-
-# --- OWNERSHIP, RIGHTS ---
-
-chmod -R o-w $PKG
-chown root:bin $PKG/usr/bin/* $PKG/usr/sbin/* $PKG/bin/* $PKG/sbin/* \
-               $PKG/usr/X11R6/bin/* $PKG/opt/kde/bin/* 2>/dev/null
-
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
+find $PKG/usr/doc -type f -exec chmod 644 {} \;
+
+# Man pages are not installed by default:
+mkdir -p $PKG/usr/man/man{1,5,8}
+cp doc/en/man/partimage.1 $PKG/usr/man/man1
+cp doc/en/man/partimagedusers.5 $PKG/usr/man/man5
+cp doc/en/man/partimaged.8 $PKG/usr/man/man8
+
+# Compress the man page(s):
+if [ -d $PKG/usr/man ]; then
+  find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \;
+  for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+fi
 
-# --- PACKAGE DESCRIPTION ---
+# Strip binaries:
+cd $PKG
+find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+cd -
 
+# Add a package description:
 mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-if [ -f $CWD/doinst.sh ]; then
-  cat $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $SRCDIR/slack-desc > $PKG/install/slack-desc
+if [ -f $SRCDIR/doinst.sh ]; then
+  cat $SRCDIR/doinst.sh >> $PKG/install/doinst.sh
+fi
+if [ -f $SRCDIR/slack-required ]; then
+  cat $SRCDIR/slack-required > $PKG/install/slack-required
 fi
-
-
-# --- BUILDING ---
 
 # Build the package:
 cd $PKG
-makepkg --linkadd y --chown n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz \
-  2>&1 | tee $CWD/makepkg-${PRGNAM}.log
-(cd $TMP && md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz.md5)
-cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txt
-
-
-# --- CLEANUP ---
+makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
+cd $OUTPUT
+md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz.md5
+cd -
+cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txt
+if [ -f $PKG/install/slack-required ]; then
+  cat $PKG/install/slack-required > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.dep
+fi
 
 # Clean up the extra stuff:
-if [ "$1" = "--cleanup" ]; then
+if [ "$P1" = "--cleanup" ]; then
   rm -rf $TMP/tmp-$PRGNAM
   rm -rf $PKG
 fi