From c343cfbeabe58fd0fb6b4f40f3c2032b0d6f17a2 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Wed, 15 May 2024 09:59:21 -0400 Subject: [PATCH 1/6] bootstrap profile: drop a use flag to avoid circular dep --- profiles/pentoo/bootstrap/package.use | 1 + 1 file changed, 1 insertion(+) diff --git a/profiles/pentoo/bootstrap/package.use b/profiles/pentoo/bootstrap/package.use index 2570342b01..b2a0716f23 100644 --- a/profiles/pentoo/bootstrap/package.use +++ b/profiles/pentoo/bootstrap/package.use @@ -19,6 +19,7 @@ dev-libs/libpcre2 -verify-sig dev-libs/libtasn1 -verify-sig dev-libs/nettle -verify-sig dev-libs/openssl -verify-sig +dev-python/pillow -webp media-libs/freetype -harfbuzz media-libs/mesa -vaapi net-analyzer/rrdtool -python -ruby From d810fd579c1fd15678e4b0782a15310a78ae11a9 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Wed, 15 May 2024 10:13:30 -0400 Subject: [PATCH 2/6] burpsuite: pkgcheck fixes, fix x86 --- net-proxy/burpsuite/Manifest | 2 -- .../burpsuite/burpsuite-2024.1.1.6.ebuild | 1 - net-proxy/burpsuite/burpsuite-9999.ebuild | 35 ++++++++++--------- 3 files changed, 19 insertions(+), 19 deletions(-) delete mode 120000 net-proxy/burpsuite/burpsuite-2024.1.1.6.ebuild diff --git a/net-proxy/burpsuite/Manifest b/net-proxy/burpsuite/Manifest index 897ced8b75..32ef75054b 100644 --- a/net-proxy/burpsuite/Manifest +++ b/net-proxy/burpsuite/Manifest @@ -1,3 +1 @@ -DIST burpsuite_community_v2024.1.1.6.jar 548785842 BLAKE2B 0b8887a1e63fac59b4b328a0afe1a85a51f2c94779273993f39218262d0b3fa4d632a5b1de204f2ad6cee7b4267eebc2c53a02dec9b275e788d0b48b643e54e1 SHA512 6ea1a3d7e9b5412e23447e10270b213fcff8f0faa503dac8c4b8220c761d65190dd3a6abfb286118fd2c622d0e288c9761b37e89eb3739cdee00b0dca4428f8e DIST burpsuite_community_v2024.3.1.4.jar 550849394 BLAKE2B 1dda0c540a7c44d8c88db3754fa3ac5be6c020fea65eb7dda0fd015a6bfbed004aa6f8503615c89922c751ef9aedc824f9b2609aae85b06bee74d7f0c27d614b SHA512 bbb3148bec76f1d6d725a8f5de497cd1c7c3555ff2eb70f9af1bd1a8c500badb42679da3799247daf631b60abb3dfea04d201ba082ebf5c8779aa64b7d47955d -DIST burpsuite_community_v9999.jar 34204 BLAKE2B 2ca921851f99bdbcb8ee72a3d13696f760595d9f64b4d6df9193a8896cb59680f1759a075d921e215b5d8b925e20bbc5a11d910171b6f3ff167e681b4465a93a SHA512 e377b69a852f7971f75709c5b755e8142bd40905271cb91c15c5125c24acc34cdb28faf9c167e25d60d3b04eafd4d2f9f5f5274349dcacd0f149f5e292e5b275 diff --git a/net-proxy/burpsuite/burpsuite-2024.1.1.6.ebuild b/net-proxy/burpsuite/burpsuite-2024.1.1.6.ebuild deleted file mode 120000 index 4946ed944e..0000000000 --- a/net-proxy/burpsuite/burpsuite-2024.1.1.6.ebuild +++ /dev/null @@ -1 +0,0 @@ -burpsuite-9999.ebuild \ No newline at end of file diff --git a/net-proxy/burpsuite/burpsuite-9999.ebuild b/net-proxy/burpsuite/burpsuite-9999.ebuild index fb036364a5..5531c56b27 100644 --- a/net-proxy/burpsuite/burpsuite-9999.ebuild +++ b/net-proxy/burpsuite/burpsuite-9999.ebuild @@ -15,27 +15,30 @@ SLOT="0" # https://portswigger.net/burp/releases # https://portswigger.net/burp/releases/professional/latest MY_PV=${PV/_rc/} -if [[ "${PN}" == *"pro" ]]; then - MY_P="burpsuite_pro_v${MY_PV}.jar" - SRC_URI="https://portswigger.net/burp/releases/download?product=pro&version=${MY_PV}&type=Jar -> ${MY_P}" -else - MY_P="burpsuite_community_v${MY_PV}.jar" - SRC_URI="https://portswigger.net/burp/releases/download?product=community&version=${MY_PV} -> ${MY_P}" -fi +if [ "${PV}" != "9999" ]; then + if [[ "${PN}" == *"pro" ]]; then + MY_P="burpsuite_pro_v${MY_PV}.jar" + SRC_URI="https://portswigger.net/burp/releases/download?product=pro&version=${MY_PV}&type=Jar -> ${MY_P}" + else + MY_P="burpsuite_community_v${MY_PV}.jar" + SRC_URI="https://portswigger.net/burp/releases/download?product=community&version=${MY_PV} -> ${MY_P}" + fi -if [[ "${PV}" == *9999 ]]; then -# SRC_URI="404.tar.gz" -# KEYWORDS="" - ewarn "9999 is a template, do not use it" -elif [[ "${PV}" == *"_rc" ]]; then - KEYWORDS="~amd64 ~x86" -else - KEYWORDS="amd64 x86" + if [ "${PV}" != "9999" ]; then + KEYWORDS="amd64 x86" + fi fi BDEPEND="app-arch/zip" #java-pkg-2 sets java based on RDEPEND so the java slot in rdepend is used to build -RDEPEND="virtual/jre:21" +RDEPEND="virtual/jre:17" + +pkg_setup() { + if [[ "${PV}" == *9999 ]]; then + eerror "9999 is a template, do not use it" + die + fi +} src_unpack() { cp "${DISTDIR}/${A}" "${S}" From fe443453d719581d3ab393e719fc2875f2858bd1 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Wed, 15 May 2024 10:25:48 -0400 Subject: [PATCH 3/6] burpsuite: fix deps and keywords --- net-proxy/burpsuite/burpsuite-9999.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net-proxy/burpsuite/burpsuite-9999.ebuild b/net-proxy/burpsuite/burpsuite-9999.ebuild index 5531c56b27..208e28896a 100644 --- a/net-proxy/burpsuite/burpsuite-9999.ebuild +++ b/net-proxy/burpsuite/burpsuite-9999.ebuild @@ -25,13 +25,13 @@ if [ "${PV}" != "9999" ]; then fi if [ "${PV}" != "9999" ]; then - KEYWORDS="amd64 x86" + KEYWORDS="~amd64 ~x86" fi fi BDEPEND="app-arch/zip" #java-pkg-2 sets java based on RDEPEND so the java slot in rdepend is used to build -RDEPEND="virtual/jre:17" +RDEPEND="virtual/jre:21" pkg_setup() { if [[ "${PV}" == *9999 ]]; then From f8253e72a099cbca8cb8f85a57bc60f08b6ab615 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Wed, 15 May 2024 10:34:56 -0400 Subject: [PATCH 4/6] profile: cleanup old java stuff --- profiles/pentoo/arch/arm/package.accept_keywords/proxies | 2 -- profiles/pentoo/base/package.accept_keywords/net-proxy | 2 +- profiles/pentoo/base/package.keywords/dev-java | 6 ------ profiles/pentoo/base/package.use.mask | 6 ------ profiles/pentoo/base/package.use/dev-java | 6 ------ profiles/pentoo/overlay/package.keywords/dev-java | 1 - profiles/pentoo/overlay/package.use/dev-java | 1 - 7 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 profiles/pentoo/base/package.keywords/dev-java delete mode 100644 profiles/pentoo/base/package.use/dev-java delete mode 120000 profiles/pentoo/overlay/package.keywords/dev-java delete mode 120000 profiles/pentoo/overlay/package.use/dev-java diff --git a/profiles/pentoo/arch/arm/package.accept_keywords/proxies b/profiles/pentoo/arch/arm/package.accept_keywords/proxies index 68040d3719..2c874da1fa 100644 --- a/profiles/pentoo/arch/arm/package.accept_keywords/proxies +++ b/profiles/pentoo/arch/arm/package.accept_keywords/proxies @@ -3,7 +3,6 @@ dev-python/itsdangerous amd64 dev-python/werkzeug amd64 ~dev-python/netlib-0.10 ** ~dev-python/flask-0.10.1 ** -=virtual/jre-1.7.0 ** ~net-vpn/iodine-0.7.0 ** ~net-proxy/burpsuite-1.5 ** ~net-proxy/zaproxy-2.1.0 ** @@ -12,7 +11,6 @@ dev-python/werkzeug amd64 1.19 ~net-dns/dnscrypt-proxy-2.1.3 -~net-proxy/burpsuite-1.5 +~net-proxy/burpsuite-2024.3.1.4 =net-proxy/zaproxy-2.9* net-proxy/redsocks diff --git a/profiles/pentoo/base/package.keywords/dev-java b/profiles/pentoo/base/package.keywords/dev-java deleted file mode 100644 index 832dbea68c..0000000000 --- a/profiles/pentoo/base/package.keywords/dev-java +++ /dev/null @@ -1,6 +0,0 @@ -#ghidra -virtual/jdk:11 amd64 -dev-java/openjdk-bin:11 amd64 -dev-java/openjdk:11 amd64 -virtual/jre:11 amd64 -dev-java/openjdk-jre-bin:11 amd64 diff --git a/profiles/pentoo/base/package.use.mask b/profiles/pentoo/base/package.use.mask index acd75465fe..9a2d0d0ac0 100644 --- a/profiles/pentoo/base/package.use.mask +++ b/profiles/pentoo/base/package.use.mask @@ -47,12 +47,6 @@ app-emulation/wine-vanilla opencl #modesetting is superior in all noticable ways and it default nearly everywhere x11-base/xorg-drivers video_cards_i915 -#unmask flag -dev-java/openjdk-bin:11 -gentoo-vm -dev-java/openjdk:11 -gentoo-vm -dev-java/openjdk-bin:17 -gentoo-vm -dev-java/openjdk:17 -gentoo-vm - #no python3 support #python2 is mostly dead, and this is clinging to it and breaking smooth update dev-lang/yasm python diff --git a/profiles/pentoo/base/package.use/dev-java b/profiles/pentoo/base/package.use/dev-java deleted file mode 100644 index faa738cd29..0000000000 --- a/profiles/pentoo/base/package.use/dev-java +++ /dev/null @@ -1,6 +0,0 @@ -dev-java/icedtea -webstart -dev-java/openjdk gentoo-vm -webstart -#required by dev-util/recaf -dev-java/oracle-jdk-bin javafx gtk3 -#javafx pulls in failing swt -#dev-java/openjdk javafx diff --git a/profiles/pentoo/overlay/package.keywords/dev-java b/profiles/pentoo/overlay/package.keywords/dev-java deleted file mode 120000 index af835f27d3..0000000000 --- a/profiles/pentoo/overlay/package.keywords/dev-java +++ /dev/null @@ -1 +0,0 @@ -../../base/package.keywords/dev-java \ No newline at end of file diff --git a/profiles/pentoo/overlay/package.use/dev-java b/profiles/pentoo/overlay/package.use/dev-java deleted file mode 120000 index 5ec38cc264..0000000000 --- a/profiles/pentoo/overlay/package.use/dev-java +++ /dev/null @@ -1 +0,0 @@ -../../base/package.use/dev-java \ No newline at end of file From 7e884d7772796f343e7e69be875d3b25e37787aa Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Wed, 15 May 2024 10:43:22 -0400 Subject: [PATCH 5/6] profile: pkgcheck fixes --- profiles/pentoo/base/package.use.mask | 16 ---------------- profiles/pentoo/bootstrap/package.use | 1 - 2 files changed, 17 deletions(-) diff --git a/profiles/pentoo/base/package.use.mask b/profiles/pentoo/base/package.use.mask index 9a2d0d0ac0..f662c05f8c 100644 --- a/profiles/pentoo/base/package.use.mask +++ b/profiles/pentoo/base/package.use.mask @@ -7,10 +7,6 @@ net-dialup/freeradius python #breaks ardunio cross-avr/gcc pie ssp -#livecd use flag forces no gentoo-syntax, we want gentoo-syntax -app-editors/vim-core livecd -#livecd is often not desired -net-misc/openssh livecd #symlinks busybox to vi sys-apps/busybox livecd #basically just forces gpm and fbcon @@ -27,16 +23,11 @@ sys-apps/portage build #https://bugs.gentoo.org/show_bug.cgi?id=531540 #this breaks a lot of things, and it sounds like all the patents are expired dev-libs/openssl bindist -#we don't let openssl be bindist and this is just to support openssl -net-wireless/wpa_supplicant bindist #this exists only to match abi with openssl net-misc/openssh bindist -#this exists only to match abi with openssl -dev-qt/qtnetwork bindist #this is too old to work right anymore afaict net-wireless/pyrit cuda -net-wireless/wifite cuda net-wireless/wifite2 cuda #wine doesn't need opencl for anything important afaik, and opencl sucks in gentoo @@ -49,12 +40,8 @@ x11-base/xorg-drivers video_cards_i915 #no python3 support #python2 is mostly dead, and this is clinging to it and breaking smooth update -dev-lang/yasm python dev-libs/libdnet python -dev-libs/libgamin python -dev-libs/libnatspec python dev-libs/libxslt python -x11-libs/goocanvas python #older versions are python 2 only Date: Wed, 15 May 2024 10:47:11 -0400 Subject: [PATCH 6/6] profile: one more pkgcheck fix --- profiles/pentoo/base/package.use.mask | 2 -- 1 file changed, 2 deletions(-) diff --git a/profiles/pentoo/base/package.use.mask b/profiles/pentoo/base/package.use.mask index f662c05f8c..85b25735f5 100644 --- a/profiles/pentoo/base/package.use.mask +++ b/profiles/pentoo/base/package.use.mask @@ -23,8 +23,6 @@ sys-apps/portage build #https://bugs.gentoo.org/show_bug.cgi?id=531540 #this breaks a lot of things, and it sounds like all the patents are expired dev-libs/openssl bindist -#this exists only to match abi with openssl -net-misc/openssh bindist #this is too old to work right anymore afaict net-wireless/pyrit cuda