conky: added Manifest

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

2 files changed, 93 insertions, 3 deletions

diff --git a/app/admin/conky/Manifest b/app/admin/conky/Manifest
new file mode 100644
index 00000000..8ba235dc
--- /dev/null
+++ b/app/admin/conky/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST conky-1.6.1.tar.bz2 442180 MD5 b2839f21cec18e5eaa338c7440a1ba28 RMD160 db9ed1cddd03711358f707f16f27d459a3b9387b SHA1 1f10d7b96f61636ffc14d2b9962c6d70aaf1c1f8 SHA256 e4acdd61e6971b7bf194c673828ef6de09f82abb95d3ece6e37e7eafab23b063 SHA512 7d23b59c8a45da3f616c2cc3bad704585fcd9772b00e0be9babc82c461ab2da18373c855b554f43e43501352f147de0e33720598dbfe565bf88e888d1208b172
+MKBUILD conky.mkbuild 4326 MD5 c5c196f066f4f846e7b08fa40cc03ba0 RMD160 613a82c43b3a3300f4c9395da13bcc333467b88c SHA1 3ccdf05d9a14a5e29e7f34cae6bdf5467337bd89 SHA256 cf86a1c7796ff05d333a704baa47136958c7d67d283baef60f4db6d91ebaa1a3 SHA512 44baeacf2c120e6c2b282360efba15bd8bbd7e74251d207980af08d07db8aece7d9caeea65d59d826d1118a4ac3f40f7e74b3f629d3a4a82b32b83113cc746ce
+SLACKBUILD conky.SlackBuild 7071 MD5 0f4cf5385651de8c3363301fd3942adf RMD160 10f896a326eb9159c95740dc1ff6bb71d728d69b SHA1 bf23957fa5d9ec95e6a431d5bed684d0e9ac2d73 SHA256 08db4c87b0550c1726d70f9cca333485da8c7959df21869f14b6e0fca76dec2e SHA512 65741b45e773854ae534850c56e2fde47db3a0b3789e2056a1723dec2681d6e495544bbe3357020d7b5ecac5dc63ea3b0d67161e014f13a172b2d808c992d1e9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJeGyoAAoJEEHL93ESzgei2HMP+QG46HOWglmtdES8EAQ5VPfp
+KD5QIGVKzkNzofCAvBsyLV9R7AEeL07RkwlogRwwCSdWFlJSi8woanrtq+rwXzZs
+tmv4T6DPxm51c+m/9dI8lz+ulFh9VkgK4gmpv2uLpDsXTp8Bn+IY6DWSHrcV6Yo4
+/IUrIPwomznZKZYjTaXl+VUdsXjaVY7bHJmmx2fqyraansp4x3UJMycUfq77QTFi
+kIKxMEg6XzWKVIUiO3xHLC3UJ7OwImOZKod45jol5b6TCLutu8kEn8whbGVmpoIj
+p1vFLZ+XcAJKiDsxvjMMGfrs3gG2SlVnIko6G0bFMJWwjyn7+gj0YEGrDaTIIDrI
+6GFvgKOLx79NrFPfKmR1D44IYhH/7iqzLGBA78vyoGe9WYqR+R0gs7nEOFgY15yh
+dIO+nC5nHndj4lEPjbPSNpcNQ7YrRNiTRxy2zyWCpaVEzuoHC/daHHlBfhjvs0wD
+0WIlv+SpzPpiOF4Dkb0NRe8DGBNQyLl/79Ge5LYGPSDz0UYaLwInfQGWf724+gcq
+GK3pb0LbP6tq4QvOEzh3hHVQdFJUl68V6XNJW9Uc46vzlA5BaGy7whFsoQZQJePa
+MetGQT8GscU3fV0dzJtDM9kvDIxVmjrTyDeNPL36gOSxsq2ahpOLzzvFHUADuO2p
+Y+3AKl7c5ePOKeBgMhtv
+=FsNt
+-----END PGP SIGNATURE-----
diff --git a/app/admin/conky/conky.SlackBuild b/app/admin/conky/conky.SlackBuild
index 62614151..15634d26 100755
--- a/app/admin/conky/conky.SlackBuild
+++ b/app/admin/conky/conky.SlackBuild
@@ -47,9 +47,9 @@ NUMJOBS=${NUMJOBS:="-j4"}
 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
@@ -84,6 +85,72 @@ if [ ! -s "$SRC_DIR/$SRC" ] || ! bunzip2 -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
@@ -148,6 +215,6 @@ 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" ]; then
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
   rm -rf "$PKG_WORK" "$PKG"
 fi