From 07525d728d2d1ba0b52acdf19bc81762f2e0f0ac Mon Sep 17 00:00:00 2001 From: Anton Midyukov Date: Fri, 4 Dec 2020 13:44:08 +0700 Subject: [PATCH] browser, live.mk: Drop use/browser/plugin/java, use/browser/plugin/flash Not needed more. --- conf.d/live.mk | 3 +-- features.in/browser/config.mk | 7 ------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/conf.d/live.mk b/conf.d/live.mk index 991f648c..109842fc 100644 --- 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; @: diff --git a/features.in/browser/config.mk b/features.in/browser/config.mk index 3098d1ff..afc41217 100644 --- 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)