openssl bad

dev-libs/openssl-bad/openssl-bad-1.0.2_p20220901-r1.ebuild

@@ -15,7 +15,7 @@ SRC_URI="https://github.com/drwetter/openssl-1.0.2.bad/archive/${MY_COMMIT}.tar.
 S="${WORKDIR}/openssl-1.0.2.bad-${MY_COMMIT}"
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa m68k ~mips ppc ppc64 sparc x86 ~arm-linux ~x86-linux"
+#KEYWORDS="alpha amd64 arm arm64 hppa m68k ~mips ppc ppc64 sparc x86 ~arm-linux ~x86-linux"
 IUSE="+asm bindist gmp +kerberos rfc3779 sctp cpu_flags_x86_sse2 +sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
 RESTRICT="!bindist? ( bindist )
 		!test? ( test )"

net-analyzer/testssl/testssl-3.0.8.ebuild

@@ -11,7 +11,7 @@ S="${WORKDIR}/testssl.sh-${PV}"
 LICENSE="GPL-2 bundled-openssl? ( openssl )"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
-IUSE="bundled-openssl kerberos"
+IUSE="+bundled-openssl kerberos"
 REQUIRED_USE="bundled-openssl? ( || ( amd64 x86 ) )"
 
 # openssl-bad provides 197 ciphers

net-analyzer/testssl/testssl-3.0.9.ebuild

@@ -11,7 +11,7 @@ S="${WORKDIR}/testssl.sh-${PV}"
 LICENSE="GPL-2 bundled-openssl? ( openssl )"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
-IUSE="bundled-openssl kerberos"
+IUSE="+bundled-openssl kerberos"
 REQUIRED_USE="bundled-openssl? ( || ( amd64 x86 ) )"
 
 # openssl-bad provides 197 ciphers

net-analyzer/testssl/testssl-3.2_rc3.ebuild

@@ -13,7 +13,7 @@ S="${WORKDIR}/testssl.sh-${MY_PV}"
 LICENSE="GPL-2 bundled-openssl? ( openssl )"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="bundled-openssl kerberos"
+IUSE="+bundled-openssl kerberos"
 REQUIRED_USE="bundled-openssl? ( || ( amd64 x86 ) )"
 
 # openssl-bad provides 197 ciphers

pentoo/zero-system/files/TODO

@@ -0,0 +1,12 @@
+#automatically handle ssh key when missing
+#this only checks green key and should check red
+if [ ! -r ~/.ssh/id_ed25519_sk_rk_yk5cgreen ] && [ ! -r ~/.ssh/id_ed25519_sk_yk5cgreen ]; then
+  if lsusb -d 1050:0407 > /dev/null 2>&1; then
+    sshkey -K
+  fi
+fi
+
+#Check if we need to do this somehow?
+if lsusb -d 1050:0407 > /dev/null 2>&1; then
+  gpg-connect-agent "scd serialno" "learn --force" /bye
+fi

pentoo/zero-system/files/zshrc

@@ -59,22 +59,18 @@ bindkey "\eOF" end-of-line
 #bindkey "\eOc" forward-word 
 
 if [ "${USER}" != "root" ]; then
-  if [ ! -r ~/.ssh/id_ed25519_sk_green ] && [ ! -r ~/.ssh/id_ed25519_sk_red ] && [ ! -r ~/.ssh/gentoo_rsa ]; then
-    printf "This system has no ssh keys, you are expected to forward ssh agent\n"
-  else
-    if [ ! -r ~/.ssh/id_ed25519_sk_green ]; then
-      printf "This system is missing your yk5cgreen primary key id_ed25519_sk_green\n"
-    fi
-    if [ ! -r ~/.ssh/id_ed25519_sk_red ]; then
-      printf "This system is missing your yk5cred backup key id_ed25519_sk_red\n"
-    fi
-    if [ ! -r ~/.ssh/gentoo_rsa ]; then
-      printf "This system is missing your old key gentoo_rsa\n"
-    fi
-
-    eval $(keychain --eval --ignore-missing ~/.ssh/id_ed25519_sk_green ~/.ssh/id_ed25519_sk_red ~/.ssh/gentoo_rsa)
-    GPG_TTY=$(tty)
+  if [ ! -r ~/.ssh/id_ed25519_sk_green ] || [ ! -r id_ed25519_sk_rk_yk5cgreen ]; then
+    printf "This system is missing your yk5cgreen primary key file\n"
+  fi
+  if [ ! -r ~/.ssh/id_ed25519_sk_red ] || [ ! -r id_ed25519_sk_rk_yk5cred ]; then
+    printf "This system is missing your yk5cred backup key file\n"
   fi
+  if [ ! -r ~/.ssh/gentoo_rsa ]; then
+    printf "This system is missing your old key gentoo_rsa\n"
+  fi
+
+  eval $(keychain --eval --ignore-missing ~/.ssh/id_ed25519_sk_green ~/.ssh/id_ed25519_sk_rk_yk5cgreen ~/.ssh/id_ed25519_sk_red ~/.ssh/id_ed25519_sk_rk_yk5cred ~/.ssh/gentoo_rsa)
+  GPG_TTY=$(tty)
 fi
 
 setopt prompt_subst

pentoo/zero-system/zero-system-2024.2-r3.ebuild → pentoo/zero-system/zero-system-2024.3.ebuild

@@ -10,45 +10,48 @@ S="${WORKDIR}"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 arm x86"
-IUSE="dev lto nu printer naga"
+IUSE="dev lto minimal nu printer naga"
 
 RDEPEND="
+	app-shells/zsh
+	net-misc/keychain
+	!minimal? (
 		dev? (
-				app-crypt/glep63-check
-				app-doc/eclass-manpages
-				app-doc/pms
-				app-portage/iwdevtools
-				app-shells/dash
-				app-shells/mksh
-				dev-python/mock
-				dev-python/pytest
-				dev-ruby/blinkstick
-				dev-ruby/bundler-audit
-				dev-ruby/irb
-				dev-ruby/pry
-				dev-util/checkbashisms
-				dev-util/libabigail
-				dev-util/meld
-				dev-util/pkgdev
-				dev-util/shellcheck
-				dev-vcs/mercurial
-				dev-vcs/cvs
-				sys-kernel/gentoo-sources
+			app-crypt/glep63-check
+			app-doc/eclass-manpages
+			app-doc/pms
+			app-portage/iwdevtools
+			app-shells/dash
+			app-shells/mksh
+			dev-python/mock
+			dev-python/pytest
+			dev-ruby/blinkstick
+			dev-ruby/bundler-audit
+			dev-ruby/irb
+			dev-ruby/pry
+			dev-util/checkbashisms
+			dev-util/libabigail
+			dev-util/meld
+			dev-util/pkgdev
+			dev-util/shellcheck
+			dev-vcs/mercurial
+			dev-vcs/cvs
+			sys-kernel/gentoo-sources
 		)
 		naga? (
-					app-misc/jq
-					app-misc/siglo
-					dev-embedded/platformio
-					dev-embedded/stlink
-					dev-util/android-sdk-build-tools
-					dev-util/android-sdk-update-manager
-					gnome-base/gnome-keyring
-					kde-apps/filelight
-					media-plugins/swh-plugins
-					media-libs/noise-suppression-for-voice
-					net-p2p/transmission
-					www-client/firefox
-				)
+			app-misc/jq
+			app-misc/siglo
+			dev-embedded/platformio
+			dev-embedded/stlink
+			dev-util/android-sdk-build-tools
+			dev-util/android-sdk-update-manager
+			gnome-base/gnome-keyring
+			kde-apps/filelight
+			media-plugins/swh-plugins
+			media-libs/noise-suppression-for-voice
+			net-p2p/transmission
+			www-client/firefox
+		)
 		app-arch/p7zip
 		app-arch/pixz
 		app-containers/docker
@@ -57,12 +60,10 @@ RDEPEND="
 		app-crypt/nitrocli
 		app-crypt/nitrokey-app
 		app-portage/genlop
-		app-shells/zsh
 		app-shells/gentoo-zsh-completions
 		app-vim/syntastic
 		net-dns/dnsmasq
 		net-misc/axel
-		net-misc/keychain
 		sys-apps/earlyoom
 		sys-fs/libeatmydata
 		sys-fs/squashfs-tools-ng
@@ -80,7 +81,8 @@ RDEPEND="
 			mail-client/thunderbird-bin
 			net-p2p/mktorrent
 		)
-		!nu? ( printer? ( net-print/foo2zjs )
+		!nu? (
+			printer? ( net-print/foo2zjs )
 			app-admin/supervisor
 			net-analyzer/metasploit:9999
 			net-wireless/dsd
@@ -115,7 +117,8 @@ RDEPEND="
 			net-wireless/md380tools
 			!lto? ( dev-embedded/arduino )
 			x11-misc/xdotool
-			)
+		)
+	)
 "
 
 src_install() {
@@ -141,14 +144,17 @@ src_install() {
 
 pkg_postinst() {
 	if grep -q '^root' /etc/passwd && [ "$(grep '^root' /etc/passwd | awk -F: '{print $7}')" != "/bin/zsh" ]; then
-		chsh -s /bin/zsh
+		chsh -s /bin/zsh || die
 	fi
 	if grep -q '^zero' /etc/passwd && [ "$(grep '^zero' /etc/passwd | awk -F: '{print $7}')" != "/bin/zsh" ]; then
-		chsh -s /bin/zsh zero
+		chsh -s /bin/zsh zero || die
 	fi
 	if use dev; then
 		if [ ! -L /etc/portage/bashrc ]; then
-			ln -s ../../usr/share/iwdevtools/bashrc /etc/portage/bashrc
+			ln -s ../../usr/share/iwdevtools/bashrc /etc/portage/bashrc || die
 		fi
 	fi
+	if [ -d /home/zero ]; then
+		chown zero:zero /home/zero/.vim-scratch || die
+	fi
 }

profiles/pentoo/base/package.use.force

@@ -1 +1,4 @@
 net-misc/wget ssl
+
+# dev-libs/openssl-bad doesn't build so force bundled
+net-analyzer/testssl bundled-openssl