TracFootNoteMacro: adding TracFootNoteMacro and updating dependencies

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

2 files changed, 101 insertions, 6 deletions

diff --git a/dev/python/genshi/Genshi.SlackBuild b/dev/python/genshi/Genshi.SlackBuild
index 9516ad86..f3344aca 100755
--- a/dev/python/genshi/Genshi.SlackBuild
+++ b/dev/python/genshi/Genshi.SlackBuild
@@ -15,8 +15,9 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for Genshi, by Silvio Rhatto
-# requires: setuptools 
-# tested: Genshi-0.5
+# requires:  
+# tested: Genshi-0.5.1
+# model: generic.mkSlackBuild $Rev: 805 $
 #
 
 # Look for slackbuildrc
@@ -31,13 +32,14 @@ CWD="$(pwd)"
 SRC_NAME="Genshi"
 PKG_NAME="Genshi"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=0.5}
+SRC_VERSION=${VERSION:=0.5.1}
 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}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="dev/python/Genshi"}
 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" ] || ! 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
@@ -142,7 +211,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
diff --git a/dev/python/genshi/Manifest b/dev/python/genshi/Manifest
new file mode 100644
index 00000000..2a1a2251
--- /dev/null
+++ b/dev/python/genshi/Manifest
@@ -0,0 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST Genshi-0.5.1.tar.bz2 303939 MD5 822942bbc3109da9f6b472eb8ea4e3a4 RMD160 f24143e4930d2a2afc3655c5b1764a38664efbec SHA1 c00e30a00e605b29fcee8322ff933dbb6c2d31a2 SHA256 3aa37624fc42b1ccbfc992344e1da7085e43ddb6b4e57a368da9fcb7ffe05dbc SHA512 6ca314ab6678bc2c62fba74518715c75d90e2663c021ab927bbeabccc295ed0de5abbb4d26ab268173009b360962a58294813f37f15a1bfca3a035f21bb7a697
+DIST Genshi-0.5.tar.bz2 302637 MD5 d8514ce763330d450bfa55869b375e5d RMD160 a04ab15033857abd64a4cab7eb1e536c1d298072 SHA1 b5166105a228da7d570a4bebe9d78854bc5f8b41 SHA256 e20311781919d86e6012f791e777e85f3b61fa88a85525aca065eb457d728004 SHA512 83c7117fe47ed55b26bc702e94e8048c046c95db21e6c01ef93fbd8cb2ecc429472d1f13be1638d05609c41d22899fd8bc19a22bc0b8acc4cca1a7034695b163
+MKBUILD Genshi.mkbuild 2766 MD5 ddd0b93f9f3ec817398cc457e939c10b RMD160 3f4dc9a5dfef9babdc14db115ab9229f4f77127a SHA1 8b373e7498c9b8b29a276aaf6e9bc15216446fef SHA256 b24e99bc947148f3fccd8176e5f4d5bbee0a6cfec7864283f39bf740cc0820ba SHA512 763fda16f3807492a88878e3736c5eb7d94da5b4aa42fb018ef63220111b45c1ca34addefcd8191ee64b2f0ee2637eacc922a1e0c5b1fe1f3c136bc6aa82f3bf
+SLACK-REQUIRED slack-required 81 MD5 fb05a05fa9be8186bad68b1d564e90fa RMD160 ab8f9cc13fb868a1a13dabbcb4cbfe342a013c4d SHA1 c465da3bc4ec63560f9a58926b037df61c8e6017 SHA256 e2b54a7c7bb00e738568a31f210e3c10303aae2cfdf405f58d0259c6321e6510 SHA512 ec083f51a9d8061a52733b77eff3a7d809401962d7f528a2cf121fe3e7825dfeb8936a7489f957b874b9a5415ea221580bbd6528b261788b8be12debaacba96d
+SLACKBUILD Genshi.SlackBuild 6909 MD5 1ef2d25a18c6ae1fff245a60d0c639b9 RMD160 15257be6409abfa878754e619fa47798d5b00921 SHA1 ecf8339254b1e06ee0ef6a22e7e771a4df44aeec SHA256 bff4537d42e8db1b52edb07c98a5152f79eefa4a75afa2cc99e33422d0c1bbcc SHA512 5234dc586bc97d9cc5ca08754db41fcdf1777e0109d0521709b27c5b0bee05854549547085cb4c1fd60acf1e51e9928b6e00d664e82f2993619bf285602979e4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIbBAEBAgAGBQJJ0749AAoJEEHL93ESzgein2wP90V5ksJWnbl57VGzY8fQbreK
+NTAwEVOZ8XgcnIbHlNkBTWPDEruc3QEkS8UcaTfrOjY1vgj3U6Xx+iZ4cnpxSB92
+04HRDrzgKqtxjcem5KMaxjbVARsgTFsi3YcSKHDaYH853+6cnDi8Nj0XzPepNWQX
+0SGZ0jR9tZVX0eeTrO0AjwNTECgc2A737rfnIiSLsOkHasT9FWFqn1uB9Vof9ELR
+x2WvjaB2rIN8GaEqpsuwxJo0R0MFj+YwbdA3de4c5Fx5eZ3XwfjjnCuuAsH1UUqv
+/FtqtRmYLwMRzTM0jqskRtW2ILcSGiJejEsi4xCestl9VT6pLLiDsMzrZ4nqDe1L
+93ckPYc0tISnJWfAQvFRHChonBPT0py5hjtgjBGRVklnJeIS6grQPIrWHK00pD3p
+wDTRnSP64DrYVovb+82OP0K/lnHtn/TfQVJnj/Ux8D9MG54TUC9SZaQWmG2oB0d2
+Gdyi9RTZWxSrOP1CVIOiu03xKJV5uj5d7JH78bVkBsBNWvE01UEzjUcvTIHr1ReZ
+ZkhaMmq9It9goJevhMWe+tscARhP3o0ggt3irLCUxNv9ptdopaCM70HPbAra9v0K
+B5VEY9ex/abwAhxP0KESUQsk9ktph+809ytQsNuvYQA27jPp3Az7mGXi3tpz3qdV
+cYc+eu8cNNjgE8chzEs=
+=IG1K
+-----END PGP SIGNATURE-----