debootstrap: adding mkbuild

git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@2136 370017ae-e619-0410-ac65-c121f96126d4

2 files changed, 181 insertions, 58 deletions

diff --git a/dev/util/debootstrap/Manifest b/dev/util/debootstrap/Manifest
new file mode 100644
index 00000000..6ec9f344
--- /dev/null
+++ b/dev/util/debootstrap/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST debootstrap_1.0.12_all.deb 53458 MD5 51a03d2712a718387bb62cb56cf1c0b2 RMD160 9ee970cf2cdb9d6d25da1503c496aa917a31835b SHA1 ed35a15dcf3a771fa143670516fe958abaf63311 SHA256 06dc356281fe5c19dd1c1ac8fca795cf71948abc6edefab0c284d264de9a0fa3 SHA512 f1fb1b51c7a7888345894a7dc0182b9f0f91f9ee1cd462923edf29e6c558a7f1ce30a28ce7a5045c48fcfd4fbb46514ed1f35270b2153bede701296ff4684337
+MKBUILD debootstrap.mkbuild 5250 MD5 9caab839b33c72848f4319da1e422b3f RMD160 fd443cc99a9314dd8d8c33e655f9455143f61ae5 SHA1 a7885e3da95580cc02d9c4a164eebe92b49b0af4 SHA256 b0691dafd1e3ec6863c14b2f3d7081f3ae943a25004dbb8b19fb5d2391d11d2a SHA512 fa24956ebcad1bbd02abfe2a603460afe551367642cfb387b7b451929cb29bd446a4215113ae3977b0744a9e1e658d5e4e8cf15170983e38876a94672a20cdbd
+SLACKBUILD debootstrap.SlackBuild 6456 MD5 0f3a897ce7e3eddd4d94d2c4c328a58a RMD160 aa64e2c4da68ade098bb08b4b7a8ddedd4ca122e SHA1 8a00d61aaeb8feb2bdac7272c94209c2c93efb6f SHA256 53089414136444d9fd0b3532d8b213f3f6c8ba57f6e05f9e15712b6307c3ebdb SHA512 350519513d1cd0dba4c7bdd4576fa6bff2e5d15a0b38500ec5fdc53ab661bc92c2a4df7bb3965634872016cddf322bbcb2bb33364dece2070fa7a6e2bac3c287
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ1UIkAAoJEEHL93ESzgeieYMP/iT6IqEdeXvJZOBuZZoj4nLw
+OEON1UHR6N/vru6JK7KyinEXE+d9VRIe8eJn+a6ShludRPruplemSimQqOXQLIOt
+tYey7ml5JLiN5Sp4GnZzIeQRGLIRtDK+gCHajF7QFCx6lPkaeSwo2fWiHpFHJ6xG
+rIQuB44o+VYm6qQEGUF/SnmoOOBevchpQGbxZqnpCuAtcdJx7Y8M3xalrDgy5rD9
+557kv7yM9B0yZG9Q4T5VUowbMsDrEvQU3A4qGiPDIJ/QYrmFXm+vt5/SQj+hd6s3
+TrPejgieYI5uDCdLUzUggQG0BElbWf/AJq61nSFxgYGgiZU8HOiIkwtAAdygqUTu
+bZu+dgaIaRiqp421Ub6BcXD5uXA4ZWWpJP258ol1ACako7FODrYWmEBShW2ucSaB
+ita8L+FXwCS3VJH+PVH1vlsPWp4P/+KVQ9vf6UcPAR0iwVVUoodIkwNpfDcqTizZ
+RHKoGnTekvCGSP7rcy49pu9W0DZ0fSx/DfdtVpV5mvMBSKeTsWkMkYUiZo94DtSO
+qSMMAIfVQjiiH4et2HGPohbZaqqr2r6cBr/DsHDljgtNcDjOKPKB245/SVBOnSBO
+8v5IvGlnJxXv/DdXO0VureGO22A8bS0xMN1zp+oobv6rgzecu6fGyZ+8Vf1/rffa
+XQKPCdYSoVBKwr11Pgrx
+=NwES
+-----END PGP SIGNATURE-----
diff --git a/dev/util/debootstrap/debootstrap.SlackBuild b/dev/util/debootstrap/debootstrap.SlackBuild
index 1eab13cc..c7db097d 100755
--- a/dev/util/debootstrap/debootstrap.SlackBuild
+++ b/dev/util/debootstrap/debootstrap.SlackBuild
@@ -1,91 +1,188 @@
 #!/bin/bash
 #
-#  debootstrap.SlackBuild is free software; you can redistribute it and/or modify it under the
-#  terms of the GNU General Public License as published by the Free Software
-#  Foundation; either version 2 of the License, or any later version.
+#  debootstrap.SlackBuild is free software; you can redistribute
+#  it and/or modify it under the terms of the GNU General Public License as
+#  published by the Free Software Foundation; either version 2 of the License,
+#  or any later version.
 #
-#  debootstrap.SlackBuild is distributed in the hope that it will be useful, but WITHOUT ANY
-#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-#  A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#  debootstrap.SlackBuild is distributed in the hope that it will
+#  be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+#  Public License for more details.
 #
-#  You should have received a copy of the GNU General Public License along with
-#  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-#  Place - Suite 330, Boston, MA 02111-1307, USA
+#  You should have received a copy of the GNU General Public License along
+#  with this program; if not, write to the Free Software Foundation, Inc.,
+#  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
-# slackbuild script for debootstrap
-# by rhatto at riseup.net
+# slackbuild for debootstrap, by Silvio Rhatto
+# requires:  
+# tested: debootstrap-1.0.12
+# model: generic.mkSlackBuild $Rev: 805 $
 #
 
-if [ -s "slack-required" ]; then
-  echo Recomended and required packages for building debootstrap are:
-  cat slack-required | sed -e 's/^/\t/'
-  if [ "$INTERACT" != "no" ]; then
-    echo If you dont have those installed, press Ctrl-C. Otherwise, hit ENTER.
-    read crap
-#  else
-#    echo Sleeping 3 seconds...
-#    sleep 3
-  fi
-fi
-
-CWD="`pwd`"
-
+# Look for slackbuildrc
 if [ -f ~/.slackbuildrc ]; then
   source ~/.slackbuildrc
 elif [ -f /etc/slackbuildrc ]; then
   source /etc/slackbuildrc
 fi
 
-# default settings
-PACKAGE="debootstrap"
+# Set variables
+CWD="$(pwd)"
+SRC_NAME="debootstrap"
+PKG_NAME="debootstrap"
 ARCH="noarch"
-VERSION=${VERSION:=0.3.3.1}
+SRC_VERSION=${VERSION:=1.0.12}
+PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1rha}
-SRC_DIR=${SRC:=$CWD}
+SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
+PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="dev/util/debootstrap"}
+PREFIX=${PREFIX:=/usr}
+PKG_WORK="$TMP/$SRC_NAME"
+CONF_OPTIONS=${CONF_OPTIONS:=""}
+NUMJOBS=${NUMJOBS:=""}
+
+# Set system libraries' path and optmization flags based on $ARCH
+LIBDIR="$PREFIX/lib"
+
+if [ "$ARCH" = "i386" ]; then
+  SLKCFLAGS="-O2 -march=i386 -mtune=i686"
+elif [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686"
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIR="$PREFIX/lib64"
+  LDFLAGS="-L/lib64 -L/usr/lib64"
+fi
 
-# -------  error codes for createpkg  --------------
+# Set error codes (used by createpkg)
 ERROR_WGET=31;      ERROR_MAKE=32;      ERROR_INSTALL=33
 ERROR_MD5=34;       ERROR_CONF=35;      ERROR_HELP=36
 ERROR_TAR=37;       ERROR_MKPKG=38;     ERROR_GPG=39
-ERROR_PATCH=40
+ERROR_PATCH=40;     ERROR_VCS=41;       ERROR_MKDIR=42
+ERROR_MANIFEST=43;
 
-RTOOL="wget"
-SRC="debootstrap_"$VERSION"_all.deb"
-URL="http://ftp.debian.org/debian/pool/main/d/debootstrap/$SRC"
+# Clean up any leftovers of previous builds
+rm -rf "$PKG_WORK" 2> /dev/null
+rm -rf "$PKG" 2> /dev/null
 
-SRC_DIR="$SRC_DIR/$PACKAGE"
-mkdir -p $SRC_DIR
+# Create directories if necessary
+mkdir -p "$SRC_DIR" || exit $ERROR_MKDIR
+mkdir -p "$PKG" || exit $ERROR_MKDIR
+mkdir -p "$REPOS" || exit $ERROR_MKDIR
+mkdir -p "$PKG_WORK" || exit $ERROR_MKDIR
 
-if [ "$RTOOL" == "wget" ] && [ ! -f "$SRC_DIR/$SRC" ]; then
+# Dowload source if necessary
+SRC="$SRC_NAME"_"$VERSION"_all".deb"
+URL="http://ftp.debian.org/debian/pool/main/d/debootstrap//$SRC"
+
+if [ ! -s "$SRC_DIR/$SRC" ] || ! ar  "$SRC_DIR/$SRC" 2> /dev/null; then
   wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
 fi
 
-TMP="$TMP/$PACKAGE"
-rm -rf $TMP
-mkdir -p $TMP
-cd $TMP
-
-ar -x $SRC_DIR/$SRC || exit $ERROR_TAR
+# Check Manifest file
+if [ -e "$CWD/Manifest" ]; then
 
-CWD="`pwd`"
-mkdir $TMP/package-$PACKAGE
-cd $TMP/package-$PACKAGE
+  # Manifest signature checking
+  if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+    echo "Checking Manifest signature..."
+    gpg --verify $CWD/Manifest
+    if [ "$?" != "0" ]; then
+      exit $ERROR_MANIFEST
+    fi
+  fi
 
-tar xvf $CWD/data.tar.gz || exit $ERROR_TAR
-cd $TMP/package-$PACKAGE
+  MANIFEST_LINES="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | wc -l`"
+
+  for ((MANIFEST_COUNT=1; MANIFEST_COUNT <= $MANIFEST_LINES; MANIFEST_COUNT++)); do
+
+    MANIFEST_LINE="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | head -n $MANIFEST_COUNT | tail -n 1`"
+    MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`"
+    MANIFEST_FILE_TYPE="`echo $MANIFEST_LINE | awk '{ print $1 }'`"
+
+    if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then
+      MANIFEST_FILE="$SRC_DIR/$MANIFEST_FILE"
+    else
+      MANIFEST_FILE="`find $CWD -name $MANIFEST_FILE`"
+    fi
+
+    if [ ! -e "$MANIFEST_FILE" ] || [ -d "$MANIFEST_FILE" ]; then
+      continue
+    fi
+
+    echo "Checking Manifest for $MANIFEST_FILE_TYPE $MANIFEST_FILE integrity..."
+
+    SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`"
+    SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`"
+
+    # Check source code size
+    if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then
+      echo "SIZE Manifest: $SIZE_MANIFEST; SIZE $SRC: $SIZE_SRC"
+      exit $ERROR_MANIFEST
+    else
+      echo "Size match."
+    fi
+
+    # Check source code integrity
+    for ALGO in md5 rmd160 sha1 sha256 sha512; do
+      if [ $ALGO = "rmd160" ]; then
+        ALGO_SRC="`openssl rmd160 $MANIFEST_FILE | awk '{ print $2 }'`"
+      else
+        ALGO_SRC="`"$ALGO"sum $MANIFEST_FILE | awk '{ print $1 }'`"
+      fi
+      ALGO="`echo $ALGO | tr '[:lower:]' '[:upper:]'`"
+      ALGO_MANIFEST=$(echo $MANIFEST_LINE | sed "s/.* $ALGO //" | awk '{ print $1 }')
+      if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
+        echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
+        exit $ERROR_MANIFEST
+      else
+        echo "$ALGO match."
+      fi
+    done
+
+  done
+
+else
+  exit $ERROR_MANIFEST
+fi
 
-mkdir install
-cat << EOF > install/slack-desc
+# Untar
+cd "$PKG_WORK"
+ar -x "$SRC_DIR/$SRC" || exit $ERROR_TAR
+PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
+
+# Install
+mkdir -p $PKG
+cd $PKG
+tar xvf $PKG_WORK/data.tar.gz || exit $ERROR_TAR
+mv usr/share/doc/debootstrap usr/share/doc/debootstrap-$PKG_VERSION
+
+# 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
+)
+
+# Add package description (slack-desc)
+mkdir -p "$PKG/install" || exit $ERROR_MKDIR
+cat << EODESC > "$PKG/install/slack-desc"
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# The "handy ruler" below makes it easier to edit a package description. Line
 # up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
+# on the right side marks the last column you can put a character in. You must
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-           |-----handy-ruler-----------------------------------------------------|
+           |-----handy-ruler--------------------------------------------------|
 debootstrap: debootstrap
 debootstrap:
 debootstrap: Debian bootstrap scripts.
@@ -97,11 +194,14 @@ debootstrap:
 debootstrap:
 debootstrap:
 debootstrap:
-EOF
+EODESC
 
-makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz || exit $ERROR_MKPKG
+# Build the package
+cd "$PKG"
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
-if [ "$CLEANUP" == "yes" ]; then
-  rm -rf $TMP
+# Delete source and build directories if requested
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
+  rm -rf "$PKG_WORK" "$PKG"
 fi
-