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, 100 insertions, 6 deletions

diff --git a/www/apps/trac/Manifest b/www/apps/trac/Manifest
new file mode 100644
index 00000000..e70c4ce4
--- /dev/null
+++ b/www/apps/trac/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST Trac-0.11.4.tar.gz 724708 MD5 a765087b22661cf4aa1520518cddecae RMD160 dffe20cb4f1cda2d8feaed5746a9701c24ccaeef SHA1 392f5fc0bc8e29ebea07182707ad31a55b9ec46f SHA256 40a8e633fd05b0468f9bce5e426a83a4ad1e42d1c59c29c6182e238efd811920 SHA512 32577419db9b28a09a363b7b21a6a24718435cdb9e6cba22954dc6c69242da176084f3fd9c69164068f9ecbd36f47d98ae0614eb33963ff7ac28569f2ea639dc
+MKBUILD Trac.mkbuild 2807 MD5 e875b97330940654de3ad62c5054293c RMD160 3950415a243e5b7b9ab90c723746a83207dbaf9e SHA1 741b4592b908a0792d19300b97d058b5818053e7 SHA256 8d81bc0a08d716a919a4a1bc8bb2a6d69bb3f70b56aabe1fff20f1d8efbe80c3 SHA512 828791000f20bea0cf5013a7a69686aedc41d64dfde640618c9475810a4d7495279bb3485cf6b7a16366ba452a517339b551dc31de815b4037dc80aeaf9c55a3
+SLACK-REQUIRED slack-required 125 MD5 ac1144e206e2e14554d27da8df7265fc RMD160 8eba69d944a6d48ecd38dbceacbe7df0997d45e4 SHA1 019386d63454083ca90b8f29145d59051e250980 SHA256 38bb7d1eaa66da1d85eb5bb5c078fa0e736889d05dc2c480abf452f5e4ea1213 SHA512 cfb550b34702f929360ff7f8cec47af4eb2a26e5f53230a2d3c3cc1da07f2eb5285df11352067ec8a09e599a83981036ebf904141acfb813a68d719761a41460
+SLACKBUILD Trac.SlackBuild 6566 MD5 820530045e3611c4b96ff774d0fd0f02 RMD160 b6f36a8de938954e1b7ced8ed5abe6708ec27cb6 SHA1 fa6c066c7ca572ea6a0ec733fde93cce85466748 SHA256 e27066be9630d42b601868f55e908c9cb4c8e0fcee103a00c97c5aa65a1f834a SHA512 7f9804c3eb6a26eac1fcfe0005a74053410bbfcbf48b8a52aadda26ebf9248af261ef78070fa1d094f97343f996a134dbb07360a223d403857bc4e4ca38efd4d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ079gAAoJEEHL93ESzgeiQIYP/3EwBz+SYvFgDFl85Pje617L
+HjoBq3uyfgDL2SZzyDCfK8GGtuogUO6dowePW2kHM/qjcnAOwUBS+ICRE+7fKvmG
+/fn0zGWRnkRZGa4U2GWHXRJealiCljOzPiyKpVd4dxyJqWY8yIjG46qg8P+mH8yQ
+gU9/+oLF7KLa7KKq1oxj8m/dFOkjGB2pYkHVLaMkLd4QDI9djw0t9S86cw0ntMYR
+l+fU3bAt8i+QXqJu2CzotZDAaulSkqym9IAO9dnzP2Xb2SUd7m5J3DXAtqIrf6RJ
+DZ7G3kC3ICPMQWJxuRfwD2TuLrBHhAi8GGeVKAnGZ2z6F5g3gfsBWvr+hg7bcT+Q
+DkLsRJk7kMddj/V/gbA2opIHjVVxvBND8GvwFM8/WRnE8p8itzsT9/27R7NuKjFD
+7bhmD7oUHSdKDznIQtP7z+HlMGxPCaiYc7TYRl4xud6a92CUgfTol5ghW8uxRCF/
+HreYoFc+sEpUlGYdv4eOLw6U2tO5VqpdoSpWd/CuUx4WiTNH26WaOsHOd1zTvhW4
+WAzGPrURFd/CHdZMRxO8kD9epaVKAZA0ShfZw6/Os6z84CJCQtG98di3n7zv/IzM
+x8J5FBfmhVjkYRWDyDuRZ4xfQunGxCY5OE29xuwS2XRDs28MTXcp2J3jQcP1I8pI
+qd14Yy9069GfF16k8wae
+=Adw9
+-----END PGP SIGNATURE-----
diff --git a/www/apps/trac/Trac.SlackBuild b/www/apps/trac/Trac.SlackBuild
index d4958f44..c67f0729 100755
--- a/www/apps/trac/Trac.SlackBuild
+++ b/www/apps/trac/Trac.SlackBuild
@@ -15,8 +15,9 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for Trac, by Silvio Rhatto
-# requires: setuptools pysqlite swig 
-# tested: Trac-0.11rc2
+# requires:  
+# tested: Trac-0.11.4
+# model: generic.mkSlackBuild $Rev: 805 $
 #
 
 # Look for slackbuildrc
@@ -31,13 +32,14 @@ CWD="$(pwd)"
 SRC_NAME="Trac"
 PKG_NAME="Trac"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=0.11rc2}
+SRC_VERSION=${VERSION:=0.11.4}
 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:="www/apps/trac"}
 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
@@ -134,7 +203,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