merging with changes made since 21th May

git-svn-id: svn+slack://slack.fluxo.info/var/svn/mkbuilds@233 18ef50b8-d735-4ccd-97c1-689132df3dd9

3 files changed, 133 insertions, 0 deletions

diff --git a/net/misc/tor/rc.tor.new b/net/misc/tor/rc.tor.new
new file mode 100755
index 0000000..f90b6d3
--- /dev/null
+++ b/net/misc/tor/rc.tor.new
@@ -0,0 +1,20 @@
+#!/bin/sh
+#
+# init script for tor
+#
+
+PID="/var/run"
+PRIVOXY_PID="$PID/privoxy.pid"
+TOR_PID="$PID/tor.pid"
+USER="privoxy"
+
+if [ -f $TOR_PID ]; then
+  if ps `cat $TOR_PID` | grep -q tor; then
+    kill `cat $TOR_PID`
+  fi
+  rm $TOR_PID
+fi
+
+sudo -u $USER /usr/bin/tor &> /dev/null &
+echo "$!" > $TOR_PID
+
diff --git a/net/misc/tor/slack-required b/net/misc/tor/slack-required
new file mode 100644
index 0000000..a5db2a0
--- /dev/null
+++ b/net/misc/tor/slack-required
@@ -0,0 +1,4 @@
+# Dependency list to tor
+#
+# dependency [condition] [version]]
+libevent				
diff --git a/net/misc/tor/tor.mkbuild b/net/misc/tor/tor.mkbuild
new file mode 100644
index 0000000..c0af364
--- /dev/null
+++ b/net/misc/tor/tor.mkbuild
@@ -0,0 +1,109 @@
+#
+#  This mkbuild is free software; you can redistribute it and/or modify it under the
+#  terms of the GNU General Public License as published by the Free Software
+#  Foundation; either version 2 of the License, or any later version.
+#
+#  This mkbuild is distributed in the hope that it will be useful, but WITHOUT ANY
+#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+#  A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License along with
+#  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+#  Place - Suite 330, Boston, MA 02111-1307, USA
+#
+
+#--------------------
+# Personal variables
+#--------------------
+# Author name
+[[SLACKBUILD AUTHOR]]="Silvio Rhatto"
+
+# Initials author name
+[[SLACKBUILD AUTHOR INITIALS]]="rha"
+
+#------------------------
+# Construction Variables
+#------------------------
+#
+# Complete URL address or URL base address ( without $SRC_NAME-$VERSION... )
+[[DOWNLOAD FOLDER URL]]="http://www.torproject.org/dist/tor-0.2.0.30.tar.gz"
+
+#
+# Dependency list input
+[[SLACK REQUIRED]]="libevent"
+
+#
+# Documentation files. Null ("") to auto-set commom doc-files:
+[[DOCUMENTATION FILES]]="AUTHORS ChangeLog LICENSE README"
+
+#
+# ./configure options
+[[OTHER CONFIGURE ARGS]]="--sysconfdir=/etc"
+
+# SlackBuild model
+[[SLACKBUILD MODEL]]="generic.mkSlackBuild"
+
+# SlackBuild PATH in Slack.Sarava tree
+[[SLACKBUILD PATH]]="net/misc/tor"
+
+# Install script
+[[REST OF DOINST.SH]]="config etc/rc.d/rc.tor.new ; config etc/tor/torrc.sample ; config etc/tor/tor-tsocks.conf.new"
+
+# Signing keys
+[[SIGNING KEY ID]]="0x28988BF5 0x165733EA"
+
+# Config files
+[[CONFIG FILES]]="etc/tor/tor-tsocks.conf"
+
+#---------------------
+# SlackBuild Sections
+#---------------------
+# Default sections:
+#      head, set_variables, slkflags, start_structure, untar_source,
+#      make_package, install_package, build_package
+# Warning: don't remove '#>>' and "#<<" tags.
+#>> Start SlackBuild Sections:
+ on: head
+ on: slackbuildrc
+ on: set_variables
+ on: slkflags
+ on: error_codes
+ on: start_structure
+off: create_build_user_and_group
+ on: download_source
+off: md5sum_download_and_check_0
+off: md5sum_download_and_check_1
+ on: gpg_signature_check
+ on: untar_source
+ on: patch_source
+ on: configure
+ on: make_package
+ on: install_package
+ on: strip_binaries
+off: compress_manpages
+off: compress_info_files
+ on: copy_init_scripts
+ on: install_documentation
+ on: slackdesc
+ on: move_config_files
+ on: postinstall_script
+ on: build_package
+ on: clean_builds
+#<< End SlackBuild Sections
+
+#------------------
+# Sections changes
+#------------------
+#>slackdesc
+tor: tor (An anonymous Internet communication system)
+tor:
+tor: Tor is a toolset for a wide range of organizations and people that
+tor: want to improve their safety and security on the Internet. Using Tor
+tor: can help you anonymize web browsing and publishing, instant
+tor: messaging, IRC, SSH, and other applications that use the TCP
+tor: protocol. Tor also provides a platform on which software developers
+tor: can build new applications with built-in anonymity, safety, and
+tor: privacy features.
+tor:
+tor:
+#<slackdesc