Merge branch 'master' of git://1.0.27.102

6 files changed, 29 insertions, 129 deletions

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 b851334..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>
@@ -25,11 +15,11 @@ AUTHOR:
 
 (UN)INSTALL:
 
-	You may optionally install splicex with cython. Doing so takes
-	longer to install because of compile times but splicex will
+	You may optionally install SpliceX with cython. Doing so takes
+	longer to install because of compile times but SpliceX will
 	also be 20% to 35% faster, depending on your system. I recommend
-	this option if you intend on putting splicex to long-term use.
-	If your goal is simply to test, try, and/or debug splicex then
+	this option if you intend on putting SpliceX to long-term use.
+	If your goal is simply to test, try, and/or debug SpliceX then
 	using the pythonic install will be more practical.
 
 	NOTES:
@@ -46,6 +36,13 @@ AUTHOR:
 		This generates Python.h and structmember.h, which are
 		needed for gcc to compile splicex.
 
+		"<python[version]>" as seen in the install instructions
+		should be typed the same way you would call a specific
+		Python interpreter with only the first two version
+		numbers. IE:
+
+		python2.6, python2.7, python3.1, python3.2
+
 	DEPENDS ON:
 
 		python (>=2.6), python-dev(>=2.6), cython (>=0.12.1), 
@@ -69,7 +66,8 @@ AUTHOR:
 		 		make uninstall
 
 			DEBIAN/UBUNTU:
-		 		apt-get remove splicex
+
+				dpkg --remove splicex
 
 PYTHONIC (UN)INSTALL:
 
@@ -79,6 +77,17 @@ PYTHONIC (UN)INSTALL:
 	cython + gcc option above. I recommend using this option
 	if you simply want to test, try, and/or debug splicex.
 
+	NOTES:
+
+		"<python[version]>" as seen in the install instructions
+		should be typed the same way you would call a specific
+		Python interpreter with only the first two version
+		numbers. For a Pythonic install "python" sans the version
+		will most likely work as well, and will set SpliceX to
+		use the default Python Interpreter. IE:
+
+		python2.6, python2.7, python3.1, python3.2
+
 	DEPENDS ON:
 
 		python (>=2.6), bash (>=4.1.5), man (>=2.5.7)
@@ -99,7 +108,8 @@ PYTHONIC (UN)INSTALL:
 		 		make uninstall
 
 			DEBIAN/UBUNTU:
-		 		apt-get remove splicex
+		 		
+				dpkg --remove splicex
 
 TOOLS:
 
@@ -110,13 +120,13 @@ TOOLS:
 
 UPDATE:
 
-	d3v11's AnoNet(2) update for splicex:
+	d3v11's AnoNet(2) update for SpliceX:
  
 	make update
 
 HELP AND USAGE:
 
-	To obtain additional information on how to use splicex
+	To obtain additional information on how to use SpliceX
 	enter either of the following commands after installation:
 
 	splicex --help
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')