Merge remote-tracking branch 'ee/master'

13 files changed, 75 insertions, 56 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 78c969907c97..9bb7f5ff65ab 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,35 @@
-pkgbase = burpsuite-pro
-	pkgdesc = An integrated platform for performing security testing of web applications (professional edition)
+pkgbase = burpsuite-pro-earlyadopter
+	pkgdesc = An integrated platform for performing security testing of web applications (professional edition) (early adopter)
 	pkgver = 2023.7
 	pkgrel = 1
 	url = https://portswigger.net/burp/
-	install = burpsuite-pro.install
 	arch = any
 	license = custom
 	makedepends = zip
-	depends = java-runtime>=9
-	noextract = burpsuite-pro-2023.7.jar
-	source = burpsuite-pro-2023.7.jar::https://portswigger.net/burp/releases/download?product=pro&version=2023.7&type=Jar
-	source = burpsuite-pro.desktop
-	source = icon128.png
+	depends = java-runtime>=17,
+	depends = hicolor-icon-theme
+	noextract = burpsuite-pro-earlyadopter-2023.7-orig.jar
+	source = burpsuite-pro-earlyadopter-2023.7-orig.jar::https://portswigger.net/burp/releases/download?product=pro&version=2023.7&type=Jar
+	source = burpsuite-pro-earlyadopter.desktop
 	source = splash.png
+	source = icon16.png
+	source = icon24.png
+	source = icon32.png
+	source = icon48.png
+	source = icon128.png
+	source = icon256.png
+	source = icon512.png
+	source = icon.svg
 	sha256sums = e29beb49af2679373bccdb497795f7180745c156cdc34abd3acee2706da1b07c
-	sha256sums = 740a01fd3feacee5b0563edc4c6634219d367bf2590ecfc954959a95354506c8
-	sha256sums = f9b8bedbab02c8f0e03b2f5e3f99fa003c58d767168c3c4aa135233b3b533d4b
-	sha256sums = 3aaa84dd4c3d31a88cd065b8445d164737c7fad4fb56833fb994de0bf6dbe3be
+	sha256sums = dabd0e917c65245aeab77f251481cdc77ac04bb756f757bb477d3969b12a75c5
+	sha256sums = be5226ff91b37f6102e143a1b8cf54c41ea66b2da6cff2d5df660b3b1a411c86
+	sha256sums = ff0b230af06fb76af053090ac021bf45b88341d746e67f6bb9e94ba40957d9d8
+	sha256sums = a6791fcaee558f6744b4f5a3fc0af2c9ad7ce244033e224c4e4464563ac9b911
+	sha256sums = 48d529f2a045b1179d9cd87ffdeb7fd469d963f7606fd22b7edc665d0515e1d2
+	sha256sums = 2b2407b8ab2ee181bfd64e3ba3e3090a328cbef8f53cce20ba76cffbfb3bc1d1
+	sha256sums = 28d17763c17e010936ad8ed44427d9ce6523510f580aefce52eb7c0f26b48045
+	sha256sums = da6469f32b0acfcad2057cf0920c128bbbf64bc72ec6a4d5e5ba10d5b8a2d859
+	sha256sums = 6bbfd022aa451efeb439a89527b814ae06f7ce6196f7ad8db276e9ad372a7e32
+	sha256sums = 8777077ed5b1809c8adde4c056a315f8ec8f1b79f4c4c0e60eb3582c4d7ab71d
 
-pkgname = burpsuite-pro
+pkgname = burpsuite-pro-earlyadopter
diff --git a/PKGBUILD b/PKGBUILD
index 3f1dac604bde..dde690ee5fe7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,45 +1,61 @@
-# Maintainer: freb
+# Maintainer: Rasmus Moorats <xx+aur@nns.ee>
+# Contributor: freb
 
-pkgname=burpsuite-pro
+pkgname=burpsuite-pro-earlyadopter
 pkgver=2023.7
 pkgrel=1
-pkgdesc="An integrated platform for performing security testing of web applications (professional edition)"
+pkgdesc="An integrated platform for performing security testing of web applications (professional edition) (early adopter)"
 url="https://portswigger.net/burp/"
-depends=('java-runtime>=9')
+depends=('java-runtime>=17', 'hicolor-icon-theme')
 makedepends=('zip')
 arch=('any')
 license=('custom')
-noextract=("${pkgname}-${pkgver}.jar")
-source=("${pkgname}-${pkgver}.jar::https://portswigger.net/burp/releases/download?product=pro&version=${pkgver}&type=Jar"
-        burpsuite-pro.desktop
-        icon128.png
-        splash.png)
-install=burpsuite-pro.install
-sha256sums=(
-  'e29beb49af2679373bccdb497795f7180745c156cdc34abd3acee2706da1b07c' # jar
-  '740a01fd3feacee5b0563edc4c6634219d367bf2590ecfc954959a95354506c8' # burpsuite-pro.desktop
-  'f9b8bedbab02c8f0e03b2f5e3f99fa003c58d767168c3c4aa135233b3b533d4b' # icon128.png
-  '3aaa84dd4c3d31a88cd065b8445d164737c7fad4fb56833fb994de0bf6dbe3be' # splash.png
-)
+noextract=("${pkgname}-${pkgver}-orig.jar")
+source=("${pkgname}-${pkgver}-orig.jar::https://portswigger.net/burp/releases/download?product=pro&version=${pkgver}&type=Jar"
+  ${pkgname}.desktop
+  splash.png
+  icon16.png
+  icon24.png
+  icon32.png
+  icon48.png
+  icon128.png
+  icon256.png
+  icon512.png
+  icon.svg)
+sha256sums=('e29beb49af2679373bccdb497795f7180745c156cdc34abd3acee2706da1b07c'
+            'dabd0e917c65245aeab77f251481cdc77ac04bb756f757bb477d3969b12a75c5'
+            'be5226ff91b37f6102e143a1b8cf54c41ea66b2da6cff2d5df660b3b1a411c86'
+            'ff0b230af06fb76af053090ac021bf45b88341d746e67f6bb9e94ba40957d9d8'
+            'a6791fcaee558f6744b4f5a3fc0af2c9ad7ce244033e224c4e4464563ac9b911'
+            '48d529f2a045b1179d9cd87ffdeb7fd469d963f7606fd22b7edc665d0515e1d2'
+            '2b2407b8ab2ee181bfd64e3ba3e3090a328cbef8f53cce20ba76cffbfb3bc1d1'
+            '28d17763c17e010936ad8ed44427d9ce6523510f580aefce52eb7c0f26b48045'
+            'da6469f32b0acfcad2057cf0920c128bbbf64bc72ec6a4d5e5ba10d5b8a2d859'
+            '6bbfd022aa451efeb439a89527b814ae06f7ce6196f7ad8db276e9ad372a7e32'
+            '8777077ed5b1809c8adde4c056a315f8ec8f1b79f4c4c0e60eb3582c4d7ab71d')
 
 prepare() {
   cd ${srcdir}
+  cp ${pkgname}-${pkgver}-orig.jar ${pkgname}-${pkgver}.jar
   # remove useless chromium versions
   zip -d ${pkgname}-${pkgver}.jar 'chromium-macosx*.zip' 'chromium-win*.zip'
 }
 
 package() {
-  mkdir -p ${pkgdir}/usr/bin
-  mkdir -p ${pkgdir}/usr/share/{applications,pixmaps,${pkgname}}
-
   cd ${srcdir}
-  install -m644 ${pkgname}-${pkgver}.jar ${pkgdir}/usr/share/${pkgname}/${pkgname}.jar
-  install -m644 burpsuite-pro.desktop ${pkgdir}/usr/share/applications/
-  install -m644 icon128.png ${pkgdir}/usr/share/pixmaps/burpsuite-pro.png
-  install -m644 splash.png ${pkgdir}/usr/share/pixmaps/burpsuite-pro-splash.png
+  install -Dm644 ${pkgname}-${pkgver}.jar ${pkgdir}/usr/share/${pkgname}/${pkgname}.jar
+  install -Dm644 ${pkgname}.desktop -t ${pkgdir}/usr/share/applications/
+  install -Dm644 splash.png ${pkgdir}/usr/share/pixmaps/${pkgname}-splash.png
+
+  # install icons
+  for size in {16,24,32,48,128,256,512}; do
+    install -Dm644 icon${size}.png ${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/burpsuite-pro-earlyadopter.png
+  done
+  install -Dm644 icon.svg ${pkgdir}/usr/share/icons/hicolor/scalable/apps/burpsuite-pro-earlyadopter.svg
 
-  # Create startup file for burpsuite-pro.
+  # create startup file for burpsuite-pro-earlyadopter.
+  mkdir -m755 ${pkgdir}/usr/bin
   echo "#!/bin/sh" > ${pkgdir}/usr/bin/${pkgname}
-  echo "exec \"\$JAVA_HOME/bin/java\" \"-splash:/usr/share/pixmaps/burpsuite-pro-splash.png\" \"--add-opens\" \"java.base/java.lang=ALL-UNNAMED\" \"--add-opens\" \"java.base/javax.crypto=ALL-UNNAMED\" \"--add-opens\" \"java.desktop/javax.swing=ALL-UNNAMED\" \"--illegal-access=permit\" \"-jar\" \"/usr/share/${pkgname}/${pkgname}.jar\" \"\$@\"" >> ${pkgdir}/usr/bin/${pkgname}
+  echo "exec \"\$JAVA_HOME/bin/java\" \"-splash:/usr/share/pixmaps/${pkgname}-splash.png\" \"--add-opens\" \"java.base/java.lang=ALL-UNNAMED\" \"--add-opens\" \"java.base/javax.crypto=ALL-UNNAMED\" \"--add-opens\" \"java.desktop/javax.swing=ALL-UNNAMED\" \"-jar\" \"/usr/share/${pkgname}/${pkgname}.jar\" \"\$@\"" >> ${pkgdir}/usr/bin/${pkgname}
   chmod 755 ${pkgdir}/usr/bin/${pkgname}
 }
diff --git a/burpsuite-pro.desktop b/burpsuite-pro-earlyadopter.desktop
index 01e9d935e0e4..a05ff1baf73b 100644
--- a/burpsuite-pro.desktop
+++ b/burpsuite-pro-earlyadopter.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
 Version=1.0
 Type=Application
-Name=Burp Suite Professional
-Exec=burpsuite-pro
-Icon=burpsuite-pro
+Name=Burp Suite Professional (Early Adopter)
+Exec=burpsuite-pro-earlyadopter
+Icon=burpsuite-pro-earlyadopter
 Comment=Burp Suite is an integrated platform for attacking web applications (professional edition)
 Categories=Development;Security
 Terminal=false
-MimeType=application/x-extension-burp;
\ No newline at end of file
+MimeType=application/x-extension-burp;
diff --git a/burpsuite-pro.install b/burpsuite-pro.install
deleted file mode 100644
index 41f985f44d29..000000000000
--- a/burpsuite-pro.install
+++ /dev/null
@@ -1,15 +0,0 @@
-_ensure_java_version() {
-    case "$(archlinux-java get)" in
-        java-8-*)
-            printf '%s\n' 'Java 8 is no longer supported by Burpsuite Pro. Please change your default Java implementation using `archlinux-java`.'
-            ;;
-    esac
-}
-
-post_install() {
-    _ensure_java_version
-}
-
-post_upgrade() {
-    _ensure_java_version
-}
\ No newline at end of file
diff --git a/icon.svg b/icon.svg
new file mode 100644
index 000000000000..3d371d87d626
--- /dev/null
+++ b/icon.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="43.851" height="43.851">
+  <path fill="#5b4fff" d="M0 0h43.851v43.851H0z" style="fill:#5b4fff;fill-opacity:1;stroke-width:1.41911"/>
+  <path fill="#fff" d="M23.709 16.522v7.24h8.754l-8.754 10.809v4.106h-3.567v-5.403l4.864-5.945h-4.864v-7.24h-8.754L20.142 9.28V5.174h3.567v5.403l-4.864 5.945z"/>
+</svg>
diff --git a/icon128.png b/icon128.png
index e9e77dccf78b..982755ed0b73 100644
--- a/icon128.png
+++ b/icon128.png
diff --git a/icon16.png b/icon16.png
new file mode 100644
index 000000000000..e39076b8de16
--- /dev/null
+++ b/icon16.png
diff --git a/icon24.png b/icon24.png
new file mode 100644
index 000000000000..2946ac22b35b
--- /dev/null
+++ b/icon24.png
diff --git a/icon256.png b/icon256.png
new file mode 100644
index 000000000000..0d9edda4ee64
--- /dev/null
+++ b/icon256.png
diff --git a/icon32.png b/icon32.png
new file mode 100644
index 000000000000..1d3fc22c43b9
--- /dev/null
+++ b/icon32.png
diff --git a/icon48.png b/icon48.png
new file mode 100644
index 000000000000..32baaa03fc12
--- /dev/null
+++ b/icon48.png
diff --git a/icon512.png b/icon512.png
new file mode 100644
index 000000000000..0e52e3328cd0
--- /dev/null
+++ b/icon512.png
diff --git a/splash.png b/splash.png
index eba422b464e4..198a3fbd0004 100644
--- a/splash.png
+++ b/splash.png