4 files changed, 101 insertions, 33 deletions
diff --git a/www/apps/tracwikiprint/Manifest b/www/apps/tracwikiprint/Manifest
index 2132284a..dfb6fe68 100644
--- a/www/apps/tracwikiprint/Manifest
+++ b/www/apps/tracwikiprint/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-MKBUILD TracWikiPrint.mkbuild 2751 MD5 0edbbc3eff976509cc8051b115be1505 RMD160 f46081b9a881cbf56d6f00fa21b1d8646c5f31ef SHA1 c01b7f4b102d071e7441eb826033b63779bb83ec SHA256 6cc8d5e1db458fdf7ce3c69b4ca86c7760f5485d6b8f320d827802234c754952 SHA512 704a7e18067b1a73f3d4f24f43f563915249a4dd154d5af2dd74deaf981046074d68b0bc62ff506fb48e7cd9dea76223b302fd558d5927bba6022a00c986c747
+MKBUILD TracWikiPrint.mkbuild 2836 MD5 fab3ab3fdd5ba52e3d296d147c717fce RMD160 4c48173bc8785b997493330362b3f050f3bcd042 SHA1 d91c4c3d601c4bf1c7c040cdf9566844bec7433b SHA256 dde920ec26fbd6cb438a4fc1aa48dd48fe9525c0cb698b75abaec8012bb4b321 SHA512 7a1439c6eddb249d0d2de85b3dc559417c5716778cda1498701c9746f7f534277f0af0c6fa77c58238749327412a0a0d9df5084c918fb0ae1ab826dfaaf637a0
 SLACK-REQUIRED slack-required 91 MD5 9d944aa1dbca6b807a154707efb48748 RMD160 93fe8eab397a78e438603fba9b5c20a20b7f3f76 SHA1 f840fec0df64cdebbbb141beb9cf847a14d98436 SHA256 c3ea7c263cba1fdd3709c6d4df48444659025ff625f2b6baa28357cdfbb65eca SHA512 c9f1367b4ea43dc493db10fe0baaef847ff3df1351d1a1af6c4bbdcf3eca67622a047bc9534300230a863a329fd712e56e34d5b452bf31f13ce2da3293a26877
-SLACKBUILD TracWikiPrint.SlackBuild 5095 MD5 aea4a6388f32b256ed0032a3a2583bb4 RMD160 cb29a667b20fad5a4b139b95497dbad7e751dcd5 SHA1 3ac0d1755d1e3bf13b07665252c8138d8ac23af1 SHA256 2080eba12ec2c6560070546a362ba38c84e389c56fc948c9e9ce9a18725ea6fa SHA512 2564e3028b7e3bb00caa5f17778158145ac75029293000ac26ede7afd1b482bc424787150ac400fee6b4d2859860e76fec1b0e96fc8cff3b8d41401aef831486
+SLACKBUILD TracWikiPrint.SlackBuild 7201 MD5 e9ec7b8dce78565ddd0bf87cb1af1b09 RMD160 0339a624dae6e700879496ef1be74d680c78fae6 SHA1 39518306e69135b76fc4133665e1c51e59f45125 SHA256 e324cc3654df1b45ab42dc7fb977409f655d873fb79e0b34fdd7128b23143139 SHA512 1af2e1135f095c83c9e8f6113e98fcd423bbd99dbb0429d88f24d57093c5fbc15864630da97dd670e51a4f680bdb71812498eb56f77b9b056c218541f1484252
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iQIcBAEBAgAGBQJJ+fu+AAoJEEHL93ESzgeiGKAP/1boR9nK3W3TjjmN3frSEqgd
-WRnkN+L+zml4MkAJwNL36ZpMHTvsITl3bOCqRQWwuhrnm+kkLVLTwTTcxQxbrL05
-E5cRL8rtxGvsAd7p4zzsGTtdAOhpS+ijGREsJ6lMdJ7SwyOkn9d7Du/6TtvNUU7y
-hpHujM08/9VdReblFwum6wokEID29+4L7O5+fv9JHXbXcKNSJt5fQzfVcPz4OdKp
-9ho8dmdDoW7faWMVQKzGpW8LH2KT19KsbPuO3WJ+jBVgmJyqFF1bVWxFZ4rnAZtj
-w7vjh2AT5fUWZg2HhJk+F5E1XkBaXgkC9Of5Jrt9rxi5/AiJfp75hgHG1MPPwy0d
-w8SzECgt07YkxlZa4inWTmrwHYdXZvcEuJoZwhhJP3q1j/OW+kx8IXSC4sTYeaQw
-FVM8ZPa0AUdj53kInZiNdptJPU/1vuJD27nChVKO1CuitbhdahdS7w3sW2bVn8pa
-EqzQ4YVWQ+AI+K73WPy7FYB8ZVSsMzKd3I3Uk4Sbg44s7Qksum1sUnziVSihyPmr
-R+t/aKSMrGIns0Mru721RoP9GFYBN1hjVylJEe8FjKUR3sRoJ33z79w0gEs9TpC8
-zZWX6lDevxi0oUdBAj6jGeXAx/lguiLKVx8fDbXgZLp9UWoEJWPKWzkh0zDc7Yu/
-L9VTTmbYnBorZ7QhRPHp
-=7ZUx
+iQIcBAEBCAAGBQJKAz3wAAoJEEHL93ESzgeidEQP/isUrlIxV4UkXZV9R254KCL6
+o+8DzCl2xy+l3mn9wyWg8KXTQan8L3wU2wSGGD5Z/Jp3uoWFH7Q20cEXjwksoxOP
+FgwQBCyDnV4zOpWIQwsGgYvQrNEs8rYXgNVoOTVb7j9MhyuUkmaTDENCMYFk4sNG
+8CTRS1ZwZ2Fn9yhuJ/np+m/+trAoyTrGL+B7YZ5PE+EDtfnCdrUTiAtqZxec5BTK
+YQTFE51p7bV53+yqCel5yjvL/FoYvqvXIg0CvgKMOq/LEmj9YWLYVaRQGp8p13OM
+2Aq0zPWasot6EuJi8iEhxabVcrPR5hrD0GWgj+0P/AI/YvdAQ+cSxOid6timKiUg
+3Jr6m5/kDGtD96QgLKHv8/Ed8Y2bAe1V1B2XE9kCKSSgpkkLTFe0mTDXDF9ZPhpB
+f9JKt8lsBNHTDRecbMRwI8jLpRwmnPL1Bc4XWnfbvwLVsmEaMmexow4q6VkxDEqH
+zP4eX+qE2D7mEJnpJjiqsF1w3s4SEce1qRqutNqsegyqZTjnmFHhatcPR7ScoGG3
+TKQ1P5Kj/fBKWEuJmWxfdLtQvA5S4FkW3FgoZZfaxAyOJSFigb6/axvvd/0RPOnz
+QO6MTxxiFhrejNOQG0pu/ZoXEa2HjKWqTqSS7L4CvwWtBp4wvzobBQiq3YjWm4X7
+ALpbS6hYr6DzIwUDHK1W
+=yd0p
 -----END PGP SIGNATURE-----
diff --git a/www/apps/tracwikiprint/TracWikiPrint.SlackBuild b/www/apps/tracwikiprint/TracWikiPrint.SlackBuild
index dfa574cd..ee9b0630 100644
--- a/www/apps/tracwikiprint/TracWikiPrint.SlackBuild
+++ b/www/apps/tracwikiprint/TracWikiPrint.SlackBuild
@@ -15,7 +15,7 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for TracWikiPrint, by Silvio Rhatto
-# requires: pisa 
+# requires:  
 # tested: TracWikiPrint-svn_version
 # model: generic.mkSlackBuild $Rev: 805 $
 #
@@ -99,8 +99,75 @@ 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
+
 # Build and install package
 python setup.py build install --root=$PKG
+touch $PKG/$LIBDIR/python2.5/site-packages/wikiprint/__init__.py
 
 # Strip binaries
 ( cd "$PKG"
diff --git a/www/apps/tracwikitopdf/Manifest b/www/apps/tracwikitopdf/Manifest
index e4eddd4b..513a95ba 100644
--- a/www/apps/tracwikitopdf/Manifest
+++ b/www/apps/tracwikitopdf/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-MKBUILD TracWikiToPdf.mkbuild 2840 MD5 ff4dae674d7e7b2fefa06aed622cfe8c RMD160 88fd33d76b7540292a99dd783afaf941540cce17 SHA1 a3a97027c5d0f753c35d030460d1b9aaf83070d1 SHA256 6f133f1b7a53611b4eee97c2595595fd7dc776462fc0eac59fed62a6f026c971 SHA512 458f44d713349f581787e4f5a72888144a4031899bc1d20e451f0d13772f56eaf8c1b6193c620021ecabd6faef0d4a8f3b2555220a13137fd91d380dcabedd31
+MKBUILD TracWikiToPdf.mkbuild 2905 MD5 8f19eb576eae9eefa59f97f44e3183d7 RMD160 a6fd50a2f012fe2c33b08249e6c78fd998151b6d SHA1 a2b0b7e0208f84baac78b509104cfe8ee9ef4e5b SHA256 a9912e8a6289778985efb60ef4b591104b767510424d102da4f14fffb46b78aa SHA512 608e72e6c87d306dec9262791e201f6db2a61e0b4668d05b1de9016460e1151455a0b41e41b147c1472b2b468ca582e534f55713f4ab8b840e90afe626ca9fd8
 SLACK-REQUIRED slack-required 94 MD5 619c81714c8c0d62ee0001b371f6d96d RMD160 a6f581a91a8f46d170a038d067e9d214e7ceb7fe SHA1 c6a272b54f5f98192e021500cfe8f1b4e1578a62 SHA256 a72c7797d3623f6241e14d24cb9fa9659ea13b53c48aa6e024098ac0fc2da650 SHA512 38db3643601e761f45488289cb8d00f3591ac1a7a012f4c7ee39f90077996aa8eb560b70242d85fff82075d1c54dc462d15a62c3ea7850366bca236c5b5002f8
-SLACKBUILD TracWikiToPdf.SlackBuild 7210 MD5 4ce6cf91dced6c336636aeb2c278cabb RMD160 99d2ebfa9e933cc5c6c6cee8c4aefe1262ace209 SHA1 b97de2a68d5c014c84682d01229d6ad5f5ca1445 SHA256 ca341483424dd676ba1fd8e9c71048ecee41f2d3bd0b3441e4e9ef1e978692c9 SHA512 cc47f3d978d42b96b40f2bae79ccb1c74656a8e95da4f8cc733b0e280dd65bf6b3572675c4f9cfe43b6b65650be660f5e16e35a12df88c76cc4e14e9c97ba89b
+SLACKBUILD TracWikiToPdf.SlackBuild 7268 MD5 da16feb34b5e9d24095f28ec14d949fc RMD160 ee63af17cdbcde12235f9ac49804058aa157a6b8 SHA1 487b028d7fae3542fe4e27e1cbfe5685c2e83f6c SHA256 76817596fe7b8100d54b527143d08612cb089c8c641776a87b0db72d19772e73 SHA512 7c25e33e80432aa7038eb3964de3cc7aa24320a195ea57cde7a1a4f318251d31c1157678fcfaf4a2ae18505e6fd41524ae115bc01a38a4bfe34da255608ed32d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iQIcBAEBCAAGBQJKAzLqAAoJEEHL93ESzgeiXCgP/2Q9+9hF0F+TjhtVkxgby/b7
-JAkyyLxq4JLPqfxx9m8STt8f7hXWPI1Q+0g1UDoobIU4aUz5tyI+XcP+1giC2Fjh
-IRO6LygYnFlIFKI5cEjotFjv5az8gEjKADrjzvQLVCSvU3n0kQw+DEHl5H36Wsvb
-/0EH3PFE5NNF2hbETAylF5MXbsGSRIoS+73eh0dy6CJzlnQ31+1JsfSYhixvRZqJ
-326YUNWJ32IDfx3UVM7R8zD+J/rV1M9z/kC5mmtPyqCit3uuvYL2Hat4h0YtN7fV
-vf/b96PFUiwdubM+z+11H+5kPB6Pcw1W9uz1lLwuTAWWbF5qyMY7fFzD2oiItmmY
-RrG+mGHRrrIk+FrTICbL4LlJGTR6AlrU0P8FmWLTtDHta9D+MONVE17vXrO7PuTD
-fdC5bOVS0GUxmFtQtypHUE9a+xX/9AbdBi3JG5OM8yjYWwfFe3dFZvtYOCaBYlJu
-/0De9X6GITttIum+E4GeYYShsJda87mZGX7fPgj5kiLRO/EcPIgO18mundK8TnoE
-T1vqw8aYts5Kd64tAjhXK+P5GHlqtIcxl84MrVybyEhj6JI7SJsLFBWGWJ9zHIjm
-rBuaAu1ZBRb/aiOdGLg0IKRWhy3A10205dMFx4ZyflrkkHP5uo/KnyXHHH/NVW8Q
-3/3UrW/y+XFhb2gGWl8M
-=CkaR
+iQIcBAEBCAAGBQJKAz5dAAoJEEHL93ESzgeidFQP/Rrf8m/8TxMwuxNypKhVh8tJ
+tlzywhCxJNjpAArdRSJf9Y6jxz2Qpof5LrDQzP/oUk8HegurYFCjKDELiOjRDvjN
+9gEl812LQfDuEhoNNKGoLZiccEhfkYzJOnen7ywweNdxxilDMPtrgyhE21NkLjuy
+4K1LEyvU+8XpRHitGzz7V6OfsRmgaWvVs2h9PxjTMva64wbpv7Qb0n0XRpRSLnwA
+sHqTP9MYijqDHlwTemJSue7iRH36LRIROGX112TfsVfKm+9OIgCAGJBzNPzV93xq
+JbAS9YuWa1+eIcBLiDgbLRlu64riMGxhUm07nzQ76kjtcyAV5fu5N46/87MDi5JU
+Q58dTyYQS91PGiaZj215tNR2VM4JUuIF0R9SuSzk1hf0+JaJ/10dTkOxWz4hLuq3
+/te9jWxMgd5F6XeNMdXLTHVUqq53UflXM+dYlQvhPft7odNn3mkMKhakWv99EuPn
+uG718Mca4APaikw+qm1wNmTq+FQMBlXGSZUs821OyoA+Wz36Jjwq4FJpBFDY7y9U
+F/3Jk7qyTNGSuzjS5RmPD83D3Zwu0Nw45FPfnjHARXioC7kTQdS1/nL0xqU3bSc1
+miPBzAbK+npptRYeEEDE0YuV0XhjHMdo7goOvMhPdD3AVpRAgySR4DlnR2U9PiN/
+PQTqZmq+p6YURSqwH9qO
+=2o35
 -----END PGP SIGNATURE-----
diff --git a/www/apps/tracwikitopdf/TracWikiToPdf.SlackBuild b/www/apps/tracwikitopdf/TracWikiToPdf.SlackBuild
index c7135ad8..4c2e9bf0 100644
--- a/www/apps/tracwikitopdf/TracWikiToPdf.SlackBuild
+++ b/www/apps/tracwikitopdf/TracWikiToPdf.SlackBuild
@@ -15,7 +15,7 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for TracWikiToPdf, by Silvio Rhatto
-# requires: htmldoc 
+# requires:  
 # tested: TracWikiToPdf-svn_version
 # model: generic.mkSlackBuild $Rev: 805 $
 #
@@ -167,6 +167,7 @@ fi
 
 # Build and install package
 python setup.py build install --root=$PKG
+touch $PKG/$LIBDIR/python2.5/site-packages/wikitopdf/__init__.py
 
 # Strip binaries
 ( cd "$PKG"