From f310719f7657ee0dfabd25e7a00068bd082522d3 Mon Sep 17 00:00:00 2001
From: Levon 'noptrix' Kayan <noptrix@nullsecurity.net>
Date: Fri, 1 Sep 2023 11:10:22 +0200
Subject: [PATCH] yawast: fix instlal (still broken because it uses old sslyze
 version)

---
 packages/yawast/PKGBUILD               | 34 +++++-----
 packages/yawast/requirements.txt.patch | 93 --------------------------
 packages/yawast/setup.py.patch         | 10 +++
 3 files changed, 26 insertions(+), 111 deletions(-)
 delete mode 100644 packages/yawast/requirements.txt.patch
 create mode 100644 packages/yawast/setup.py.patch

diff --git a/packages/yawast/PKGBUILD b/packages/yawast/PKGBUILD
index 110d6ce5d6c..02aee14e358 100644
--- a/packages/yawast/PKGBUILD
+++ b/packages/yawast/PKGBUILD
@@ -2,8 +2,9 @@
 # See COPYING for license details.
 
 pkgname=yawast
-pkgver=1072.5e9e7a3
-pkgrel=8
+pkgver=0.11.0
+pkgrel=1
+epoch=1
 pkgdesc='The YAWAST Antecedent Web Application Security Toolkit.'
 groups=('blackarch' 'blackarch-webapp' 'blackarch-scanner' 'blackarch-fuzzer')
 arch=('any')
@@ -23,34 +24,31 @@ depends=('python' 'python-asn1crypto' 'python-attrs' 'python-beautifulsoup4'
          'python-ordered-set' 'python-orderedmultidict' 'python-pip-shims'
          'python-plette' 'python-tomlkit' 'python-zipp'
          'python-requirementslib')
-makedepends=('git' 'python-setuptools')
-source=("git+https://github.com/adamcaudill/$pkgname.git"
-        'requirements.txt.patch')
-sha512sums=('SKIP'
-            'a53ec0fff5e911dba2ffe0360904f0ce1a5634edecda80bd432863f31082f6ad0e2da587eba97f7be1e51da35a54451291ffd2301e65204776442bda59099cb1')
-
-pkgver() {
-  cd $pkgname
-
-  echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
-}
+makedepends=('python-setuptools' 'python-requirementslib')
+#source=("git+https://github.com/adamcaudill/$pkgname.git"
+source=("https://files.pythonhosted.org/packages/d3/f6/8082e949efa4e8f4139599f4c9773cdfed6d18c1e08f4f731e6cc95fbf9a/yawast-0.11.0.tar.gz"
+        'setup.py.patch')
+sha512sums=('a03c8621cef543cd2c6635f595cae9eed8e458eb25b941ddc4c506143f32cf19f7ae73da926fa59f832c63bcf5c0d53b9363b213d1a40abcae29fa14f678939e'
+            'acabc5def734bab6bfe60834f1c762c26c1496f3f20dfd822bba31c26d56917353004a27a6779c6bf55f2ce44e4cc9e4680210d65a49a956f67b9e7c88fe8ea6')
 
 prepare() {
-  cd $pkgname
+  cd "$pkgname-$pkgver"
+
+  patch -p0 < ../setup.py.patch
 
-  patch -p0 < "$srcdir/requirements.txt.patch"
+  touch Pipfile
 }
 
 build() {
-  cd $pkgname
+  cd "$pkgname-$pkgver"
 
   python setup.py build
 }
 
 package() {
-  cd $pkgname
+  cd "$pkgname-$pkgver"
 
-  python setup.py install --root="$pkgdir" --prefix=/usr --skip-build
+  python setup.py install --root="$pkgdir" --prefix=/usr -O1 --skip-build
 
   install -Dm 644 -t "$pkgdir/usr/share/doc/$pkgname/" *.md
   install -Dm 644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
diff --git a/packages/yawast/requirements.txt.patch b/packages/yawast/requirements.txt.patch
deleted file mode 100644
index 0894a9fbc00..00000000000
--- a/packages/yawast/requirements.txt.patch
+++ /dev/null
@@ -1,93 +0,0 @@
---- src/yawast/requirements.txt	2021-06-28 09:46:51.356666383 +0200
-+++ requirements.txt	2021-06-28 09:47:47.426666378 +0200
-@@ -1,45 +1,45 @@
--appdirs==1.4.3
--asn1crypto==1.2.0
--attrs==19.3.0
--beautifulsoup4==4.8.2
--cached-property==1.5.1
--cerberus==1.3.2
--certifi==2019.11.28
--cffi==1.13.2
--chardet==3.0.4
--colorama==0.4.3
--cryptography==2.5
--distlib==0.3.0
--dnspython==1.16.0
--first==2.0.2
--idna==2.8
--importlib-metadata==1.3.0 ; python_version < '3.8'
--jsonschema==2.6.0
--more-itertools==8.0.2
--nassl==2.2.0
--ordered-set==3.1.1
--orderedmultidict==1.0.1
--packaging==19.2
--pep517==0.8.1
--pip-shims==0.4.0
--plette[validation]==0.2.3
--psutil==5.6.7
--publicsuffixlist==0.6.11
--pycparser==2.19
--pyparsing==2.4.6
--python-dateutil==2.8.1
--requests-mock==1.7.0
--requests==2.22.0
--requirementslib==1.5.3
--selenium==3.141.0
--six==1.13.0
--soupsieve==1.9.5
--sslyze==2.1.4
--tls-parser==1.2.1
--toml==0.10.0
--tomlkit==0.5.8
--urllib3==1.25.7
--validator-collection==1.4.0
--vistir==0.4.3
--wheel==0.33.6
--zipp==0.6.0 ; python_version < '3.8'
-+appdirs
-+asn1crypto
-+attrs
-+beautifulsoup4
-+cached-property
-+cerberus
-+certifi
-+cffi
-+chardet
-+colorama
-+cryptography
-+distlib
-+dnspython
-+first
-+idna
-+importlib-metadata
-+jsonschema
-+more-itertools
-+nassl
-+ordered-set
-+orderedmultidict
-+packaging
-+pep517
-+pip-shims
-+plette[validation]
-+psutil
-+publicsuffixlist
-+pycparser
-+pyparsing
-+python-dateutil
-+requests-mock
-+requests
-+requirementslib
-+selenium
-+six
-+soupsieve
-+sslyze
-+tls-parser
-+toml
-+tomlkit
-+urllib3
-+validator-collection
-+vistir
-+wheel
-+zipp
diff --git a/packages/yawast/setup.py.patch b/packages/yawast/setup.py.patch
new file mode 100644
index 00000000000..2274315189e
--- /dev/null
+++ b/packages/yawast/setup.py.patch
@@ -0,0 +1,10 @@
+--- src/yawast-0.11.0/setup.py	2020-01-02 04:01:28.000000000 +0100
++++ setup.py	2023-09-01 11:08:27.323331781 +0200
+@@ -144,7 +144,6 @@
+     executables=[Executable("bin/yawast", base=None)],
+     packages=find_packages(exclude=["tests"]),
+     entry_points={"console_scripts": ["yawast = yawast.__main__:main"]},
+-    install_requires=get_install_reqs(),
+     include_package_data=True,
+     package_data={"yawast": ["resources/*"]},
+     zip_safe=False,