Merge pull request offensive-security#1222 from inferillum/master

Update repo URL to http://http.kali.org/kali Update DriveDroid to v0.10.50 Update OpenVPN to v0.7.6 remove --foreign in debootstrap bump php7.0 to php7.2
bowman03 · Jan 18, 2019 · 466dd8b · 466dd8b
2 parents 1814961 + 66d40bf
commit 466dd8b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/nethunter-fs/build.sh b/nethunter-fs/build.sh
@@ -149,7 +149,7 @@ pkg_minimal="openssh-server kali-defaults kali-archive-keyring
 
 # DEFAULT PACKAGES FULL INSTALL
 pkg_full="kali-linux-nethunter mana-toolkit exploitdb lua-sql-sqlite3 msfpc
-	exe2hexbat bettercap libapache2-mod-php7.0 libreadline6-dev
+	exe2hexbat bettercap libapache2-mod-php7.2 libreadline6-dev
 	libncurses5-dev libnewlib-arm-none-eabi binutils-arm-none-eabi
 	gcc-arm-none-eabi autoconf libtool make gcc-6 g++-6
 	libxml2-dev zlib1g-dev libncurses5-dev"

diff --git a/nethunter-fs/stages/stage1 b/nethunter-fs/stages/stage1
@@ -25,7 +25,7 @@ update-binfmts --enable "qemu-$qemu_arch"
 echo "[+] Starting debootstrap (download)..."
 tries=0
 max_tries=5
-while ! debootstrap --foreign --download-only --verbose --arch $build_arch kali-rolling "$rootfs" http://repo.kali.org/kali; do
+while ! debootstrap --download-only --verbose --arch $build_arch kali-rolling "$rootfs" http://http.kali.org/kali; do
 	((tries++))
 	if [ $tries -ge $max_tries ]; then
 		echo "[!] Error, maximum retries ($max_tries) reached, could not download packages!"
@@ -36,7 +36,7 @@ while ! debootstrap --foreign --download-only --verbose --arch $build_arch kali-
 done
 
 echo "[+] Starting debootstrap (install)..."
-debootstrap --foreign --verbose --arch $build_arch kali-rolling "$rootfs" http://repo.kali.org/kali
+debootstrap --foreign --verbose --arch $build_arch kali-rolling "$rootfs" http://http.kali.org/kali
 
 echo "[+] Installing qemu-$qemu_arch-static interpreter to rootfs"
 cp "/usr/bin/qemu-$qemu_arch-static" "$rootfs/usr/bin/"

diff --git a/nethunter-fs/stages/stage3 b/nethunter-fs/stages/stage3
@@ -48,7 +48,7 @@ if [ "$build_size" = full ]; then
 	cat << EOF >> "$rootfs/third-stage"
 
 # Enable PHP in Apache
-a2enmod php7.0
+a2enmod php7.2
 
 # Enable /var/www/html as default, disable mana unless we need it
 a2dissite 000-mana-toolkit.conf

diff --git a/nethunter-installer/build.py b/nethunter-installer/build.py
@@ -24,9 +24,9 @@
 	'Hackerskeyboard':
 		['https://f-droid.org/repo/org.pocketworkstation.pckeyboard_1039003.apk', '8c861c7540e6eeb006070d0f2d80134e75637066591d705b987e164c3fe87521ed694ac844c945eb74449aff8723ff039f793b2e3743aac73865f74bb248edf5'],
 	'Drivedroid':
-		['https://softwarebakery.com/apps/drivedroid/files/drivedroid-free-0.10.48.apk', 'db12634d68d4220ef236625cccebf4a0f148def953e68cda46f325e3c7a8356e3dc91bbe9c75d230aa62fba7145d3f124410424a18e64c3a8558e3e8c539ca77'],
+		['https://softwarebakery.com/apps/drivedroid/files/drivedroid-free-0.10.50.apk', '455354369d34dd59cdf71e50c02fd1dc969925f803fbc1c498467ac1b3b50b7a3b23dd22a3e60a5dbe61d7106c99106f92ef6a86c56775f01e42dfcd1837c198'],
 	'OpenVPN':
-		['https://f-droid.org/repo/de.blinkt.openvpn_158.apk', '61a52eb1a8e802cc252cffd54a505822b8fdf03dc87032935856405a5b868d7b3242df333c4f940c920393d52583cb378bd9f06bd44ad50b0e22f13b8cc3e177'],
+		['https://f-droid.org/repo/de.blinkt.openvpn_159.apk', 'a47200c972a6e98649f6a8f87e02c5b924b1c7915ef86698f1339a1ec82af3eab82e7ecf442a3b2f5ab5ded91b59b0943315133413b50a2c473d5f9ba8050695'],
 	'USBKeyboard': # Feb 3, 2015
 		['https://github.com/pelya/android-keyboard-gadget/raw/7ea69c684aa1/USB-Keyboard.apk', '18bced7b339a67c48fe31698cb54063bce8f3dd9f7d7f23d9e5c619697e8da5ab08312cf9a2fa0e3f445a584485db23d1e4c27e3ffc1448551bbaf486ccb11e9'],
 	'RFAnalyzer':