Replaced Epiphany with Firefox

doc/changelog.txt

@@ -19,6 +19,7 @@
   * More robust Xorg autoconfiguration with sequential fallbacks
   * Added ASCII virtual keyboard table for OTFE password entry
 
+  * Replaced Epiphany with Firefox
   * Added UFRaw, a RAW images viewer and converter
   * Added proxychains, a heterogeneous chaining proxyfier
   * Removed experimental I2P support and JamVM

doc/info.txt

@@ -47,11 +47,12 @@ openvpn                 ssl, polarssl           ssl             networkmanager-o
 pkcs11-helper           !ssl, gnutls, nss       ssl             openvpn
 
 glib-networking         gnutls                  gnutls          libsoup
-libsoup                 gnutls                  gnutls          gst-plugins-soup, totem, webkit-gtk
+libsoup                 gnutls                  gnutls          gst-plugins-soup, totem
 libmicrohttpd           gnutls                  -               cables
 curl                    ssl, gnutls, nss        ssl             cables, gnupg, quvi, uget
 wget                    ssl, gnutls             ssl             portage, libqalculate(forex)
 
+firefox                 nss                     nss
 claws-mail              gnutls                  gnutls
 libetpan                ssl, gnutls             gnutls          claws-mail
 cyrus-sasl              ssl                     ssl             pidgin
@@ -171,11 +172,7 @@ Tor                              (127.0.0.1:9050)
         glib-networking[-gnome]  (glib GIO modules)
           libsoup                (HTTP library)
             libsoup-gnome        (GNOME libsoup plugin)
-              Epiphany
               Totem              (Playlist parser)
-            WebKit-GTK
-              <browsers>
-            xombrero
             NetworkManager       (connectivity checking)
             gst-plugins-soup     (GStreamer HTTP plugin, http_proxy envvar is supported)
       libxml2                    (NanoHTTP)
@@ -185,6 +182,7 @@ Tor                              (127.0.0.1:9050)
       gFTP                       (HTTP only)
       uim                        (custom-http.scm)
   explicit configuration
+    Firefox                      (environment and GConf are supported)
     Pidgin                       (GConf is supported)
     HexChat
     SSH

src/etc/dconf/db/anon.d/db.ini

@@ -1,19 +1,2 @@
 # http://live.gnome.org/dconf/SystemAdministrators
 
-[org/gnome/epiphany]
-automatic-downloads=false
-enable-smooth-scrolling=true
-enabled-extensions=['extensions-manager-ui', 'html5tube', 'tab-states']
-keyword-search-url='http://3g2upl4pq6kufc4m.onion/html/?q=%s'
-middle-click-opens-url=true
-remember-passwords=false
-
-[org/gnome/epiphany/state]
-download-dir='/home/anon/persist/desktop'
-save-dir='/home/anon/persist/desktop'
-
-[org/gnome/epiphany/web]
-cache-size=20
-enable-plugins=false
-# enable-webgl=true
-language=['en-us', 'en']

src/etc/dconf/db/nofw.d/db.ini

@@ -1,15 +1,2 @@
 # http://live.gnome.org/dconf/SystemAdministrators
 
-[org/gnome/epiphany]
-automatic-downloads=false
-enable-smooth-scrolling=true
-enabled-extensions=['extensions-manager-ui', 'html5tube', 'tab-states']
-keyword-search-url='https://duckduckgo.com/html/?q=%s'
-middle-click-opens-url=true
-remember-passwords=false
-
-[org/gnome/epiphany/web]
-cache-size=20
-enable-plugins=false
-# enable-webgl=true
-language=['en-us', 'en']

src/etc/portage/make.conf

@@ -23,20 +23,20 @@ FEATURES="webrsync-gpg usersync userpriv usersandbox collision-protect
 MAKEOPTS="-j3"
 
 # USE flags (aggregative)
-USE="aac acpi alsa archive aspell bluetooth bs2b cairo caps cdda cjk
-     consolekit cpudetection custom-cflags cue dbus dhcp djvu eap-sim
-     eap-tls exif expat flac gmp goffice gpm grammar groupwise gtk
-     hires-icons hwdb hybrid-auth id3tag idn iproute2 irda jbig jpeg jpeg2k
-     keymap lcms libkms libnotify libproxy lzma m17n-lib mad mktemp mmx
-     mmxext modemmanager mp3 multicall netlink networkmanager ntfsprogs ogg
-     ots pcmcia pcsc-lite pkcs11 png policykit postscript scsi silc
+USE="aac acpi alsa apng archive bluetooth bs2b cairo caps cdda cjk
+     consolekit cpudetection custom-cflags custom-optimization cue dbus dhcp
+     djvu eap-sim eap-tls exif expat flac gmp goffice gpm grammar groupwise
+     gtk hires-icons hwdb hybrid-auth id3tag idn iproute2 irda jbig jpeg
+     jpeg2k keymap lcms libkms libnotify libproxy lzma m17n-lib mad mktemp
+     mmx mmxext modemmanager mp3 multicall netlink networkmanager ntfsprogs
+     ogg ots pcmcia pcsc-lite pkcs11 png policykit postscript scsi silc
      smartcard smime sndfile speex spell sse startup-notification
      staticsocket svg symlink thesaurus threads tiff truetype uuid usb v4l
      vorbis wavpack webgl wifi wmf X X509 xattr xft xinerama xmp xv"
 
 USE="${USE} -ant -berkdb -cracklib -cramfs -cups -cxx -enca -fts3 -gdbm -git
-     -http-cache -hunspell -ipv6 -lvm1 -mudflap -orc -ptpax -qt4 -sendmail
-     -session -sqlite -static -tcpd -thin -xscreensaver -zeroconf"
+     -http-cache -ipv6 -lvm1 -mudflap -orc -ptpax -qt4 -sendmail -session
+     -sqlite -static -tcpd -thin -xscreensaver -zeroconf"
 
 # PaX markings
 PAX_MARKINGS="XT"
@@ -79,12 +79,13 @@ DONT_MOUNT_BOOT=1
 # lha                         = unrestricted distribution via network
 # unRAR                       = unrestricted distribution w/o reverse engineering
 # BINARY-REDISTRIBUTABLE      = unrestricted distribution in binary form
+# myspell-ru_RU-ALexanderLebedev = unrestricted distribution in unmodified / binary form
 # Atmel                       = unrestricted distribution in binary form
 # bluez-firmware              = distribution by BlueZ project
 # Broadcom                    = should probably be "as-is" (#446658)
 # PUEL                        = personal license (build-time virtualbox-bin)
 ACCEPT_LICENSE="-* @FREE as-is freedist unRAR lha @BINARY-REDISTRIBUTABLE Atmel
-                   bluez-firmware Broadcom PUEL"
+                   myspell-ru_RU-ALexanderLebedev bluez-firmware Broadcom PUEL"
 
 # Backward compatibility wrt. /etc/portage/repos.conf (#474574, #478318)
 PORTDIR="/usr/portage"

src/etc/portage/package.accept_keywords

@@ -13,8 +13,6 @@
 
 # GTK+ 3
 =x11-themes/light-themes-0.1.93*
-=www-client/epiphany-3.4.3*
-=www-client/epiphany-extensions-3.4*
 =app-accessibility/florence-0.6.0*
 
 # Guest virtualization

src/etc/portage/package.use/all

@@ -12,6 +12,7 @@ gnome-extra/libgsf              -gtk
 x11-apps/xinput_calibrator      -gtk
 x11-misc/redshift               -gtk
 dev-lang/python                 -ncurses -readline
+app-text/hunspell               -ncurses
 net-im/pidgin                   -ncurses
 sys-apps/gawk                   -readline
 dev-lang/lua                    -readline
@@ -40,23 +41,23 @@ net-analyzer/netcat             -crypt
 net-misc/iputils                -ssl
 dev-libs/opensc                 -ssl
 app-i18n/uim                    -ssl
-www-client/epiphany             -nss
 net-libs/glib-networking        -gnome
 net-irc/hexchat                 -libproxy
 
 # Multimedia
 # [ffmpeg/libav: encode-only flags: mp3 aac aacplus faac theora vorbis x264 xvid]
-media-video/totem               -youtube nsplugin
+media-video/totem               -youtube
 virtual/ffmpeg                  -X -encode -truetype -speex
 media-video/libav               -X -encode -truetype -alsa -ssl -qt-faststart  -hardcoded-tables  -speex -v4l
 media-sound/sox                 encode
 media-plugins/gst-plugins-meta  dv lame theora vpx x264 xvid  a52 dts dvd libass mms mpeg  ffmpeg
 media-libs/gst-plugins-base             theora
 media-libs/libtheora            encode
+www-client/firefox              -alsa gstreamer  system-sqlite -wifi
 net-im/pidgin                   -gstreamer
 media-libs/libass               -harfbuzz
 
-# Unnecessary functionality (geoclue: (#416331))
+# Unnecessary functionality
 sys-libs/ncurses                minimal
 dev-util/dialog                 minimal
 media-libs/libsndfile           minimal
@@ -86,7 +87,6 @@ app-editors/nano                -spell
 dev-libs/libxslt                -crypt
 media-libs/libwmf               -expat
 app-text/ghostscript-gpl        -djvu -idn
-app-misc/geoclue                -*
 app-emulation/virtualbox-bin    headless -additions -chm
 
 # Extra functionality
@@ -107,6 +107,8 @@ media-libs/openjpeg             tools
 gnome-base/librsvg              tools
 media-libs/libquvi-scripts      offensive
 app-portage/eix                 strong-security
+dev-db/sqlite                   secure-delete
+dev-lang/python                 sqlite
 app-arch/p7zip                  rar
 app-office/abiword              gnome
 app-text/evince                 gnome
@@ -117,7 +119,7 @@ net-dialup/ppp                  ipv6
 
 # Internationalization
 app-i18n/uim                    -linguas_*
-app-text/aspell                 -linguas_* linguas_en
+app-text/hunspell               -linguas_* linguas_en linguas_ru
 sys-apps/portage                -linguas_*
 app-portage/eix                 -linguas_*
 sys-apps/man-pages              -linguas_*

src/etc/portage/profile/package.provided

@@ -4,9 +4,6 @@ mail-mta/nullmailer-0
 # virtual/mailx (smartmontools)
 mail-client/mailx-0
 
-# Needed only for HTML validation support (epiphany-extensions:error-viewer)
-app-text/opensp-0
-
 # Unneeded (app-i18n/uim (#404463))
 media-fonts/font-sony-misc-0
 

src/etc/portage/sets/apps

@@ -39,10 +39,10 @@ gnome-extra/gucharmap
 app-text/evince
 app-office/abiword
 app-office/gnumeric
+www-client/firefox
 mail-client/claws-mail
 app-crypt/gpa
 sci-calculators/qalculate-gtk
-www-client/epiphany
 net-irc/hexchat
 net-im/pidgin
 net-ftp/gftp
@@ -59,6 +59,5 @@ media-plugins/gst-plugins-jpeg:0.10
 media-plugins/gst-plugins-libpng:0.10
 media-plugins/gst-plugins-speex:0.10
 media-plugins/gst-plugins-ximagesrc:0.10
-www-client/epiphany-extensions
 x11-plugins/pidgin-otr
 x11-plugins/pidgin-libnotify

src/home/anon/.mozilla/firefox/profiles.ini

@@ -0,0 +1 @@
+../../config/firefox/profiles.ini

src/home/anon/bin/wrappers/epiphany

@@ -1,12 +0,0 @@
-#!/bin/sh -e
-
-export TZ=:UTC
-
-homepage=file:///home/anon/info/browser.html
-if [ $# != 0 ]; then
-    homepage=
-fi
-
-# Use --new-window to override --new-tab (-n), which does
-# not seem to interfere with any other options (like -b)
-exec /usr/bin/epiphany -n ${homepage} "$@"

src/home/anon/config/aspell/.aspell.en.pws

@@ -1,2 +0,0 @@
-personal_ws-1.1 en 0
-Liberte

src/home/anon/config/firefox/profile.anon/user.js

@@ -0,0 +1,60 @@
+/*
+  https://developer.mozilla.org/en-US/docs/Mozilla/Preferences/A_brief_guide_to_Mozilla_preferences
+*/
+
+// UI
+user_pref("accessibility.typeaheadfind", false);
+user_pref("browser.startup.homepage", "file:///home/anon/info/browser.html");
+user_pref("general.warnOnAboutConfig", false);
+
+// Proxy
+user_pref("network.proxy.socks", "127.0.0.1");
+user_pref("network.proxy.socks_port", 9050);
+user_pref("network.proxy.socks_remote_dns", true);
+user_pref("network.proxy.type", 1);
+
+// Network usage
+user_pref("browser.safebrowsing.enabled", false);
+user_pref("browser.safebrowsing.malware.enabled", false);
+user_pref("browser.search.update", false);
+user_pref("extensions.blocklist.enabled", false);
+user_pref("extensions.update.autoUpdateDefault", false);
+user_pref("network.dns.disablePrefetch", true);
+
+// Disk usage
+user_pref("browser.cache.disk.enable", false);
+user_pref("browser.cache.offline.enable", false);
+user_pref("browser.download.dir", "/home/anon/persist/desktop");
+user_pref("browser.download.folderList", 0);
+user_pref("extensions.getAddons.cache.enabled", false);
+
+// Privacy
+user_pref("browser.chrome.load_toolbar_icons", 1);
+user_pref("browser.download.manager.retention", 1);
+user_pref("browser.privatebrowsing.autostart", true);
+user_pref("browser.search.suggest.enabled", false);
+user_pref("geo.enabled", false);
+user_pref("privacy.donottrackheader.enabled", true);
+user_pref("security.enable_tls_session_tickets", false);
+
+// Security
+user_pref("plugins.click_to_play", true);
+user_pref("network.http.spdy.enabled", false);
+user_pref("xpinstall.whitelist.add", "");
+user_pref("xpinstall.whitelist.add.103", "");
+
+// Fingerprint
+user_pref("browser.startup.homepage_override.buildID", "0");
+user_pref("browser.startup.homepage_override.mstone", "rv:17.0");
+user_pref("dom.enable_performance", false);
+user_pref("general.appname.override", "Netscape");
+user_pref("general.appversion.override", "5.0 (Windows)");
+user_pref("general.buildID.override", 0);
+user_pref("general.oscpu.override", "Windows NT 6.1");
+user_pref("general.platform.override", "Win32");
+user_pref("general.productSub.override", "20100101");
+user_pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:17.0) Gecko/20100101 Firefox/17.0");
+user_pref("general.useragent.vendor", "");
+user_pref("general.useragent.vendorSub", "");
+user_pref("gfx.downloadable_fonts.fallback_delay", -1);
+user_pref("intl.accept_languages", "en-us,en");

src/home/anon/config/firefox/profiles.ini

@@ -0,0 +1,9 @@
+[General]
+StartWithLastProfile=1
+
+[Profile0]
+Name=anon
+IsRelative=0
+Path=/home/anon/config/firefox/profile.anon
+Default=1
+

src/home/anon/config/gnome2/epiphany/.migrated

@@ -1 +0,0 @@
-5

src/home/anon/config/gnome2/epiphany/bookmarks.rdf

@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<rdf:RDF xmlns="http://purl.org/rss/1.0/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:ephy="http://gnome.org/ns/epiphany#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-  <channel rdf:about="file:///home/anon/.gnome2/epiphany/bookmarks.rdf">
-    <title>Epiphany bookmarks</title>
-    <link>http://www.gnome.org/projects/epiphany/</link>
-    <items>
-      <rdf:Seq>
-        <rdf:li rdf:resource="http://3g2upl4pq6kufc4m.onion"/>
-        <rdf:li rdf:resource="https://startpage.com"/>
-        <rdf:li rdf:resource="https://ixquick.com"/>
-        <rdf:li rdf:resource="https://en.wikipedia.org"/>
-        <rdf:li rdf:resource="http://www.thefreedictionary.com"/>
-        <rdf:li rdf:resource="file:///home/anon/info/browser.html"/>
-      </rdf:Seq>
-    </items>
-  </channel>
-  <item rdf:about="http://3g2upl4pq6kufc4m.onion">
-    <title>DuckDuckGo</title>
-    <link>http://3g2upl4pq6kufc4m.onion</link>
-    <ephy:smartlink>http://3g2upl4pq6kufc4m.onion/html/?q=%s</ephy:smartlink>
-    <dc:subject>Search Engines</dc:subject>
-  </item>
-  <item rdf:about="https://startpage.com">
-    <title>Ixquick via Google</title>
-    <link>https://startpage.com</link>
-    <ephy:smartlink>https://startpage.com/do/search?query=%s</ephy:smartlink>
-    <dc:subject>Search Engines</dc:subject>
-  </item>
-  <item rdf:about="https://ixquick.com">
-    <title>Ixquick</title>
-    <link>https://ixquick.com</link>
-    <ephy:smartlink>https://ixquick.com/do/search?query=%s</ephy:smartlink>
-    <dc:subject>Search Engines</dc:subject>
-  </item>
-  <item rdf:about="https://en.wikipedia.org">
-    <title>Search Wikipedia</title>
-    <link>https://en.wikipedia.org</link>
-    <ephy:smartlink>https://en.wikipedia.org/wiki/Special:Search/%s</ephy:smartlink>
-    <dc:subject>Search Engines</dc:subject>
-  </item>
-  <item rdf:about="http://www.thefreedictionary.com">
-    <title>The Free Dictionary</title>
-    <link>http://www.thefreedictionary.com</link>
-    <ephy:smartlink>http://www.thefreedictionary.com/%s</ephy:smartlink>
-    <dc:subject>Search Engines</dc:subject>
-  </item>
-  <item rdf:about="file:///home/anon/info/browser.html">
-    <title>Safe Browser</title>
-    <link>file:///home/anon/info/browser.html</link>
-  </item>
-</rdf:RDF>

src/home/anon/config/gnome2/epiphany/epiphany-toolbars-3.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<toolbars version="1.1">
-  <toolbar name="DefaultToolbar" hidden="false" editable="true">
-    <toolitem name="NavigationBack"/>
-    <toolitem name="NavigationForward"/>
-    <toolitem name="ViewStop"/>
-    <toolitem name="ViewReload"/>
-    <toolitem name="Location"/>
-    <toolitem name="ViewZoomOut"/>
-    <toolitem name="ViewZoomIn"/>
-  </toolbar>
-</toolbars>

src/home/anon/config/libfm/pref-apps.conf

@@ -1,3 +1,3 @@
 [Preferred Applications]
-WebBrowser=epiphany.desktop
+WebBrowser=firefox.desktop
 MailClient=claws-mail.desktop

src/home/anon/config/lxpanel/default/panels/panel

@@ -61,7 +61,7 @@ Plugin {
     type = launchbar
     Config {
         Button {
-            id=/usr/share/applications/epiphany.desktop
+            id=/usr/share/applications/firefox.desktop
         }
         Button {
             id=/usr/share/applications/claws-mail.desktop

src/home/anon/config/openbox/rc.xml

@@ -339,7 +339,7 @@
           <enabled>true</enabled>
           <name>Browser</name>
         </startupnotify>
-        <command>epiphany</command>
+        <command>firefox</command>
       </action>
     </keybind>
     <keybind key="XF86AudioRaiseVolume">

src/home/anon/config/persist.excludes

@@ -6,10 +6,16 @@
 /config/images/liberte-logo-wallpaper.png
 
 # Browsing
-/config/gnome2/epiphany/cookies.sqlite
-/config/gnome2/epiphany/ephy-history.db
-/config/gnome2/epiphany/ephy-bookmarks.xml
-/config/gnome2/epiphany/session_crashed.xml
+/config/firefox/profile.anon/*[Cc]ache/
+/config/firefox/profile.anon/**backup*
+/config/firefox/profile.anon/*lock
+/config/firefox/profile.anon/safebrowsing/
+/config/firefox/profile.anon/downloads.sqlite
+/config/firefox/profile.anon/formhistory.sqlite
+/config/firefox/profile.anon/extensions.sqlite
+/config/firefox/profile.anon/extensions.ini
+/config/firefox/profile.anon/compatibility.ini
+/config/firefox/profile.anon/pluginreg.dat
 
 # Mail
 /config/claws-mail/menurc
@@ -41,8 +47,6 @@
 /config/gftp/cache/
 /config/nip2/tmp/
 /config/emelfm2/*.save
-/config/local/epiphany/
-/config/local/webkit/
 /config/local/geeqie/metadata/
 /config/local/geeqie/trash/
 /config/local/Trash/

src/home/anon/config/shell/profile

@@ -13,7 +13,6 @@ export XDG_DATA_HOME=${XDG_CONFIG_HOME}/local
 export XDG_CACHE_HOME=${TMPDIR}/cache
 export SECURITY_HOME=${HOME}/persist/security
 
-export ASPELL_CONF="per-conf ${XDG_CONFIG_HOME}/aspell/aspell.conf; home-dir ${XDG_CONFIG_HOME}/aspell"
 export DCONF_PROFILE=${USER}
 export GTK2_RC_FILES=${XDG_CONFIG_HOME}/gtk-2.0/gtkrc
 export GNUPGHOME=${SECURITY_HOME}/pgp
@@ -39,7 +38,7 @@ export GTK_IM_MODULE=uim
 export QT_IM_MODULE=uim
 
 # Application settings
-export BROWSER=epiphany
+export BROWSER=firefox
 export LESS="-R -M --shift 16 -Swi -x4"
 export LESSHISTFILE=-
 export EDITOR=nano

src/home/nofw/.asoundrc

@@ -1,4 +1,4 @@
-# GStreamer video plugins in WebKit-based browsers fail without
+# GStreamer video plugins in GStreamer-based browsers fail without
 # access to audio devices. An alternative to disabling audio in
 # ALSA is temporarily granting playback access:
 #   setfacl -m u:nofw:rw /dev/snd/{control*,pcm*p}

src/root/config/rootfs.excludes

@@ -93,6 +93,7 @@
 
 # Miscellaneous
 .keep*
+.mkdir.done
 /root/**
 /boot/memtest86plus/memtest.*
 /home/anon/persist/security/pgp/*~
@@ -117,8 +118,6 @@
 /usr/share/tor/
 /usr/share/misc/*.ids.*
 /usr/share/smartmontools/*.h.*
-# (Geoclue providers are disabled)
-/usr/share/geoclue-providers/**
 
 # Statically linked binaries (and symlinks)
 /sbin/ldconfig
@@ -135,8 +134,8 @@
 /usr/bin/ntp-wait
 # dev-util/strace: nice strace output
 /usr/bin/strace-graph
-# app-text/aspell: old dictionaries import
-/usr/bin/aspell-import
+# app-text/hunspell: ispell affix tables converter
+/usr/bin/ispellaff2myspell
 # dev-libs/openssl: optional functionality for update-ca-certificates,
 # helper for "openssl ca", improvement of CA.sh; an alternative to ssl-ts
 /usr/bin/c_rehash
@@ -204,8 +203,7 @@
 /usr/share/avconv/
 /usr/sbin/vboxguest-service
 /lib/firmware/microcode.dat
-/usr/lib/tclConfig.sh
 /usr/sbin/fix_libtool_files.sh
 /usr/share/gcc-data/fixlafiles.awk
 /usr/bin/c[89]9
-/usr/bin/sudoedit
+/usr/lib/firefox/dictionaries/

src/root/helpers/chk-live-tree

@@ -54,8 +54,7 @@ for lib in `find . -name 'lib*.so'`; do
 done
 
 sinfo "Docs:"
-find . \( -name '*.info*' ! -path './usr/lib/aspell*.info' \) \
-        -o -name '*.htm*' -o -name '*.1.bz2'
+find . -name '*.info*' -o -name '*.htm*' -o -name '*.1.bz2'
 
 sinfo "Hidden:"
 find . -mindepth 1 -name '.*' ! \( -path './home/anon/*' -o -path './root/*' \
@@ -84,7 +83,7 @@ getfacl -psR .
 
 
 sinfo "STACK / TEXTRELs / PaX markings:"
-find . -type f \( -name '*.so*' -o -perm /111 \) ! -path './usr/lib/paxtest/*' -print0 \
+find . -type f \( -name '*.so*' -o -perm /111 \) -print0 \
     | xargs -0 scanelf -qtex
 
 
@@ -98,8 +97,9 @@ if [ -e ${regexps} ]; then
     xzgrep -iE "${regexps}" \
         /usr/src/linux-{main,kexec{,-64}}/usr/initramfs_data.cpio.xz
 
-    find . -type f ! -name '*.mo' ! -name 'words.*' ! -name '*.rws' \
-        ! -name 'libgucharmap*.so.*' ! -name oui.txt ! -name iab.txt -print0 \
+    find . -type f ! -name '*.mo' ! -name 'words.*' ! -name '*.rws'  \
+        ! -name 'libgucharmap*.so.*' ! -name oui.txt ! -name iab.txt \
+        ! -path '*/usr/share/myspell/*' ! -path '*/extensions/langpack-*' -print0 \
         | xargs -0 grep -liE "${regexps}"
 else
     echo "checkregexp file not found, skipping"

src/root/setup

@@ -454,8 +454,12 @@ sed -n '/^\//p' ${HOME}/config/rootfs.nosuid | while read file caps; do
     fi
 done
 
+
+sinfo "Disabling PaX markings"
 # (#485910, #485908)
 paxctl-ng -d /usr/lib/polkit-1/polkitd || :
+# Not necessary for any plugins
+paxctl-ng -d /usr/lib/firefox/plugin-container || :
 
 
 sinfo "Initializing a secondary PGP keyring"

src/root/setup-copy

@@ -48,6 +48,7 @@ ebuilds="app-misc/ca-certificates
          net-misc/vpnc
          sys-apps/lm_sensors
          sys-apps/portage
+         www-client/firefox
          x11-libs/xcb-util-wm"
 
 # /usr/portage is bind-mounted ro
@@ -74,11 +75,13 @@ sed -i 's:\<dev-python/dbus-python\>::'  ${ebuild_pidgin}
 sed -i s:dev-lang/perl:: ${ebuild_lm_sensors} ${ebuild_pptpclient} ${ebuild_vpnc}
 
 # [debianutils]            ca-certificates:  update-ca-certificates
+# [binutils]               firefox:          not needed              (#486394)
 # [xcb-proto]              xcb-util-wm:      not needed              (#398953, upstream)
 # [liboil]                 vips:             not needed              (#416815)
-sed -i 's:\<sys-apps/debianutils\>::'           ${ebuild_cacertificates}
-sed -i 's:\<x11-proto/xcb-proto\>::'            ${ebuild_xcbutilwm}
-sed -i 's:>=dev-libs/liboil-[^[:blank:]"]*\>::' ${ebuild_vips}
+sed -i 's:\<sys-apps/debianutils\>::'             ${ebuild_cacertificates}
+sed -i 's:>=sys-devel/binutils[^[:blank:]"]*\>::' ${ebuild_firefox}
+sed -i 's:\<x11-proto/xcb-proto\>::'              ${ebuild_xcbutilwm}
+sed -i 's:>=dev-libs/liboil-[^[:blank:]"]*\>::'   ${ebuild_vips}
 
 for ebuild in ${!ebuild_*}; do
     eval ebuild=\$${ebuild}
@@ -148,7 +151,7 @@ emerge -qC sys-apps/sandbox
 
 
 sinfo "Removing development files"
-rm /etc/env.d/{??binutils,??gcc-i686-pc-linux-gnu}
+rm /etc/env.d/{??binutils,??gcc-i686-pc-linux-gnu,??nss}
 rm /lib/cpp /usr/bin/cc
 for f in /usr/bin/i686-pc-linux-gnu-*; do
     rm ${f} /usr/bin/${f#/usr/bin/i686-pc-linux-gnu-}

src/usr/local/portage/www-client/epiphany-extensions/Manifest

@@ -1 +0,0 @@
-DIST epiphany-extensions-3.4.0.tar.xz 1372100 SHA256 eaf1b466e316f4d6ed35437f8fdd4723a61ae57dd2744751e99109fd581f8fa5 SHA512 de90610eead8c03723b484d42abbe6d7a2a8b352e5c8449d9d94ec0274f02a9749ae1913b91b6a7eae1057cd2de800bed4fc4b4b803d1e8df823f0c322b6cc90 WHIRLPOOL 405b2e6503965c7c6582b666a0464151c286f0d6944d4f985248759edaad20c9799aca72cb01b75e2640188631e47a1c16c6f2451e13082275419ec019fcfef5

src/usr/local/portage/www-client/epiphany-extensions/epiphany-extensions-3.4.0.ebuild

@@ -1,62 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/epiphany-extensions-3.4.0.ebuild,v 1.1 2012/05/19 21:50:59 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Extensions for the Epiphany web browser"
-HOMEPAGE="http://www.gnome.org/projects/epiphany/extensions.html"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="dbus examples pcre"
-
-RDEPEND=">=www-client/epiphany-3.3
-	app-text/opensp
-	>=dev-libs/glib-2.26.0:2
-	>=dev-libs/libxml2-2.6:2
-	>=x11-libs/gtk+-2.90.4:3
-	net-libs/webkit-gtk:3
-
-	dbus? (
-		>=dev-libs/dbus-glib-0.34
-		sys-apps/dbus )
-	pcre? ( >=dev-libs/libpcre-3.9-r2 )"
-DEPEND="${RDEPEND}
-	>=app-text/gnome-doc-utils-0.3.2
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-
-	gnome-base/gnome-common"
-# eautoreconf dependencies:
-#	  gnome-base/gnome-common
-
-pkg_setup() {
-	local extensions=""
-	# XXX: Only enable default/useful extensions?
-	extensions="actions adblock auto-reload certificates \
-			   error-viewer extensions-manager-ui gestures html5tube \
-			   java-console livehttpheaders page-info \
-			   push-scroller select-stylesheet \
-			   smart-bookmarks soup-fly tab-states"
-	use dbus && extensions="${extensions} rss"
-	use pcre && extensions="${extensions} greasemonkey"
-	use examples && extensions="${extensions} sample"
-
-	G2CONF="${G2CONF}
-		--disable-schemas-compile
-		--with-extensions=$(echo "${extensions}" | sed -e 's/[[:space:]]\+/,/g')"
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-}
-
-src_prepare() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=664369; needs eautoreconf
-	epatch "${FILESDIR}/${PN}-3.2.0-dbus-libs.patch"
-	eautoreconf
-	gnome2_src_prepare
-}

src/usr/local/portage/www-client/epiphany-extensions/files/epiphany-extensions-3.2.0-dbus-libs.patch

@@ -1,29 +0,0 @@
-From 2066084961b77810477b658cabbb7f6e90a17b94 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sat, 19 Nov 2011 01:01:12 -0500
-Subject: [PATCH] rss: add DBUS_LIBS to librssextension_la_LIBADD
-
-Otherwise, epiphany-3.2 crashes.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=664369
----
- extensions/rss/Makefile.am |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/extensions/rss/Makefile.am b/extensions/rss/Makefile.am
-index ed6962f..da669c8 100644
---- a/extensions/rss/Makefile.am
-+++ b/extensions/rss/Makefile.am
-@@ -25,6 +25,9 @@ librssextension_la_LDFLAGS = \
- 	-export-symbols $(top_srcdir)/ephy-extension.symbols \
- 	$(AM_LDFLAGS)
- 
-+librssextension_la_LIBADD = \
-+	$(DBUS_LIBS)
-+
- uidir = $(pkgdatadir)/ui
- ui_DATA = rss-ui.ui
- 
--- 
-1.7.8.rc3
-

src/usr/local/portage/www-client/epiphany/Manifest

@@ -1 +0,0 @@
-DIST epiphany-3.4.3.tar.xz 5029412 SHA256 3233fb9e9e8a056c3ef494e85cf5e27068abf51df5fc7f5203ab7afda480f395 SHA512 d6afb43b90473ef5328a171a7e7a2bf4a05cb17a5ed0e143df5387e5ae780610b8e88d4ac66b18cab7fb15a13d05f8c03661f9b0bd471164913ffa11e0f1e41b WHIRLPOOL e1a1f1278198460998edd82a4914045fc895bf3d2edb2baa8c482981713ec8a104261e8d179176f0e8746e4110863414d95d782cbc6775fd4562982bf2362dd8

src/usr/local/portage/www-client/epiphany/epiphany-3.4.3.ebuild

@@ -1,97 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-3.4.3.ebuild,v 1.1 2012/08/09 08:42:41 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-
-inherit autotools eutils gnome2 pax-utils versionator virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="GNOME webbrowser based on Webkit"
-HOMEPAGE="http://projects.gnome.org/epiphany/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="avahi doc +introspection +jit +nss test"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# XXX: Should we add seed support? Seed seems to be unmaintained now.
-RDEPEND="
-	>=dev-libs/glib-2.31.2:2
-	>=x11-libs/gtk+-3.3.14:3[introspection?]
-	>=dev-libs/libxml2-2.6.12:2
-	>=dev-libs/libxslt-1.1.7
-	>=app-text/iso-codes-0.35
-	>=net-libs/webkit-gtk-1.8.2:3[introspection?]
-	>=net-libs/libsoup-gnome-2.37.1:2.4
-	>=gnome-base/gnome-keyring-2.26.0
-	>=gnome-base/gsettings-desktop-schemas-0.0.1
-	>=x11-libs/libnotify-0.5.1
-
-	dev-db/sqlite:3
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-
-	x11-themes/gnome-icon-theme
-	x11-themes/gnome-icon-theme-symbolic
-
-	avahi? ( >=net-dns/avahi-0.6.22 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	!jit? ( net-libs/webkit-gtk[-jit] )
-	nss? ( dev-libs/nss )"
-# paxctl needed for bug #407085
-DEPEND="${RDEPEND}
-	app-text/gnome-doc-utils
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-	jit? ( sys-apps/paxctl )
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
-	G2CONF="${G2CONF}
-		--enable-shared
-		--disable-schemas-compile
-		--disable-scrollkeeper
-		--disable-static
-		--with-distributor-name=Gentoo
-		$(use_enable avahi zeroconf)
-		$(use_enable introspection)
-		$(use_enable nss)
-		$(use_enable test tests)"
-}
-
-src_prepare() {
-	# Build-time segfaults under PaX with USE=introspection when building
-	# against webkit-gtk[introspection,jit]
-	if use introspection && use jit; then
-		epatch "${FILESDIR}/${PN}-3.3.90-paxctl-introspection.patch"
-		cp "${FILESDIR}/paxctl.sh" "${S}/" || die
-		eautoreconf
-	fi
-	gnome2_src_prepare
-}
-
-src_compile() {
-	# needed to avoid "Command line `dbus-launch ...' exited with non-zero exit status 1"
-	unset DISPLAY
-	gnome2_src_compile
-}
-
-src_test() {
-	# FIXME: this should be handled at eclass level
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-
-	use jit && pax-mark m $(list-paxables tests/test*) #415801
-	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
-}
-
-src_install() {
-	gnome2_src_install
-	use jit && pax-mark m "${ED}usr/bin/epiphany"
-}

src/usr/local/sbin/init-profile

@@ -30,11 +30,10 @@ case "${profile}" in
         # GnuPG: replace .onion keyserver
         sed -i 's/^keyserver\>/# &/; s/^# \[noanon\] //' /home/anon/config/pgp/gpg.conf
 
-        # Epiphany: replace default homepage and .onion search bookmarks
-        cp  /home/anon/info/browser-noanon.html /home/anon/info/browser.html
-        sed -i 's@http://3g2upl4pq6kufc4m.onion@https://duckduckgo.com@' \
-            /etc/dconf/db/anon.d/db.ini                                  \
-            /home/anon/config/gnome2/epiphany/bookmarks.rdf
+        # Browser: disable Tor SOCKS proxy, replace default homepage and .onion search bookmarks
+        sed -i 's/\("network\.proxy\.type",\) 1/\1 5/' /home/anon/config/firefox/profile.anon/prefs.js
+        sed -i 's/browser\.html/browser-noanon.html/'  /home/anon/config/firefox/profile.anon/prefs.js
+        # sed -i 's@http://3g2upl4pq6kufc4m.onion@https://duckduckgo.com@'
 
         rm -f /etc/dconf/db/anon
         dconf update

src/usr/local/sbin/unsafe-browser

@@ -35,5 +35,5 @@ export GST_REGISTRY=/var/cache/gstreamer/registry.bin
 export GST_REGISTRY_UPDATE=no
 
 
-# Run Epiphany
-exec epiphany -p file:///home/nofw/info/warning.html
+# Run browser
+exec firefox file:///home/nofw/info/warning.html