Build-time updates

src/etc/fstab

@@ -7,9 +7,9 @@
 
 # Mounted by init.d services (before localmount):
 # (if not mounted; fstab is consulted except for /sys/*)
-# sysfs:      /sys{,/kernel{/security,/debug,/config,/cgroup{,/cpu,...,/openrc}}}
+# sysfs:      /sys{,/kernel{/security,/debug,/config,/cgroup{,/cpu,...,/openrc}},/firmware/efi/efivars,/fs/fuse/connections}
 # udev-mount: /dev
-# devfs:      /dev{/pts,/shm}
+# devfs:      /dev{/pts,/shm[disabled]}
 
 # Empty writable directories (/mnt/rwroot's mountpoint options)
 /mnt/rwroot/tmp /tmp none bind 0 0

src/etc/portage/make.conf

@@ -26,8 +26,8 @@ MAKEOPTS="-j3"
 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
+     gtk hires-icons hybrid-auth id3tag idn iproute2 irda jbig jpeg
+     jpeg2k 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
@@ -35,8 +35,9 @@ USE="aac acpi alsa apng archive bluetooth bs2b cairo caps cdda cjk
      vorbis wavpack webgl wifi wmf X X509 xattr xft xinerama xmp xv"
 
 USE="${USE} -ant -berkdb -cracklib -cramfs -cups -cxx -enca -firmware-loader
-     -fts3 -gdbm -git -http-cache -ipv6 -lvm1 -mudflap -orc -ptpax -qt4 -sendmail
-     -session -sqlite -static -tcpd -thin -xscreensaver -zeroconf"
+     -fts3 -gdbm -git -http-cache -ipv6 -lvm1 -mudflap -netifrc -orc -ptpax
+     -qt4 -sendmail -session -sqlite -static -tcpd -thin -xscreensaver
+     -zeroconf"
 
 # PaX markings
 PAX_MARKINGS="XT"

src/etc/portage/package.accept_keywords

@@ -2,9 +2,6 @@
 =app-crypt/gnupg-pkcs11-scd-0.7.3*
 =sys-power/cpupower-3.11*
 
-# Boot process (cdrtools: EFI platform support)
-=sys-fs/cryptsetup-1.6.2*
-
 # Network
 =net-wireless/reaver-1.4*
 

src/etc/portage/package.use/all

@@ -52,7 +52,7 @@ 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
+www-client/firefox              -alsa gstreamer  system-jpeg system-cairo system-sqlite system-icu  -wifi
 net-im/pidgin                   -gstreamer
 media-libs/libass               -harfbuzz
 

src/etc/rc.conf

@@ -46,6 +46,9 @@ rc_nostop="irqbalance sysctl"
 # Unicode support for keyboards and screens.
 unicode="YES"
 
+# How long fuser should wait for a remote server to respond.
+# rc_fuser_timeout=60
+
 # Default list of network fstypes:
 #     afs cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre ncpfs
 #     nfs nfs4 ocfs2 shfs smbfs
@@ -68,6 +71,7 @@ unicode="YES"
 # rc_provide="!net"
 
 # The above commands can be also enabled here for each service
+# ('-' in service names should be converted to '_')
 # rc_foo_config="/etc/foo"
 # rc_foo_need="openvpn"
 # rc_foo_after="clock"
@@ -95,3 +99,21 @@ rc_tty_number=4
 
 # Used by sysfs init.d service for /sys/fs/cgroup mounts
 # rc_controller_cgroups="YES"
+
+# Per-cgroup-controller settings that apply to all services
+# (can be also set in /etc/conf.d/foo).
+# rc_cgroup_cpu="
+# cpu.shares 512
+# "
+# rc_cgroup_blkio=""
+# rc_cgroup_cpu=""
+# rc_cgroup_cpuacct=""
+# rc_cgroup_cpuset=""
+# rc_cgroup_devices=""
+# rc_cgroup_memory=""
+# rc_cgroup_net_prio=""
+
+# Kill all processes in a service cgroup on stop/restart.
+# (should be probably set in /etc/conf.d/foo).
+# Also: { /etc/init.d/<service> | rc-service <service> } cgroup_cleanup
+# rc_cgroup_cleanup="NO"

src/root/config/rootfs.nosuid

@@ -11,9 +11,6 @@
 /usr/bin/chage
 /usr/bin/expiry
 
-# pt_chown is not used with devpts
-/usr/lib/misc/glibc/pt_chown
-
 # Limit mounting to root
 /usr/bin/fusermount
 /sbin/mount.vboxsf

src/root/helpers/chk-live-tree

@@ -54,7 +54,8 @@ for lib in `find . -name 'lib*.so'`; do
 done
 
 sinfo "Docs:"
-find . -name '*.info*' -o -name '*.htm*' -o -name '*.1.bz2'
+find . -name '*.info*' -o -name '*.1.bz2' \
+        -o \( -name '*.htm*' ! -path './usr/lib/firefox/*/bookmarks.html' \)
 
 sinfo "Hidden:"
 find . -mindepth 1 -name '.*' ! \( -path './home/anon/*' -o -path './root/*' \

src/root/setup

@@ -354,7 +354,7 @@ sed -i 's/^# include /include /' /etc/nanorc
 
 
 sinfo "Configuring start-up services"
-svcsysinit="udev"
+svcsysinit="udev kmod-static-nodes"
 svcboot="consolefont irqbalance haveged metalog
          iptables consolekit lockdown"
 svcdefault="liberte identity cabled persist xconfig vmconfig spindown
@@ -379,8 +379,6 @@ for runlevel in boot default shutdown; do
     done
 done
 
-rc-update -u
-
 
 # /run/lock prevents a dangling symlink
 sinfo "Initializing /run"
@@ -455,7 +453,7 @@ 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 || :
+paxctl-ng -d /usr/lib/firefox/{firefox,firefox-bin,plugin-container} || :
 
 
 sinfo "Initializing a secondary PGP keyring"

src/root/setup-copy

@@ -48,7 +48,6 @@ 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
@@ -75,11 +74,9 @@ 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:>=sys-devel/binutils[^[:blank:]"]*\>::' ${ebuild_firefox}
 sed -i 's:\<x11-proto/xcb-proto\>::'              ${ebuild_xcbutilwm}
 sed -i 's:>=dev-libs/liboil-[^[:blank:]"]*\>::'   ${ebuild_vips}