Merge pull request 0x90#6 from portbx/master

Bug fix

Makefile

@@ -90,8 +90,8 @@ upgrade:
 
 #: kali - install Kali Linux repos and soft                     *
 kali:
-	echo "deb http://http.kali.org/kali kali-rolling main contrib non-free" > /etc/apt/sources.list
-	echo "deb-src http://http.kali.org/kali kali-rolling main contrib non-free" > /etc/apt/sources.list
+	echo "deb http://http.kali.org/kali kali-rolling main contrib non-free" >> /etc/apt/sources.list
+	echo "deb-src http://http.kali.org/kali kali-rolling main contrib non-free" >> /etc/apt/sources.list
 	sudo apt-get update -y
 	sudo apt-get install kali-archive-keyring -y
 	sudo apt-get update -y
@@ -152,10 +152,10 @@ dev-vcs:
 
 ##: dev-build - install build tools and environment
 dev-build:
-	@echo "Istalling development tools and environment"
+	@echo "Installing development tools and environment"
 	@apt-get install -y cmake cmake-data module-assistant build-essential patch g++ gcc gcc-multilib \
 	dkms patchutils strace wdiff pkg-config automake autoconf flex bison gawk flex gettext \
-	linux-source libncurses5-dev libreadline6 libreadline6-dev \
+	linux-source libncurses5-dev libreadline7 libreadline6-dev \
 	libbz2-dev zlib1g-dev fakeroot ncurses-dev libtool libmagickcore-dev libmagick++-dev libmagickwand-dev \
 	libyaml-dev libxslt1-dev libxml2-dev libxslt-dev libc6-dev python-pip
 	# linux-headers-`uname -r`
@@ -238,7 +238,7 @@ libtins:
 	cmake ../ -DLIBTINS_ENABLE_CXX11=1 && make && make install
 
 #: wifi-python - install python libraries for WiFi              *
-python-wifi:
+wifi-python:
 	@echo "Installing python network libs.."
 	pip install wifi scapy==2.3.2 impacket pcapy pcappy
 	@echo "Installing pythonwifi library"
@@ -423,9 +423,11 @@ autowps:
 
 airgeddon:	deps reaver pixiewps
 	apt-get install -y crunch isc-dhcp-server sslstrip lighttpd
-	git clone https://github.com/v1s1t0r1sh3r3/airgeddon.git /usr/share/airgeddon
-	chmod +x /usr/share/airgeddon/airgeddon.sh
-	ln -s /usr/share/airgeddon/airgeddon.sh /usr/bin/airgeddon
+	@if ! [ -d /usr/share/airgeddon ]; then \
+			git clone https://github.com/v1s1t0r1sh3r3/airgedon.git /usr/share/airgeddon; \
+			chmod +x /usr/share/airgeddon/airgeddon.sh; \
+			ln -s /usr/share/airgeddon/airgeddon.sh /usr/bin/airgeddon; \
+	fi;
 
 fluxion:
 	@echo "Installing fluxion dependencies"
@@ -640,7 +642,7 @@ nrf24-firmware:
 	@echo "Build research firmware for nRF24LU1+"
 	$(MAKE) -C ${TMPDIR}/nrf24-arsenal/mousejack/nrf-research-firmware
 	@echo "Build firmware for Crazyradio"
-	$(MAKE) -C ${TMPDIR}/nrf24-arsenal/crazyradio-firmware
+	$(MAKE) -C ${TMPDIR}/nrf24-arsenal/crazyradio-firmware/firmware
 	# TODO: add support for Crazyradio PA via make CRPA=1
 	# @echo "Use make nrf24-flash-research to flash proper firmware"
 
@@ -676,7 +678,7 @@ firmware-reverse:
 	cd $(repo) && ./build.sh  # make && sudo make install
 	@echo "installing binwalk"
 	$(call gitclone,https://github.com/devttys0/binwalk)
-	cd $(repo) && y| ./deps.sh && pip install .
+	cd $(repo) && yes | ./deps.sh && pip install .
 	@echo "installing firmadyne"
 	$(call gitclone,https://github.com/firmadyne/firmadyne)
 	@echo "installing firmwalker"
@@ -702,14 +704,16 @@ avatar:
 ##: crossdev - install cross platfrorm dev tools
 crossdev:	deps
 	# http://www.emdebian.org/crosstools.html
-	@echo "installing Emdebian, xapt"
-	apt-get install emdebian-archive-keyring xapt -y
+	@echo "installing Emdebian"
+	apt-get install emdebian-archive-keyring dirmngr -y
+	# >> xapt and dpkg-cross are deprecated xapt and dpkg-cross are deprecated
+	# and may not make it into the Jessie release. Both packages are likely to be
+	# removed from Debian after the Jessie release is made.
+	# See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=771496#41 for the reasons.
+
 	# sudo apt-get install gcc-msp430 binutils-msp430 msp430-libc msp430mcu mspdebug
 	# apt_add_source emdebian
 	# cp -f "files/etc/emdebian.list" /etc/apt/sources.list.d/emdebian.list && apt-get update -y
-	echo "deb http://ftp.us.debian.org/debian/ squeeze main" > /etc/apt/sources.list.d/emdebian.list
-	echo "deb http://www.emdebian.org/debian/ squeeze main" >> /etc/apt/sources.list.d/emdebian.list
-	echo "deb http://www.emdebian.org/debian/ oldstable main" >> /etc/apt/sources.list/emdebian.list
 	apt-get update -y
 	@echo "installing GCC-4.4 for mips, mipsel"
 	apt-get install -y linux-libc-dev-mipsel-cross libc6-mipsel-cross libc6-dev-mipsel-cross \
@@ -733,14 +737,17 @@ hardware-generic:	deps dev
 ##: hardware-signal - install signal analysis tools
 hardware-signal:
 	# TODO: OLS install
-	apt-get install -y libsigrok0-dev sigrok-cli libsigrokdecode0-dev autoconf-archive \
+	apt-get install -y libsigrok-dev sigrok-cli libsigrokdecode-dev autoconf-archive \
 	libglib2.0-dev libglibmm-2.4-dev libzip-dev check default-jdk libqt4-dev libboost-dev \
 	libboost-system-dev libglib2.0-dev libqt4-dev libboost-test-dev libboost-thread-dev \
 	libboost-filesystem-dev
+	apt-get install qt5-default libqt5svg5 libqt5svg5-dev
 	$(call gitclone,git://sigrok.org/libserialport)
 	cd $(repo) && ./autogen.sh && ./configure && make && make install
 	$(call gitclone,git://sigrok.org/libsigrok)
 	cd $(repo) && ./autogen.sh && ./configure && make && make install
+	$(call gitclone,git://sigrok.org/libsigrokdecode)
+	cd $(repo) && ./autogen.sh && ./configure && make && make install
 	$(call gitclone,git://sigrok.org/pulseview)
 	cd $(repo) && cmake . && make && make install
 ################################# hardware #####################################
@@ -765,7 +772,7 @@ wifi-rogueap: rogueap-deps hotspotd #linset wifipumpkin
 #: wifi-autopwn - install autopwn tools                         *
 wifi-autopwn: wifite  #wpsbreak autoreaver autowps autopixiewps
 ##: wifi - soft for unlicensed bands: 433/866/915Mhz 2.4Ghz      *
-wifi: fresh dev wifi-rogueap python-wifi wifi-autopwn wifi-wps wifi-wpa
+wifi: fresh dev wifi-rogueap wifi-python wifi-autopwn wifi-wps wifi-wpa
 #: nrf24 - Nordic Semiconductor NRF24XXX hacking tools          *
 nrf24:	nrf24-deps nrf24-firmware
 #: ism - soft for unlicensed bands: 433/866/915Mhz 2.4Ghz       *

dev.sh

@@ -54,11 +54,14 @@ install_ruby(){
 
 install_dev(){
     print_status "Installing development tools and environment"
+    echo "deb http://security.debian.org/debian-security wheezy/updates main" >> /etc/apt/sources.list
+    apt-get update -y
     apt-get install -y cmake cmake-data autoconf build-essential module-assistant libncurses5-dev zlib1g-dev gawk flex gettext \
-    gcc gcc-multilib dkms make patchutils strace wdiff linux-headers-`uname -r` autoconf automake libssl-dev \
-    kernel-package ncurses-dev fakeroot bzip2 linux-source openssl libreadline6 libreadline6-dev git-core zlib1g zlib1g-dev libssl-dev \
-    libyaml-dev libsqlite3-dev sqlite3 libxml2-dev libxslt-dev autoconf libc6-dev ncurses-dev automake libtool bison \
-    libmysqlclient-dev libmagickcore-dev libmagick++-dev libmagickwand-dev libnetfilter-queue-dev git subversion mercurial
+    gcc gcc-multilib dkms make patchutils strace wdiff linux-headers-amd64 autoconf automake libssl-dev \
+    kernel-package libncurses5-dev fakeroot bzip2 linux-source openssl libreadline7 libreadline-dev git-core zlib1g zlib1g-dev libssl-dev \
+    libyaml-dev libsqlite3-dev sqlite3 libxml2-dev libxslt1-dev autoconf libc6-dev libncurses5-dev automake libtool bison \
+    libmysqlclient18 libmagickwand-6.q16-dev libmagickcore-6.q16-dev libmagick++-6.q16-dev libmagickcore-dev libmagick++-dev libmagickwand-dev \
+    libnetfilter-queue-dev git subversion mercurial
     check_success
     print_status "System Pre-requirements"
 
@@ -84,10 +87,11 @@ install_dev(){
     fi
 
     if ask "Install MinGW compiler+tools?" N; then
-        apt-get install -y binutils-mingw-w64 gcc-mingw-w64 mingw-w64 mingw-w64-dev
+        apt-get install -y binutils-mingw-w64 gcc-mingw-w64 mingw-w64 \
+        mingw-w64-x86-64-dev mingw-w64-i686-dev
     fi
 }
 
 if [ "${0##*/}" = "dev.sh" ]; then
     install_dev
-fi
+fi

pentest.sh

@@ -12,14 +12,16 @@ install_pentest(){
         print_notification "Newly installed tools should be located on your default PATH."
 
         #This is a simple git pull of the Cortana .cna script repository available on github.
-        print_status "Grabbing Armitage Cortana Scripts via github.."
-        git clone http://www.github.com/rsmudge/cortana-scripts.git /opt/cortana
-        check_success
-        print_notification "Cortana scripts installed under /opt/cortana."
+        if ! [ -d /opt/cortana ]; then
+            print_status "Grabbing Armitage Cortana Scripts via github..";
+            git clone http://www.github.com/rsmudge/cortana-scripts.git /opt/cortana;
+            check_success;
+            print_notification "Cortana scripts installed under /opt/cortana.";
+        fi
     fi
 
     if ask "Do you want to install BeEF,arachni,w3af, WATOBO?" Y; then
-        apt-get -y install beef-xss arachni w3af 
+        apt-get -y install beef-xss arachni w3af
     fi
 
     if ask "Do you want to install Veil?" Y; then
@@ -81,8 +83,8 @@ install_mitm(){
 
         print_notification "Download & unpack"
         cd /tmp
-        wget http://sniff.su/_Intercepter-NG.CE.05.zip
-        unzip _Intercepter-NG.CE.05.zip
+        wget http://sniff.su/Intercepter-NG.CE.05.zip
+        unzip Intercepter-NG.CE.05.zip
         mv intercepter_linux /usr/bin/intercepter
         chmod +x /usr/bin/intercepter
     fi

postinstall.sh

@@ -11,7 +11,7 @@ install_archivers(){
 install_32bit(){
     if [ `getconf LONG_BIT` = "64" ] ; then
         if ask "64-bit OS detected. Installing 32-bit libs?" Y; then
-            dpkg --add-architecture i386 && apt-get update -y && apt-get install ia32-libs -y
+            dpkg --add-architecture i386 && apt-get update -y && apt-get install lib32z1 lib32ncurses5 -y
             check_success
         fi
     fi