kino: updating to 1.3.2 and adding Manifest

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

3 files changed, 211 insertions, 79 deletions

diff --git a/mail/mta/ssmtp/Manifest b/mail/mta/ssmtp/Manifest
index cf0cc0eb..a693da2c 100644
--- a/mail/mta/ssmtp/Manifest
+++ b/mail/mta/ssmtp/Manifest
@@ -1,3 +1,4 @@
-DIST sstmp_VERSION.orig.tar.gz 53341 MD5 957e6fff08625fe34f4fc33d0925bbc9 RMD160 da76ee6dd86fc663e6fd69fcb2fb5f550f716de7 SHA1 bc4b6c20bf8c2c9e66b359e3c24545a2615a1988 SHA256 2151ad18cb73f9a254f796dde2b48be7318b45410b59fedbb258db5a41044fb5 SHA512 d359da461aa8e78fd274de7787f5b682ec53b71bc077e015ea268741a79d0c82849b94543c7c4caa6ad6c97366be0077bfa3e9fb765f2097dd76ca9e1d6ba413
-MKBUILD ssmtp.mkbuild 4316 MD5 0052b417fb0697f346c5735cf48956cb RMD160 2a6ae028d7136efd9b00867a60ef210b9d97ef2e SHA1 e7e837b5b54b0c0471878e6afb1009a135690e8e SHA256 bbc9c0d81b91d13459aa8f5a50173f470141d2a310787c736ef941cd05906f8e SHA512 0217afc638d4c010eeb76f6078502f64449b8702de7a38918f55486b3f4ff71d57c22f65e19a600784c7b5b6d9e0e7f1fe9705d5e85af1c6060abb9d28bf82c6
-SLACKBUILD sstmp.SlackBuild 8230 MD5 5061a3189178abc5b2ef40ed859f7aff RMD160 27dc5ced1e8f3e9f304648622254967a7a044c5c SHA1 32a53b4a1fe9dd2ef3c14eacebfdb220a5e23888 SHA256 8aa7b1d33973ae4761f09aaaa5c7de4f21ef3fc99bbc7ca026c97d3fcd7b57f6 SHA512 be90a0c279dde6da78bf83843ab1be12fa075d9704b8a310bb56d4fee834a39c886c6ed149338bd07ab25b06af389e0d180f3ebebae95775201344287872d8d3
+DIST ssmtp_6.61.orig.tar.gz 53341 MD5 957e6fff08625fe34f4fc33d0925bbc9 RMD160 da76ee6dd86fc663e6fd69fcb2fb5f550f716de7 SHA1 bc4b6c20bf8c2c9e66b359e3c24545a2615a1988 SHA256 2151ad18cb73f9a254f796dde2b48be7318b45410b59fedbb258db5a41044fb5 SHA512 d359da461aa8e78fd274de7787f5b682ec53b71bc077e015ea268741a79d0c82849b94543c7c4caa6ad6c97366be0077bfa3e9fb765f2097dd76ca9e1d6ba413
+MKBUILD ssmtp.mkbuild 4297 MD5 8a94b79da3af88ce5644290fa83fbaaf RMD160 f166dfb218b0c4525ced5bce97004d5fa640c698 SHA1 b75b3fd3d0bae067f95779dd2e85f102dc76e32a SHA256 c5524ff781b2b420047ee6c776482f79db6b0f0e069c8043ad113d470a14b394 SHA512 1d1154d35da725bcd9a67f61d4611b5eae9c748a53d9ab6759cdd851a0933111a502e1994e33837f30be40b68009c761dddf20882c1733114ce3b8f9be094910
+SLACKBUILD ssmtp.SlackBuild 8211 MD5 50558cfa58a402300e5815caf1044ed5 RMD160 9841c8f6c5c5a96e04c866ba12cc2e1550dffc11 SHA1 eeec9f7ea222d8d89198fc2af0fb44bb9baf3b38 SHA256 aab7e708f85bc90cbc58b3396cb45dd1362862aa24dfbbbb409da918139eae81 SHA512 4e7fcd1114b7599c24d4b94c5cc61c569f0204689e4713b3228e716fbcd74a194a8a21dd5078d652c74d661f635f5396cf9e6f619a92c08608b8fd6f319bdc92
+SLACKBUILD sstmp.SlackBuild 8231 MD5 04141d8dbab003cb71557e76bdb54cb0 RMD160 f977ca5092f960f063bb070c8c1ba12e945d27dc SHA1 dc5a8cf1edce719ea8c28b979da41484565aca4e SHA256 4731651f864654353f703b23c124b56c237a1af2f71e4020b53cc67c6e9e5e25 SHA512 17a037db335ce35095d44bd294340bc5127d11b7bf72d7b0cd0cee9e275dc7616d4067b74e18bb03b48dc44a43afd6001c37c76e1f33d4835960fb468e01e567
diff --git a/mail/mta/ssmtp/ssmtp.SlackBuild b/mail/mta/ssmtp/ssmtp.SlackBuild
index b4285343..76d5c523 100755
--- a/mail/mta/ssmtp/ssmtp.SlackBuild
+++ b/mail/mta/ssmtp/ssmtp.SlackBuild
@@ -1,96 +1,198 @@
 #!/bin/bash
 #
-#  ssmtp.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.
+#  ssmtp.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.
 #
-#  ssmtp.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.
+#  ssmtp.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 ssmtp
-# by rhatto at riseup.net
+# slackbuild for ssmtp, by Silvio Rhatto
+# requires:  
+# tested: ssmtp-6.61
 #
 
-CWD="`pwd`"
-
+# Look for slackbuildrc
 if [ -f ~/.slackbuildrc ]; then
   source ~/.slackbuildrc
 elif [ -f /etc/slackbuildrc ]; then
   source /etc/slackbuildrc
 fi
 
-# default settings
-PACKAGE="ssmtp"
+# Set variables
+CWD="$(pwd)"
+SRC_NAME="ssmtp"
+PKG_NAME="ssmtp"
 ARCH=${ARCH:=i486}
-VERSION=${VERSION:=2.61}
-BUILD=${BUILD:=4rha}
-SRC_DIR=${SRC:=$CWD}
+SRC_VERSION=${VERSION:=6.61}
+PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
+BUILD=${BUILD:=1rha}
+SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
+PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+PREFIX=${PREFIX:=/usr}
+PKG_WORK="$TMP/$SRC_NAME"
+CONF_OPTIONS=${CONF_OPTIONS:=""}
+NUMJOBS=${NUMJOBS:=""}
 
-if [ "$ARCH" == "x86_64" ]; then
-  LIBDIR=/usr/lib64
-else
-  LIBDIR=/usr/lib
+# 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
 
-RTOOL="wget"
-PACKAGE_EXT="gz"
-SRC="$PACKAGE"_"$VERSION.orig.tar.$PACKAGE_EXT"
-URL="http://ftp.debian.org/debian/pool/main/s/ssmtp/$SRC"
+# 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_VCS=41;       ERROR_MKDIR=42
+ERROR_MANIFEST=43;
 
-if [ "$PACKAGE_EXT" == "bz2" ]; then
-  tarflag="j"
-else
-  tarflag="z"
-fi
+# Clean up any leftovers of previous builds
+rm -rf "$PKG_WORK" 2> /dev/null
+rm -rf "$PKG" 2> /dev/null
+
+# 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
 
-SRC_DIR="$SRC_DIR/$PACKAGE"
-mkdir -p $SRC_DIR
+# Dowload source if necessary
+SRC="$SRC_NAME"_"$VERSION.orig.tar.gz"
+URL="http://ftp.de.debian.org/debian/pool/main/s/ssmtp/$SRC"
 
-if [ "$RTOOL" == "wget" ] && [ ! -f "$SRC_DIR/$SRC" ]; then
-  wget "$URL" -O "$SRC_DIR/$SRC"
+if [ ! -s "$SRC_DIR/$SRC" ] || ! gunzip -t "$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/package-$PACKAGE
-cd $TMP
+# Check Manifest file
+if [ -e "$CWD/Manifest" ]; then
+
+  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..."
 
-tar xvf$tarflag $SRC_DIR/$SRC
-cd $PACKAGE-$VERSION
-./configure --prefix=/usr --sysconfdir=/etc --libdir=$LIBDIR
-make || exit 32
+    SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`"
+    SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`"
 
-CWD="`pwd`"
+    # 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
 
-cd $TMP/package-$PACKAGE
+    # 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
 
-mkdir -p usr/{sbin,man/man8}
-mkdir -p etc/ssmtp
+  done
 
-cp $CWD/ssmtp usr/sbin ; chmod 755 usr/sbin/ssmtp
-cp $CWD/ssmtp.8 usr/man/man8 ; chmod 644 usr/man/man8/ssmtp.8
-cp $CWD/ssmtp.conf etc/ssmtp/ssmtp.conf.new
-cp $CWD/revaliases etc/ssmtp/revaliases.conf.new
+else
+  exit $ERROR_MANIFEST
+fi
+
+# Untar
+cd "$PKG_WORK"
+tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
+PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
+cd "$PKG_SRC"
+
+# Configure
+CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  ./configure \
+  --prefix="$PREFIX" --libdir="$LIBDIR" $CONF_OPTIONS || exit $ERROR_CONF
+
+# Compile
+make $NUMJOBS || exit $ERROR_MAKE
+
+# Install
+mkdir -p $PKG/usr/{sbin,man/man8}
+mkdir -p $PKG/etc/ssmtp
+cp ssmtp $PKG/usr/sbin ; chmod 755 $PKG/usr/sbin/ssmtp
+cp ssmtp.8 $PKG/usr/man/man8 ; chmod 644 $PKG/usr/man/man8/ssmtp.8
+cp ssmtp.conf $PKG/etc/ssmtp/ssmtp.conf.new
+cp revaliases $PKG/etc/ssmtp/revaliases.conf.new
 
-strip --strip-unneeded usr/sbin/ssmtp
+# 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
+)
 
-mkdir install
-cat << EOF > install/slack-desc
+# Install documentation
+DOCS="CHANGELOG_OLD COPYING INSTALL README TLS"
+mkdir -p "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR
+for doc in $DOCS; do
+  if [ -f "$doc" ]; then
+    cp -a $doc "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION"
+  fi
+done
+
+# 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--------------------------------------------------------|
 ssmtp: ssmtp (extremely simple MTA)
 ssmtp:
 ssmtp: This is sSMTP, a program that replaces sendmail on workstations
@@ -102,27 +204,56 @@ ssmtp: one.
 ssmtp:
 ssmtp:
 ssmtp:
-EOF
+EODESC
 
-# docs
-mkdir -p usr/doc/$PACKAGE-$VERSION
+# Add a post-installation script (doinst.sh)
+mkdir -p "$PKG/install" || exit $ERROR_MKDIR
+cat << EOSCRIPT > "$PKG/install/doinst.sh"
+config() {
+  NEW="\$1"
+  OLD="\$(dirname \$NEW)/\$(basename \$NEW .new)"
+  OLD="\$(dirname \$NEW)/\$(basename \$OLD .sample)"
+  OLD="\$(dirname \$NEW)/\$(basename \$OLD .dist)"
 
-for file in CHANGELOG_OLD COPYING INSTALL README TLS; do 
-  cp $CWD/$file* usr/doc/$PACKAGE-$VERSION/
-done
+  # If there's no config file by that name, mv it over:
+  if [ ! -r \$OLD ]; then
+    mv \$NEW \$OLD
+  elif [ "\$(cat \$OLD | md5sum)" = "\$(cat \$NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm \$NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
 
-# install script
-echo '( if [ ! -f "etc/ssmtp/ssmtp.conf" ]; then mv etc/ssmtp/ssmtp.conf.new etc/ssmtp/ssmtp.conf; fi )' > install/doinst.sh
-echo '( if [ ! -f "etc/ssmtp/revaliases" ]; then mv etc/ssmtp/revaliases.conf.new etc/ssmtp/revaliases; fi )' >> install/doinst.sh
-echo '( cd usr/man/man8 ; rm -rf sendmail.8.gz )' >> install/doinst.sh
-echo '( cd usr/man/man8 ; ln -sf .gz sendmail.8.gz )' >> install/doinst.sh
-echo '( cd usr/sbin ; rm -rf sendmail )' >> install/doinst.sh
-echo '( cd usr/sbin ; ln -sf ssmtp sendmail )' >> install/doinst.sh
-echo '( cd usr/lib ; ln -sf ../sbin/ssmtp sendmail )' >> install/doinst.sh
+mkgroup() {
+  GROUP="\$1"
+  if ! grep -qe "^\$GROUP:" etc/group; then
+    echo Creating group \$GROUP...
+    chroot . /usr/sbin/groupadd \$GROUP
+  fi
+}
 
-makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz
+mkuser() {
+  USER="\$1"
+  if [ ! -z "\$2" ]; then
+    GROUP="\$2"
+  else
+    GROUP="\$USER"
+  fi
+  if ! grep -qe "^\$USER:" etc/passwd; then
+    echo Creating user \$USER...
+    chroot . /usr/sbin/useradd \$USER -g \$GROUP
+  fi
+}
 
-if [ "$CLEANUP" == "yes" ]; then
-  rm -rf $TMP
-fi
+config etc/ssmtp/ssmtp.conf.new ; config etc/ssmtp/revaliases.conf.new ; ( cd usr/man/man8 ; rm -rf sendmail.8.gz ) ; ( cd usr/man/man8 ; ln -sf .gz sendmail.8.gz ) ; ( cd usr/sbin ; rm -rf sendmail ) ; ( cd usr/sbin ; ln -sf ssmtp sendmail ) ; ( cd usr/lib ; ln -sf ../sbin/ssmtp sendmail )
+EOSCRIPT
+
+# Build the package
+cd "$PKG"
+makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
+# Delete source and build directories if requested
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
+  rm -rf "$PKG_WORK" "$PKG"
+fi
diff --git a/mail/mta/ssmtp/sstmp.SlackBuild b/mail/mta/ssmtp/sstmp.SlackBuild
index cd679cac..2d02ef33 100644
--- a/mail/mta/ssmtp/sstmp.SlackBuild
+++ b/mail/mta/ssmtp/sstmp.SlackBuild
@@ -78,7 +78,7 @@ mkdir -p "$REPOS" || exit $ERROR_MKDIR
 mkdir -p "$PKG_WORK" || exit $ERROR_MKDIR
 
 # Dowload source if necessary
-SRC="$SRC_NAME"_"VERSION.orig.tar.gz"
+SRC="$SRC_NAME"_"$VERSION.orig.tar.gz"
 URL="http://ftp.de.debian.org/debian/pool/main/s/ssmtp/$SRC"
 
 if [ ! -s "$SRC_DIR/$SRC" ] || ! gunzip -t "$SRC_DIR/$SRC" 2> /dev/null; then