cinelerra: adding manifests for some dependencies

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

2 files changed, 102 insertions, 16 deletions

diff --git a/media/libs/ilmbase/Manifest b/media/libs/ilmbase/Manifest
new file mode 100644
index 00000000..d6d8e96d
--- /dev/null
+++ b/media/libs/ilmbase/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST ilmbase-1.0.1.tar.gz 463275 MD5 f76f094e69a6079b0beb93d97e2a217e RMD160 124f10b6f4ebefc9bb5dba7715d8897c7d71b947 SHA1 143adc547be83c6df75831ae957eef4b2706c9c0 SHA256 4f14fc7b26a37a391ec5f979697148e6774bc36bc052de26e40ffabe401e397d SHA512 32aab1cfa6faa821d3a98709d669d6d8cfcce2af335deea148eed33da7dda71a01db28405ab58e3951d388efdbbe16a57ffbb1a66b6bd997f399cfe4e33c0fb0
+MKBUILD ilmbase.mkbuild 2515 MD5 84400b3327600e90ed49635329c57569 RMD160 67be3eb03f48903a8ab265595d9bd1a5c680622b SHA1 5c683480b2cc5a8399e9b9298621e537a42179db SHA256 bd6d61a7a1102658ccb841f48dcffbb001512bc3442eccd1885bcb60a979f041 SHA512 7596cd03e337f76fbfbfa9a5ee6e172838490e7abd533dfb89b11999f3be8cb02e015f455c6d593eaaf1094ecfdb1ebd410112229dac849a1dd0251928bc9e70
+SLACKBUILD ilmbase.SlackBuild 7782 MD5 895df9b9e589bc999b18ea9ee6b478e6 RMD160 2005e1b754e561dfeea0f856d167c0034cb64f66 SHA1 45b737cb4e91a39f550d21c7fba27903a6f83333 SHA256 f6a01b83188b9730b4c30574a45dc5b8af2a54f77919e6bcab424684425fdc6a SHA512 82b533c1d51ed2f2a010f3e31d0e98888276a788fc08e055bb10ebe7e0a71d428629a48d0bafc431650e14edce661b13333a67117b40f80105e2bb7e81745d98
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ/ej0AAoJEEHL93ESzgeiG+sP/0yMurSaSuuaJXnYSjatcXXP
+g/9ZrXI63nDSd9bdoRAkc+7i9LuoyQ2uibKk8Wu2RDOKSJd7rC1UnsWMSykHWGQs
+bL6geetsN98nBws0VD6n2BA7FwPFfWj55fyjMq66628n+c9TksyzxMJ4RDZaVaEQ
+ttYGmuLpnqmnj+rC7iI6mt862UdZvYYCw27jO2DAPp1mPYLNDXaR+tC67vUzmw1N
+atS7nXKwJKozwC+X0Lxf8JVXbE+rLweqQKYYxAzRKRV3mAkOoCjMYu5qIhrzWEaT
+u5AcWVCmFH3wXa0USfxvKKDEDjIOZ5rrzPHAtGWtud868+HSftn2pNxHOAu8RREq
+T5T8MgOHn5CZ9b9z/bQzxMrMrPtx6CmOELaMnsTjx0oTy/ZtJgNuYLsLZOvq4BMo
+GyAOVgOBlmhFRDmTXc9CYepxYW6hAMrykGDapNVkXwoV2pgQhE+C/OGJbB26Eae4
+Zh1lTIPR0Zv63Gnt/kTE73QLh5+UUas6xsEI1fXcpn+l2Pu5FMHLODqk5CE/EazN
+sq5ORQ/l47ocYPDzsbUkongDT4wU0RbE35vDezxMWKYVKJeUE4BEczma5z+5KB3S
+DIX8g2YReEleikiz143b0b1yom4dy9gd9CWywjyxd/LXNusJ/u4tlNqy5pw4H/P6
+nNJr6vwjLt0aowKArvnb
+=kRuk
+-----END PGP SIGNATURE-----
diff --git a/media/libs/ilmbase/ilmbase.SlackBuild b/media/libs/ilmbase/ilmbase.SlackBuild
index d391f141..a6a50042 100755
--- a/media/libs/ilmbase/ilmbase.SlackBuild
+++ b/media/libs/ilmbase/ilmbase.SlackBuild
@@ -17,6 +17,7 @@
 # slackbuild for ilmbase, by Silvio Rhatto
 # requires:  
 # tested: ilmbase-1.0.1
+# model: generic.mkSlackBuild $Rev: 805 $
 #
 
 # Look for slackbuildrc
@@ -38,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/libs/ilmbase"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:=""}
@@ -47,9 +49,9 @@ NUMJOBS=${NUMJOBS:=""}
 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 +67,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
@@ -84,6 +87,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
@@ -91,10 +160,11 @@ PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
 cd "$PKG_SRC"
 
 # Patch source
-patches="
+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 +173,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,8 +181,8 @@ if echo [[PATCH URLS]] | grep -q -v "PATCH URLS"; then
     else
       patch -Np1 < "$SRC_DIR/$patch" || exit $ERROR_PATCH
     fi
-  done
-fi
+  fi
+done
 
 # Configure
 CFLAGS="$SLKCFLAGS" \
@@ -177,9 +239,10 @@ EODESC
 
 # 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" ]; then
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
   rm -rf "$PKG_WORK" "$PKG"
 fi