switch to Python 3

2 files changed, 21 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2e11d5293089..e413b897618f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,23 @@
 pkgbase = social-engineer-toolkit-git
 	pkgdesc = The Social-Engineer Toolkit (SET) - Development Version
 	pkgver = 8.0.3.r4.bc1459567
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/trustedsec/social-engineer-toolkit
 	changelog = CHANGELOG
 	arch = any
 	license = BSD
 	makedepends = git
-	makedepends = python2
-	depends = python2-pexpect
-	depends = python2-crypto
-	depends = python2-requests
-	depends = python2-pyopenssl
-	depends = python2-pefile
+	depends = python-pexpect
+	depends = python-pycryptodome
+	depends = python-requests
+	depends = python-pyopenssl
+	depends = python-pefile
 	depends = impacket
-	depends = python2-pillow
-	depends = python2-qrcode
-	depends = python2-beautifulsoup4
+	depends = python-qrcode
+	depends = python-beautifulsoup4
 	optdepends = metasploit
 	provides = social-engineer-toolkit
 	conflicts = social-engineer-toolkit
-	options = !strip
 	source = git+https://github.com/trustedsec/social-engineer-toolkit.git
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 4256df78c67d..2d57800d9434 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,46 +5,42 @@ pkgname=social-engineer-toolkit-git
 
 pkgver() { git -C "${pkgname%-git}" describe --tags | sed 's/\([^-]*-\)g/r\1/;s/-/./g'; }
 pkgver=8.0.3.r4.bc1459567
-pkgrel=1
+pkgrel=2
 
 pkgdesc='The Social-Engineer Toolkit (SET) - Development Version'
 arch=('any')
 url="https://github.com/trustedsec/${pkgname%-git}"
 license=('BSD')
 
-makedepends=('git' 'python2')
-depends=('python2-pexpect' 'python2-crypto' 'python2-requests'
-         'python2-pyopenssl' 'python2-pefile' 'impacket'
-         'python2-pillow' 'python2-qrcode' 'python2-beautifulsoup4')
+makedepends=('git')
+depends=('python-pexpect' 'python-pycryptodome' 'python-requests'
+         'python-pyopenssl' 'python-pefile' 'impacket'
+         'python-qrcode' 'python-beautifulsoup4')
 optdepends=('metasploit')
 
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
 
-options=('!strip')
-
 changelog=CHANGELOG
 source=("git+$url.git")
 sha256sums=('SKIP')
 
 
 prepare() {
-    cd "${pkgname%-git}"
-    sed -si '1s/python3/python2/' se{toolkit,proxy,automate,update}
+    rm -r "${pkgname%-git}"/{seupdate,setup.py,requirements.txt,.git{hub,ignore}}
 }
 
 build() {
-    cd "${pkgname%-git}"
-    python2 -O -m compileall .
-    find src -name __init__.pyo -delete
+    python -O -m compileall "${pkgname%-git}"
 }
 
 package() {
-    cd "${pkgname%-git}"
-    install -dm755 "$pkgdir/usr/"{bin,share/{,doc/,licenses/}setoolkit}
-    cp -a --no-preserve=ownership * "$pkgdir/usr/share/setoolkit/"
-    ln -s /usr/share/setoolkit/readme/* "$pkgdir/usr/share/doc/setoolkit/"
-    ln -s /usr/share/setoolkit/README.md "$pkgdir/usr/share/doc/setoolkit/"
+    install -Dm644 "${pkgname%-git}/src/core/config.baseline" "$pkgdir/etc/setoolkit/set.config"
+    install -dm755 "$pkgdir/usr/"{bin,share/{doc,licenses/setoolkit}}
+    cp -a --no-preserve=ownership "${pkgname%-git}" "$pkgdir/usr/share/setoolkit"
+    mv "$pkgdir/usr/share/setoolkit/readme" "$pkgdir/usr/share/doc/setoolkit"
+    mv "$pkgdir/usr/share/setoolkit/README.md" "$pkgdir/usr/share/doc/setoolkit/"
+    ln -s /usr/share/doc/setoolkit "$pkgdir/usr/share/setoolkit/readme"
     ln -s /usr/share/doc/setoolkit/LICENSE "$pkgdir/usr/share/licenses/setoolkit/"
     ln -s /usr/share/setoolkit/se{toolkit,proxy,automate} "$pkgdir/usr/bin/"
 }