switch to current fork

6 files changed, 80 insertions, 68 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ca55c459584d..974a88ddac94 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
 pkgbase = blackeye-git
 	pkgdesc = The most complete phishing tool - 38 website templates, updated version with ngrok
-	pkgver = 2020.10.07.g2304100
-	pkgrel = 2
-	url = https://github.com/x3rz/blackeye
-	install = blackeye.install
-	arch = any
+	pkgver = 1.0.0.r3.db23b39
+	pkgrel = 1
+	epoch = 1
+	url = https://github.com/Blackeye2/blackeye
+	arch = x86_64
 	license = GPL3
 	makedepends = git
 	depends = php
@@ -12,12 +12,12 @@ pkgbase = blackeye-git
 	optdepends = wget: used to download the ngrok binary if none is found
 	provides = blackeye
 	conflicts = blackeye
-	source = git+https://github.com/x3rz/blackeye.git
+	source = git+https://github.com/Blackeye2/blackeye.git
 	source = blackeye.patch
 	source = blackeye.patch.sig
 	validpgpkeys = 7A194E3F7A8F867BEA8A5339023F078862ACFE50
 	sha256sums = SKIP
-	sha256sums = b520c32fdb2a053b2c5c9c7a13452ba360a48f6c66aeaac87b47b6d293b2e167
+	sha256sums = 9de0d9c6b07324fd334e8e7db5b9d965ecaee01d029e71d4a9a1ebc4d179bfde
 	sha256sums = SKIP
 
 pkgname = blackeye-git
diff --git a/.gitignore b/.gitignore
index a916b3fbb5e6..5d326da8222e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,5 @@
 !.SRCINFO
 !PKGBUILD
 
-!blackeye.install
-
 !blackeye.patch
 !blackeye.patch.sig
diff --git a/PKGBUILD b/PKGBUILD
index 3a38dbb05fff..5008e4772d99 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,13 +3,14 @@
 
 pkgname=blackeye-git
 
-pkgver() { git -C "${pkgname%-git}" log -n1 --format=%cs.g%h | tr - .; }
-pkgver=2020.10.07.g2304100
-pkgrel=2
+epoch=1
+pkgver() { git -C "${pkgname%-git}" describe --tags | sed 's/^v//;s/-/.r/;s/-g/./'; }
+pkgver=1.0.0.r3.db23b39
+pkgrel=1
 
 pkgdesc='The most complete phishing tool - 38 website templates, updated version with ngrok'
-arch=('any')
-url="https://github.com/x3rz/${pkgname%-git}"
+arch=('x86_64')
+url="https://github.com/Blackeye2/${pkgname%-git}"
 license=('GPL3')
 
 makedepends=('git')
@@ -20,15 +21,18 @@ optdepends=('ngrok: if not installed, the binary will be downloaded into the use
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
 
-install="${pkgname%-git}.install"
 source=("git+$url.git" "${pkgname%-git}.patch" "${pkgname%-git}.patch.sig")
-sha256sums=('SKIP' 'b520c32fdb2a053b2c5c9c7a13452ba360a48f6c66aeaac87b47b6d293b2e167' 'SKIP')
+sha256sums=('SKIP'
+            '9de0d9c6b07324fd334e8e7db5b9d965ecaee01d029e71d4a9a1ebc4d179bfde'
+            'SKIP')
 validpgpkeys=('7A194E3F7A8F867BEA8A5339023F078862ACFE50')
 
 
 prepare() {
     cd "${pkgname%-git}"
     patch -Np1 <"../${pkgname%-git}.patch"
+    # clean up
+    rm -f sites/*/saved.{ip,usernames}.txt
 }
 
 package() {
diff --git a/blackeye.install b/blackeye.install
deleted file mode 100644
index f8a38e21b44b..000000000000
--- a/blackeye.install
+++ /dev/null
@@ -1,10 +0,0 @@
-post_install() {
-    printf "\e[1;32m ==>\e[0;1m %s\n" \
-           "blackeye: IMPORTANT"
-    printf "\e[1;34m  ->\e[0;1m %s\n" \
-           "Don't forget to save your ngrok token to your local configuration by"
-    printf "\e[1;34m  ->\e[0;33m %s\n" \
-           "    $ ngrok authtoken <your_token>"
-    printf "\e[1;34m  ->\e[0;1m %s\e[0m\n" \
-           "if you haven't done so yet."
-}
diff --git a/blackeye.patch b/blackeye.patch
index c2d22c04f506..d3bed26dda1e 100644
--- a/blackeye.patch
+++ b/blackeye.patch
@@ -1,46 +1,66 @@
 diff -ru --color old/blackeye.sh new/blackeye.sh
---- old/blackeye.sh	2020-12-12 19:37:48.130378733 +0100
-+++ new/blackeye.sh	2020-12-12 19:50:22.552417197 +0100
-@@ -10,7 +10,7 @@
- dependencies() {
- 
- command -v php > /dev/null 2>&1 || { echo >&2 "I require php but it's not installed. Install it. Aborting."; exit 1; }
--command -v wget > /dev/null 2>&1 || { echo >&2 "I require wget but it's not installed. Install it. Aborting."; exit 1; }
-+{ command -v wget || command -v ngrok; } > /dev/null 2>&1 || { echo >&2 "I require either ngrok or wget but neither of them is installed. Install one of those. Aborting."; exit 1; }
- command -v unzip > /dev/null 2>&1 || { echo >&2 "I require unzip but it's not installed. Install it. Aborting."; exit 1; }
- command -v curl > /dev/null 2>&1 || { echo >&2 "I require curl but it's not installed. Install it. Aborting."; exit 1; }
- 
-@@ -18,15 +18,15 @@
- 
- menu() {
- 
--printf "          \e[1;92m[\e[0m\e[1;77m01\e[0m\e[1;92m]\e[0m\e[1;91m Instagram\e[0m      \e[1;92m[\e[0m\e[1;77m17\e[0m\e[1;92m]\e[0m\e[1;91m DropBox\e[0m        \e[1;92m[\e[0m\e[1;77m33\e[0m\e[1;92m]\e[0m\e[1;91m eBay\e[0m               \n"                                
--printf "          \e[1;92m[\e[0m\e[1;77m02\e[0m\e[1;92m]\e[0m\e[1;91m Facebook\e[0m       \e[1;92m[\e[0m\e[1;77m18\e[0m\e[1;92m]\e[0m\e[1;91m Adobe ID   \e[0m    \e[1;92m[\e[0m\e[1;77m34\e[0m\e[1;92m]\e[0m\e[1;91m Amazon\e[0m         \n"
--printf "          \e[1;92m[\e[0m\e[1;77m03\e[0m\e[1;92m]\e[0m\e[1;91m Snapchat\e[0m       \e[1;92m[\e[0m\e[1;77m19\e[0m\e[1;92m]\e[0m\e[1;91m Shopify   \e[0m     \e[1;92m[\e[0m\e[1;77m35\e[0m\e[1;92m]\e[0m\e[1;91m iCloud\e[0m          \n"
--printf "          \e[1;92m[\e[0m\e[1;77m04\e[0m\e[1;92m]\e[0m\e[1;91m Twitter\e[0m        \e[1;92m[\e[0m\e[1;77m20\e[0m\e[1;92m]\e[0m\e[1;91m Messenger   \e[0m   \e[1;92m[\e[0m\e[1;77m36\e[0m\e[1;92m]\e[0m\e[1;91m Spotify\e[0m          \n"                
--printf "          \e[1;92m[\e[0m\e[1;77m05\e[0m\e[1;92m]\e[0m\e[1;91m Github\e[0m         \e[1;92m[\e[0m\e[1;77m21\e[0m\e[1;92m]\e[0m\e[1;91m GitLab   \e[0m      \e[1;92m[\e[0m\e[1;77m37\e[0m\e[1;92m]\e[0m\e[1;91m Netflix\e[0m          \n"                
--printf "          \e[1;92m[\e[0m\e[1;77m06\e[0m\e[1;92m]\e[0m\e[1;91m Google\e[0m         \e[1;92m[\e[0m\e[1;77m22\e[0m\e[1;92m]\e[0m\e[1;91m Twitch   \e[0m      \e[1;92m[\e[0m\e[1;77m38\e[0m\e[1;92m]\e[0m\e[1;91m Custom\e[0m         \n"
--printf "          \e[1;92m[\e[0m\e[1;77m07\e[0m\e[1;92m]\e[0m\e[1;91m Origin\e[0m         \e[1;92m[\e[0m\e[1;77m23\e[0m\e[1;92m]\e[0m\e[1;91m MySpace    \e[0m             \n"
--printf "          \e[1;92m[\e[0m\e[1;77m08\e[0m\e[1;92m]\e[0m\e[1;91m Yahoo\e[0m          \e[1;92m[\e[0m\e[1;77m24\e[0m\e[1;92m]\e[0m\e[1;91m Badoo   \e[0m                \n"        
--printf "          \e[1;92m[\e[0m\e[1;77m09\e[0m\e[1;92m]\e[0m\e[1;91m Linkedin\e[0m       \e[1;92m[\e[0m\e[1;77m25\e[0m\e[1;92m]\e[0m\e[1;91m VK   \e[0m                   \n"         
-+printf "          \e[1;92m[\e[0m\e[1;77m 1\e[0m\e[1;92m]\e[0m\e[1;91m Instagram\e[0m      \e[1;92m[\e[0m\e[1;77m17\e[0m\e[1;92m]\e[0m\e[1;91m DropBox\e[0m        \e[1;92m[\e[0m\e[1;77m33\e[0m\e[1;92m]\e[0m\e[1;91m eBay\e[0m               \n"
-+printf "          \e[1;92m[\e[0m\e[1;77m 2\e[0m\e[1;92m]\e[0m\e[1;91m Facebook\e[0m       \e[1;92m[\e[0m\e[1;77m18\e[0m\e[1;92m]\e[0m\e[1;91m Adobe ID   \e[0m    \e[1;92m[\e[0m\e[1;77m34\e[0m\e[1;92m]\e[0m\e[1;91m Amazon\e[0m         \n"
-+printf "          \e[1;92m[\e[0m\e[1;77m 3\e[0m\e[1;92m]\e[0m\e[1;91m Snapchat\e[0m       \e[1;92m[\e[0m\e[1;77m19\e[0m\e[1;92m]\e[0m\e[1;91m Shopify   \e[0m     \e[1;92m[\e[0m\e[1;77m35\e[0m\e[1;92m]\e[0m\e[1;91m iCloud\e[0m          \n"
-+printf "          \e[1;92m[\e[0m\e[1;77m 4\e[0m\e[1;92m]\e[0m\e[1;91m Twitter\e[0m        \e[1;92m[\e[0m\e[1;77m20\e[0m\e[1;92m]\e[0m\e[1;91m Messenger   \e[0m   \e[1;92m[\e[0m\e[1;77m36\e[0m\e[1;92m]\e[0m\e[1;91m Spotify\e[0m          \n"
-+printf "          \e[1;92m[\e[0m\e[1;77m 5\e[0m\e[1;92m]\e[0m\e[1;91m Github\e[0m         \e[1;92m[\e[0m\e[1;77m21\e[0m\e[1;92m]\e[0m\e[1;91m GitLab   \e[0m      \e[1;92m[\e[0m\e[1;77m37\e[0m\e[1;92m]\e[0m\e[1;91m Netflix\e[0m          \n"
-+printf "          \e[1;92m[\e[0m\e[1;77m 6\e[0m\e[1;92m]\e[0m\e[1;91m Google\e[0m         \e[1;92m[\e[0m\e[1;77m22\e[0m\e[1;92m]\e[0m\e[1;91m Twitch   \e[0m      \e[1;92m[\e[0m\e[1;77m38\e[0m\e[1;92m]\e[0m\e[1;91m Custom\e[0m         \n"
-+printf "          \e[1;92m[\e[0m\e[1;77m 7\e[0m\e[1;92m]\e[0m\e[1;91m Origin\e[0m         \e[1;92m[\e[0m\e[1;77m23\e[0m\e[1;92m]\e[0m\e[1;91m MySpace    \e[0m             \n"
-+printf "          \e[1;92m[\e[0m\e[1;77m 8\e[0m\e[1;92m]\e[0m\e[1;91m Yahoo\e[0m          \e[1;92m[\e[0m\e[1;77m24\e[0m\e[1;92m]\e[0m\e[1;91m Badoo   \e[0m                \n"
-+printf "          \e[1;92m[\e[0m\e[1;77m 9\e[0m\e[1;92m]\e[0m\e[1;91m Linkedin\e[0m       \e[1;92m[\e[0m\e[1;77m25\e[0m\e[1;92m]\e[0m\e[1;91m VK   \e[0m                   \n"
- printf "          \e[1;92m[\e[0m\e[1;77m10\e[0m\e[1;92m]\e[0m\e[1;91m Protonmail\e[0m     \e[1;92m[\e[0m\e[1;77m26\e[0m\e[1;92m]\e[0m\e[1;91m Yandex   \e[0m               \n"
- printf "          \e[1;92m[\e[0m\e[1;77m11\e[0m\e[1;92m]\e[0m\e[1;91m Wordpress\e[0m      \e[1;92m[\e[0m\e[1;77m27\e[0m\e[1;92m]\e[0m\e[1;91m devianART   \e[0m            \n"
- printf "          \e[1;92m[\e[0m\e[1;77m12\e[0m\e[1;92m]\e[0m\e[1;91m Microsoft\e[0m      \e[1;92m[\e[0m\e[1;77m28\e[0m\e[1;92m]\e[0m\e[1;91m Wi-Fi   \e[0m                \n"
-@@ -392,7 +392,7 @@
- fi
+--- old/blackeye.sh	2020-12-19 21:16:48.990415929 +0100
++++ new/blackeye.sh	2020-12-19 21:34:52.926612866 +0100
+@@ -9,43 +9,25 @@
+ # TrapControl
+ trap 'printf "\n";stop;exit 1' 2
  
+-# Ensure system knows where blackeye directory was installed.
+-if [[ ! -f '~/.local/.be_dir' ]]; then
+-  LDIR=$(pwd)
+-  echo ${LDIR} > ~/.local/.be_dir
+-fi
+-
+-# When launched if CLI is not in Blackeye directory it will change to where user has installed it.
+-WDIR=$(cat ~/.local/.be_dir)
+-cd ${WDIR}
+-
+-# Adds Blackeye to Path
+-if [[ ! -f '/usr/sbin/blackeye' ]]; then
+-  sudo cp blackeye.sh /usr/sbin/blackeye
+-  sudo chmod +x /usr/sbin/blackeye
+-  sudo chown $USER:$USER /usr/sbin/blackeye
+-fi
+-## Blackeye can now be started from anywhere by running 'blackeye'
+-
+ # Dependancy Check
+ dependencies() {
+   command -v php > /dev/null 2>&1 || { echo >&2 "I require php but it's not installed. Install it. Aborting."; exit 1; }
+-  command -v wget > /dev/null 2>&1 || { echo >&2 "I require wget but it's not installed. Install it. Aborting."; exit 1; }
++  { command -v wget || command -v ngrok; } > /dev/null 2>&1 || { echo >&2 "I require either ngrok or wget but neither of them is installed. Install one of those. Aborting."; exit 1; }
+   command -v unzip > /dev/null 2>&1 || { echo >&2 "I require unzip but it's not installed. Install it. Aborting."; exit 1; }
+   command -v curl > /dev/null 2>&1 || { echo >&2 "I require curl but it's not installed. Install it. Aborting."; exit 1; }
+ }
  
--if [[ -e ngrok ]]; then
-+if [[ -e ngrok ]] || ln -s "$(type -P ngrok)" ./; then
- echo ""
- else
+ # Option Menu
+ menu(){
+-  echo -e "          ${BC}01${AC} Instagram ${NC}       ${BC}17${AC} DropBox ${NC}        ${BC}33${AC} eBay ${NC}"
+-  echo -e "          ${BC}02${AC} FaceBook ${NC}        ${BC}18${AC} Adobe ID ${NC}       ${BC}34${AC} Amazon ${NC}"
+-  echo -e "          ${BC}03${AC} SnapChat ${NC}        ${BC}19${AC} Shopify ${NC}        ${BC}35${AC} iCloud ${NC}"
+-  echo -e "          ${BC}04${AC} Twitter ${NC}         ${BC}20${AC} Messenger ${NC}      ${BC}36${AC} Spotify ${NC}"
+-  echo -e "          ${BC}05${AC} Github ${NC}          ${BC}21${AC} GitLab ${NC}         ${BC}37${AC} Netflix ${NC}"
+-  echo -e "          ${BC}06${AC} Google ${NC}          ${BC}22${AC} Twitch ${NC}         ${BC}38${AC} Custom ${NC}"
+-  echo -e "          ${BC}07${AC} Origin ${NC}          ${BC}23${AC} MySpace ${NC}        ${BC}**${AC} Extra Tools ${NC}"
+-  echo -e "          ${BC}08${AC} Yahoo ${NC}           ${BC}24${AC} Badoo ${NC}          ${BC}39${AC} CamPhish ${NC}"
+-  echo -e "          ${BC}09${AC} LinkedIn ${NC}        ${BC}25${AC} VK ${NC}             ${BC}40${AC} LostPass ${NC}"
++  echo -e "          ${BC} 1${AC} Instagram ${NC}       ${BC}17${AC} DropBox ${NC}        ${BC}33${AC} eBay ${NC}"
++  echo -e "          ${BC} 2${AC} FaceBook ${NC}        ${BC}18${AC} Adobe ID ${NC}       ${BC}34${AC} Amazon ${NC}"
++  echo -e "          ${BC} 3${AC} SnapChat ${NC}        ${BC}19${AC} Shopify ${NC}        ${BC}35${AC} iCloud ${NC}"
++  echo -e "          ${BC} 4${AC} Twitter ${NC}         ${BC}20${AC} Messenger ${NC}      ${BC}36${AC} Spotify ${NC}"
++  echo -e "          ${BC} 5${AC} Github ${NC}          ${BC}21${AC} GitLab ${NC}         ${BC}37${AC} Netflix ${NC}"
++  echo -e "          ${BC} 6${AC} Google ${NC}          ${BC}22${AC} Twitch ${NC}         ${BC}38${AC} Custom ${NC}"
++  echo -e "          ${BC} 7${AC} Origin ${NC}          ${BC}23${AC} MySpace ${NC}        ${BC}**${AC} Extra Tools ${NC}"
++  echo -e "          ${BC} 8${AC} Yahoo ${NC}           ${BC}24${AC} Badoo ${NC}          ${BC}39${AC} CamPhish ${NC}"
++  echo -e "          ${BC} 9${AC} LinkedIn ${NC}        ${BC}25${AC} VK ${NC}             ${BC}40${AC} LostPass ${NC}"
+   echo -e "          ${BC}10${AC} Protonmail ${NC}      ${BC}26${AC} Yandex ${NC}         ${BC}41${AC} PhishMailer ${NC}"
+   echo -e "          ${BC}11${AC} Wordpress ${NC}       ${BC}27${AC} DevianART ${NC}      ${BC}42${AC} HackerPro ${NC}"
+   echo -e "          ${BC}12${AC} Microsoft ${NC}       ${BC}28${AC} Wi-Fi ${NC}      "       #${BC}01${AC} ?? ${NC}
+@@ -57,7 +39,7 @@
+   read -p $'\n\e[1;92m[\e[0m\e[1;77m*\e[0m\e[1;92m] Choose an option: \e[0m\en' option
  
+   # Ngrok Auth Validation
+-  if [[ ! -f 'ngrok' ]]; then
++  if [[ ! -f 'ngrok' ]] && ! ln -s "$(type -P ngrok)" ./ 2>/dev/null; then
+     wget https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-linux-amd64.zip
+     unzip ngrok-stable-linux-amd64.zip
+     rm ngrok-stable-linux-amd64.zip
diff --git a/blackeye.patch.sig b/blackeye.patch.sig
index 9861b0daedd8..1c064833f252 100644
--- a/blackeye.patch.sig
+++ b/blackeye.patch.sig