updated my software to resdb

10 files changed, 40 insertions, 124 deletions

diff --git a/contrib/peer2anonet/peer2anonet b/contrib/peer2anonet/peer2anonet
index fb8564f..1893439 100755
--- a/contrib/peer2anonet/peer2anonet
+++ b/contrib/peer2anonet/peer2anonet
@@ -10,7 +10,9 @@ USAGE(){
     echo -e '\n    --update                regenerate peer configurations'
     echo -e '\n    --configure-peer        generate a new peer configuration and update'
     echo -e '\n    --rm-peer               remove a peer configuration and update'
-    echo -e '\n    --install-daemontools   installs daemontools\n'
+    echo -e '\n    --install-daemontools   installs daemontools'
+    echo -e '\n    --install-ucspi-tcp     installs ucspi-tcp'
+    echo -e '\n    --install-djbdns        installs djbdns\n'
     exit 0
     }
 
@@ -282,6 +284,36 @@ INSTALL_DAEMONTOOLS(){
     package/install
     }
 
+INSTALL_UCSPI_TCP(){
+    [[ $(echo X`which gcc`) == X ]] && echo '   error: cannot find gcc'
+    [[ $(echo X`which gcc`) == X ]] && exit 1
+    [[ $(echo X`which make`) == X ]] && echo '   error: cannot find make'
+    [[ $(echo X`which make`) == X ]] && exit 1
+    cd /usr/local/src
+    wget http://cr.yp.to/ucspi-tcp/ucspi-tcp-0.88.tar.gz
+    gunzip ucspi-tcp-0.88.tar
+    tar -xf ucspi-tcp-0.88.tar
+    cd ucspi-tcp-0.88
+    sed -i 's/gcc/gcc -include errno.h/g' src/conf-cc
+    make
+    make setup check
+    }
+
+INSTALL_DJBDNS(){
+    [[ $(echo X`which gcc`) == X ]] && echo '   error: cannot find gcc'
+    [[ $(echo X`which gcc`) == X ]] && exit 1
+    [[ $(echo X`which make`) == X ]] && echo '   error: cannot find make'
+    [[ $(echo X`which make`) == X ]] && exit 1
+    cd /usr/local/src
+    wget http://cr.yp.to/djbdns/djbdns-1.05.tar.gz
+    gunzip djbdns-1.05.tar
+    tar -xf djbdns-1.05.tar
+    cd djbdns-1.05
+    echo gcc -O2 -include /usr/include/errno.h > conf-cc
+    make
+    make setup check
+    }
+
 
 if [ "$1" == '--configure' ]; then
     CONFIGURE
@@ -293,8 +325,12 @@ elif [ "$1" == '--configure-peer' ]; then
 elif [ "$1" == '--rm-peer' ]; then
     RM_PEER
     UPDATE
-elif [ "$1" == '--rm-peer' ]; then
-    INSTALL_DAEMONTOOLS
+elif [ "$1" == '--install-daemontools' ]; then
+    INSTALL_CORE
+elif [ "$1" == '--install-ucspi-tcp' ]; then
+    INSTALL_UCSPI_TCP
+elif [ "$1" == '--install-djbdns' ]; then
+    INSTALL_DJBDNS
 else
     USAGE
 fi
diff --git a/contrib/splicex/CHANGES b/contrib/splicex/CHANGES
deleted file mode 100644
index aefb866..0000000
--- a/contrib/splicex/CHANGES
+++ /dev/null
@@ -1,63 +0,0 @@
-CHANGES:
-
-	d3v11 - Sat Oct 22 2011:
-
-		SpliceX is the new replacement for Splice3.
-		it includes some new options and should be
-		compatible with most versions of Python.
-
-		see README, splicex --help, splicex --rtfm
-
-	d3v11 - Sun Oct 23 2011:
-
-		Added some colour enhancements to SpliceX
-		:-). This is a useless update but i thought
-		it was fun.
-
-		Also, I trimmed down much unnecessary
-		code.
-
-		'deshadow' bug fixed in splicex.py src
-
-	d3v11 - Fri Oct 28 2011:
-
-		SpliceX now compiles to machine language
-		via Cython. see README for dependencies
-		and installation details.
-		
-		SpliceX compiler flags patched. recent
-		update did not distinguish:
-
-			/usr/include/<python version>
-
-				-FROM-
-
-			/usr/local/include/<python version>
-
-		Thus, if you have debian python-dev or 
-		source python-dev the ./configure script
-		should choose the appropriate option.
-		if the configure still failed to locate
-		the python development files (headers)
-		please let me know and I will correct.
-
-		SpliceX can now optionally do a pure
-		python install. This cuts down on
-		dependencies and is useful if you just
-		want to test, try, and/or debug.
-
-		SpliceX now detects invalid arguments
-		and prints with error message.
-
-	d3v11 - Sat Oct 29 2011:
-		
-		Old timing bug is now fixed. --time now
-		how a consistant tracking of how many
-		passwords and how much time has elapsed
-		among each brute force algorithm. This
-		new patch also simplified the code and
-		makes the functions faster. Much code
-		has been trimmed from splicex without
-		removing any options or functionality.
-
-		--no-char bug fixed
diff --git a/contrib/splicex/DEBIAN/control b/contrib/splicex/DEBIAN/control
index 4bc2760..8f97b98 100644
--- a/contrib/splicex/DEBIAN/control
+++ b/contrib/splicex/DEBIAN/control
@@ -7,6 +7,6 @@ Package: Splicex
 Architecture: all
 Depends: python2.6 (>= 2.6)
 Description: SpliceX
- brute force utilities for the linux shell.
+ Brute Force Utilities For GNU/Linux.
 
 
diff --git a/contrib/splicex/LICENSE b/contrib/splicex/LICENSE
deleted file mode 100644
index 87f9e86..0000000
--- a/contrib/splicex/LICENSE
+++ /dev/null
@@ -1,22 +0,0 @@
-                __________        _ _         __  __    ______  
-               / / / / ___| _ __ | (_) ___ ___\ \/ /   / / / /  
-              / / / /\___ \| '_ \| | |/ __/ _ \\  /   / / / /
-             / / / /  ___) | |_) | | | (_|  __//  \  / / / /   
-            /_/_/_/  |____/| .__/|_|_|\___\___/_/\_\/_/_/_/    
-                           |_|                                                           
-                                                                                               
-                                                                                               
-                                                                                               
-                 .:Brute Force Utilities For GNU/Linux:.                              
-
-
-
-   SpliceX 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 3 of the License, or (at your option)
-   any later version.                                                       
-
-   SpliceX 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. <http://www.gnu.org/licenses/>
diff --git a/contrib/splicex/README b/contrib/splicex/README
index 8cbe4ee..69b78f5 100644
--- a/contrib/splicex/README
+++ b/contrib/splicex/README
@@ -7,16 +7,6 @@
 
                      .:Brute Force Utilities For GNU/Linux:.
 
-       SpliceX 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 3 of the License, or (at your option)
-       any later version.
-
-       SpliceX 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. http://www.gnu.org/licenses/
-
 AUTHOR:
 
 	d3v11 <d3v11@d3v11.ano>
diff --git a/contrib/splicex/src/manual b/contrib/splicex/src/manual
index f11acc0..8453157 100644
--- a/contrib/splicex/src/manual
+++ b/contrib/splicex/src/manual
@@ -8,19 +8,6 @@
  
                      .:Brute Force Utilities For GNU/Linux:.
 
-
-       SpliceX 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 3 of the License, or (at your option)
-       any later version.
-
-       SpliceX 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. <http://www.gnu.org/licenses/>
-
-
-
 .SH
 OPTIONS
 
diff --git a/contrib/splicex/src/splicex.pyx b/contrib/splicex/src/splicex.pyx
index 206cee6..abf9057 100644
--- a/contrib/splicex/src/splicex.pyx
+++ b/contrib/splicex/src/splicex.pyx
@@ -22,18 +22,6 @@ def HELP():
     print('')
     print('')
     print('')
-    print('   SpliceX is free software: you can redistribute it and/or modify it under ')
-    print('   the terms of the GNU General Public License as published by the Free     ')
-    print('   Software Foundation, either version 3 of the License, or (at your option)')
-    print('   any later version.                                                       ')
-    print('')
-    print('   SpliceX is distributed in the hope that it will be useful, but WITHOUT   ')
-    print('   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or    ')
-    print('   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License    ')
-    print('   for more details. <http://www.gnu.org/licenses/>                         ')
-    print('')
-    print('')
-    print('')
     print(Red + '   --help                ' + DefColour + 'Show help display and exit')
     print('')
     print(Red + '   --command             ' + DefColour + 'Parse passwords to this command')
diff --git a/contrib/tor2dns/tor2dns/README b/contrib/tor2dns/README
index 5194c76..5194c76 100644
--- a/contrib/tor2dns/tor2dns/README
+++ b/contrib/tor2dns/README
diff --git a/contrib/tor2dns/tor2dns/run b/contrib/tor2dns/run
index 1e543a9..1e543a9 100755
--- a/contrib/tor2dns/tor2dns/run
+++ b/contrib/tor2dns/run
diff --git a/contrib/tor2dns/tor2dns/serve b/contrib/tor2dns/serve
index 0274b74..0274b74 100755
--- a/contrib/tor2dns/tor2dns/serve
+++ b/contrib/tor2dns/serve