merging with changes made since 21th May

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

4 files changed, 357 insertions, 0 deletions

diff --git a/net/proxy/privoxy/privoxy.mkbuild b/net/proxy/privoxy/privoxy.mkbuild
new file mode 100644
index 0000000..bd1c85e
--- /dev/null
+++ b/net/proxy/privoxy/privoxy.mkbuild
@@ -0,0 +1,122 @@
+#
+#  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://downloads.sourceforge.net/ijbswa/privoxy-3.0.9-beta-src.tar.gz"
+
+# Source base name. if different from package name. Null ("") to default value.
+# Auto-set, get SRC_NAME from URL: http://.../$SRC_NAME-$VERSION.tar.$EXTENSION'
+[[SOURCE NAME]]="privoxy"
+
+#
+# Package version.  Null ("") to auto-set.
+# Auto-set, get VERSION from URL: http://.../$SRC_NAME-$VERSION.tar.$EXTENSION'
+[[VERSION]]="3.0.9-beta"
+
+#
+# Source Name construction string
+# Default value is: $SRC_NAME-$VERSION.tar.$EXTENSION
+[[SOURCE NAME CONSTRUCTION STRING]]="$SRC_NAME-$VERSION-src.tar.$EXTENSION"
+
+#
+# Documentation files. Null ("") to auto-set commom doc-files:
+[[DOCUMENTATION FILES]]="AUTHORS ChangeLog LICENSE Makefile README"
+
+#
+# ./configure options
+[[OTHER CONFIGURE ARGS]]="--sysconfdir=/etc/privoxy"
+
+# SlackBuild model
+[[SLACKBUILD MODEL]]="generic.mkSlackBuild"
+
+# SlackBuild PATH in Slack.Sarava tree
+[[SLACKBUILD PATH]]="net/proxy/privoxy"
+
+# Install script
+[[REST OF DOINST.SH]]="mkgroup privoxy ; mkuser privoxy ; config etc/privoxy/config.new ; config etc/privoxy/trust.new"
+
+# Config files
+[[CONFIG FILES]]="etc/privoxy/config etc/privoxy/trust"
+
+#---------------------
+# 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
+ on: create_build_user_and_group
+ on: download_source
+off: md5sum_download_and_check_0
+off: md5sum_download_and_check_1
+off: 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
+privoxy: privoxy (A Web proxy with advanced filtering capabilities)
+privoxy:
+privoxy: Privoxy is a Web proxy based on Internet Junkbuster with advanced
+privoxy: filtering capabilities for protecting privacy, filtering Web page
+privoxy: content, managing cookies, controlling access, and removing ads,
+privoxy: banners, pop-ups, and other obnoxious Internet junk. Privoxy has a
+privoxy: very flexible configuration and can be customized to suit individual
+privoxy: needs and tastes. Privoxy is useful for both stand-alone systems and
+privoxy: multi-user networks.
+privoxy:
+privoxy:
+#<slackdesc
+
+#p>
+ # Configure
++autoheader || exit $ERROR_CONF
++autoconf || exit $ERROR_CONF
+#p<
diff --git a/net/proxy/privoxy/rc.privoxy.new b/net/proxy/privoxy/rc.privoxy.new
new file mode 100755
index 0000000..932dcc0
--- /dev/null
+++ b/net/proxy/privoxy/rc.privoxy.new
@@ -0,0 +1,105 @@
+#!/bin/sh
+#  ********************************************************************
+
+RETVAL=1
+
+PRIVOXY_PRG="privoxy"
+PRIVOXY_BIN="/usr/sbin/$PRIVOXY_PRG"
+PRIVOXY_CONF="/etc/privoxy/config"
+PRIVOXY_USER="privoxy"
+PRIVOXY_GROUP="privoxy"
+PRIVOXY_PID="/var/run/$PRIVOXY_PRG/$PRIVOXY_PRG.pid"
+
+declare -i check
+check=(`/bin/ps -e|/bin/grep $PRIVOXY_PRG|/usr/bin/wc -l`)
+
+# some checks for us
+if [ ! -x $PRIVOXY_BIN  ] ; then exit 0 ;fi
+if [ ! -f $PRIVOXY_CONF ] ; then exit 0 ;fi
+
+# See how we were called.
+
+PRIVOXY="$PRIVOXY_BIN $PRIVOXY_CONF"
+
+start () {
+	# start daemon
+	echo -n $"Starting $PRIVOXY_PRG: "
+
+	if [ ! -f $PRIVOXY_PID ]; then
+		( $PRIVOXY --user $PRIVOXY_USER.$PRIVOXY_GROUP --pidfile $PRIVOXY_PID -c $PRIVOXY_CONF 2>/dev/tty9 ) \
+			&& echo " OK" \
+			&& /bin/touch /var/lock/$PRIVOXY_PRG \
+			&& RETVAL=0
+	elif [ $check -lt 3 ]; then 
+	        echo "Zombie lock file found"
+	        /bin/rm -f /var/lock/$PRIVOXY_PRG $PRIVOXY_PID
+		echo "Retrying..."
+		start
+	else
+		echo "Already running"
+	fi
+	echo
+}
+
+stop () {
+	# stop daemon
+	echo -n $"Stopping $PRIVOXY_PRG: "
+	if [ -f $PRIVOXY_PID ]; then
+		/bin/kill `/bin/cat $PRIVOXY_PID` \
+			&& /bin/rm -f /var/lock/$PRIVOXY_PRG $PRIVOXY_PID \
+			&& echo " OK" \
+			&& RETVAL=0
+		echo
+	else
+		echo " Not Running"
+	fi
+}
+
+case "$1" in
+  start)
+	start	
+	;;
+  stop)
+	stop	
+	;;
+  reload)
+	if [ -f $PRIVOXY_PID ] ; then
+                /bin/kill -HUP `cat $PRIVOXY_PID` \
+			&& RETVAL=0
+        fi
+	;;
+  restart)
+	stop 
+	start
+	;;
+  kill)
+	echo "Kill all Privoxy"
+	/bin/rm -f /var/lock/$PRIVOXY_PRG $PRIVOXY_PID 
+	/bin/killall $PRIVOXY
+	;;
+  condrestart)
+	# restart only if already running
+	if [ -f $PRIVOXY_PID ] ; then
+		stop
+		start
+	fi 
+	;;
+  status)
+	/bin/ps ax|/bin/grep $PRIVOXY_PRG|/bin/grep -v 'grep\|init\.d\|rc\.d'
+	RETVAL=0
+	;;
+  top)
+	if [ -f $PRIVOXY_PID ]; then
+                a=""
+                for i in `/sbin/pidof $PRIVOXY_PRG` ; do
+                        a="$a -p $i"
+                done
+                /usr/bin/top $a
+        fi
+	;;
+  *)
+	echo $"Usage: $PRIVOXY_PRG {start|stop|reload|restart|condrestart|status|top|kill}"
+	exit 1
+esac
+
+exit $RETVAL
diff --git a/net/proxy/tsocks/tsocks-1.8beta5-x86_64.diff b/net/proxy/tsocks/tsocks-1.8beta5-x86_64.diff
new file mode 100644
index 0000000..53b86af
--- /dev/null
+++ b/net/proxy/tsocks/tsocks-1.8beta5-x86_64.diff
@@ -0,0 +1,36 @@
+diff -Naur tsocks-1.8.orig/tsocks tsocks-1.8/tsocks
+--- tsocks-1.8.orig/tsocks	2002-03-16 07:27:18.000000000 -0300
++++ tsocks-1.8/tsocks	2006-12-06 19:33:31.000000000 -0200
+@@ -46,14 +46,14 @@
+ 	on)
+ 		if [ -z "$LD_PRELOAD" ]
+ 			then
+-				export LD_PRELOAD="/usr/lib/libtsocks.so"
++				export LD_PRELOAD="/usr/lib64/libtsocks.so"
+ 			else
+-				echo $LD_PRELOAD | grep -q "/usr/lib/libtsocks\.so" || \
+-				export LD_PRELOAD="/usr/lib/libtsocks.so $LD_PRELOAD"
++				echo $LD_PRELOAD | grep -q "/usr/lib64/libtsocks\.so" || \
++				export LD_PRELOAD="/usr/lib64/libtsocks.so $LD_PRELOAD"
+ 		fi
+ 	;;
+ 	off)
+-		export LD_PRELOAD=`echo -n $LD_PRELOAD | sed 's/\/usr\/lib\/libtsocks.so \?//'`
++		export LD_PRELOAD=`echo -n $LD_PRELOAD | sed 's/\/usr\/lib64\/libtsocks.so \?//'`
+ 		if [ -z "$LD_PRELOAD" ]
+ 			then
+ 				unset LD_PRELOAD
+@@ -68,10 +68,10 @@
+ 	*)
+ 		if [ -z "$LD_PRELOAD" ]
+ 		then
+-			export LD_PRELOAD="/usr/lib/libtsocks.so"
++			export LD_PRELOAD="/usr/lib64/libtsocks.so"
+ 		else
+-			echo $LD_PRELOAD | grep -q "/usr/lib/libtsocks\.so" || \
+-			export LD_PRELOAD="/usr/lib/libtsocks.so $LD_PRELOAD"
++			echo $LD_PRELOAD | grep -q "/usr/lib64/libtsocks\.so" || \
++			export LD_PRELOAD="/usr/lib64/libtsocks.so $LD_PRELOAD"
+ 		fi
+ 
+ 		if [ $# = 0 ]
diff --git a/net/proxy/tsocks/tsocks.mkbuild b/net/proxy/tsocks/tsocks.mkbuild
new file mode 100644
index 0000000..74123e8
--- /dev/null
+++ b/net/proxy/tsocks/tsocks.mkbuild
@@ -0,0 +1,94 @@
+#
+#  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://downloads.sourceforge.net/tsocks/tsocks-1.8beta5.tar.gz"
+
+#
+# Documentation files. Null ("") to auto-set commom doc-files:
+[[DOCUMENTATION FILES]]="COPYING ChangeLog FAQ TODO"
+
+[[OTHER CONFIGURE ARGS]]="--sysconfdir=/etc"
+
+# SlackBuild model
+[[SLACKBUILD MODEL]]="generic.mkSlackBuild"
+
+# SlackBuild PATH in Slack.Sarava tree
+[[SLACKBUILD PATH]]="net/proxy/tsocks"
+
+#---------------------
+# 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
+off: 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
+off: copy_init_scripts
+ on: install_documentation
+ on: slackdesc
+off: move_config_files
+off: postinstall_script
+ on: build_package
+ on: clean_builds
+#<< End SlackBuild Sections
+
+#------------------
+# Sections changes
+#------------------
+#>slackdesc
+tsocks: tsocks (a transparent SOCKS proxying library)
+tsocks:
+tsocks: tsocks' role is to allow these non SOCKS aware applications (e.g
+tsocks: telnet, ssh, ftp etc) to use SOCKS without any modification. It does
+tsocks: this by intercepting the calls that applications make to establish
+tsocks: network connections and negotating them through a SOCKS server as
+tsocks: necessary.
+tsocks:
+tsocks:
+tsocks:
+tsocks:
+#<slackdesc