browser, live.mk: Drop use/browser/plugin/java, use/browser/plugin/flash

Not needed more.

browser, live.mk: Drop use/browser/plugin/java, use/browser/plugin/flash
07525d72 · Anton Midyukov · 8889187e · 07525d72 · 07525d72
Commit 07525d72 authored Dec 04, 2020 by Anton Midyukov
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 9 deletions

live.mk conf.d/live.mk +1 -2

config.mk features.in/browser/config.mk +0 -7

No files found.
--- a/conf.d/live.mk
+++ b/conf.d/live.mk
@@ -65,8 +65,7 @@ distro/live-webkiosk-mini: distro/.live-webkiosk-gtk \
 	@$(call add,LIVE_PACKAGES,livecd-webkiosk-firefox)

 # NB: flash/java plugins are predictable security holes
-distro/live-webkiosk-flash: distro/live-webkiosk-mini use/plymouth/live \
-	use/browser/plugin/flash use/browser/plugin/java +vmguest; @:
+distro/live-webkiosk-flash: distro/live-webkiosk-mini use/plymouth/live +vmguest; @:

 distro/live-webkiosk: distro/live-webkiosk-mini use/live/desktop; @:


--- a/features.in/browser/config.mk
+++ b/features.in/browser/config.mk
@@ -38,10 +38,3 @@ use/browser/firefox/esr:

 use/browser/firefox/live: use/browser/firefox
 	@$(call add,THE_BROWSER,livecd-firefox)
-
-# inherently insecure, NPAPI only
-use/browser/plugin/flash: use/browser
-	@$(call add,THE_PACKAGES,mozilla-plugin-adobe-flash)
-
-use/browser/plugin/java: use/browser
-	@$(call add,THE_PACKAGES,mozilla-plugin-java-1.8.0-openjdk)