tor: adding tor

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

2 files changed, 29 insertions, 20 deletions

diff --git a/net/misc/tor/Manifest b/net/misc/tor/Manifest
index 40367731..3e65e968 100644
--- a/net/misc/tor/Manifest
+++ b/net/misc/tor/Manifest
@@ -3,24 +3,25 @@ Hash: SHA256
 
 DIST tor-0.2.0.34.tar.gz 2170871 MD5 f20011be23d5a76988233df12c346f41 RMD160 a7a1a78b32072524472c6b2973117689aab4823b SHA1 6797b85cf4bd44a3a1c3ff1ccb9c46b55f9391f9 SHA256 1bb19bcc52d365b47dd0e7bc06e3208786447a1cf759d6595c516a0f0cde3cb2 SHA512 7e7bc9a57213a4111d6e24df1d02debf7f4e8e5e1fab1987af667bee81c1ba15360f0bbadc0d4fc7c1844e6330d25bfc439bed7566c8a3565a6c6a912c3b3d2c
 DIST tor-0.2.0.35.tar.gz 2221852 MD5 d4841e1b4d54866495fd373e865b2d44 RMD160 ecc98c602b5c153a8aa8f6e651166705bc05c972 SHA1 6216887e0575c4a18f46e53faea1ebdb04bf7905 SHA256 7180c56c11e13d1ca860e3773ddfb2c9f951900670224a0850766795ac94b62e SHA512 3b0ad2148c5f64921112a8fc46dc3fc389fae095fc03cdd489063ced87b4063f9890d2c3fa1c0d3ed906c98a5d318fd04fe6f879e037d6c4f8a7b384fb5972ce
+DIST tor-0.2.1.22.tar.gz 2408280 MD5 583501a989ed0c39e209b604c3671ecd RMD160 382829f8772a16fb94883b9a88e1f3e3ff0f16a6 SHA1 bf6114592570e0a0d0d8b23de991ecc03bfc6633 SHA256 c6f9340bcbae3a033bfac215ad9e6df80e4ee814a880b9755bddfa3a266f3e18 SHA512 e9c44a2e4008856b525f370ca6cd49cfc3663c20edf9969e65065cba1158724405671aa2aac3798544c50a74e4823bb10470efc01e8524786239458cfd4b0eb0
 MISC rc.tor.new 301 MD5 63b5085a7fba2cc7a88653504b34493c RMD160 976c4a560173fffc854b519c67250fb8b43c72a8 SHA1 9352f5b64c054ce043721fb633979c1981674546 SHA256 b949e5b6f12920c52609a618f8972e29b310369d53617bb6629b61731a17e141 SHA512 e91108836f610871ada25941784b23b5a8510de27477108fc01c6e3b4e1c95107ca9c115984774eeaf5c7d82efcef32bbe5202f6d4bae4938cedda89d2474dcb
-MKBUILD tor.mkbuild 3251 MD5 ab761ecbe904c16a7c060b4c8d039b48 RMD160 83ece15a32584f43b77f5f0b91b94741b8d37dbe SHA1 378a56d74d4b916109225f05ea20c329295e84f3 SHA256 e8a3ca7d38be10e088699c1c63721e89baa577746562343e8459b00ddad3a5cd SHA512 83b3a9674cca1b0ef2d706ad58112be953e43a4c7c39fc23c75f56b63c05ccfe58e0a8de9a7a7114275b9111cd6cc7b64254ae5d6648e33439432b764b25d094
+MKBUILD tor.mkbuild 3251 MD5 4a35e3322b55751f755a4c54b31a59b0 RMD160 52b759692ec9d5586fd68811b93c7e2bd9725bdb SHA1 79190d3afde192eb0e7cd615b373687e3c99f151 SHA256 e19c5737249aa1a97bb2a95229357f4aea5036586f0a2196ffe0a6619d634f0b SHA512 0130a93dfcc28efab0911ae09133a43a56f2211cabf7652a7748777bb34e0fcfc47428dd5750c4de393b52d095cbbb1d44813b32b81e1a6430aa67ee33a2ae21
 SLACK-REQUIRED slack-required 76 MD5 c7ca4740be239c51d69b3d4a7cce9528 RMD160 ed0db5575c2bdd8667623e3a34b1df9afa256704 SHA1 a22b8cb045bfce0c916de6ffd280773656531001 SHA256 94857833fe38ed3fecd7ec592c6d2ae46bb2f9c7bc7ac0f278c8e73c752b1a34 SHA512 546946b33f6f93ae79fd8a021d93115533baa5c9ca398369d54aedb6d7295a57ceb72311f9fab7ce4c43bb68bf79f3c2ed95580da1e8337dfe951cc535f54a3f
-SLACKBUILD tor.SlackBuild 10973 MD5 19eb7204614dc868a7b1c460503ba64d RMD160 417bb771c803b38356bc751ab6ff4151cbb41f11 SHA1 0dfb73ef6a401e81e5cb578f91631b89b9de2281 SHA256 74e79215c0d51db6d71be34e318a92b4f32c7991570e9c71e6cfa9d9a007db81 SHA512 48b6bb87e2a9b31af0df9bad372ee8c76d86b3cd6babf7bedc838ea57f39271375fd85be7efc80d4348701133bb27ee551a4c6a6de945809fcf64c767f337ea1
+SLACKBUILD tor.SlackBuild 11250 MD5 33995caef48925f9a886e2db3889fe22 RMD160 ecc9632a92fe845ce63b9bd85a7abf0ba0cbab13 SHA1 673adabb781ac4d0dece61a7860cabf3b83df702 SHA256 ce779bc557286da4d5dbeecbdb01d445c015cf54730c6dbc99a9cab4eb8dcb81 SHA512 dba86292887194e78000c9dcc8a0d288cb8488a30c621fb9f24fd9a0d80c109ca05e70014bf29e87c4597a9b0fcc033882afc1d77f05b3b7b0e291bf4d95ec94
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iQIcBAEBCAAGBQJKSLhPAAoJEEHL93ESzgeiUawP/2Jcotp+xb0Q+7T3nbRVPblz
-kS2/IOo7AbnoQjytkaT3gDWIwxe+i8IQYGWfMCbMh5lyueej8nkdZVvyNX9XeJ7T
-Zg5FXo73yz1C/HqZqFPSVzvPWwylg0iZ13DAJb+MpZ57Dn4z2SF5GvWDXVuiGi3V
-GdrmrLU4JmaaU8DY2fdkvS/9As6eid2V7OPR4BjoIuWhFWBcca0BTN5nquuHv560
-M6VL/6dPyaXT5lZtXDjbjgvIlyYo4ex6VmS2sD8xkusj9a7PECYnJXmIbhotr3w1
-izWPFKWBlDvKhI8UfV9mq4Mum9FCNhAHEeTfMTPTkl9uEVvyeB7GOIprSx0Wlcf8
-/RkLxq6IranpJs7DVlyzCZZ27Ice7nhOH0HtLPZF9tNFvf0+ciqD/0WqUsLEPhte
-ohS37JC1ltbjnwfawp5iXaBS9D9v+nq/wLcIaE/7UcTX0VHDe63jMIePjpkhs6//
-13KK6n4SDlc9RaRXkY9JhGNxcg+6VxXdHDn5bKJ1j1e0z4x4yPlg0MDQnFeWJzU8
-AEwpGvPd1rKtE5EzngOLZvHMywX3a8RkaKRKhOjr8+8UUvhnWwLHdQxLsLX8usge
-5jUnECNmMbx1rQo9tl3ubhVt3NWDjOyj8Ig7/fjvlhZYni//Ktq4hO7Yen/Xu+TC
-tBnCMrY6l0Jm1w8fmQzy
-=Mww7
+iQIcBAEBCAAGBQJLZC2tAAoJEEHL93ESzgeiXucP/A42LIFFfeUwmJeFjtX1c/mf
+Gaz6UMA1Ishp/oc0UMwBrVp9BotqWEF2Cf7Kp98gHymEsG/flkbBuJyLYQ1O0ZMw
+cOq9R0YVNYkMlsuf+/itwlBbxqqTJsioo4e8u2cou2QQEFHjiy/qyKK+AeFImcvc
+HGcez12UXUtWe5FMPIoavKaIk62y2uR03uybnLODhQxckUFXoy5caLFeU5Zpg8Qm
+JQvr88IpwDm4qE+VgzdwqpdBr8JeqsmQGOIPgpb2vfUdQWGO+ZMLLTatzc2UfMul
+saaIsg/Op6j1F9+ytlSLel2fydD9ojhzoiaISvZgekkljlwfY5m1aIahJf8CgODy
+7HhHrWVWNY0yKFtyaCO3gy4Z5P1u50pbVzBL3iCe/1a5khUhdKRX8IaRFeuHxXZe
+SuumLBsegWW5TXDQPsYl5jnLIPEeJRciazwJuVl53kXRD6AY+XCw/BOUEIsopCej
+ZRRzaKCMhDwiE99y5dP1Yf5oCwZyjKR2guw7G4UmbZxixEcXKbW2BqxY2w1MkLkX
+SujKqXeMhh+xSVWiZlMWQETN+7Xe0ezesAuK6WlXgqI9KPHNXj36szjdUx6j0qFU
+a7vm5IV1OOzaPtpnD4SIgf3I217OPFIgvW+UEKxNUtSp0dzWWzdeLet2rRCSio0Q
+2lvnO3INBZ0R1Nlf1hTl
+=McoR
 -----END PGP SIGNATURE-----
diff --git a/net/misc/tor/tor.SlackBuild b/net/misc/tor/tor.SlackBuild
index c840c209..0b121aca 100755
--- a/net/misc/tor/tor.SlackBuild
+++ b/net/misc/tor/tor.SlackBuild
@@ -16,8 +16,8 @@
 #
 # slackbuild for tor, by Silvio Rhatto
 # requires:  
-# tested: tor-0.2.0.35
-# model: generic.mkSlackBuild $Rev: 805 $
+# tested: tor-0.2.1.22
+# model: generic.mkSlackBuild $Rev: 824 $
 #
 
 # Look for slackbuildrc
@@ -32,7 +32,7 @@ CWD="$(pwd)"
 SRC_NAME="tor"
 PKG_NAME="tor"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=0.2.0.35}
+SRC_VERSION=${VERSION:=0.2.1.22}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1rha}
 SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
@@ -109,6 +109,8 @@ else
     SIGNATURE="$SRC.sig"
   elif [ -s "$SRC_DIR/$SRC.asc" ]; then
     SIGNATURE="$SRC.asc"
+  elif [ -s "$SRC_DIR/$SRC.sign" ]; then
+    SIGNATURE="$SRC.sign"
   else
     echo Trying to get signature file from $URL.sig...
     if wget "$URL.sig" -O "$SRC_DIR/$SRC.sig"; then
@@ -120,8 +122,14 @@ else
         SIGNATURE="$SRC.asc"
       else
         rm $SRC_DIR/$SRC.asc
-        echo "Error getting source's signature file"
-        exit $ERROR_GPG
+        echo Trying to get signature file from $URL.sign...
+        if wget "$URL.sign" -O "$SRC_DIR/$SRC.sign"; then
+          SIGNATURE="$SRC.sign"
+        else
+          rm $SRC_DIR/$SRC.sign
+          echo "Error getting source's signature file"
+          exit $ERROR_GPG
+        fi
       fi
     fi
   fi