5 files changed, 175 insertions, 21 deletions
diff --git a/media/video/cinelerra/Manifest b/media/video/cinelerra/Manifest
index 22772614..97d65bba 100644
--- a/media/video/cinelerra/Manifest
+++ b/media/video/cinelerra/Manifest
@@ -1,25 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MKBUILD cinelerra.mkbuild 3573 MD5 b64de9891e6996d109e84339ad8a432a RMD160 ce9030a5093579b32e4de4e06b2d3efc48679a04 SHA1 7107c8a737d527239df4c87b2ea9fc6cc5e325e3 SHA256 c957b705d6514eba4bfb5c957f3f17b2ac7b4011c3d34061019dcd2efcf80c58 SHA512 a7d5e5dbfa092481deed02abe560fbeacc76afa1dae4bd325098926b8f9c053af00585cb49f7b77518ae1f2098f313c66cd8e22ad86243a622f292f53e945cee
+MKBUILD cinelerra.mkbuild 3593 MD5 6f5788c2b2f753de07b506a1ed0901b7 RMD160 92a5c7cb099baa75746bb8771adaa4837be03ec8 SHA1 7dea9fe1a522a7bc6dfa78efa784ac94723ea4c1 SHA256 248efa25b1808a58d6c5b90ad0f645e4f52ffe65252e8684819c6bb133b8f361 SHA512 a1c434cf57719dddbc089d5b56265a00d4cfeb0a89bdc04f24f9cbf8cf51e52be878aae7369cef41bf5c3caa5243c54d4575261c48a8eeb45a8b73a9a3180a83
 PATCH cinelerra-altivec.diff 1512 MD5 4d355626b69e0a5ec80ffe7b0d67a04a RMD160 1aa86330043b309e2ae8bb0ebcd84112a16aa096 SHA1 078b15b78fbbf1abe61c33360ebf09915570dc98 SHA256 6ea5e62dce887178e0af5664034a10561c804f5b09c47fae16263c6cc40ac3ef SHA512 2c979f10e4a6d047ba1a7d18d62552da946e9ac5e5089edcae44b3817bd5f0f15216c63788e0cd00e4feb5cb3d20d0506f22a838b02598d6d51dacff06e75e56
-PATCH cinelerra-git_version.diff 386 MD5 4edab9c08f9aa2a000e8ad2448df3a2f RMD160 d9a5b10836435fce72bc4b3ba0dc169f43b00878 SHA1 fe42ed01fa441d57978f8b3ae08b3375a23411af SHA256 3718f88e955c0f019c506528ea72f02c65cb0e24642e256f8544dfd1d99c4d50 SHA512 aec168d4b79f6d901c75b65e7acb1877678b29fcbcff3136257e3e3ea74d704f7aaba93beb0d9da9ad4223f44c44e482258bf12f6835ca23a601e247badcc905
+PATCH cinelerra-git_version.diff 732 MD5 0297972dd518c1a75e5befc6cfc50876 RMD160 985c4aa151f7090b629390d990b16ba60453bbd2 SHA1 c67b334f9ac10d3b631047e93d04b1ea69766f11 SHA256 1f919464835a0ab8ebf38db5b83cb9f5096892c1be8df05ed63d07132a43ea6c SHA512 30952a5570ab728a131c0ad256efd282566d1531df4814e20a36ea5a439d0e15beb5a2b74df68ef2029a73d4907d58a73c357b9256bb3681d209b70bdb2ee3ad
 SLACK-REQUIRED slack-required 238 MD5 6f4bb0514f34bbdbf57ccccec8e43dde RMD160 501a2205f942d6b3af700fa71527f6fa49fbb9b5 SHA1 62124d02edd9cd533d71e48fbd3ddf931391b837 SHA256 d66761e5d0949530f2acdea4436ee4eb25ae07ab1446b739d97d9add3ef557e6 SHA512 3e9b81f07e31d2d2b1ae75ececfb7baf35d54a94e51efe971d3a95f22cb63bf700751584c8abdfa81bece961651c1d3514b2088ba19d36606ea4b1cab85164ce
-SLACKBUILD cinelerra.SlackBuild 6391 MD5 ce32b2915aa1375a98428064542c60d3 RMD160 c8310b229f7acc7cbc5b8dd9d742bf3b2ce8f5a9 SHA1 d52ca7d86a0ff9553dc280f03eae0baf7abeb1cd SHA256 91770999949e6c1164429e9262d69e87e503ee16930cf0d53cfa5bce1975b542 SHA512 cf3bd370090ac652abbaf32b7122540a6e4616d3b99467aae2cb8e7b78a6d804cbeafa7324aeb34c98e38d219c84722b01583f333dbe8018f6ede8a55d9a6b99
+SLACKBUILD cinelerra.SlackBuild 8436 MD5 26e25e829a38b16ecb3ca46a47d5695d RMD160 3f9e676c7fce93688a31cd3af66833eb069109cd SHA1 a216239ab2db4c91fe04495e8b42ba828bec5d0f SHA256 4cc33008ce661b79a16c0c18bdfcca3fc564dc179ffa64bb3bab713cfaa9b2c7 SHA512 14c24d15f03fe531c1fa4417783a518655aa9695d9e99961ce00c7e51ce66c6635da1dc4e51bc47a762b8fe8662e415f09b87c2e9dc760d4f6b94d6c64726d30
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iQIcBAEBAgAGBQJJ/er8AAoJEEHL93ESzgeipa4QALOR4yDPRBiMSZ3KuNz4bhgy
-eeKrRLXyHDHWOL1q/SPq93fcDF7a4tmFi6M+fVUEzQA/AHeGh0N/Ip7Yu1gl3CVw
-aoIuYQdG5KWwoyDu5sBxjmVcyNAwsTaV+QcyCmBnoLKJ/32en8ftqnFDmSIJ2GU1
-sZtk2IJF7df9RWL8CRcCBHj/sgi6lWLaw9BOj0LdPorpRKx6aSEEuiU5U3A00jsW
-wUnC03tAEQUZQDREat0fJftu1r5iHieNe7XuE7vTQ259UDooDf7VYlSX1+UsMhpl
-mlOR33T15862IEYo0Avj/ueb/XAxyg0PkRMkBKKgV0OjXwuv9GB3eZpDqslmhGfW
-ukKJRevw7AhW5a5KtJ1lapfWbPe1E7V1E3Newm/fxcM5zNtBm8OWfHSi1uR9xnKO
-/K6r/6mRP4xP8NuGgOEqPbAGYpdO+U8v+9LeRB5QuOoRS5HyXmF6n4dT3mpEAYWp
-MZAwLoVYigdpSrZd0jOawGkaUQrLHAg1yu9nhKaYuRPFtefoj5P0pWFL47M6haJL
-A1v6aW3BeXXwRWEWgrsGoNrDj1KkgQWwm//0MdmH4kF3RFEEvVvlqgHZy4lK1859
-yaQm2zTK9bllRpiTcc2zOcxUmSzPvpY7h2EEQ78Fhp7WL8qUPHCdI9/bejaJtbym
-NXl2ZNCBPUWjhRoRXWUg
-=zt52
+iQIcBAEBAgAGBQJJ/wolAAoJEEHL93ESzgeiWlgQAKpsANCY4bFOJS0o14kgmN5o
+dIx5uh9KU7vdhU+lbu0E8zKyroPIBxbde9dbi6tNwYg8fSL3yez2xxS7VQYq40CW
+us1aNeQGAbqnowDQ3fp+6Y/72cOIaAoT3U2mTY9TTgHxRWYQusesYSJqPMs1awS/
+/DgmG21old/aPQFS9Up8F72H5r+DpQexPAOGGXWcrOP8nGqaROVO3h/iAK75VKk9
+cdwXWC4mxlSzhlKBaA6ujviOZmUWVtFRChLo2sVwUZKYUFbPLF62XJneuTrtBBXh
+yNa8IJXQpiU0SMZ9o5L8erirvbtgqgQZMuqn97j/YKRFT9sXyrRA/99iupWa/lZy
+74Apz3sfcXKhKCdMVdqfXPioWm1AK/gO+9YwXBMleco8/G/E/woPeeu7hV4StlPm
+DLN06MGz4t1YIQFuw39XZC0aATFmGoNsWWUr4SkdW8l2KcAUHVSdjz+6lK+8rsJ0
+QHPWRvL//ZPUOohL3K7ddhjv5G0fCTZ8N+kGGb728YL/sX+A1yM+88Co3gawZ1fH
+CUb3ODxrpT7eqHmvMh7S7AHVGx4MoDBbkdgZ04lvqsPq5w1ijJb3Mym56hrTPylH
+hpOhFOjoNs4NSuNihLE6hHcf7olvOAnrzXVjtSUVsjXAhx4V3LJIWN72U93yiJ0q
+mKLp9BWudDcVuoT2tIVC
+=7WrQ
 -----END PGP SIGNATURE-----
diff --git a/media/video/cinelerra/cinelerra.SlackBuild b/media/video/cinelerra/cinelerra.SlackBuild
index 511fd10d..fbcd36df 100755
--- a/media/video/cinelerra/cinelerra.SlackBuild
+++ b/media/video/cinelerra/cinelerra.SlackBuild
@@ -99,6 +99,72 @@ cp -a $SRC_DIR/* .
 PKG_SRC="$PWD/$SND_DIR"
 cd "$PKG_SRC"
 
+# 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
+
 # Patch source
 patches=" [[PATCH URLS]]
          $PKG_NAME.diff $PKG_NAME-$PKG_VERSION.diff
diff --git a/media/video/cinelerra/cinelerra-git_version.diff b/media/video/cinelerra/cinelerra.diff
index 04352db7..04352db7 100644
--- a/media/video/cinelerra/cinelerra-git_version.diff
+++ b/media/video/cinelerra/cinelerra.diff
diff --git a/media/video/mjpegtools/Manifest b/media/video/mjpegtools/Manifest
index 080c5eab..1dc795ce 100644
--- a/media/video/mjpegtools/Manifest
+++ b/media/video/mjpegtools/Manifest
@@ -1,7 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST mjpegtools-1.9.0.tar.gz 1718063 MD5 309a6fcf0900a010d6a9c1e91afc2f5c RMD160 79e0eb4bce468bb8f12da336e29abe8fab390a5f SHA1 1701233354c7ea86b5b7808c4dd5d03a71118e48 SHA256 a9322aaab1e0835fbaa00fc10e58e885833454fa0ad6f57c60c89a78f7ed1711 SHA512 98046c8b648c68ce6afb0e27bd775484468c82c95b20e3e443ceffb0303f7f3cff52aeaf26e9b92a860a3b16e488430e22e0e0894b1955c3bfc949882401379d
-MKBUILD mjpegtools.mkbuild 3415 MD5 1e57112aa62a5739bb276154478f7e6e RMD160 d71a13cfd3fb8d3083130b35c5511e4821e354e6 SHA1 59dda5b65c53a579b6ca3df1d4db0368c3537fba SHA256 b1736dd965bd070587cad10cb774eb198e47bc9f8a8e7ba0f2a8791c494e3ea5 SHA512 041b26f04ab46c563a33a744d3d63347464430c329be92cc910c37439026c67ebb9fa514758e6bb4a05e57f97abdbdcb5fc14acff8401ed17d8f01e535b2f29d
+MKBUILD mjpegtools.mkbuild 3435 MD5 e39d3fb38fa2cfc4f1f830d09db26c3d RMD160 38b439b81f88b2e997ef73f16bd93d616425acb8 SHA1 868eb6238abbfb5e6b85b2b17e05d5ed1e583997 SHA256 c65350965afc82e6c5c7e03b6099d98b4ba09080a084ca8b6787cc4719ed740e SHA512 736abd54516c022e6811c6566e07252c285236d1aa36692162cd01f1cb2a5feca84230d693e82589468af59ff2dfdf1ca8744b753fe5a5fb4394dc25237c9b50
 PATCH mjpegtools-1.8.0-powerpc.diff 271 MD5 6bda996b94c1c6fbeb0ca57c9bbf545f RMD160 4ca6ea775449e6f74c179a3aff64129ae3410e24 SHA1 19c24485d48dda444e40b0c077fe9370512357d8 SHA256 5d94d8e7cd6015d3a204f32b54a7fefd0d064b244691e9509af2f600ae3b5e3b SHA512 4d79772990bdc2d66c92416d776ada12ff891c13c1867c98631a49f3c19600e16b8332f0abcad78dbc069be43d59e9415bb015819039df9c7774e330bb0fe916
 PATCH mjpegtools-1.8.0.diff 370 MD5 13f280039b6e3f12225fe0199bf2fe17 RMD160 c7de06e25fc96ecddaf88341341558488b6e2023 SHA1 9cb58a2b72175cb2b4d03873c77f78e213bcc555 SHA256 5ed4adf76454bacbb5e0cec35a6ef2d6bf601ecb2ec664435647134a9d73ffe4 SHA512 c300c2736f6f5c6080bee7be331a9a34850ed77abc209f6a2518e3e7f21dccc3573bc1f8e7b34cb7321f539ee5317183c7180d69c1057c9f6917ea16042c5d7a
 PATCH mjpegtools-1.9.0rc2-x86_64.diff 1062 MD5 b69348e9f4120ceaaea42e72bbb3a0a2 RMD160 df7dbed4b24c31ed759f5018ea58b6c9370a0aab SHA1 bf1983c91d9e2c048591d440d0bc9c5c411f221e SHA256 119edb9fad88a0f53a368d34d136521d394df9e4e9263b4174a0de6df52a86e2 SHA512 5bfd2849b0b0a156a408ac65ba9cfb5940a876e1699494af47e3c5606916aba9a2639380c9a37136de1b78e71e670139fe0655fdb1ae8d355eb5ec55935c36a6
 SLACK-REQUIRED slack-required 97 MD5 75dc44e48a4f96e3d7ff63d63a2ff1d2 RMD160 4660f49b0b1e0205b8ade63396bce3572c251bde SHA1 de4415b89d05cd331461d51d485ad883bf8d9bab SHA256 da710ce17c14bd9aab64d641fff4667f1093caa3145240178362c46e92893e86 SHA512 bc4497fc4050bd92a55737267df235b5a01ee9bcdb3e47b8a13241f02e31d4a5eea9a44852446944274c20907dd019dbc5661b48cf3ada091c4d18dc55e1d622
-SLACKBUILD mjpegtools.SlackBuild 6253 MD5 e99a3d70bc61c434da298c78793de67d RMD160 828994031983fb3b4eb1cf436751075d62363621 SHA1 de78904de7af170561899dc487638f59c6909cb8 SHA256 88c59f0c4202fb4c29d58ad9484523bd6c267d1a4c2b76e2f4249be3f5c746ef SHA512 a3050434fe49a32c949b1ed4ede5818469595d6cf412f626cb2951867ccf4830f03a7ae936e16acb72a382cacc06cd7cfa95397c030ed3747edb5272dda6cbf9
+SLACKBUILD mjpegtools.SlackBuild 8391 MD5 6ff67c5250985a8eb41c11fa9bca69ff RMD160 4cd8b58fa2e388181ca5ea1c769d847487e964fd SHA1 290c441d88fef6f7ff65c5dffc33d1ca336ecda4 SHA256 9d6c0b06ddf1a999566b7b9f3c115d3a80ea8be84e3eab469fc3216b394883a2 SHA512 34ed94e2f6a534d083fbcfbdc7e01c0162998b6cec00e7858b308340ad06b53e2ca30be74ceef4edb862dcb61b59cedaeeaced912486923e100dea3f5058ff87
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ/vicAAoJEEHL93ESzgeiXI8P+wVo6FkAqGo8ZvhP2sZBqud0
+Cn7GSo3w9tB6hU2SSqfcpq2kY653olrVcjDUzasf1UB4JqFfI6OjOqCCeFjNvDKW
+jNQ4icIjuDedkpGv1pGlVvjK5Dwwb+Vz+iIpYStXAL16mkC2gqeCo3akpSQEGjCx
+Cmw5PeqcaLUxnSD1XKTbhvUC2/ketYSH79n74NvcVR8ptX41kkbJeJeZxKSJSrxs
+6W4AnW+trkCJRh5VvrVCbypZNBeLEbOea/TVVGmLAc49FTMb8f3fvDR0HUfTfSJy
+hcDq5OVnLPPHFZHFmO7myeXZt9LET0Ar3m4kzcEYhNyK4qoBVPrQtAP/0VsT9qU/
+MIz8KdRF1olH6FpbF6RXyfXrxwbFI4hvQIA+AFyMOHoGr1rWzF8P1YPf9mHuuRCG
+YCMSekCAp9g9ILIgFAm5w0rZgID3Yq+a5j5BpokxTYtiDkoO1tRMUk5Qb0ulGBRB
+g8YslKMhYMgzAbnp+93DDdfneg9wceroE4ws+6OGZEqp8rkK88ZxkkYIHxam7LRf
+EWo773VrbH/uVI3DV5mOLin2ynx2DHSk3c6SPW3oPmbMppdu8BO7ySA05/ZTQ6kZ
+Sz7fZF9HhhBHxFVcHjVjA4d7R4vfPHD3799Tz2wU5ekBuvunpTV47b5uVd1m3JRJ
+xGpELebL8piMyEql5zn6
+=0e/v
+-----END PGP SIGNATURE-----
diff --git a/media/video/mjpegtools/mjpegtools.SlackBuild b/media/video/mjpegtools/mjpegtools.SlackBuild
index e5c5686d..db225148 100755
--- a/media/video/mjpegtools/mjpegtools.SlackBuild
+++ b/media/video/mjpegtools/mjpegtools.SlackBuild
@@ -15,9 +15,9 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for mjpegtools, by Silvio Rhatto
-# requires: libdv libquicktime 
+# requires:  
 # tested: mjpegtools-1.9.0
-# model: generic.mkSlackBuild $Rev: 784 $
+# model: generic.mkSlackBuild $Rev: 805 $
 #
 
 # Look for slackbuildrc
@@ -39,6 +39,7 @@ SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="media/video/mjpegtools"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:="--with-docdir=/usr/doc/$PKG_NAME-$VERSION"}
@@ -90,6 +91,72 @@ 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
@@ -183,7 +250,8 @@ fi
 
 # Build the package
 cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
 if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then