xmltoman: updating to 0.4 and adding Manifest

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

2 files changed, 107 insertions, 22 deletions

diff --git a/app/doc/xmltoman/Manifest b/app/doc/xmltoman/Manifest
new file mode 100644
index 00000000..279c39cf
--- /dev/null
+++ b/app/doc/xmltoman/Manifest
@@ -0,0 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST xmltoman-0.4.tar.gz 15250 MD5 99be944b9fce40b3fe397049bf14a097 RMD160 ce61c5184d5ba0a9db63bff2d4635eb644825383 SHA1 151f75d78d1fa53bca25b94dc00e46a27fabfee8 SHA256 948794a316aaecd13add60e17e476beae86644d066cb60171fc6b779f2df14b0 SHA512 347722731e2101ecd0619f88f4efdbca534810c96977a1281af685e8a61f4c1a826a71a9f0e3af43cc899936640787366a78077f36d23a9efcfeb789dbcfae22
+DIST xmltoman_0.3.orig.tar.gz 14780 MD5 30272d184b99f5920994bda9abe4baf7 RMD160 be720be467e6cb6805a831a326fa5c30521cd923 SHA1 dcda61c3fe1deae57bf0377547fead58cc40eac0 SHA256 5dfde3066ee70b481888f5937159c120854ff660004addf80eceb44fda3920cc SHA512 e29c8038266e9479e469bc4f288dcbd760b91590a1a557dea053e44ac286741109eeaaf90d2d5258b16ce84a4fb77a709bea429575916b75fc226cd6ebb3d461
+MKBUILD xmltoman.mkbuild 2315 MD5 dd15443b140f48f853bac04baf00ac4f RMD160 73b41a55b29d90264a99151d600e031c8901527f SHA1 f0457f35fdf1be696c3aa1b048af45d17f3f4d5d SHA256 f7ebd73474e2e57967e139693bf4162615416c584fdeb196705870900cfaf2c2 SHA512 9fadb68dcb6cd2183ebaf86d714021afc6a610d775cab837e168c1bbd6db68512f49444b0a3fcbdfaafe4e559b1008d0cb5e1d9863809f3b2833ce1db4ed1a6e
+SLACK-REQUIRED slack-required 77 MD5 8b3dde7ba9a3f21c6ed69910dae70339 RMD160 f502068750e4f6c1528a5645ab3f562ae40352f7 SHA1 5e6232739da8e1e4fa16c955b68f43c0a62ebec8 SHA256 76cc985c77839de3c4e4f921b5213e0f33b5f1a28d2ad7c1ca120e6735b8a1fa SHA512 5fd021d1a281c8a5884a6b8206ec09aa8b98491d6a9078e7c38a36b7d5684ed044cb2fb70f14753490e51b93c9c5538ed79072addbdc23efd8dfdce3d76c415e
+SLACKBUILD xmltoman.SlackBuild 7808 MD5 7ed239d6cb6005ad517f3a574f648465 RMD160 603eb9e4f9c097e6fb5f77055013ae32b506364b SHA1 ee96df458ba4e971edb216968fdebb3c3a893d68 SHA256 5d6f88ef4c3e31c9019d34e37796c0aaa1ed19cc9b171616432aeb7a2195eaf6 SHA512 65e9998fbcc81a176334383b3b584110b0c1e626f88467780dba0da71e7036efe05525d73d28977d5a0f23020e2229c731ea888f38f51582fa6fd5237c82fbfe
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJf5q+AAoJEEHL93ESzgeiyXsQAJopyurMl+5v/eV/FLeOjFhz
+1RrdgGZVGuG0h13W0GxGY0PTPYG6pF8eiEDzJL5pi+pDpXmTQ8VNHC4vv2VItgWA
+DZM6e47ieu4+fxHUSVaQ/RqxFV48mjfSDA1st2FlLlrrm1eLkBrbC7n72qOP0qkr
+PWFjkjuHvBnBkTE/T6sCkFiwgRgVBT1ZfSD0zaPoH+iQXABDfLxxpAFp4u6Cfvgz
+oFJ//mMmjB3hd7OWGS7g8vIstGfk4ZtT+ix6ChClrK5+iQfRYwTxgRFZ9J/St3qt
+7dEMTtIx3mmeo/70s3KAodCUIeKd53RUgimbCwxOxaWeK37vTBbOjgMDh9WUZ+d3
+ULR5JrZh+HeAr5Yce5V7QRvUJXOXPBxFGEtWVk6JbpNyM2aqmgfqUPrTRni3rwrJ
+0C3M0O1ZRERM8nMm5+T7IfN5Eth8V820ppnxznGV9GfEDt1Di3slLQGc3Jj5cJVI
+hUv+2CD1HOgAiU8pnwNzpS3pXuQ8YO7vWSQxqlxKFcTcc20QL1DRq8Cbcjv7qh4q
+m6kEuPQe5bbToEFJF9Rawq70+5ensYvMIB6e6Mlsv5QdzyWOXQzAXAJsc84MRAHa
+8KjPaOuNYNTyun6rVpFYzsYU4e6O/NJUhGjNsnlhWXi3FTL0zVG4o8khtNTUZ6xR
+AKkaNUYPRK8ox5i/O5+t
+=sIb/
+-----END PGP SIGNATURE-----
diff --git a/app/doc/xmltoman/xmltoman.SlackBuild b/app/doc/xmltoman/xmltoman.SlackBuild
index c6ffeac8..d2d9ba88 100644
--- a/app/doc/xmltoman/xmltoman.SlackBuild
+++ b/app/doc/xmltoman/xmltoman.SlackBuild
@@ -15,8 +15,8 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for xmltoman, by Rudson R. Alves
-# requires: perl 
-# tested: xmltoman-0.3
+# requires:  
+# tested: xmltoman-0.4
 #
 
 # Look for slackbuildrc
@@ -31,7 +31,7 @@ CWD="$(pwd)"
 SRC_NAME="xmltoman"
 PKG_NAME="xmltoman"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=0.3}
+SRC_VERSION=${VERSION:=0.4}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1rra}
 SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
@@ -41,15 +41,15 @@ REPOS=${REPOS:=$TMP}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:=""}
-NUMJOBS=${NUMJOBS:="-j7"}
+NUMJOBS=${NUMJOBS:=""}
 
 # Set system libraries' path and optmization flags based on $ARCH
 LIBDIR="$PREFIX/lib"
 
 if [ "$ARCH" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i386 -mtune=i686"
 elif [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686"
 elif [ "$ARCH" = "s390" ]; then
@@ -65,6 +65,7 @@ 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;
 
 # Clean up any leftovers of previous builds
 rm -rf "$PKG_WORK" 2> /dev/null
@@ -77,13 +78,79 @@ mkdir -p "$REPOS" || exit $ERROR_MKDIR
 mkdir -p "$PKG_WORK" || exit $ERROR_MKDIR
 
 # Dowload source if necessary
-SRC="${SRC_NAME}_$VERSION.orig.tar.gz"
-URL="http://ftp.debian.org/debian/pool/main/x/xmltoman/$SRC"
+SRC="$SRC_NAME-$VERSION.tar.gz"
+URL="http://downloads.sourceforge.net/xmltoman/$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
 
+# Check Manifest file
+if [ -e "$CWD/Manifest" ]; then
+
+  # 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
+
+  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
+
 # Untar
 cd "$PKG_WORK"
 tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
@@ -91,10 +158,11 @@ PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
 cd "$PKG_SRC"
 
 # Patch source
-patches="http://ftp.debian.org/debian/pool/main/x/xmltoman/xmltoman_0.3-1.diff.gz
+patches=" [[PATCH URLS]]
          $PKG_NAME.diff $PKG_NAME-$PKG_VERSION.diff
          $PKG_NAME-$PKG_VERSION-$ARCH.diff $PKG_NAME-$ARCH.diff"
 for patch in $patches; do
+  patch="`basename $patch`"
   if [ -f "$CWD/$patch" ]; then
     patch -Np1 < "$CWD/$patch" || exit $ERROR_PATCH
   elif [ -f "$CWD/patches/$patch" ]; then
@@ -103,15 +171,7 @@ for patch in $patches; do
     gzip -dc "$CWD/$patch.gz" | patch -Np1 || exit $ERROR_PATCH
   elif [ -f "$CWD/patches/$patch.gz" ]; then
     gzip -dc "$CWD/patches/$patch.gz" | patch -Np1 || exit $ERROR_PATCH
-  fi
-done
-
-if echo [[PATCH URLS]] | grep -q -v "PATCH URLS"; then
-  for patch_url in [[PATCH URLS]]; do
-    patch="`basename $patch_url`"
-    if [ ! -s "$SRC_DIR/$patch" ]; then
-      wget "$patch_url" -O "$SRC_DIR/$patch" || exit $ERROR_WGET
-    fi
+  elif [ -f "$SRC_DIR/$patch" ]; then
     if [ "`basename $patch .gz`" != "$patch" ]; then
       gzip -dc $SRC_DIR/$patch | patch -Np1 || exit $ERROR_PATCH
     elif [ "`basename $patch .bz2`" != "$patch" ]; then
@@ -119,14 +179,14 @@ if echo [[PATCH URLS]] | grep -q -v "PATCH URLS"; then
     else
       patch -Np1 < "$SRC_DIR/$patch" || exit $ERROR_PATCH
     fi
-  done
-fi
+  fi
+done
 
 # Compile
 make PREFIX=$PREFIX || exit $ERROR_MAKE
 
 # Install
-make install PREFIX=$PKG/usr  || exit $ERROR_INSTALL
+make install DESTDIR="$PKG" PREFIX=/usr  || exit $ERROR_INSTALL
 
 # Strip binaries
 ( cd "$PKG"
@@ -137,7 +197,7 @@ make install PREFIX=$PKG/usr  || exit $ERROR_INSTALL
 )
 
 # Install documentation
-DOCS="NEWS TODO README AUTHORS INSTALL ChangeLog MAINTAINERS COPYING LICENSE SIGNATURE readme.*"
+DOCS="COPYING ChangeLog README"
 mkdir -p "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR
 for doc in $DOCS; do
   if [ -f "$doc" ]; then