From e7437b31a5bb66fcce4bb32239d6c4b87cf84741 Mon Sep 17 00:00:00 2001 From: d3v11 Date: Fri, 23 Sep 2011 00:12:08 -0500 Subject: added splice3 to resdb/contrib --- contrib/splice3/Makefile | 72 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 contrib/splice3/Makefile (limited to 'contrib/splice3/Makefile') diff --git a/contrib/splice3/Makefile b/contrib/splice3/Makefile new file mode 100644 index 0000000..c7350f8 --- /dev/null +++ b/contrib/splice3/Makefile @@ -0,0 +1,72 @@ +#!/usr/bin/make -f + +install-deb: + make clean + mkdir DEBIAN/splice3 + mkdir DEBIAN/splice3/DEBIAN + mkdir DEBIAN/splice3/usr + mkdir DEBIAN/splice3/usr/bin + mkdir DEBIAN/splice3/etc + mkdir DEBIAN/splice3/etc/splice3 + cp DEBIAN/control DEBIAN/splice3/DEBIAN/control + ./LINUX/splice3.compile + mv LINUX/splice3.pyc DEBIAN/splice3/usr/bin/splice3 + mv LINUX/splice3-deshadow.pyc DEBIAN/splice3/usr/bin/splice3-deshadow + chmod +x DEBIAN/splice3/usr/bin/splice3 + chmod +x DEBIAN/splice3/usr/bin/splice3-deshadow + cp SPLICE3/splice3.list DEBIAN/splice3/etc/splice3/splice3.list + cp LINUX/manual DEBIAN/splice3/etc/splice3/splice3.1 + gzip DEBIAN/splice3/etc/splice3/splice3.1 + cp SPLICE3/LICENSE DEBIAN/splice3/etc/splice3/LICENSE + cp SPLICE3/splice3.L DEBIAN/splice3/etc/splice3/splice3.L + cp SPLICE3/splice3.N DEBIAN/splice3/etc/splice3/splice3.N + cp SPLICE3/splice3.S DEBIAN/splice3/etc/splice3/splice3.S + cp SPLICE3/splice3.LN DEBIAN/splice3/etc/splice3/splice3.LN + cp SPLICE3/splice3.LS DEBIAN/splice3/etc/splice3/splice3.LS + cp SPLICE3/splice3.NS DEBIAN/splice3/etc/splice3/splice3.NS + cp SPLICE3/splice3.LNS DEBIAN/splice3/etc/splice3/splice3.LNS + dpkg-deb --build DEBIAN/splice3 + dpkg -i DEBIAN/splice3.deb + rm -rf DEBIAN/splice3 DEBIAN/splice3.deb + +install: + make clean + make uninstall + ./LINUX/splice3.compile + mv LINUX/splice3.pyc /usr/bin/splice3 + mv LINUX/splice3-deshadow.pyc /usr/bin/splice3-deshadow + chmod +x /usr/bin/splice3 + chmod +x /usr/bin/splice3-deshadow + mkdir /etc/splice3 + cp SPLICE3/splice3.list /etc/splice3/splice3.list + cp LINUX/manual /etc/splice3/splice3.1 + gzip /etc/splice3/splice3.1 + cp SPLICE3/splice3.L /etc/splice3/splice3.L + cp SPLICE3/splice3.N /etc/splice3/splice3.N + cp SPLICE3/splice3.S /etc/splice3/splice3.S + cp SPLICE3/splice3.LN /etc/splice3/splice3.LN + cp SPLICE3/splice3.LS /etc/splice3/splice3.LS + cp SPLICE3/splice3.NS /etc/splice3/splice3.NS + cp SPLICE3/splice3.LNS /etc/splice3/splice3.LNS + cp SPLICE3/LICENSE /etc/splice3/LICENSE + +uninstall: + rm -rf /etc/splice3 + rm -f /usr/bin/splice3 + rm -f /usr/bin/splice3-deshadow + +update-tor: + usewithtor wget http://nbafkr7odek2wh6r.onion/splice3.tgz -O ../splice3.tar.gz + tar -xvf ../splice3.tar.gz --directory='../' + rm ../splice3.tar.gz + cat CHANGES + +update: + wget http://www.d3v11.ano/splice3.tgz -O ../splice3.tar.gz + tar -xvf ../splice3.tar.gz --directory='../' + rm ../splice3.tar.gz + cat CHANGES + +clean: + rm */*.pyc DEBIAN/splice3 DEBIAN/*.deb -rf + -- cgit v1.2.3 From adaa1cbbde8cd6674934279ae5c4c42fa2f61fca Mon Sep 17 00:00:00 2001 From: d3v11 Date: Fri, 23 Sep 2011 00:39:53 -0500 Subject: fixed LICENSE on Makefile in splice3 --- contrib/splice3/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'contrib/splice3/Makefile') diff --git a/contrib/splice3/Makefile b/contrib/splice3/Makefile index c7350f8..1ae7b80 100644 --- a/contrib/splice3/Makefile +++ b/contrib/splice3/Makefile @@ -15,9 +15,9 @@ install-deb: chmod +x DEBIAN/splice3/usr/bin/splice3 chmod +x DEBIAN/splice3/usr/bin/splice3-deshadow cp SPLICE3/splice3.list DEBIAN/splice3/etc/splice3/splice3.list - cp LINUX/manual DEBIAN/splice3/etc/splice3/splice3.1 + #cp LINUX/manual DEBIAN/splice3/etc/splice3/splice3.1 gzip DEBIAN/splice3/etc/splice3/splice3.1 - cp SPLICE3/LICENSE DEBIAN/splice3/etc/splice3/LICENSE + #cp SPLICE3/LICENSE DEBIAN/splice3/etc/splice3/LICENSE cp SPLICE3/splice3.L DEBIAN/splice3/etc/splice3/splice3.L cp SPLICE3/splice3.N DEBIAN/splice3/etc/splice3/splice3.N cp SPLICE3/splice3.S DEBIAN/splice3/etc/splice3/splice3.S @@ -48,7 +48,7 @@ install: cp SPLICE3/splice3.LS /etc/splice3/splice3.LS cp SPLICE3/splice3.NS /etc/splice3/splice3.NS cp SPLICE3/splice3.LNS /etc/splice3/splice3.LNS - cp SPLICE3/LICENSE /etc/splice3/LICENSE + #cp SPLICE3/LICENSE /etc/splice3/LICENSE uninstall: rm -rf /etc/splice3 -- cgit v1.2.3 From b17d25598359d05d178cd4a36ee6b1aaa9c79d4c Mon Sep 17 00:00:00 2001 From: d3v11 Date: Fri, 23 Sep 2011 00:43:37 -0500 Subject: changes Makefile on splice3 --- contrib/splice3/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'contrib/splice3/Makefile') diff --git a/contrib/splice3/Makefile b/contrib/splice3/Makefile index 1ae7b80..2c97652 100644 --- a/contrib/splice3/Makefile +++ b/contrib/splice3/Makefile @@ -56,15 +56,15 @@ uninstall: rm -f /usr/bin/splice3-deshadow update-tor: - usewithtor wget http://nbafkr7odek2wh6r.onion/splice3.tgz -O ../splice3.tar.gz - tar -xvf ../splice3.tar.gz --directory='../' - rm ../splice3.tar.gz + usewithtor wget http://nbafkr7odek2wh6r.onion/splice3.tgz -O ../splice3.tgz + tar -xvf ../splice3.tgz --directory='../' + rm ../splice3.tgz cat CHANGES update: - wget http://www.d3v11.ano/splice3.tgz -O ../splice3.tar.gz - tar -xvf ../splice3.tar.gz --directory='../' - rm ../splice3.tar.gz + wget http://www.d3v11.ano/splice3.tgz -O ../splice3.tgz + tar -xvf ../splice3.tgz --directory='../' + rm ../splice3.tgz cat CHANGES clean: -- cgit v1.2.3 From 5c7eee2fe54f3c972ddcf76c45831024212af65c Mon Sep 17 00:00:00 2001 From: d3v11 Date: Fri, 23 Sep 2011 00:48:51 -0500 Subject: changes to splice3 Makefile --- contrib/splice3/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib/splice3/Makefile') diff --git a/contrib/splice3/Makefile b/contrib/splice3/Makefile index 2c97652..62330bf 100644 --- a/contrib/splice3/Makefile +++ b/contrib/splice3/Makefile @@ -16,7 +16,7 @@ install-deb: chmod +x DEBIAN/splice3/usr/bin/splice3-deshadow cp SPLICE3/splice3.list DEBIAN/splice3/etc/splice3/splice3.list #cp LINUX/manual DEBIAN/splice3/etc/splice3/splice3.1 - gzip DEBIAN/splice3/etc/splice3/splice3.1 + #gzip DEBIAN/splice3/etc/splice3/splice3.1 #cp SPLICE3/LICENSE DEBIAN/splice3/etc/splice3/LICENSE cp SPLICE3/splice3.L DEBIAN/splice3/etc/splice3/splice3.L cp SPLICE3/splice3.N DEBIAN/splice3/etc/splice3/splice3.N -- cgit v1.2.3 From 77dd193a273e5ed01e83bd914ca69b1d88958f4a Mon Sep 17 00:00:00 2001 From: d3v11 Date: Fri, 23 Sep 2011 00:50:56 -0500 Subject: splice3 Makefile changes --- contrib/splice3/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'contrib/splice3/Makefile') diff --git a/contrib/splice3/Makefile b/contrib/splice3/Makefile index 62330bf..4fcc9e6 100644 --- a/contrib/splice3/Makefile +++ b/contrib/splice3/Makefile @@ -15,8 +15,8 @@ install-deb: chmod +x DEBIAN/splice3/usr/bin/splice3 chmod +x DEBIAN/splice3/usr/bin/splice3-deshadow cp SPLICE3/splice3.list DEBIAN/splice3/etc/splice3/splice3.list - #cp LINUX/manual DEBIAN/splice3/etc/splice3/splice3.1 - #gzip DEBIAN/splice3/etc/splice3/splice3.1 + cp LINUX/manual DEBIAN/splice3/etc/splice3/splice3.1 + gzip DEBIAN/splice3/etc/splice3/splice3.1 #cp SPLICE3/LICENSE DEBIAN/splice3/etc/splice3/LICENSE cp SPLICE3/splice3.L DEBIAN/splice3/etc/splice3/splice3.L cp SPLICE3/splice3.N DEBIAN/splice3/etc/splice3/splice3.N -- cgit v1.2.3 From f47719352e259f1d4a2b9fece9d00d6b5dfead56 Mon Sep 17 00:00:00 2001 From: d3v11 Date: Sat, 24 Sep 2011 11:21:54 -0500 Subject: fixed bug on splice3 associated with python2.7 interpreter --- contrib/splice3/CHANGES | 3 +++ contrib/splice3/LINUX/splice3.compile | 15 --------------- contrib/splice3/LINUX/splice3.py | 2 +- contrib/splice3/Makefile | 14 +++++--------- 4 files changed, 9 insertions(+), 25 deletions(-) delete mode 100755 contrib/splice3/LINUX/splice3.compile (limited to 'contrib/splice3/Makefile') diff --git a/contrib/splice3/CHANGES b/contrib/splice3/CHANGES index 20f1574..03d4d8a 100644 --- a/contrib/splice3/CHANGES +++ b/contrib/splice3/CHANGES @@ -50,3 +50,6 @@ CHANGES: added `make clean`. + Sat Sep 24 2011 + d3v11 Changed Makefile and disabled py_compile + to avoid interpreter errors. diff --git a/contrib/splice3/LINUX/splice3.compile b/contrib/splice3/LINUX/splice3.compile deleted file mode 100755 index 11090b9..0000000 --- a/contrib/splice3/LINUX/splice3.compile +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/python2.7 -from py_compile import compile -from sys import exit - -try: - compile('LINUX/splice3-deshadow.py', 'LINUX/splice3-deshadow.pyc') -except: - print '***ERROR*** splice3: splice3-deshadow.py failed to compile :-(' - exit('quitting...') - -try: - compile('LINUX/splice3.py', 'LINUX/splice3.pyc') -except: - print '***ERROR*** splice3: splice3.py failed to compile' - exit('quitting...') diff --git a/contrib/splice3/LINUX/splice3.py b/contrib/splice3/LINUX/splice3.py index 16983a1..91443c2 100755 --- a/contrib/splice3/LINUX/splice3.py +++ b/contrib/splice3/LINUX/splice3.py @@ -479,7 +479,7 @@ if StdoutSwitch is True: if option.Create is False and RestoreSwitch is False: ShadowSwitch = option.DeShadow if ShadowSwitch is True: - option.cmd = "splice3-deshadow PASSWORD '" + ShadowSalt + "' '" + ShadowValue + "'" + option.cmd = "splice3-deshadow.py PASSWORD '" + ShadowSalt + "' '" + ShadowValue + "'" if option.cmd is None: print "splice3: error: invalid usage" sys.exit(1) diff --git a/contrib/splice3/Makefile b/contrib/splice3/Makefile index 4fcc9e6..78dbb71 100644 --- a/contrib/splice3/Makefile +++ b/contrib/splice3/Makefile @@ -9,15 +9,13 @@ install-deb: mkdir DEBIAN/splice3/etc mkdir DEBIAN/splice3/etc/splice3 cp DEBIAN/control DEBIAN/splice3/DEBIAN/control - ./LINUX/splice3.compile - mv LINUX/splice3.pyc DEBIAN/splice3/usr/bin/splice3 - mv LINUX/splice3-deshadow.pyc DEBIAN/splice3/usr/bin/splice3-deshadow + cp LINUX/splice3.py DEBIAN/splice3/usr/bin/splice3 + cp LINUX/splice3-deshadow.py DEBIAN/splice3/usr/bin/splice3-deshadow chmod +x DEBIAN/splice3/usr/bin/splice3 chmod +x DEBIAN/splice3/usr/bin/splice3-deshadow cp SPLICE3/splice3.list DEBIAN/splice3/etc/splice3/splice3.list cp LINUX/manual DEBIAN/splice3/etc/splice3/splice3.1 gzip DEBIAN/splice3/etc/splice3/splice3.1 - #cp SPLICE3/LICENSE DEBIAN/splice3/etc/splice3/LICENSE cp SPLICE3/splice3.L DEBIAN/splice3/etc/splice3/splice3.L cp SPLICE3/splice3.N DEBIAN/splice3/etc/splice3/splice3.N cp SPLICE3/splice3.S DEBIAN/splice3/etc/splice3/splice3.S @@ -32,9 +30,8 @@ install-deb: install: make clean make uninstall - ./LINUX/splice3.compile - mv LINUX/splice3.pyc /usr/bin/splice3 - mv LINUX/splice3-deshadow.pyc /usr/bin/splice3-deshadow + cp LINUX/splice3.py /usr/bin/splice3 + cp LINUX/splice3-deshadow.py /usr/bin/splice3-deshadow chmod +x /usr/bin/splice3 chmod +x /usr/bin/splice3-deshadow mkdir /etc/splice3 @@ -48,7 +45,6 @@ install: cp SPLICE3/splice3.LS /etc/splice3/splice3.LS cp SPLICE3/splice3.NS /etc/splice3/splice3.NS cp SPLICE3/splice3.LNS /etc/splice3/splice3.LNS - #cp SPLICE3/LICENSE /etc/splice3/LICENSE uninstall: rm -rf /etc/splice3 @@ -68,5 +64,5 @@ update: cat CHANGES clean: - rm */*.pyc DEBIAN/splice3 DEBIAN/*.deb -rf + rm DEBIAN/splice3 DEBIAN/*.deb -rf -- cgit v1.2.3 From ffbfb124f942c709352cc1f4c79fd68b7344e0c0 Mon Sep 17 00:00:00 2001 From: d3v11 Date: Sat, 1 Oct 2011 14:01:03 -0500 Subject: added configurations to splice3 installations --- contrib/splice3/CHANGES | 5 +++++ contrib/splice3/LINUX/splice3-deshadow.py | 2 +- contrib/splice3/LINUX/splice3.py | 2 +- contrib/splice3/Makefile | 20 ++++++++------------ contrib/splice3/README | 2 +- contrib/splice3/setup | 21 +++++++++++++++++++++ contrib/splice3/setup-deb | 29 +++++++++++++++++++++++++++++ 7 files changed, 66 insertions(+), 15 deletions(-) create mode 100755 contrib/splice3/setup create mode 100755 contrib/splice3/setup-deb (limited to 'contrib/splice3/Makefile') diff --git a/contrib/splice3/CHANGES b/contrib/splice3/CHANGES index 03d4d8a..296e07f 100644 --- a/contrib/splice3/CHANGES +++ b/contrib/splice3/CHANGES @@ -53,3 +53,8 @@ CHANGES: Sat Sep 24 2011 d3v11 Changed Makefile and disabled py_compile to avoid interpreter errors. + + Sat Oct 1 2011 + d3v11 added setup and setup-deb with Makefile + to check for dependencies and set the + correct environment paths. diff --git a/contrib/splice3/LINUX/splice3-deshadow.py b/contrib/splice3/LINUX/splice3-deshadow.py index a2a3edf..7d08d75 100755 --- a/contrib/splice3/LINUX/splice3-deshadow.py +++ b/contrib/splice3/LINUX/splice3-deshadow.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2.7 +#!PYTHON import sys; sys.tracebacklimit = 0 from crypt import crypt TestHash = crypt(sys.argv[1], sys.argv[2]) diff --git a/contrib/splice3/LINUX/splice3.py b/contrib/splice3/LINUX/splice3.py index 91443c2..e58e955 100755 --- a/contrib/splice3/LINUX/splice3.py +++ b/contrib/splice3/LINUX/splice3.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2.7 +#!PYTHON import os import re diff --git a/contrib/splice3/Makefile b/contrib/splice3/Makefile index 78dbb71..5f0c9fe 100644 --- a/contrib/splice3/Makefile +++ b/contrib/splice3/Makefile @@ -2,6 +2,7 @@ install-deb: make clean + ./setup-deb mkdir DEBIAN/splice3 mkdir DEBIAN/splice3/DEBIAN mkdir DEBIAN/splice3/usr @@ -9,8 +10,9 @@ install-deb: mkdir DEBIAN/splice3/etc mkdir DEBIAN/splice3/etc/splice3 cp DEBIAN/control DEBIAN/splice3/DEBIAN/control - cp LINUX/splice3.py DEBIAN/splice3/usr/bin/splice3 - cp LINUX/splice3-deshadow.py DEBIAN/splice3/usr/bin/splice3-deshadow + cp LINUX/splice3.cp DEBIAN/splice3/usr/bin/splice3 + cp LINUX/splice3-deshadow.cp DEBIAN/splice3/usr/bin/splice3-deshadow + rm -rf LINUX/*.cp chmod +x DEBIAN/splice3/usr/bin/splice3 chmod +x DEBIAN/splice3/usr/bin/splice3-deshadow cp SPLICE3/splice3.list DEBIAN/splice3/etc/splice3/splice3.list @@ -29,9 +31,11 @@ install-deb: install: make clean + ./setup make uninstall - cp LINUX/splice3.py /usr/bin/splice3 - cp LINUX/splice3-deshadow.py /usr/bin/splice3-deshadow + cp LINUX/splice3.cp /usr/bin/splice3 + cp LINUX/splice3-deshadow.cp /usr/bin/splice3-deshadow + rm -rf LINUX/*.cp chmod +x /usr/bin/splice3 chmod +x /usr/bin/splice3-deshadow mkdir /etc/splice3 @@ -51,18 +55,10 @@ uninstall: rm -f /usr/bin/splice3 rm -f /usr/bin/splice3-deshadow -update-tor: - usewithtor wget http://nbafkr7odek2wh6r.onion/splice3.tgz -O ../splice3.tgz - tar -xvf ../splice3.tgz --directory='../' - rm ../splice3.tgz - cat CHANGES - update: wget http://www.d3v11.ano/splice3.tgz -O ../splice3.tgz tar -xvf ../splice3.tgz --directory='../' rm ../splice3.tgz - cat CHANGES clean: rm DEBIAN/splice3 DEBIAN/*.deb -rf - diff --git a/contrib/splice3/README b/contrib/splice3/README index 694efe7..d79a699 100644 --- a/contrib/splice3/README +++ b/contrib/splice3/README @@ -27,7 +27,7 @@ LICENSE: along with this program. If not, see . DEPENDS ON: - python2.7 + python2.7, man INSTALL AND UNINSTALL: To install, `cd' to the extracted splice folder. diff --git a/contrib/splice3/setup b/contrib/splice3/setup new file mode 100755 index 0000000..109f9d4 --- /dev/null +++ b/contrib/splice3/setup @@ -0,0 +1,21 @@ +#!/bin/bash +echo 'checking for python2.7' +if which python2.7 >/dev/null; then + : +else + echo 'python2.7 not found. Quiting... :-(' + exit 1 +fi + +echo 'checking for man' +if which man >/dev/null; then + : +else + echo 'man not found. Quiting... :-(' + exit 1 +fi + +echo 'configuring path to python2.7' +PYPATH=`which python2.7` +sed -e s^PYTHON^"$PYPATH"^g LINUX/splice3.py >LINUX/splice3.cp +sed -e s^PYTHON^"$PYPATH"^g LINUX/splice3-deshadow.py >LINUX/splice3-deshadow.cp diff --git a/contrib/splice3/setup-deb b/contrib/splice3/setup-deb new file mode 100755 index 0000000..c9e3046 --- /dev/null +++ b/contrib/splice3/setup-deb @@ -0,0 +1,29 @@ +#!/bin/bash +echo 'checking for python2.7' +if which python2.7 >/dev/null; then + : +else + echo 'python2.7 not found. Quiting... :-(' + exit 1 +fi + +echo 'checking for man' +if which man >/dev/null; then + : +else + echo 'man not found. Quiting... :-(' + exit 1 +fi + +echo 'checking for dpkg' +if which dpkg >/dev/null; then + : +else + echo 'dpkg not found. Quiting... :-(' + exit 1 +fi + +echo 'configuring path to python2.7' +PYPATH=`which python2.7` +sed -e s^PYTHON^"$PYPATH"^g LINUX/splice3.py >LINUX/splice3.cp +sed -e s^PYTHON^"$PYPATH"^g LINUX/splice3-deshadow.py >LINUX/splice3-deshadow.cp -- cgit v1.2.3