Sat Jan 26 16:31:04 UTC 2008

Author: anonym
Date: 2008-01-26 11:31:02 -0500 (Sat, 26 Jan 2008)
New Revision: 13299

Added:
   incognito/tags/20080109.1/
   incognito/tags/20080109.1/ChangeLog
   incognito/tags/20080109.1/TODO
   incognito/tags/20080109.1/arch/readme.html
   incognito/tags/20080109.1/arch/x86/kernel-2.6.23.config
   incognito/tags/20080109.1/arch/x86/livecd-stage1-tiny.spec
   incognito/tags/20080109.1/arch/x86/livecd-stage1.spec
   incognito/tags/20080109.1/arch/x86/livecd-stage2-tiny.spec
   incognito/tags/20080109.1/arch/x86/livecd-stage2.spec
   incognito/tags/20080109.1/arch/x86/overlay/incognito.ico
   incognito/tags/20080109.1/arch/x86/stage1.spec
   incognito/tags/20080109.1/arch/x86/stage2.spec
   incognito/tags/20080109.1/arch/x86/stage3.spec
   incognito/tags/20080109.1/building.html
   incognito/tags/20080109.1/fsscript.sh
   incognito/tags/20080109.1/hacking.html
   incognito/tags/20080109.1/livecd-stage2.sh
   incognito/tags/20080109.1/portage.config/package.keywords
   incognito/tags/20080109.1/portage.config/package.mask
   incognito/tags/20080109.1/portage.overlay/kde-misc/tork/Manifest
   incognito/tags/20080109.1/portage.overlay/kde-misc/tork/files/digest-tork-0.26
   incognito/tags/20080109.1/portage.overlay/kde-misc/tork/files/tork-0.26-ext_tsocks.patch
   incognito/tags/20080109.1/portage.overlay/kde-misc/tork/tork-0.26.ebuild
   incognito/tags/20080109.1/portage.overlay/net-im/kopete-otr/Manifest
   incognito/tags/20080109.1/portage.overlay/net-im/kopete-otr/files/digest-kopete-otr-0.7
   incognito/tags/20080109.1/portage.overlay/net-im/kopete-otr/kopete-otr-0.7.ebuild
   incognito/tags/20080109.1/portage.overlay/net-misc/tor/Manifest
   incognito/tags/20080109.1/portage.overlay/net-misc/tor/files/digest-tor-0.1.2.19
   incognito/tags/20080109.1/portage.overlay/net-misc/tor/tor-0.1.2.19.ebuild
   incognito/tags/20080109.1/portage.overlay/net-misc/vidalia/Manifest
   incognito/tags/20080109.1/portage.overlay/net-misc/vidalia/files/digest-vidalia-0.0.16
   incognito/tags/20080109.1/portage.overlay/net-misc/vidalia/vidalia-0.0.16.ebuild
   incognito/tags/20080109.1/portage.overlay/net-wireless/
   incognito/tags/20080109.1/portage.overlay/x11-plugins/adblock_plus/Manifest
   incognito/tags/20080109.1/portage.overlay/x11-plugins/adblock_plus/adblock_plus-0.7.5.3.ebuild
   incognito/tags/20080109.1/portage.overlay/x11-plugins/adblock_plus/files/digest-adblock_plus-0.7.5.3
   incognito/tags/20080109.1/portage.overlay/x11-plugins/cs-lite/
   incognito/tags/20080109.1/portage.overlay/x11-plugins/enigmail-bin/Manifest
   incognito/tags/20080109.1/portage.overlay/x11-plugins/enigmail-bin/enigmail-bin-0.95.6.ebuild
   incognito/tags/20080109.1/portage.overlay/x11-plugins/enigmail-bin/files/digest-enigmail-bin-0.95.6
   incognito/tags/20080109.1/portage.overlay/x11-plugins/firefox-quick-locale-switcher/Manifest
   incognito/tags/20080109.1/portage.overlay/x11-plugins/firefox-quick-locale-switcher/files/digest-firefox-quick-locale-switcher-1.6.3.7
   incognito/tags/20080109.1/portage.overlay/x11-plugins/firefox-quick-locale-switcher/firefox-quick-locale-switcher-1.6.3.7.ebuild
   incognito/tags/20080109.1/portage.overlay/x11-plugins/firegpg/Manifest
   incognito/tags/20080109.1/portage.overlay/x11-plugins/firegpg/files/digest-firegpg-0.4.8
   incognito/tags/20080109.1/portage.overlay/x11-plugins/firegpg/firegpg-0.4.8.ebuild
   incognito/tags/20080109.1/portage.overlay/x11-plugins/noscript-bin/
   incognito/tags/20080109.1/portage.overlay/x11-plugins/noscript-bin/Manifest
   incognito/tags/20080109.1/portage.overlay/x11-plugins/noscript-bin/files/digest-noscript-bin-1.3.1
   incognito/tags/20080109.1/portage.overlay/x11-plugins/noscript-bin/noscript-bin-1.3.1.ebuild
   incognito/tags/20080109.1/portage.overlay/x11-plugins/refcontrol/Manifest
   incognito/tags/20080109.1/portage.overlay/x11-plugins/refcontrol/files/digest-refcontrol-0.8.9
   incognito/tags/20080109.1/portage.overlay/x11-plugins/refcontrol/refcontrol-0.8.9.ebuild
   incognito/tags/20080109.1/portage.overlay/x11-plugins/thunderplunger/Manifest
   incognito/tags/20080109.1/portage.overlay/x11-plugins/thunderplunger/files/digest-thunderplunger-0.8
   incognito/tags/20080109.1/portage.overlay/x11-plugins/thunderplunger/thunderplunger-0.8.ebuild
   incognito/tags/20080109.1/release-steps.html
   incognito/tags/20080109.1/root_overlay/etc/init.d/external-config-setup
   incognito/tags/20080109.1/root_overlay/etc/locale.gen
   incognito/tags/20080109.1/root_overlay/etc/polipo/config
   incognito/tags/20080109.1/root_overlay/etc/socks/socks.conf
   incognito/tags/20080109.1/root_overlay/etc/socks/tsocks.conf
   incognito/tags/20080109.1/root_overlay/etc/splash/livecd-2006.1/images/background-1024x768.png
   incognito/tags/20080109.1/root_overlay/etc/tor/torrc
   incognito/tags/20080109.1/root_overlay/usr/sbin/create-homevol
   incognito/tags/20080109.1/root_overlay/usr/sbin/enable-persistent-vol
   incognito/tags/20080109.1/root_overlay/usr/sbin/replace-versions.pl
   incognito/tags/20080109.1/root_overlay/usr/share/applications/enable-persistent-vol.desktop
   incognito/tags/20080109.1/root_overlay/usr/share/incognito/readme.html
   incognito/tags/20080109.1/root_overlay/var/lib/firefox-config/firefox/m7m1jk79.Default User/localstore.rdf
   incognito/tags/20080109.1/root_overlay/var/lib/firefox-config/firefox/m7m1jk79.Default User/prefs.js
   incognito/tags/20080109.1/root_overlay/var/lib/firefox-config/firefox/m7m1jk79.Default User/searchplugins/
   incognito/tags/20080109.1/root_overlay/var/lib/iptables/rules-save
   incognito/tags/20080109.1/root_overlay/var/lib/kdesession/bookmarks.xml
   incognito/tags/20080109.1/root_overlay/var/lib/kdesession/emaildefaults
   incognito/tags/20080109.1/root_overlay/var/lib/kdesession/emailidentities
   incognito/tags/20080109.1/root_overlay/var/lib/kdesession/kickerrc
   incognito/tags/20080109.1/root_overlay/var/lib/kdesession/kioslaverc
   incognito/tags/20080109.1/root_overlay/var/lib/kdesession/konquerorrc
   incognito/tags/20080109.1/root_overlay/var/lib/kdesession/ksmserverrc
   incognito/tags/20080109.1/root_overlay/var/lib/kdesession/ksynapticsrc
   incognito/tags/20080109.1/root_overlay/var/lib/kdesession/session/tork_10cfcd7665000116774324900000243640016_1167743318_223267
   incognito/tags/20080109.1/root_overlay/var/lib/kdesession/torkrc
   incognito/tags/20080109.1/root_overlay/var/lib/thunderbird-config/qmuzmhh7.default/prefs.js
   incognito/tags/20080109.1/root_overlay/var/lib/vidalia-config/
   incognito/tags/20080109.1/root_overlay/var/patches/secure_halt.patch
Removed:
   incognito/tags/20080109.1/ChangeLog
   incognito/tags/20080109.1/TODO
   incognito/tags/20080109.1/arch/readme.html
   incognito/tags/20080109.1/arch/x86/kernel-2.6.21.config
   incognito/tags/20080109.1/arch/x86/livecd-stage1-tiny.spec
   incognito/tags/20080109.1/arch/x86/livecd-stage1.spec
   incognito/tags/20080109.1/arch/x86/livecd-stage2-tiny.spec
   incognito/tags/20080109.1/arch/x86/livecd-stage2.spec
   incognito/tags/20080109.1/arch/x86/overlay/incognito.ico
   incognito/tags/20080109.1/arch/x86/stage1.spec
   incognito/tags/20080109.1/arch/x86/stage2.spec
   incognito/tags/20080109.1/arch/x86/stage3.spec
   incognito/tags/20080109.1/building.html
   incognito/tags/20080109.1/fsscript.sh
   incognito/tags/20080109.1/hacking.html
   incognito/tags/20080109.1/livecd-stage2.sh
   incognito/tags/20080109.1/portage.config/package.keywords
   incognito/tags/20080109.1/portage.config/package.mask
   incognito/tags/20080109.1/portage.overlay/app-crypt/
   incognito/tags/20080109.1/portage.overlay/app-misc/
   incognito/tags/20080109.1/portage.overlay/kde-misc/knetworkmanager/
   incognito/tags/20080109.1/portage.overlay/kde-misc/tork/Manifest
   incognito/tags/20080109.1/portage.overlay/kde-misc/tork/files/digest-tork-0.23
   incognito/tags/20080109.1/portage.overlay/kde-misc/tork/files/tork-0.20-ext_tsocks.patch
   incognito/tags/20080109.1/portage.overlay/kde-misc/tork/tork-0.23.ebuild
   incognito/tags/20080109.1/portage.overlay/mail-client/
   incognito/tags/20080109.1/portage.overlay/net-dialup/
   incognito/tags/20080109.1/portage.overlay/net-im/kopete-otr/ChangeLog
   incognito/tags/20080109.1/portage.overlay/net-im/kopete-otr/Manifest
   incognito/tags/20080109.1/portage.overlay/net-im/kopete-otr/files/digest-kopete-otr-0.5
   incognito/tags/20080109.1/portage.overlay/net-im/kopete-otr/kopete-otr-0.5.ebuild
   incognito/tags/20080109.1/portage.overlay/net-im/kopete-otr/metadata.xml
   incognito/tags/20080109.1/portage.overlay/net-misc/tor/Manifest
   incognito/tags/20080109.1/portage.overlay/net-misc/tor/files/digest-tor-0.1.2.18-r1
   incognito/tags/20080109.1/portage.overlay/net-misc/tor/tor-0.1.2.18-r1.ebuild
   incognito/tags/20080109.1/portage.overlay/net-misc/vidalia/Manifest
   incognito/tags/20080109.1/portage.overlay/net-misc/vidalia/files/digest-vidalia-0.0.15
   incognito/tags/20080109.1/portage.overlay/net-misc/vidalia/vidalia-0.0.15.ebuild
   incognito/tags/20080109.1/portage.overlay/net-proxy/
   incognito/tags/20080109.1/portage.overlay/sys-boot/
   incognito/tags/20080109.1/portage.overlay/www-client/
   incognito/tags/20080109.1/portage.overlay/x11-plugins/adblock_plus/Manifest
   incognito/tags/20080109.1/portage.overlay/x11-plugins/adblock_plus/adblock_plus-0.7.5.3.ebuild
   incognito/tags/20080109.1/portage.overlay/x11-plugins/adblock_plus/files/digest-adblock_plus-0.7.5.3
   incognito/tags/20080109.1/portage.overlay/x11-plugins/cookiesafe/
   incognito/tags/20080109.1/portage.overlay/x11-plugins/enigmail-bin/Manifest
   incognito/tags/20080109.1/portage.overlay/x11-plugins/enigmail-bin/enigmail-bin-0.95.2.ebuild
   incognito/tags/20080109.1/portage.overlay/x11-plugins/enigmail-bin/files/digest-enigmail-bin-0.95.2
   incognito/tags/20080109.1/portage.overlay/x11-plugins/firefox-quick-locale-switcher/Manifest
   incognito/tags/20080109.1/portage.overlay/x11-plugins/firefox-quick-locale-switcher/files/digest-firefox-quick-locale-switcher-1.6.3.1
   incognito/tags/20080109.1/portage.overlay/x11-plugins/firefox-quick-locale-switcher/firefox-quick-locale-switcher-1.6.3.1.ebuild
   incognito/tags/20080109.1/portage.overlay/x11-plugins/firegpg/Manifest
   incognito/tags/20080109.1/portage.overlay/x11-plugins/firegpg/files/digest-firegpg-0.4.4
   incognito/tags/20080109.1/portage.overlay/x11-plugins/firegpg/firegpg-0.4.4.ebuild
   incognito/tags/20080109.1/portage.overlay/x11-plugins/noscript-bin/Manifest
   incognito/tags/20080109.1/portage.overlay/x11-plugins/noscript-bin/files/digest-noscript-bin-1.2.9
   incognito/tags/20080109.1/portage.overlay/x11-plugins/noscript-bin/noscript-bin-1.2.9.ebuild
   incognito/tags/20080109.1/portage.overlay/x11-plugins/noscript/
   incognito/tags/20080109.1/portage.overlay/x11-plugins/refcontrol/Manifest
   incognito/tags/20080109.1/portage.overlay/x11-plugins/refcontrol/files/digest-refcontrol-0.8.9
   incognito/tags/20080109.1/portage.overlay/x11-plugins/refcontrol/refcontrol-0.8.9.ebuild
   incognito/tags/20080109.1/portage.overlay/x11-plugins/thunderplunger/Manifest
   incognito/tags/20080109.1/portage.overlay/x11-plugins/thunderplunger/files/digest-thunderplunger-0.7
   incognito/tags/20080109.1/portage.overlay/x11-plugins/thunderplunger/thunderplunger-0.7.ebuild
   incognito/tags/20080109.1/release-steps.html
   incognito/tags/20080109.1/root_overlay/etc/init.d/external-config-setup
   incognito/tags/20080109.1/root_overlay/etc/locale.gen
   incognito/tags/20080109.1/root_overlay/etc/polipo/config
   incognito/tags/20080109.1/root_overlay/etc/socks/socks.conf
   incognito/tags/20080109.1/root_overlay/etc/socks/tsocks.conf
   incognito/tags/20080109.1/root_overlay/etc/splash/livecd-2006.1/images/background-1024x768.png
   incognito/tags/20080109.1/root_overlay/etc/tor/torrc
   incognito/tags/20080109.1/root_overlay/usr/sbin/create-homevol
   incognito/tags/20080109.1/root_overlay/usr/sbin/replace-versions.pl
   incognito/tags/20080109.1/root_overlay/usr/share/incognito/readme.html
   incognito/tags/20080109.1/root_overlay/var/lib/firefox-config/firefox/m7m1jk79.Default User/localstore.rdf
   incognito/tags/20080109.1/root_overlay/var/lib/firefox-config/firefox/m7m1jk79.Default User/prefs.js
   incognito/tags/20080109.1/root_overlay/var/lib/iptables/rules-save
   incognito/tags/20080109.1/root_overlay/var/lib/kdesession/bookmarks.xml
   incognito/tags/20080109.1/root_overlay/var/lib/kdesession/emaildefaults
   incognito/tags/20080109.1/root_overlay/var/lib/kdesession/emailidentities
   incognito/tags/20080109.1/root_overlay/var/lib/kdesession/kickerrc
   incognito/tags/20080109.1/root_overlay/var/lib/kdesession/kioslaverc
   incognito/tags/20080109.1/root_overlay/var/lib/kdesession/konquerorrc
   incognito/tags/20080109.1/root_overlay/var/lib/kdesession/ksmserverrc
   incognito/tags/20080109.1/root_overlay/var/lib/kdesession/session/tork_10cfcd7665000116774324900000243640016_1167743318_223267
   incognito/tags/20080109.1/root_overlay/var/lib/kdesession/torkrc
   incognito/tags/20080109.1/root_overlay/var/lib/thunderbird-config/qmuzmhh7.default/prefs.js
   incognito/tags/20080109.1/root_overlay/var/patches/secure_halt.patch
Log:
Tagged 20080109.1


Copied: incognito/tags/20080109.1 (from rev 13114, incognito/trunk)

Deleted: incognito/tags/20080109.1/ChangeLog
===================================================================

--- incognito/trunk/ChangeLog	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/ChangeLog	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,83 +0,0 @@
-	- Changed home page to Incognito's main site
-	- Added icon
-	- Fixed a bug where macchanger gave two or more interfaces the same MAC ending.
-	- Fixed USB copying script so that it works while running from USB.
-	- Fixed KDED Media Manager (i.e. automounting through KDE).
-	- Fixed PCMCIA support.
-	- Pat has resigned from development and passed on maintenance to anonym.
-	- Thunderbird 2.0.0.9
-	- Firefox 2.0.0.11
-	- TorK 0.23
-
-03 Nov 2007
-20070824.3 changes since 20070824.2:
-	- Tor 0.1.2.18
-	- TorK 0.22
-	- Vidalia 0.0.15
-	- Firefox 2.0.0.8
-	- Add ability to serve hidden content over a hidden service with
-	content stored in the home directory on a USB drive.
-	- Replace squid/privoxy with polipo
-	- Added "Extras" Konqueror toolbar for quick Java/JavaScript/Cookies
-	control.
-	- Added AdBlock Plus easylist to Konqueror
-	- Added AdBlock Plus 0.7.5.3 Firefox extension
-	- Added RefControl 0.8.9 Firefox extension for controlling the HTTP referer
-	- Added FireGPG 0.4.4 Firefox extension (http://firegpg.tuxfamily.org)
-	- Added 3proxy to tiny.
-	- Added TCGUI 0.93, a TrueCrypt UI on full.
-	- Added a boot menu option for enabling macchanger
-	- Include boot menu when run as virtual PC.
-
-27 Sep 2007
-20070824.2 changes since 20070824.1:
-
-	- Full version CD may be run in a virtual PC. For computers that do
-	not allow booting from media this allows Incognito to run on a Windows
-	x86 platform. Note that keystroke recorders may still be able to
-	capture what you type!
-	- Update script that copies to a USB drive to optionally format the
-	drive. (anonym)
-	- On tiny changed back from dhcp to dhcpcd as it is more robust and
-	some cards drop link status after the initial IP address. Full needs
-	to use dhcp because that is what NetworkManager requires.
-	- Add video driver fall back to VESA for video cards that are not
-	supported by a card specific driver.
-	- Use cookie authentication with Tor (more secure). Vidalia works again.
-	- Added paranoid settings for the NoScript and CookieSafe Firefox
-	extensions.
-	- Clean up task bar and background.
-	- Upgrade mixminion to 0.0.8 alpha3.
-	- Upgrade Firefox to 2.0.0.7.
-	- Upgrade NoScript Firefox extension to 1.1.7.2.
-	- Upgrade TorK to 0.20.
-
-4 Sep 2007
-20070824.1 changes since r200:
-
-	- Moved SVN to https://tor-svn.freehaven.net/svn/incognito
-	- Changed versioning scheme to use snapshot date plus increment
-	number.
-	- New snapshot, various upgrades, such as KDE 3.5.7.
-	- Tor 0.1.2.17
-	- Added mplayer and kplayer for video.
-	- Added more network hardware support.
-	- Added kmix for volume control.
-	- Added CookieSafe Firefox extension to control cookie permissions.
-	- Added EnigMail extension to Thunderbird.
-	- Added NetworkManager for easier configuration of the network
-	including entering wireless network keys.
-	- Added ThunderPlunger Thunderbird extension to keep disk space usage
-	lower.
-	- NoScript 1.1.6.17
-	- Firefox Quick Locale Switcher 1.6.3.1
-	- Fix bug in hardware configuration causing hardware requiring
-	firmware to fail.
-	- Added proxy config for links web browser.
-	- Fix title when opening existing TrueCrypt volume.
-	- Improve keymap handling. Remove keymap selection on full since the
-	language selection will do this. Use KDE built-in keymap selector.
-
-
-
-

Copied: incognito/tags/20080109.1/ChangeLog (from rev 13298, incognito/trunk/ChangeLog)
===================================================================
--- incognito/tags/20080109.1/ChangeLog	                        (rev 0)
+++ incognito/tags/20080109.1/ChangeLog	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,103 @@
+26 Jan 2008
+20080109.1 changes since 20070824.3:
+	- Removed fluxbox from full version (use KDE instead!).
+	- Fixed several bugs with encrypted file storage using truecrypt's
+	  hidden volume (for plausible deniability). Now the normal volume
+	  password should work. Some general usability improvements for the
+	  creation process has also been incorporated. It's also possible to
+	  completely disable the feature (and re-enable it).
+	- Added icon (for CD/USB devices in systems that support it).
+	- Fixed a bug where macchanger gave two or more interfaces the same
+	  MAC ending.
+	- Fixed USB copying script so that it works while running from USB.
+	- Fixed KDED Media Manager (i.e. automounting through KDE).
+	- Fixed PCMCIA support.
+	- Tor 0.1.2.19
+	- Thunderbird 2.0.0.9
+	- Enigmail 0.95.6
+	- Thunderplunger 0.8
+	- Firefox 2.0.0.11
+	- Replaced CookieSafe (discontinued) with CS Lite 1.3.5.
+	- FireGPG 0.4.8
+	- NoScript 1.3.1
+	- firefox-quick-locale-switcher 1.6.3.7
+	- TorK 0.26
+	- Vidalia 0.16
+	- Linux kernel 2.6.23 (with gentoo patches)
+	- New portage snapshot (2008-01-09) and major update of software base.
+	- Dropped maintenance and development of Incognito tiny.
+	- New website: http://incognito.anonymityanywhere.com
+	- Pat has resigned and passed on maintenance to anonym.
+
+03 Nov 2007
+20070824.3 changes since 20070824.2:
+	- Tor 0.1.2.18
+	- TorK 0.22
+	- Vidalia 0.0.15
+	- Firefox 2.0.0.8
+	- Add ability to serve hidden content over a hidden service with
+	content stored in the home directory on a USB drive.
+	- Replace squid/privoxy with polipo
+	- Added "Extras" Konqueror toolbar for quick Java/JavaScript/Cookies
+	control.
+	- Added AdBlock Plus easylist to Konqueror
+	- Added AdBlock Plus 0.7.5.3 Firefox extension
+	- Added RefControl 0.8.9 Firefox extension for controlling the HTTP referer
+	- Added FireGPG 0.4.4 Firefox extension (http://firegpg.tuxfamily.org)
+	- Added 3proxy to tiny.
+	- Added TCGUI 0.93, a TrueCrypt UI on full.
+	- Added a boot menu option for enabling macchanger
+	- Include boot menu when run as virtual PC.
+
+27 Sep 2007
+20070824.2 changes since 20070824.1:
+
+	- Full version CD may be run in a virtual PC. For computers that do
+	not allow booting from media this allows Incognito to run on a Windows
+	x86 platform. Note that keystroke recorders may still be able to
+	capture what you type!
+	- Update script that copies to a USB drive to optionally format the
+	drive. (anonym)
+	- On tiny changed back from dhcp to dhcpcd as it is more robust and
+	some cards drop link status after the initial IP address. Full needs
+	to use dhcp because that is what NetworkManager requires.
+	- Add video driver fall back to VESA for video cards that are not
+	supported by a card specific driver.
+	- Use cookie authentication with Tor (more secure). Vidalia works again.
+	- Added paranoid settings for the NoScript and CookieSafe Firefox
+	extensions.
+	- Clean up task bar and background.
+	- Upgrade mixminion to 0.0.8 alpha3.
+	- Upgrade Firefox to 2.0.0.7.
+	- Upgrade NoScript Firefox extension to 1.1.7.2.
+	- Upgrade TorK to 0.20.
+
+4 Sep 2007
+20070824.1 changes since r200:
+
+	- Moved SVN to https://tor-svn.freehaven.net/svn/incognito
+	- Changed versioning scheme to use snapshot date plus increment
+	number.
+	- New snapshot, various upgrades, such as KDE 3.5.7.
+	- Tor 0.1.2.17
+	- Added mplayer and kplayer for video.
+	- Added more network hardware support.
+	- Added kmix for volume control.
+	- Added CookieSafe Firefox extension to control cookie permissions.
+	- Added EnigMail extension to Thunderbird.
+	- Added NetworkManager for easier configuration of the network
+	including entering wireless network keys.
+	- Added ThunderPlunger Thunderbird extension to keep disk space usage
+	lower.
+	- NoScript 1.1.6.17
+	- Firefox Quick Locale Switcher 1.6.3.1
+	- Fix bug in hardware configuration causing hardware requiring
+	firmware to fail.
+	- Added proxy config for links web browser.
+	- Fix title when opening existing TrueCrypt volume.
+	- Improve keymap handling. Remove keymap selection on full since the
+	language selection will do this. Use KDE built-in keymap selector.
+
+
+
+

Deleted: incognito/tags/20080109.1/TODO
===================================================================
--- incognito/trunk/TODO	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/TODO	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,80 +0,0 @@
-- Improve documentation
-	design (what we are trying to do, assumptions)
-	spec (the detail to build your own)
-	impl (here's how we did it)
-
-- Verify security
-Need some people to verify the software and configuration choices.
-
-- Identify and remove unnecessary files
-Effort has already been made to remove files not necessary on a CD/USB distribution. Any suggestions for further clean up is appreciated.
-
-- Script to generate CDs from SVN checkout
-It would be nice to have a script in SVN that builds everything with one command. One important point is to determine if we have a Gentoo machine or not. If not download a stage3 tarball and create a chroot environment. Catalyst needs to be installed. The rest is documented in building.html.
-
-- Test script that copies to USB
-It is difficult to get a hold of a lot of USB hardware to test this script. If you'd like to test it, run "sudo /usr/sbin/create-usb" from an xterm as the script outputs what it is doing. This will help if a problem occurs.
-
-- Wipe memory and reboot when USB drive is removed
-If running from the USB drive and it is removed, wipe memory and reboot. If you're in a persecuted country and they are on to you, you can grab the USB and leave.
-
-- Mixminion on tiny
-Install mixminion on the tiny version and use Xdialog to provide UI. Needs a link in the fluxbox menu as well. The main problem here is that mixminion is a python program, and python takes too much space. There is a freeze.py in the python distribution that creates an executable that does not depends on python. Two problems with this, the result for mixminion is over 3MB and it isn't straightforward to create the executable, there are import errors when running it.
-
-- Allow higher resolutions than 1024x768
-Add a menu option to the boot menu to select a higher resolution, OR attempt to do monitor detection when configuring. The latest x.org server has much better auto-detection, perhaps allowing it to do more work would be better. Note that a kernel option "xres=1024x768" is available (plug in your own dimensions) and working. A boot menu option requires a custom syslinux menu which does not look too difficult.a
-
-- A less hack-ish macchanger option to boot menu
-Currently there are two different cfg:s, one without (default) and one with macchanger enabled. At least there is a script which adds this hack, but it should nonetheless get a nicer solution eventually.
-A custom syslinux boot menu would do, but they are currently exremely ugly and probably confuses some users (seriously!). Hopefully a not so distant future release of syslinux will improve this.
-
-- Use unionfs
-Currently the writable portions of the filesystem need to be copied to RAM during the boot process. Using unionfs is an option in catalyst (via genkernel) which overlays a tmpfs on the CD filesystem so every file becomes writable and no copying is necessary during the boot process. It is faster and uses less memory. However, in the current genkernel it is badly broken. The newer unionfs versions are patches for the kernel and that doesn't fit into the latest genkernel unionfs support. Reports are that when the vanilla kernel includes unionfs, then this will be supported. At that time unionfs can be enabled.
-
-- Tor DNS proxy (when 0.2.x is released)
-Tor 0.2.x has a DNS proxy. We can replace dns-proxy-tor with this. The tiny version can be setup for DNS proxy again. Need the following config in /etc/tor:
-	DNSPort 53
-	AutomapHostsOnResolve 1
-	AutomapHostsSuffixes .exit,.onion
-
-- Retroshare instant messenger
-Looks promising. Might be added when out of beta. See: http://retroshare.sourceforge.net
-
-- Consider using hardend profile ?
-
-- Consider using grsec ?
-
-- Add torbutton, disabling tor enable/disable in toolbar and status bar
-torbutton is more user friendly and less annoying than NoScript+CookieCuller so if it provides a reasonable amount of protection for tor (which it should since that's its design goal) it should replace the other two extensions when it becomes more stable.
-Also, if we setup a new http(s) proxy that is excluded from the netfiler tor forwarding, torbutton could be used to have firefox access the network directly, which can be necessary when ISP require logins (see below).
-
-- Update Incognito branded images
-livecd-stage2.sh has some branding support so you can change the name. There are a few images that still have Incognito. ImageMagick scripting looks like a possible way to do this.
-
-- Change gensplash theme to use a modified livecd-2007.0 variant
-Because I think it looks nicer. All the "Gentoo" branding needs to be removed due to trademark restrictions.
-
-- Handle ISP login requirement
-Public networks may require a login before allowing access to the outside. Generally this is done by a transparent proxy that redirects to the login screen whenever an http request is made. A solution to this may be to add the class C network to the iptables exclusion list so the redirect won't run through Tor. The user will need to access something on the local net first though since the redirect won't happen when running through Tor. Other suggestions are welcome.
-(see entry for torbutton for a possible solution)
-
-- Allow Tor to be bypassed
-Sometimes a direct connection to the Internet is desired. We need a way to bypass the iptables filter. Possibly another proxy process that does not go through Tor. There should be a clear indicator that we are not anonymous.
-(see entry for torbutton for a possible solution)
-
-- Move to kernel 2.6.22
-Note that as of 2007-08-24 some of the wireless NIC drivers will not compile with 2.6.22.
-
-- Fix virtual USB boot for read/write mode
-The CD or USB may be run in a virtual PC for computers that won't boot from removable media. USB must be run read-only due to bugs in QEMU (writable vvfat). When QEMU fixes this, we should use it.
-See http://www.h7.dion.ne.jp/~qemu-win/HowToFloppyCdrom-en.html
-
-- Upgrade to xorg-server 1.4 and remove xorg.conf
-xorg-server is supposed to have good hardware detection. If we use this version we may be able to drop sys-apps/hwsetup altogether and possibly use the best resolution the card/monitor have to offer instead of fixing to 1024x768.
-
-- Allow home dir on USB when booting from CD
-Allow the home directory on a USB drive (or other media) when booting from the CD. This will require an optional menu if more than one possibility for a home directory is found.
-
-- Never create persistent home option on USB
-Make it possible to to permanently decline creating a persistent home partition during boot from USB (otherwise this will constantly be halting the boot process).
-This easily implemented by a "lock" file, i.e. NO_PERSISTANT on the USB root, created by external-config-setup when the users choses to never have a persistent home. external-config-setup will check for the existence of that file before prompting the user. Also, there should be a readily available script which resets this available on the KDE desktop and in the fluxbox menu.

Copied: incognito/tags/20080109.1/TODO (from rev 13298, incognito/trunk/TODO)
===================================================================
--- incognito/tags/20080109.1/TODO	                        (rev 0)
+++ incognito/tags/20080109.1/TODO	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,88 @@
+- Improve documentation
+	design (what we are trying to do, assumptions)
+	spec (the detail to build your own)
+	impl (here's how we did it)
+
+- Verify security
+Need some people to verify the software and configuration choices.
+
+- Identify and remove unnecessary files
+Effort has already been made to remove files not necessary on a CD/USB distribution. Any suggestions for further clean up is appreciated.
+
+- Script to generate CDs from SVN checkout
+It would be nice to have a script in SVN that builds everything with one command. One important point is to determine if we have a Gentoo machine or not. If not download a stage3 tarball and create a chroot environment. Catalyst needs to be installed. The rest is documented in building.html.
+
+- Wipe memory and reboot when USB drive is removed
+If running from the USB drive and it is removed, wipe memory and reboot. If you're in a persecuted country and they are on to you, you can grab the USB and leave.
+
+- Mixminion on tiny
+Install mixminion on the tiny version and use Xdialog to provide UI. Needs a link in the fluxbox menu as well. The main problem here is that mixminion is a python program, and python takes too much space. There is a freeze.py in the python distribution that creates an executable that does not depends on python. Two problems with this, the result for mixminion is over 3MB and it isn't straightforward to create the executable, there are import errors when running it.
+
+- Allow other resolutions than 1024x768
+Add a menu option to the boot menu to select a higher resolution, OR attempt to do monitor detection when configuring. The latest x.org server has much better auto-detection, perhaps allowing it to do more work would be better. Note that a kernel option "xres=1024x768" is available (plug in your own dimensions) and working. A boot menu option requires a custom syslinux menu which does not look too difficult.a
+
+- A less hack-ish macchanger option to boot menu
+Currently there are two different cfg:s, one without (default) and one with macchanger enabled. At least there is a script which adds this hack, but it should nonetheless get a nicer solution eventually.
+A custom syslinux boot menu would do, but they are currently exremely ugly and probably confuses some users (seriously!). Hopefully a not so distant future release of syslinux will improve this.
+
+- Use unionfs
+Currently the writable portions of the filesystem need to be copied to RAM during the boot process. Using unionfs is an option in catalyst (via genkernel) which overlays a tmpfs on the CD filesystem so every file becomes writable and no copying is necessary during the boot process. It is faster and uses less memory. However, in the current genkernel it is badly broken. The newer unionfs versions are patches for the kernel and that doesn't fit into the latest genkernel unionfs support. Reports are that when the vanilla kernel includes unionfs, then this will be supported. At that time unionfs can be enabled.
+
+- Tor DNS proxy (when 0.2.x is released)
+Tor 0.2.x has a DNS proxy. We can replace dns-proxy-tor with this. The tiny version can be setup for DNS proxy again. Need the following config in /etc/tor:
+	DNSPort 53
+	AutomapHostsOnResolve 1
+	AutomapHostsSuffixes .exit,.onion
+
+- Retroshare instant messenger
+Might be added when out of beta. See: http://retroshare.sourceforge.net
+
+- Consider using hardend profile ?
+
+- Consider using grsec ?
+
+- Add Torbutton, disabling Tor enable/disable in toolbar and status bar
+Torbutton is more user friendly and less annoying than NoScript+CookieCuller so if it provides a reasonable amount of protection for Tor (which it should since that's its design goal) it should replace the other two extensions when it becomes more stable.
+Also, if we setup a new http(s) proxy that is excluded from the netfiler Tor forwarding, Torbutton could be used to have firefox access the network directly, which can be necessary when ISP require logins (see below).
+
+- Update Incognito branded images
+livecd-stage2.sh has some branding support so you can change the name. There are a few images that still have Incognito. ImageMagick scripting looks like a possible way to do this.
+
+- Change gensplash theme to use a modified livecd-2007.0 variant
+Because I think it looks nicer. All the "Gentoo" branding needs to be removed due to trademark restrictions.
+
+- Handle ISP login requirement
+Public networks may require a login before allowing access to the outside. Generally this is done by a transparent proxy that redirects to the login screen whenever an http request is made. A solution to this may be to add the class C network to the iptables exclusion list so the redirect won't run through Tor. The user will need to access something on the local net first though since the redirect won't happen when running through Tor. Other suggestions are welcome.
+(see entry for Torbutton for a possible solution)
+
+- Allow Tor to be bypassed
+Sometimes a direct connection to the Internet is desired. We need a way to bypass the iptables filter. Possibly another proxy process that does not go through Tor. There should be a clear indicator that we are not anonymous.
+(see entry for Torbutton for a possible solution)
+
+- Fix virtual USB boot for read/write mode
+The CD or USB may be run in a virtual PC for computers that won't boot from removable media. USB must be run read-only due to bugs in QEMU (writable vvfat). When QEMU fixes this, we should use it.
+See http://www.h7.dion.ne.jp/~qemu-win/HowToFloppyCdrom-en.html
+
+- Upgrade to xorg-server 1.4 and remove xorg.conf
+xorg-server is supposed to have good hardware detection. If we use this version we may be able to drop sys-apps/hwsetup altogether and possibly use the best resolution the card/monitor have to offer instead of fixing to 1024x768.
+
+- Allow home dir on USB when booting from CD
+Allow the home directory on a USB drive (or other media) when booting from the CD. This will require an optional menu if more than one possibility for a home directory is found.
+
+- Mixmaster
+Install mixmaster and mixmaster-smtp and integrate into mail clients. Remove mixminion-smtp.
+
+- IRC client
+KSirc isn't that user friendly. Konversation is probably better, wait for 1.1 release + make comprehensive server list incl. privacy and Tor related servers.
+
+- Kqemu
+Badly needed for performance in qemu. The autostart should check if it's installed. If not, prompt if it should be installed (plus describe benefits). Include kqemu windows install.
+
+- Remove kmail?
+We already have Thunderbird, so we could save space this way. Also, Torbutton is only for Thunderbird and it scrapes IP address/host from EHLO/HELO message. Don't know whether this is possible for kmail and that's serious if it's to be used for SMTP(s).
+
+- User help
+There should be an http document present on the CD detailing how the following Internet programs should be used for security: Firefox + CS Lite + NoScript + FireGPG, Konqueror (telling that Firefox is preferred), Thunderbird + Enigmail + Torbutton, Mixminion, Tork, Vidalia, Pidgin + OTR, KSirc/Konversation etc. A link to this doscumentation should be present on the desktop, Firefox and Konqueror should have it as start page.
+
+- Incognito config app
+A configuration program for Incognito specific things like creating USB, clearing persistent home etc.

Deleted: incognito/tags/20080109.1/arch/readme.html
===================================================================
--- incognito/trunk/arch/readme.html	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/arch/readme.html	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,18 +0,0 @@
-<html>
-<head>
-<title>__INCOGNITO_TITLE__</title>
-</head>
-
-<body>
-
-<p>
-__INCOGNITO__ provides anonymous Internet use anywhere you go. It makes it very difficult for the administrators of a site or others listening on the network to determine what sites you are connecting to or where you are coming from. For details see <a href="https://www.torproject.org">Tor</a>. Details about this CD/USB are available after booting.
-</p>
-
-<p>
-The latest version can be found at <a href="http://www.patdouble.com/incognito.html">http://www.patdouble.com/incognito.html</a>.
-</p>
-
-</body>
-</html>
-

Copied: incognito/tags/20080109.1/arch/readme.html (from rev 13148, incognito/trunk/arch/readme.html)
===================================================================
--- incognito/tags/20080109.1/arch/readme.html	                        (rev 0)
+++ incognito/tags/20080109.1/arch/readme.html	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,18 @@
+<html>
+<head>
+<title>__INCOGNITO_TITLE__</title>
+</head>
+
+<body>
+
+<p>
+__INCOGNITO__ provides anonymous Internet use anywhere you go. It makes it very difficult for the administrators of a site or others listening on the network to determine what sites you are connecting to or where you are coming from. For details see <a href="https://www.torproject.org">Tor</a>. Details about this CD/USB are available after booting.
+</p>
+
+<p>
+The latest version can be found at <a href="http://incognito.anonymityanywhere.com/">http://incognito.anonymityanywhere.com/</a>.
+</p>
+
+</body>
+</html>
+

Deleted: incognito/tags/20080109.1/arch/x86/kernel-2.6.21.config
===================================================================
--- incognito/trunk/arch/x86/kernel-2.6.21.config	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/arch/x86/kernel-2.6.21.config	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,2395 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-gentoo-r4
-# Fri Aug 17 07:26:24 2007
-#
-CONFIG_X86_32=y
-CONFIG_GENERIC_TIME=y
-CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_SEMAPHORE_SLEEPERS=y
-CONFIG_X86=y
-CONFIG_MMU=y
-CONFIG_ZONE_DMA=y
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_IOMAP=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-CONFIG_DMI=y
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-
-#
-# Code maturity level options
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_BROKEN_ON_SMP=y
-CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
-CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-# CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
-CONFIG_AUDIT=y
-CONFIG_AUDITSYSCALL=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_SYSFS_DEPRECATED=y
-# CONFIG_RELAY is not set
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_SYSCTL=y
-CONFIG_EMBEDDED=y
-CONFIG_UID16=y
-CONFIG_SYSCTL_SYSCALL=y
-# CONFIG_KALLSYMS is not set
-CONFIG_HOTPLUG=y
-CONFIG_PRINTK=y
-# CONFIG_BUG is not set
-# CONFIG_ELF_CORE is not set
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SHMEM=y
-CONFIG_SLAB=y
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_RT_MUTEXES=y
-# CONFIG_TINY_SHMEM is not set
-CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-
-#
-# Loadable module support
-#
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_MODVERSIONS=y
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_KMOD=y
-
-#
-# Block layer
-#
-CONFIG_BLOCK=y
-# CONFIG_LBD is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-# CONFIG_LSF is not set
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-# CONFIG_IOSCHED_AS is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-CONFIG_IOSCHED_CFQ=y
-# CONFIG_DEFAULT_AS is not set
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
-
-#
-# Processor type and features
-#
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-# CONFIG_SMP is not set
-CONFIG_X86_PC=y
-# CONFIG_X86_ELAN is not set
-# CONFIG_X86_VOYAGER is not set
-# CONFIG_X86_NUMAQ is not set
-# CONFIG_X86_SUMMIT is not set
-# CONFIG_X86_BIGSMP is not set
-# CONFIG_X86_VISWS is not set
-# CONFIG_X86_GENERICARCH is not set
-# CONFIG_X86_ES7000 is not set
-# CONFIG_PARAVIRT is not set
-# CONFIG_M386 is not set
-# CONFIG_M486 is not set
-# CONFIG_M586 is not set
-# CONFIG_M586TSC is not set
-# CONFIG_M586MMX is not set
-CONFIG_M686=y
-# CONFIG_MPENTIUMII is not set
-# CONFIG_MPENTIUMIII is not set
-# CONFIG_MPENTIUMM is not set
-# CONFIG_MCORE2 is not set
-# CONFIG_MPENTIUM4 is not set
-# CONFIG_MK6 is not set
-# CONFIG_MK7 is not set
-# CONFIG_MK8 is not set
-# CONFIG_MCRUSOE is not set
-# CONFIG_MEFFICEON is not set
-# CONFIG_MWINCHIPC6 is not set
-# CONFIG_MWINCHIP2 is not set
-# CONFIG_MWINCHIP3D is not set
-# CONFIG_MGEODEGX1 is not set
-# CONFIG_MGEODE_LX is not set
-# CONFIG_MCYRIXIII is not set
-# CONFIG_MVIAC3_2 is not set
-CONFIG_X86_GENERIC=y
-CONFIG_X86_CMPXCHG=y
-CONFIG_X86_L1_CACHE_SHIFT=7
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_X86_PPRO_FENCE=y
-CONFIG_X86_WP_WORKS_OK=y
-CONFIG_X86_INVLPG=y
-CONFIG_X86_BSWAP=y
-CONFIG_X86_POPAD_OK=y
-CONFIG_X86_CMPXCHG64=y
-CONFIG_X86_GOOD_APIC=y
-CONFIG_X86_INTEL_USERCOPY=y
-CONFIG_X86_USE_PPRO_CHECKSUM=y
-CONFIG_X86_TSC=y
-CONFIG_HPET_TIMER=y
-# CONFIG_PREEMPT_NONE is not set
-CONFIG_PREEMPT_VOLUNTARY=y
-# CONFIG_PREEMPT is not set
-# CONFIG_X86_UP_APIC is not set
-# CONFIG_X86_MCE is not set
-CONFIG_VM86=y
-CONFIG_TOSHIBA=m
-CONFIG_I8K=m
-CONFIG_X86_REBOOTFIXUPS=y
-# CONFIG_MICROCODE is not set
-CONFIG_X86_MSR=m
-# CONFIG_X86_CPUID is not set
-
-#
-# Firmware Drivers
-#
-# CONFIG_EDD is not set
-# CONFIG_DELL_RBU is not set
-# CONFIG_DCDBAS is not set
-# CONFIG_NOHIGHMEM is not set
-CONFIG_HIGHMEM4G=y
-# CONFIG_HIGHMEM64G is not set
-CONFIG_VMSPLIT_3G=y
-# CONFIG_VMSPLIT_3G_OPT is not set
-# CONFIG_VMSPLIT_2G is not set
-# CONFIG_VMSPLIT_1G is not set
-CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_HIGHMEM=y
-CONFIG_ARCH_FLATMEM_ENABLE=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ARCH_POPULATES_NODE_MAP=y
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_SPARSEMEM_STATIC=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_RESOURCES_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=1
-# CONFIG_HIGHPTE is not set
-# CONFIG_MATH_EMULATION is not set
-CONFIG_MTRR=y
-# CONFIG_EFI is not set
-CONFIG_SECCOMP=y
-# CONFIG_HZ_100 is not set
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_300 is not set
-CONFIG_HZ_1000=y
-CONFIG_HZ=1000
-# CONFIG_KEXEC is not set
-# CONFIG_CRASH_DUMP is not set
-CONFIG_PHYSICAL_START=0x100000
-# CONFIG_RELOCATABLE is not set
-CONFIG_PHYSICAL_ALIGN=0x100000
-# CONFIG_COMPAT_VDSO is not set
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-
-#
-# Power management options (ACPI, APM)
-#
-CONFIG_PM=y
-# CONFIG_PM_LEGACY is not set
-# CONFIG_PM_DEBUG is not set
-# CONFIG_PM_SYSFS_DEPRECATED is not set
-# CONFIG_SOFTWARE_SUSPEND is not set
-
-#
-# ACPI (Advanced Configuration and Power Interface) Support
-#
-CONFIG_ACPI=y
-CONFIG_ACPI_SLEEP=y
-CONFIG_ACPI_SLEEP_PROC_FS=y
-# CONFIG_ACPI_SLEEP_PROC_SLEEP is not set
-CONFIG_ACPI_PROCFS=y
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_FAN=m
-CONFIG_ACPI_DOCK=m
-# CONFIG_ACPI_BAY is not set
-CONFIG_ACPI_PROCESSOR=m
-CONFIG_ACPI_THERMAL=m
-CONFIG_ACPI_ASUS=m
-CONFIG_ACPI_IBM=m
-CONFIG_ACPI_IBM_BAY=y
-CONFIG_ACPI_TOSHIBA=m
-CONFIG_ACPI_BLACKLIST_YEAR=0
-# CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_EC=y
-CONFIG_ACPI_POWER=y
-CONFIG_ACPI_SYSTEM=y
-CONFIG_X86_PM_TIMER=y
-# CONFIG_ACPI_CONTAINER is not set
-
-#
-# APM (Advanced Power Management) BIOS Support
-#
-# CONFIG_APM is not set
-
-#
-# CPU Frequency scaling
-#
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_TABLE=m
-# CONFIG_CPU_FREQ_DEBUG is not set
-CONFIG_CPU_FREQ_STAT=m
-# CONFIG_CPU_FREQ_STAT_DETAILS is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=m
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
-
-#
-# CPUFreq processor drivers
-#
-CONFIG_X86_ACPI_CPUFREQ=m
-CONFIG_X86_POWERNOW_K6=m
-CONFIG_X86_POWERNOW_K7=m
-CONFIG_X86_POWERNOW_K7_ACPI=y
-CONFIG_X86_POWERNOW_K8=m
-CONFIG_X86_POWERNOW_K8_ACPI=y
-CONFIG_X86_GX_SUSPMOD=m
-CONFIG_X86_SPEEDSTEP_CENTRINO=m
-CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI=y
-CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
-CONFIG_X86_SPEEDSTEP_ICH=m
-CONFIG_X86_SPEEDSTEP_SMI=m
-CONFIG_X86_P4_CLOCKMOD=m
-CONFIG_X86_CPUFREQ_NFORCE2=m
-CONFIG_X86_LONGRUN=m
-CONFIG_X86_LONGHAUL=m
-# CONFIG_X86_E_POWERSAVER is not set
-
-#
-# shared options
-#
-# CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set
-CONFIG_X86_SPEEDSTEP_LIB=m
-# CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set
-
-#
-# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
-#
-CONFIG_PCI=y
-# CONFIG_PCI_GOBIOS is not set
-# CONFIG_PCI_GOMMCONFIG is not set
-# CONFIG_PCI_GODIRECT is not set
-CONFIG_PCI_GOANY=y
-CONFIG_PCI_BIOS=y
-CONFIG_PCI_DIRECT=y
-CONFIG_PCI_MMCONFIG=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_PCIEAER=y
-CONFIG_ISA_DMA_API=y
-CONFIG_ISA=y
-CONFIG_EISA=y
-CONFIG_EISA_VLB_PRIMING=y
-CONFIG_EISA_PCI_EISA=y
-CONFIG_EISA_VIRTUAL_ROOT=y
-# CONFIG_EISA_NAMES is not set
-# CONFIG_MCA is not set
-# CONFIG_SCx200 is not set
-
-#
-# PCCARD (PCMCIA/CardBus) support
-#
-CONFIG_PCCARD=m
-# CONFIG_PCMCIA_DEBUG is not set
-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_PCMCIA_IOCTL=y
-CONFIG_CARDBUS=y
-
-#
-# PC-card bridges
-#
-CONFIG_YENTA=m
-CONFIG_YENTA_O2=y
-CONFIG_YENTA_RICOH=y
-CONFIG_YENTA_TI=y
-CONFIG_YENTA_ENE_TUNE=y
-CONFIG_YENTA_TOSHIBA=y
-CONFIG_PD6729=m
-CONFIG_I82092=m
-CONFIG_I82365=m
-CONFIG_TCIC=m
-CONFIG_PCMCIA_PROBE=y
-CONFIG_PCCARD_NONSTATIC=m
-
-#
-# PCI Hotplug Support
-#
-# CONFIG_HOTPLUG_PCI is not set
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_AOUT is not set
-# CONFIG_BINFMT_MISC is not set
-
-#
-# Networking
-#
-CONFIG_NET=y
-
-#
-# Networking options
-#
-# CONFIG_NETDEBUG is not set
-CONFIG_PACKET=y
-# CONFIG_PACKET_MMAP is not set
-CONFIG_UNIX=y
-CONFIG_XFRM=y
-CONFIG_XFRM_USER=m
-# CONFIG_XFRM_SUB_POLICY is not set
-CONFIG_XFRM_MIGRATE=y
-CONFIG_NET_KEY=m
-CONFIG_NET_KEY_MIGRATE=y
-CONFIG_INET=y
-# CONFIG_IP_MULTICAST is not set
-# CONFIG_IP_ADVANCED_ROUTER is not set
-CONFIG_IP_FIB_HASH=y
-# CONFIG_IP_PNP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
-# CONFIG_ARPD is not set
-# CONFIG_SYN_COOKIES is not set
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_DIAG=y
-CONFIG_INET_TCP_DIAG=y
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
-# CONFIG_TCP_MD5SIG is not set
-
-#
-# IP: Virtual Server Configuration
-#
-# CONFIG_IP_VS is not set
-CONFIG_IPV6=m
-CONFIG_IPV6_PRIVACY=y
-# CONFIG_IPV6_ROUTER_PREF is not set
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_MIP6=y
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_IPV6_SIT=m
-CONFIG_IPV6_TUNNEL=m
-# CONFIG_IPV6_MULTIPLE_TABLES is not set
-# CONFIG_NETWORK_SECMARK is not set
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-
-#
-# Core Netfilter Configuration
-#
-CONFIG_NETFILTER_NETLINK=m
-CONFIG_NETFILTER_NETLINK_QUEUE=m
-# CONFIG_NETFILTER_NETLINK_LOG is not set
-CONFIG_NF_CONNTRACK_ENABLED=m
-CONFIG_NF_CONNTRACK_SUPPORT=y
-# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
-CONFIG_NF_CONNTRACK=m
-# CONFIG_NF_CT_ACCT is not set
-# CONFIG_NF_CONNTRACK_MARK is not set
-# CONFIG_NF_CONNTRACK_EVENTS is not set
-# CONFIG_NF_CT_PROTO_SCTP is not set
-# CONFIG_NF_CONNTRACK_AMANDA is not set
-CONFIG_NF_CONNTRACK_FTP=m
-# CONFIG_NF_CONNTRACK_H323 is not set
-CONFIG_NF_CONNTRACK_IRC=m
-# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
-# CONFIG_NF_CONNTRACK_PPTP is not set
-# CONFIG_NF_CONNTRACK_SANE is not set
-# CONFIG_NF_CONNTRACK_SIP is not set
-# CONFIG_NF_CONNTRACK_TFTP is not set
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NETFILTER_XTABLES=m
-# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
-# CONFIG_NETFILTER_XT_TARGET_MARK is not set
-# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
-# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
-# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
-# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
-# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
-# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
-# CONFIG_NETFILTER_XT_MATCH_ESP is not set
-# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
-# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
-# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_MAC is not set
-# CONFIG_NETFILTER_XT_MATCH_MARK is not set
-# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
-# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
-# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
-# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
-# CONFIG_NETFILTER_XT_MATCH_REALM is not set
-# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
-# CONFIG_NETFILTER_XT_MATCH_STRING is not set
-# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
-# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_NF_CONNTRACK_IPV4=m
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-# CONFIG_IP_NF_QUEUE is not set
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_IPRANGE=m
-CONFIG_IP_NF_MATCH_TOS=m
-CONFIG_IP_NF_MATCH_RECENT=m
-# CONFIG_IP_NF_MATCH_ECN is not set
-# CONFIG_IP_NF_MATCH_AH is not set
-# CONFIG_IP_NF_MATCH_TTL is not set
-CONFIG_IP_NF_MATCH_OWNER=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-# CONFIG_IP_NF_TARGET_LOG is not set
-# CONFIG_IP_NF_TARGET_ULOG is not set
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
-# CONFIG_IP_NF_TARGET_MASQUERADE is not set
-CONFIG_IP_NF_TARGET_REDIRECT=m
-# CONFIG_IP_NF_TARGET_NETMAP is not set
-# CONFIG_IP_NF_TARGET_SAME is not set
-# CONFIG_NF_NAT_SNMP_BASIC is not set
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-# CONFIG_NF_NAT_TFTP is not set
-# CONFIG_NF_NAT_AMANDA is not set
-# CONFIG_NF_NAT_PPTP is not set
-# CONFIG_NF_NAT_H323 is not set
-# CONFIG_NF_NAT_SIP is not set
-# CONFIG_IP_NF_MANGLE is not set
-CONFIG_IP_NF_RAW=m
-# CONFIG_IP_NF_ARPTABLES is not set
-
-#
-# IPv6: Netfilter Configuration (EXPERIMENTAL)
-#
-CONFIG_NF_CONNTRACK_IPV6=m
-# CONFIG_IP6_NF_QUEUE is not set
-CONFIG_IP6_NF_IPTABLES=m
-# CONFIG_IP6_NF_MATCH_RT is not set
-# CONFIG_IP6_NF_MATCH_OPTS is not set
-# CONFIG_IP6_NF_MATCH_FRAG is not set
-# CONFIG_IP6_NF_MATCH_HL is not set
-CONFIG_IP6_NF_MATCH_OWNER=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-# CONFIG_IP6_NF_MATCH_AH is not set
-# CONFIG_IP6_NF_MATCH_MH is not set
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_FILTER=m
-# CONFIG_IP6_NF_TARGET_LOG is not set
-CONFIG_IP6_NF_TARGET_REJECT=m
-# CONFIG_IP6_NF_MANGLE is not set
-# CONFIG_IP6_NF_RAW is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
-# CONFIG_TIPC is not set
-CONFIG_ATM=m
-CONFIG_ATM_CLIP=m
-CONFIG_ATM_CLIP_NO_ICMP=y
-CONFIG_ATM_LANE=m
-CONFIG_ATM_MPOA=m
-CONFIG_ATM_BR2684=m
-CONFIG_ATM_BR2684_IPFILTER=y
-# CONFIG_BRIDGE is not set
-# CONFIG_VLAN_8021Q is not set
-# CONFIG_DECNET is not set
-CONFIG_LLC=y
-# CONFIG_LLC2 is not set
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-
-#
-# QoS and/or fair queueing
-#
-# CONFIG_NET_SCHED is not set
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_HAMRADIO is not set
-# CONFIG_IRDA is not set
-CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-# CONFIG_BT_CMTP is not set
-CONFIG_BT_HIDP=m
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_HCIUSB=m
-CONFIG_BT_HCIUSB_SCO=y
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIDTL1=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBTUART=m
-CONFIG_BT_HCIVHCI=m
-CONFIG_IEEE80211=m
-# CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_WEP=m
-CONFIG_IEEE80211_CRYPT_CCMP=m
-CONFIG_IEEE80211_CRYPT_TKIP=m
-CONFIG_IEEE80211_SOFTMAC=m
-# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
-CONFIG_WIRELESS_EXT=y
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=m
-# CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
-# CONFIG_CONNECTOR is not set
-
-#
-# Memory Technology Devices (MTD)
-#
-# CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
-CONFIG_PARPORT=m
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_SERIAL=m
-CONFIG_PARPORT_PC_FIFO=y
-CONFIG_PARPORT_PC_SUPERIO=y
-CONFIG_PARPORT_PC_PCMCIA=m
-# CONFIG_PARPORT_GSC is not set
-# CONFIG_PARPORT_AX88796 is not set
-CONFIG_PARPORT_1284=y
-CONFIG_PARPORT_NOT_PC=y
-
-#
-# Plug and Play support
-#
-CONFIG_PNP=y
-# CONFIG_PNP_DEBUG is not set
-
-#
-# Protocols
-#
-CONFIG_ISAPNP=y
-# CONFIG_PNPBIOS is not set
-CONFIG_PNPACPI=y
-
-#
-# Block devices
-#
-CONFIG_BLK_DEV_FD=m
-# CONFIG_BLK_DEV_XD is not set
-# CONFIG_PARIDE is not set
-# CONFIG_BLK_CPQ_DA is not set
-# CONFIG_BLK_CPQ_CISS_DA is not set
-# CONFIG_BLK_DEV_DAC960 is not set
-# CONFIG_BLK_DEV_UMEM is not set
-# CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_CRYPTOLOOP=y
-# CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_SX8 is not set
-# CONFIG_BLK_DEV_UB is not set
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=8192
-CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-# CONFIG_CDROM_PKTCDVD is not set
-# CONFIG_ATA_OVER_ETH is not set
-
-#
-# Misc devices
-#
-# CONFIG_IBM_ASM is not set
-# CONFIG_SGI_IOC4 is not set
-CONFIG_TIFM_CORE=m
-CONFIG_TIFM_7XX1=m
-# CONFIG_MSI_LAPTOP is not set
-CONFIG_SONY_LAPTOP=m
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
-CONFIG_IDE=y
-CONFIG_IDE_MAX_HWIFS=4
-CONFIG_BLK_DEV_IDE=y
-
-#
-# Please see Documentation/ide.txt for help/info on IDE drives
-#
-# CONFIG_BLK_DEV_IDE_SATA is not set
-# CONFIG_BLK_DEV_HD_IDE is not set
-CONFIG_BLK_DEV_IDEDISK=y
-CONFIG_IDEDISK_MULTI_MODE=y
-CONFIG_BLK_DEV_IDECS=m
-# CONFIG_BLK_DEV_DELKIN is not set
-CONFIG_BLK_DEV_IDECD=y
-# CONFIG_BLK_DEV_IDETAPE is not set
-CONFIG_BLK_DEV_IDEFLOPPY=m
-# CONFIG_BLK_DEV_IDESCSI is not set
-CONFIG_BLK_DEV_IDEACPI=y
-# CONFIG_IDE_TASK_IOCTL is not set
-
-#
-# IDE chipset support/bugfixes
-#
-CONFIG_IDE_GENERIC=y
-CONFIG_BLK_DEV_CMD640=y
-CONFIG_BLK_DEV_CMD640_ENHANCED=y
-CONFIG_BLK_DEV_IDEPNP=y
-CONFIG_BLK_DEV_IDEPCI=y
-CONFIG_IDEPCI_SHARE_IRQ=y
-# CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_GENERIC=y
-CONFIG_BLK_DEV_OPTI621=y
-CONFIG_BLK_DEV_RZ1000=y
-CONFIG_BLK_DEV_IDEDMA_PCI=y
-# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
-# CONFIG_IDEDMA_ONLYDISK is not set
-CONFIG_BLK_DEV_AEC62XX=y
-CONFIG_BLK_DEV_ALI15X3=y
-# CONFIG_WDC_ALI15X3 is not set
-CONFIG_BLK_DEV_AMD74XX=y
-CONFIG_BLK_DEV_ATIIXP=y
-CONFIG_BLK_DEV_CMD64X=y
-CONFIG_BLK_DEV_TRIFLEX=y
-CONFIG_BLK_DEV_CY82C693=y
-CONFIG_BLK_DEV_CS5520=y
-CONFIG_BLK_DEV_CS5530=y
-CONFIG_BLK_DEV_CS5535=y
-CONFIG_BLK_DEV_HPT34X=y
-# CONFIG_HPT34X_AUTODMA is not set
-CONFIG_BLK_DEV_HPT366=y
-# CONFIG_BLK_DEV_JMICRON is not set
-CONFIG_BLK_DEV_SC1200=y
-CONFIG_BLK_DEV_PIIX=y
-# CONFIG_BLK_DEV_IT8213 is not set
-CONFIG_BLK_DEV_IT821X=y
-CONFIG_BLK_DEV_NS87415=y
-CONFIG_BLK_DEV_PDC202XX_OLD=y
-# CONFIG_PDC202XX_BURST is not set
-CONFIG_BLK_DEV_PDC202XX_NEW=y
-CONFIG_BLK_DEV_SVWKS=y
-CONFIG_BLK_DEV_SIIMAGE=m
-CONFIG_BLK_DEV_SIS5513=y
-CONFIG_BLK_DEV_SLC90E66=y
-CONFIG_BLK_DEV_TRM290=y
-CONFIG_BLK_DEV_VIA82CXXX=y
-# CONFIG_BLK_DEV_TC86C001 is not set
-# CONFIG_IDE_ARM is not set
-CONFIG_IDE_CHIPSETS=y
-
-#
-# Note: most of these also require special kernel boot parameters
-#
-CONFIG_BLK_DEV_4DRIVES=y
-CONFIG_BLK_DEV_ALI14XX=y
-CONFIG_BLK_DEV_DTC2278=y
-CONFIG_BLK_DEV_HT6560B=y
-CONFIG_BLK_DEV_QD65XX=y
-CONFIG_BLK_DEV_UMC8672=y
-CONFIG_BLK_DEV_IDEDMA=y
-CONFIG_IDEDMA_IVB=y
-# CONFIG_BLK_DEV_HD is not set
-
-#
-# SCSI device support
-#
-# CONFIG_RAID_ATTRS is not set
-CONFIG_SCSI=y
-# CONFIG_SCSI_TGT is not set
-CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=y
-# CONFIG_CHR_DEV_ST is not set
-# CONFIG_CHR_DEV_OSST is not set
-CONFIG_BLK_DEV_SR=y
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=m
-# CONFIG_CHR_DEV_SCH is not set
-
-#
-# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-#
-# CONFIG_SCSI_MULTI_LUN is not set
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-
-#
-# SCSI Transports
-#
-CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SCSI_FC_ATTRS=m
-# CONFIG_SCSI_ISCSI_ATTRS is not set
-CONFIG_SCSI_SAS_ATTRS=m
-# CONFIG_SCSI_SAS_LIBSAS is not set
-
-#
-# SCSI low-level drivers
-#
-# CONFIG_ISCSI_TCP is not set
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-# CONFIG_SCSI_3W_9XXX is not set
-# CONFIG_SCSI_7000FASST is not set
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_AHA152X is not set
-# CONFIG_SCSI_AHA1542 is not set
-# CONFIG_SCSI_AHA1740 is not set
-# CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_AIC7XXX is not set
-# CONFIG_SCSI_AIC7XXX_OLD is not set
-# CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_AIC94XX is not set
-# CONFIG_SCSI_DPT_I2O is not set
-# CONFIG_SCSI_ADVANSYS is not set
-# CONFIG_SCSI_IN2000 is not set
-# CONFIG_SCSI_ARCMSR is not set
-# CONFIG_MEGARAID_NEWGEN is not set
-# CONFIG_MEGARAID_LEGACY is not set
-# CONFIG_MEGARAID_SAS is not set
-# CONFIG_SCSI_HPTIOP is not set
-# CONFIG_SCSI_BUSLOGIC is not set
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_DTC3280 is not set
-# CONFIG_SCSI_EATA is not set
-# CONFIG_SCSI_FUTURE_DOMAIN is not set
-# CONFIG_SCSI_GDTH is not set
-# CONFIG_SCSI_GENERIC_NCR5380 is not set
-# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
-# CONFIG_SCSI_IPS is not set
-# CONFIG_SCSI_INITIO is not set
-# CONFIG_SCSI_INIA100 is not set
-CONFIG_SCSI_PPA=m
-CONFIG_SCSI_IMM=m
-# CONFIG_SCSI_IZIP_EPP16 is not set
-# CONFIG_SCSI_IZIP_SLOW_CTR is not set
-# CONFIG_SCSI_NCR53C406A is not set
-# CONFIG_SCSI_STEX is not set
-# CONFIG_SCSI_SYM53C8XX_2 is not set
-# CONFIG_SCSI_PAS16 is not set
-# CONFIG_SCSI_PSI240I is not set
-# CONFIG_SCSI_QLOGIC_FAS is not set
-# CONFIG_SCSI_QLOGIC_1280 is not set
-# CONFIG_SCSI_QLA_FC is not set
-# CONFIG_SCSI_QLA_ISCSI is not set
-# CONFIG_SCSI_LPFC is not set
-# CONFIG_SCSI_SEAGATE is not set
-# CONFIG_SCSI_SIM710 is not set
-# CONFIG_SCSI_SYM53C416 is not set
-# CONFIG_SCSI_DC395x is not set
-# CONFIG_SCSI_DC390T is not set
-# CONFIG_SCSI_T128 is not set
-# CONFIG_SCSI_U14_34F is not set
-# CONFIG_SCSI_ULTRASTOR is not set
-# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_DEBUG is not set
-# CONFIG_SCSI_SRP is not set
-
-#
-# PCMCIA SCSI adapter support
-#
-# CONFIG_PCMCIA_AHA152X is not set
-# CONFIG_PCMCIA_FDOMAIN is not set
-# CONFIG_PCMCIA_NINJA_SCSI is not set
-# CONFIG_PCMCIA_QLOGIC is not set
-# CONFIG_PCMCIA_SYM53C500 is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
-# CONFIG_ATA is not set
-
-#
-# Old CD-ROM drivers (not SCSI, not IDE)
-#
-# CONFIG_CD_NO_IDESCSI is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
-CONFIG_MD=y
-# CONFIG_BLK_DEV_MD is not set
-CONFIG_BLK_DEV_DM=m
-# CONFIG_DM_DEBUG is not set
-# CONFIG_DM_CRYPT is not set
-# CONFIG_DM_SNAPSHOT is not set
-# CONFIG_DM_MIRROR is not set
-# CONFIG_DM_ZERO is not set
-# CONFIG_DM_MULTIPATH is not set
-# CONFIG_BLK_DEV_DM_BBR is not set
-
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-# CONFIG_FUSION_SPI is not set
-# CONFIG_FUSION_FC is not set
-# CONFIG_FUSION_SAS is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-CONFIG_IEEE1394=m
-
-#
-# Subsystem Options
-#
-# CONFIG_IEEE1394_VERBOSEDEBUG is not set
-CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y
-CONFIG_IEEE1394_CONFIG_ROM_IP1394=y
-
-#
-# Device Drivers
-#
-
-#
-# Texas Instruments PCILynx requires I2C
-#
-CONFIG_IEEE1394_OHCI1394=m
-
-#
-# Protocol Drivers
-#
-CONFIG_IEEE1394_VIDEO1394=m
-CONFIG_IEEE1394_SBP2=m
-# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
-CONFIG_IEEE1394_ETH1394=m
-CONFIG_IEEE1394_DV1394=m
-CONFIG_IEEE1394_RAWIO=m
-
-#
-# I2O device support
-#
-CONFIG_I2O=m
-# CONFIG_I2O_LCT_NOTIFY_ON_CHANGES is not set
-CONFIG_I2O_EXT_ADAPTEC=y
-CONFIG_I2O_CONFIG=m
-CONFIG_I2O_CONFIG_OLD_IOCTL=y
-CONFIG_I2O_BUS=m
-CONFIG_I2O_BLOCK=m
-CONFIG_I2O_SCSI=m
-CONFIG_I2O_PROC=m
-
-#
-# Macintosh device drivers
-#
-# CONFIG_MAC_EMUMOUSEBTN is not set
-
-#
-# Network device support
-#
-CONFIG_NETDEVICES=y
-# CONFIG_DUMMY is not set
-# CONFIG_BONDING is not set
-# CONFIG_EQUALIZER is not set
-CONFIG_TUN=m
-CONFIG_NET_SB1000=m
-
-#
-# ARCnet devices
-#
-# CONFIG_ARCNET is not set
-
-#
-# PHY device support
-#
-CONFIG_PHYLIB=m
-
-#
-# MII PHY device drivers
-#
-CONFIG_MARVELL_PHY=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_CICADA_PHY=m
-CONFIG_VITESSE_PHY=m
-CONFIG_SMSC_PHY=m
-# CONFIG_BROADCOM_PHY is not set
-CONFIG_FIXED_PHY=m
-# CONFIG_FIXED_MII_10_FDX is not set
-# CONFIG_FIXED_MII_100_FDX is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
-CONFIG_NET_ETHERNET=y
-CONFIG_MII=m
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
-CONFIG_CASSINI=m
-CONFIG_NET_VENDOR_3COM=y
-CONFIG_EL1=m
-CONFIG_EL2=m
-CONFIG_ELPLUS=m
-CONFIG_EL16=m
-CONFIG_EL3=m
-CONFIG_3C515=m
-CONFIG_VORTEX=m
-CONFIG_TYPHOON=m
-CONFIG_LANCE=m
-CONFIG_NET_VENDOR_SMC=y
-CONFIG_WD80x3=m
-CONFIG_ULTRA=m
-CONFIG_ULTRA32=m
-CONFIG_SMC9194=m
-CONFIG_NET_VENDOR_RACAL=y
-# CONFIG_NI5010 is not set
-CONFIG_NI52=m
-CONFIG_NI65=m
-
-#
-# Tulip family network device support
-#
-CONFIG_NET_TULIP=y
-CONFIG_DE2104X=m
-CONFIG_TULIP=m
-CONFIG_TULIP_MWI=y
-CONFIG_TULIP_MMIO=y
-CONFIG_TULIP_NAPI=y
-CONFIG_TULIP_NAPI_HW_MITIGATION=y
-CONFIG_DE4X5=m
-CONFIG_WINBOND_840=m
-CONFIG_DM9102=m
-CONFIG_ULI526X=m
-CONFIG_PCMCIA_XIRCOM=m
-# CONFIG_PCMCIA_XIRTULIP is not set
-CONFIG_AT1700=m
-CONFIG_DEPCA=m
-CONFIG_HP100=m
-CONFIG_NET_ISA=y
-CONFIG_E2100=m
-CONFIG_EWRK3=m
-CONFIG_EEXPRESS=m
-CONFIG_EEXPRESS_PRO=m
-CONFIG_HPLAN_PLUS=m
-CONFIG_HPLAN=m
-CONFIG_LP486E=m
-CONFIG_ETH16I=m
-CONFIG_NE2000=m
-CONFIG_ZNET=m
-CONFIG_SEEQ8005=m
-CONFIG_NET_PCI=y
-CONFIG_PCNET32=m
-# CONFIG_PCNET32_NAPI is not set
-CONFIG_AMD8111_ETH=m
-# CONFIG_AMD8111E_NAPI is not set
-CONFIG_ADAPTEC_STARFIRE=m
-# CONFIG_ADAPTEC_STARFIRE_NAPI is not set
-CONFIG_AC3200=m
-CONFIG_APRICOT=m
-CONFIG_B44=m
-CONFIG_FORCEDETH=m
-# CONFIG_FORCEDETH_NAPI is not set
-CONFIG_CS89x0=m
-CONFIG_DGRS=m
-# CONFIG_EEPRO100 is not set
-CONFIG_E100=m
-CONFIG_LNE390=m
-CONFIG_FEALNX=m
-CONFIG_NATSEMI=m
-CONFIG_NE2K_PCI=m
-CONFIG_NE3210=m
-CONFIG_ES3210=m
-CONFIG_8139CP=m
-CONFIG_8139TOO=m
-# CONFIG_8139TOO_PIO is not set
-CONFIG_8139TOO_TUNE_TWISTER=y
-CONFIG_8139TOO_8129=y
-# CONFIG_8139_OLD_RX_RESET is not set
-CONFIG_SIS900=m
-CONFIG_EPIC100=m
-CONFIG_SUNDANCE=m
-CONFIG_SUNDANCE_MMIO=y
-CONFIG_TLAN=m
-CONFIG_VIA_RHINE=m
-CONFIG_VIA_RHINE_MMIO=y
-# CONFIG_VIA_RHINE_NAPI is not set
-# CONFIG_SC92031 is not set
-CONFIG_NET_POCKET=y
-CONFIG_ATP=m
-CONFIG_DE600=m
-CONFIG_DE620=m
-
-#
-# Ethernet (1000 Mbit)
-#
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_DL2K=m
-CONFIG_E1000=m
-# CONFIG_E1000_NAPI is not set
-# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
-CONFIG_NS83820=m
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_R8169=m
-# CONFIG_R8169_NAPI is not set
-CONFIG_SIS190=m
-CONFIG_SKGE=m
-CONFIG_SKY2=m
-# CONFIG_SK98LIN is not set
-CONFIG_VIA_VELOCITY=m
-CONFIG_TIGON3=m
-CONFIG_BNX2=m
-CONFIG_QLA3XXX=m
-CONFIG_ATL1=m
-
-#
-# Ethernet (10000 Mbit)
-#
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T1_NAPI=y
-CONFIG_CHELSIO_T3=m
-CONFIG_IXGB=m
-# CONFIG_IXGB_NAPI is not set
-CONFIG_S2IO=m
-# CONFIG_S2IO_NAPI is not set
-CONFIG_MYRI10GE=m
-CONFIG_NETXEN_NIC=m
-
-#
-# Token Ring devices
-#
-CONFIG_TR=y
-CONFIG_IBMTR=m
-CONFIG_IBMOL=m
-CONFIG_IBMLS=m
-CONFIG_3C359=m
-CONFIG_TMS380TR=m
-CONFIG_TMSPCI=m
-CONFIG_SKISA=m
-CONFIG_PROTEON=m
-CONFIG_ABYSS=m
-CONFIG_SMCTR=m
-
-#
-# Wireless LAN (non-hamradio)
-#
-CONFIG_NET_RADIO=y
-CONFIG_NET_WIRELESS_RTNETLINK=y
-
-#
-# Obsolete Wireless cards support (pre-802.11)
-#
-CONFIG_STRIP=m
-CONFIG_ARLAN=m
-CONFIG_WAVELAN=m
-CONFIG_PCMCIA_WAVELAN=m
-CONFIG_PCMCIA_NETWAVE=m
-
-#
-# Wireless 802.11 Frequency Hopping cards support
-#
-CONFIG_PCMCIA_RAYCS=m
-
-#
-# Wireless 802.11b ISA/PCI cards support
-#
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-# CONFIG_IPW2200_RADIOTAP is not set
-# CONFIG_IPW2200_PROMISCUOUS is not set
-# CONFIG_IPW2200_QOS is not set
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_AIRO=m
-CONFIG_HERMES=m
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_NORTEL_HERMES=m
-CONFIG_PCI_HERMES=m
-CONFIG_ATMEL=m
-CONFIG_PCI_ATMEL=m
-
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_SPECTRUM=m
-CONFIG_AIRO_CS=m
-CONFIG_PCMCIA_ATMEL=m
-CONFIG_PCMCIA_WL3501=m
-
-#
-# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
-#
-CONFIG_PRISM54=m
-CONFIG_USB_ZD1201=m
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_FIRMWARE=y
-CONFIG_HOSTAP_FIRMWARE_NVRAM=y
-CONFIG_HOSTAP_PLX=m
-CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_CS=m
-CONFIG_BCM43XX=m
-CONFIG_BCM43XX_DEBUG=y
-CONFIG_BCM43XX_DMA=y
-CONFIG_BCM43XX_PIO=y
-CONFIG_BCM43XX_DMA_AND_PIO_MODE=y
-# CONFIG_BCM43XX_DMA_MODE is not set
-# CONFIG_BCM43XX_PIO_MODE is not set
-CONFIG_ZD1211RW=m
-# CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_NET_WIRELESS=y
-
-#
-# PCMCIA network device support
-#
-CONFIG_NET_PCMCIA=y
-CONFIG_PCMCIA_3C589=m
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_PCMCIA_AXNET=m
-CONFIG_PCMCIA_IBMTR=m
-
-#
-# Wan interfaces
-#
-# CONFIG_WAN is not set
-
-#
-# ATM drivers
-#
-# CONFIG_ATM_DUMMY is not set
-# CONFIG_ATM_TCP is not set
-# CONFIG_ATM_LANAI is not set
-# CONFIG_ATM_ENI is not set
-# CONFIG_ATM_FIRESTREAM is not set
-# CONFIG_ATM_ZATM is not set
-# CONFIG_ATM_NICSTAR is not set
-# CONFIG_ATM_IDT77252 is not set
-# CONFIG_ATM_AMBASSADOR is not set
-# CONFIG_ATM_HORIZON is not set
-# CONFIG_ATM_IA is not set
-# CONFIG_ATM_FORE200E_MAYBE is not set
-# CONFIG_ATM_HE is not set
-CONFIG_FDDI=y
-CONFIG_DEFXX=m
-# CONFIG_DEFXX_MMIO is not set
-CONFIG_SKFP=m
-CONFIG_HIPPI=y
-CONFIG_ROADRUNNER=m
-# CONFIG_ROADRUNNER_LARGE_RINGS is not set
-# CONFIG_PLIP is not set
-CONFIG_PPP=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_MPPE=m
-CONFIG_PPPOE=m
-CONFIG_PPPOATM=m
-CONFIG_SLIP=m
-CONFIG_SLIP_COMPRESSED=y
-CONFIG_SLHC=m
-CONFIG_SLIP_SMART=y
-CONFIG_SLIP_MODE_SLIP6=y
-CONFIG_NET_FC=y
-# CONFIG_SHAPER is not set
-# CONFIG_NETCONSOLE is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
-CONFIG_ISDN=m
-
-#
-# Old ISDN4Linux
-#
-# CONFIG_ISDN_I4L is not set
-
-#
-# CAPI subsystem
-#
-CONFIG_ISDN_CAPI=m
-# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
-CONFIG_CAPI_TRACE=y
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_CAPI_CAPI20=m
-CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
-CONFIG_ISDN_CAPI_CAPIFS=m
-
-#
-# CAPI hardware drivers
-#
-
-#
-# Active AVM cards
-#
-CONFIG_CAPI_AVM=y
-CONFIG_ISDN_DRV_AVMB1_B1ISA=m
-CONFIG_ISDN_DRV_AVMB1_B1PCI=m
-CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
-CONFIG_ISDN_DRV_AVMB1_T1ISA=m
-CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
-CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
-CONFIG_ISDN_DRV_AVMB1_T1PCI=m
-CONFIG_ISDN_DRV_AVMB1_C4=m
-
-#
-# Active Eicon DIVA Server cards
-#
-CONFIG_CAPI_EICON=y
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS_USERIDI=m
-CONFIG_ISDN_DIVAS_MAINT=m
-
-#
-# Telephony Support
-#
-# CONFIG_PHONE is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-# CONFIG_INPUT_FF_MEMLESS is not set
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_TSDEV is not set
-CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ATKBD=y
-CONFIG_KEYBOARD_SUNKBD=m
-CONFIG_KEYBOARD_LKKBD=m
-CONFIG_KEYBOARD_XTKBD=m
-CONFIG_KEYBOARD_NEWTON=m
-CONFIG_KEYBOARD_STOWAWAY=m
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=y
-CONFIG_MOUSE_SERIAL=m
-CONFIG_MOUSE_INPORT=m
-CONFIG_MOUSE_ATIXL=y
-CONFIG_MOUSE_LOGIBM=m
-CONFIG_MOUSE_PC110PAD=m
-# CONFIG_MOUSE_VSXXXAA is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_PCSPKR=m
-# CONFIG_INPUT_WISTRON_BTNS is not set
-# CONFIG_INPUT_ATLAS_BTNS is not set
-# CONFIG_INPUT_UINPUT is not set
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-CONFIG_SERIO_I8042=y
-CONFIG_SERIO_SERPORT=m
-CONFIG_SERIO_CT82C710=m
-CONFIG_SERIO_PARKBD=m
-CONFIG_SERIO_PCIPS2=m
-CONFIG_SERIO_LIBPS2=y
-# CONFIG_SERIO_RAW is not set
-# CONFIG_GAMEPORT is not set
-
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-# CONFIG_VT_HW_CONSOLE_BINDING is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_PNP=y
-CONFIG_SERIAL_8250_CS=m
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-CONFIG_SERIAL_8250_EXTENDED=y
-CONFIG_SERIAL_8250_MANY_PORTS=y
-CONFIG_SERIAL_8250_FOURPORT=m
-CONFIG_SERIAL_8250_ACCENT=m
-CONFIG_SERIAL_8250_BOCA=m
-# CONFIG_SERIAL_8250_EXAR_ST16C554 is not set
-CONFIG_SERIAL_8250_HUB6=m
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-CONFIG_SERIAL_8250_RSA=y
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-# CONFIG_SERIAL_JSM is not set
-CONFIG_UNIX98_PTYS=y
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_PRINTER is not set
-CONFIG_PPDEV=m
-# CONFIG_TIPAR is not set
-
-#
-# IPMI
-#
-# CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
-# CONFIG_WATCHDOG is not set
-CONFIG_HW_RANDOM=y
-CONFIG_HW_RANDOM_INTEL=m
-CONFIG_HW_RANDOM_AMD=m
-CONFIG_HW_RANDOM_GEODE=m
-CONFIG_HW_RANDOM_VIA=m
-CONFIG_NVRAM=m
-CONFIG_RTC=m
-# CONFIG_GEN_RTC is not set
-CONFIG_DTLK=m
-# CONFIG_R3964 is not set
-# CONFIG_APPLICOM is not set
-# CONFIG_SONYPI is not set
-# CONFIG_AGP is not set
-# CONFIG_DRM is not set
-
-#
-# PCMCIA character devices
-#
-# CONFIG_SYNCLINK_CS is not set
-# CONFIG_CARDMAN_4000 is not set
-# CONFIG_CARDMAN_4040 is not set
-CONFIG_MWAVE=m
-CONFIG_PC8736x_GPIO=m
-CONFIG_NSC_GPIO=m
-CONFIG_CS5535_GPIO=m
-# CONFIG_RAW_DRIVER is not set
-# CONFIG_HPET is not set
-# CONFIG_HANGCHECK_TIMER is not set
-
-#
-# TPM devices
-#
-# CONFIG_TCG_TPM is not set
-# CONFIG_TELCLOCK is not set
-
-#
-# I2C support
-#
-# CONFIG_I2C is not set
-
-#
-# SPI support
-#
-# CONFIG_SPI is not set
-# CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
-# CONFIG_W1 is not set
-
-#
-# Hardware Monitoring support
-#
-# CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
-
-#
-# Multifunction device drivers
-#
-# CONFIG_MFD_SM501 is not set
-
-#
-# Multimedia devices
-#
-# CONFIG_VIDEO_DEV is not set
-
-#
-# Digital Video Broadcasting Devices
-#
-# CONFIG_DVB is not set
-# CONFIG_USB_DABUSB is not set
-
-#
-# Graphics support
-#
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-CONFIG_BACKLIGHT_CLASS_DEVICE=m
-# CONFIG_BACKLIGHT_PROGEAR is not set
-CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
-# CONFIG_FB_DDC is not set
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-# CONFIG_FB_SVGALIB is not set
-# CONFIG_FB_MACMODES is not set
-# CONFIG_FB_BACKLIGHT is not set
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_TILEBLITTING is not set
-
-#
-# Frame buffer hardware drivers
-#
-# CONFIG_FB_CIRRUS is not set
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_ARC is not set
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-# CONFIG_FB_VGA16 is not set
-CONFIG_FB_VESA=y
-CONFIG_FB_VESA_STD=y
-# CONFIG_FB_VESA_TNG is not set
-CONFIG_VIDEO_SELECT=y
-# CONFIG_FB_HGA is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_I810 is not set
-# CONFIG_FB_INTEL is not set
-# CONFIG_FB_MATROX is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIS is not set
-# CONFIG_FB_NEOMAGIC is not set
-# CONFIG_FB_KYRO is not set
-# CONFIG_FB_3DFX is not set
-# CONFIG_FB_VOODOO1 is not set
-# CONFIG_FB_CYBLA is not set
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_VIRTUAL is not set
-
-#
-# Console display driver support
-#
-CONFIG_VGA_CONSOLE=y
-# CONFIG_VGACON_SOFT_SCROLLBACK is not set
-# CONFIG_MDA_CONSOLE is not set
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-
-#
-# Logo configuration
-#
-# CONFIG_LOGO is not set
-CONFIG_FB_SPLASH=y
-
-#
-# Speakup console speech
-#
-CONFIG_SPEAKUP=y
-CONFIG_SPEAKUP_ACNTSA=y
-CONFIG_SPEAKUP_ACNTPC=y
-CONFIG_SPEAKUP_APOLLO=y
-CONFIG_SPEAKUP_AUDPTR=y
-CONFIG_SPEAKUP_BNS=y
-CONFIG_SPEAKUP_DECTLK=y
-CONFIG_SPEAKUP_DECEXT=y
-# CONFIG_SPEAKUP_DECPC is not set
-CONFIG_SPEAKUP_DTLK=y
-CONFIG_SPEAKUP_KEYPC=y
-CONFIG_SPEAKUP_LTLK=y
-CONFIG_SPEAKUP_SFTSYN=y
-CONFIG_SPEAKUP_SPKOUT=y
-CONFIG_SPEAKUP_TXPRT=y
-
-#
-# Enter the 3 to 6 character keyword from the list above, or none for no default synthesizer on boot up.
-#
-CONFIG_SPEAKUP_DEFAULT="none"
-
-#
-# Sound
-#
-CONFIG_SOUND=y
-
-#
-# Advanced Linux Sound Architecture
-#
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
-CONFIG_SND_HWDEP=m
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_SEQUENCER=m
-# CONFIG_SND_SEQ_DUMMY is not set
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_PCM_OSS_PLUGINS=y
-CONFIG_SND_SEQUENCER_OSS=y
-CONFIG_SND_RTCTIMER=m
-CONFIG_SND_SEQ_RTCTIMER_DEFAULT=y
-# CONFIG_SND_DYNAMIC_MINORS is not set
-CONFIG_SND_SUPPORT_OLD_API=y
-# CONFIG_SND_VERBOSE_PROCFS is not set
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-
-#
-# Generic devices
-#
-CONFIG_SND_MPU401_UART=m
-CONFIG_SND_OPL3_LIB=m
-CONFIG_SND_OPL4_LIB=m
-CONFIG_SND_VX_LIB=m
-CONFIG_SND_AC97_CODEC=m
-# CONFIG_SND_DUMMY is not set
-# CONFIG_SND_VIRMIDI is not set
-# CONFIG_SND_MTPAV is not set
-CONFIG_SND_MTS64=m
-# CONFIG_SND_SERIAL_U16550 is not set
-CONFIG_SND_MPU401=m
-# CONFIG_SND_PORTMAN2X4 is not set
-
-#
-# ISA devices
-#
-CONFIG_SND_AD1848_LIB=m
-CONFIG_SND_CS4231_LIB=m
-CONFIG_SND_ADLIB=m
-CONFIG_SND_AD1816A=m
-CONFIG_SND_AD1848=m
-CONFIG_SND_ALS100=m
-CONFIG_SND_AZT2320=m
-CONFIG_SND_CMI8330=m
-CONFIG_SND_CS4231=m
-CONFIG_SND_CS4232=m
-CONFIG_SND_CS4236=m
-CONFIG_SND_DT019X=m
-CONFIG_SND_ES968=m
-CONFIG_SND_ES1688=m
-CONFIG_SND_ES18XX=m
-CONFIG_SND_GUS_SYNTH=m
-CONFIG_SND_GUSCLASSIC=m
-CONFIG_SND_GUSEXTREME=m
-CONFIG_SND_GUSMAX=m
-CONFIG_SND_INTERWAVE=m
-CONFIG_SND_INTERWAVE_STB=m
-CONFIG_SND_OPL3SA2=m
-CONFIG_SND_OPTI92X_AD1848=m
-CONFIG_SND_OPTI92X_CS4231=m
-CONFIG_SND_OPTI93X=m
-CONFIG_SND_MIRO=m
-CONFIG_SND_SB8=m
-CONFIG_SND_SB16=m
-CONFIG_SND_SBAWE=m
-CONFIG_SND_SB16_CSP=y
-CONFIG_SND_SGALAXY=m
-CONFIG_SND_SSCAPE=m
-CONFIG_SND_WAVEFRONT=m
-
-#
-# PCI devices
-#
-CONFIG_SND_AD1889=m
-CONFIG_SND_ALS300=m
-CONFIG_SND_ALS4000=m
-CONFIG_SND_ALI5451=m
-CONFIG_SND_ATIIXP=m
-CONFIG_SND_ATIIXP_MODEM=m
-CONFIG_SND_AU8810=m
-CONFIG_SND_AU8820=m
-CONFIG_SND_AU8830=m
-CONFIG_SND_AZT3328=m
-CONFIG_SND_BT87X=m
-# CONFIG_SND_BT87X_OVERCLOCK is not set
-CONFIG_SND_CA0106=m
-CONFIG_SND_CMIPCI=m
-CONFIG_SND_CS4281=m
-CONFIG_SND_CS46XX=m
-CONFIG_SND_CS46XX_NEW_DSP=y
-CONFIG_SND_CS5535AUDIO=m
-CONFIG_SND_DARLA20=m
-CONFIG_SND_GINA20=m
-CONFIG_SND_LAYLA20=m
-CONFIG_SND_DARLA24=m
-CONFIG_SND_GINA24=m
-CONFIG_SND_LAYLA24=m
-CONFIG_SND_MONA=m
-CONFIG_SND_MIA=m
-CONFIG_SND_ECHO3G=m
-CONFIG_SND_INDIGO=m
-CONFIG_SND_INDIGOIO=m
-CONFIG_SND_INDIGODJ=m
-CONFIG_SND_EMU10K1=m
-CONFIG_SND_EMU10K1X=m
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
-CONFIG_SND_ES1938=m
-CONFIG_SND_ES1968=m
-CONFIG_SND_FM801=m
-# CONFIG_SND_FM801_TEA575X_BOOL is not set
-CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDSP=m
-CONFIG_SND_HDSPM=m
-CONFIG_SND_ICE1712=m
-CONFIG_SND_ICE1724=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_KORG1212=m
-CONFIG_SND_MAESTRO3=m
-CONFIG_SND_MIXART=m
-CONFIG_SND_NM256=m
-CONFIG_SND_PCXHR=m
-CONFIG_SND_RIPTIDE=m
-CONFIG_SND_RME32=m
-CONFIG_SND_RME96=m
-CONFIG_SND_RME9652=m
-CONFIG_SND_SONICVIBES=m
-CONFIG_SND_TRIDENT=m
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
-CONFIG_SND_VX222=m
-CONFIG_SND_YMFPCI=m
-CONFIG_SND_AC97_POWER_SAVE=y
-
-#
-# USB devices
-#
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_USB_USX2Y=m
-
-#
-# PCMCIA devices
-#
-CONFIG_SND_VXPOCKET=m
-CONFIG_SND_PDAUDIOCF=m
-
-#
-# SoC audio support
-#
-CONFIG_SND_SOC=m
-
-#
-# SoC Platforms
-#
-
-#
-# SoC Audio for the Atmel AT91
-#
-
-#
-# SoC Audio for the Intel PXA2xx
-#
-
-#
-# Open Sound System
-#
-# CONFIG_SOUND_PRIME is not set
-CONFIG_AC97_BUS=m
-
-#
-# HID Devices
-#
-CONFIG_HID=y
-# CONFIG_HID_DEBUG is not set
-
-#
-# USB support
-#
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB=m
-# CONFIG_USB_DEBUG is not set
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_SUSPEND is not set
-# CONFIG_USB_OTG is not set
-
-#
-# USB Host Controller Drivers
-#
-CONFIG_USB_EHCI_HCD=m
-# CONFIG_USB_EHCI_SPLIT_ISO is not set
-# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
-# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
-CONFIG_USB_ISP116X_HCD=m
-CONFIG_USB_OHCI_HCD=m
-# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_UHCI_HCD=m
-CONFIG_USB_U132_HCD=m
-CONFIG_USB_SL811_HCD=m
-CONFIG_USB_SL811_CS=m
-
-#
-# USB Device Class drivers
-#
-CONFIG_USB_ACM=m
-CONFIG_USB_PRINTER=m
-
-#
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-#
-
-#
-# may also be needed; see USB_STORAGE Help for more information
-#
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_DATAFAB=y
-CONFIG_USB_STORAGE_FREECOM=y
-CONFIG_USB_STORAGE_ISD200=y
-CONFIG_USB_STORAGE_DPCM=y
-CONFIG_USB_STORAGE_USBAT=y
-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y
-CONFIG_USB_STORAGE_JUMPSHOT=y
-CONFIG_USB_STORAGE_ALAUDA=y
-# CONFIG_USB_STORAGE_KARMA is not set
-# CONFIG_USB_LIBUSUAL is not set
-
-#
-# USB Input Devices
-#
-CONFIG_USB_HID=m
-CONFIG_USB_HIDINPUT_POWERBOOK=y
-# CONFIG_HID_FF is not set
-CONFIG_USB_HIDDEV=y
-
-#
-# USB HID Boot Protocol drivers
-#
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_MOUSE is not set
-CONFIG_USB_AIPTEK=m
-CONFIG_USB_WACOM=m
-CONFIG_USB_ACECAD=m
-CONFIG_USB_KBTAB=m
-# CONFIG_USB_POWERMATE is not set
-CONFIG_USB_TOUCHSCREEN=m
-CONFIG_USB_TOUCHSCREEN_EGALAX=y
-CONFIG_USB_TOUCHSCREEN_PANJIT=y
-CONFIG_USB_TOUCHSCREEN_3M=y
-CONFIG_USB_TOUCHSCREEN_ITM=y
-CONFIG_USB_TOUCHSCREEN_ETURBO=y
-CONFIG_USB_TOUCHSCREEN_GUNZE=y
-CONFIG_USB_TOUCHSCREEN_DMC_TSC10=y
-# CONFIG_USB_YEALINK is not set
-CONFIG_USB_XPAD=m
-CONFIG_USB_ATI_REMOTE=m
-CONFIG_USB_ATI_REMOTE2=m
-# CONFIG_USB_KEYSPAN_REMOTE is not set
-CONFIG_USB_APPLETOUCH=m
-# CONFIG_USB_GTCO is not set
-
-#
-# USB Imaging devices
-#
-# CONFIG_USB_MDC800 is not set
-# CONFIG_USB_MICROTEK is not set
-
-#
-# USB Network Adapters
-#
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_USBNET_MII=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_CDCETHER=m
-CONFIG_USB_NET_DM9601=m
-# CONFIG_USB_NET_GL620A is not set
-CONFIG_USB_NET_NET1080=m
-# CONFIG_USB_NET_PLUSB is not set
-CONFIG_USB_NET_MCS7830=m
-# CONFIG_USB_NET_RNDIS_HOST is not set
-# CONFIG_USB_NET_CDC_SUBSET is not set
-CONFIG_USB_NET_ZAURUS=m
-# CONFIG_USB_MON is not set
-
-#
-# USB port drivers
-#
-CONFIG_USB_USS720=m
-
-#
-# USB Serial Converter support
-#
-CONFIG_USB_SERIAL=m
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_AIRCABLE=m
-CONFIG_USB_SERIAL_AIRPRIME=m
-CONFIG_USB_SERIAL_ARK3116=m
-# CONFIG_USB_SERIAL_BELKIN is not set
-CONFIG_USB_SERIAL_WHITEHEAT=m
-# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
-CONFIG_USB_SERIAL_CP2101=m
-# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
-# CONFIG_USB_SERIAL_EMPEG is not set
-# CONFIG_USB_SERIAL_FTDI_SIO is not set
-CONFIG_USB_SERIAL_FUNSOFT=m
-# CONFIG_USB_SERIAL_VISOR is not set
-# CONFIG_USB_SERIAL_IPAQ is not set
-# CONFIG_USB_SERIAL_IR is not set
-# CONFIG_USB_SERIAL_EDGEPORT is not set
-# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
-# CONFIG_USB_SERIAL_GARMIN is not set
-CONFIG_USB_SERIAL_IPW=m
-# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
-# CONFIG_USB_SERIAL_KEYSPAN is not set
-# CONFIG_USB_SERIAL_KLSI is not set
-# CONFIG_USB_SERIAL_KOBIL_SCT is not set
-# CONFIG_USB_SERIAL_MCT_U232 is not set
-CONFIG_USB_SERIAL_MOS7720=m
-CONFIG_USB_SERIAL_MOS7840=m
-CONFIG_USB_SERIAL_NAVMAN=m
-# CONFIG_USB_SERIAL_PL2303 is not set
-# CONFIG_USB_SERIAL_HP4X is not set
-# CONFIG_USB_SERIAL_SAFE is not set
-CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-# CONFIG_USB_SERIAL_TI is not set
-# CONFIG_USB_SERIAL_CYBERJACK is not set
-# CONFIG_USB_SERIAL_XIRCOM is not set
-CONFIG_USB_SERIAL_OPTION=m
-CONFIG_USB_SERIAL_OMNINET=m
-# CONFIG_USB_SERIAL_DEBUG is not set
-CONFIG_USB_EZUSB=y
-
-#
-# USB Miscellaneous drivers
-#
-# CONFIG_USB_EMI62 is not set
-# CONFIG_USB_EMI26 is not set
-# CONFIG_USB_ADUTUX is not set
-CONFIG_USB_AUERSWALD=m
-# CONFIG_USB_RIO500 is not set
-# CONFIG_USB_LEGOTOWER is not set
-# CONFIG_USB_LCD is not set
-# CONFIG_USB_BERRY_CHARGE is not set
-# CONFIG_USB_LED is not set
-# CONFIG_USB_CYPRESS_CY7C63 is not set
-# CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_PHIDGET is not set
-# CONFIG_USB_IDMOUSE is not set
-CONFIG_USB_FTDI_ELAN=m
-# CONFIG_USB_APPLEDISPLAY is not set
-CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
-# CONFIG_USB_LD is not set
-# CONFIG_USB_TRANCEVIBRATOR is not set
-# CONFIG_USB_IOWARRIOR is not set
-# CONFIG_USB_TEST is not set
-
-#
-# USB DSL modem support
-#
-CONFIG_USB_ATM=m
-CONFIG_USB_SPEEDTOUCH=m
-CONFIG_USB_CXACRU=m
-CONFIG_USB_UEAGLEATM=m
-CONFIG_USB_XUSBATM=m
-
-#
-# USB Gadget Support
-#
-# CONFIG_USB_GADGET is not set
-
-#
-# MMC/SD Card support
-#
-CONFIG_MMC=m
-# CONFIG_MMC_DEBUG is not set
-CONFIG_MMC_BLOCK=m
-CONFIG_MMC_SDHCI=m
-CONFIG_MMC_WBSD=m
-CONFIG_MMC_TIFM_SD=m
-
-#
-# LED devices
-#
-# CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# InfiniBand support
-#
-CONFIG_INFINIBAND=m
-# CONFIG_INFINIBAND_USER_MAD is not set
-# CONFIG_INFINIBAND_USER_ACCESS is not set
-CONFIG_INFINIBAND_ADDR_TRANS=y
-CONFIG_INFINIBAND_MTHCA=m
-# CONFIG_INFINIBAND_MTHCA_DEBUG is not set
-# CONFIG_INFINIBAND_AMSO1100 is not set
-# CONFIG_INFINIBAND_CXGB3 is not set
-CONFIG_INFINIBAND_IPOIB=m
-# CONFIG_INFINIBAND_IPOIB_CM is not set
-# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
-CONFIG_INFINIBAND_SRP=m
-# CONFIG_INFINIBAND_ISER is not set
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
-# CONFIG_EDAC is not set
-
-#
-# Real Time Clock
-#
-CONFIG_RTC_LIB=m
-CONFIG_RTC_CLASS=m
-
-#
-# RTC interfaces
-#
-CONFIG_RTC_INTF_SYSFS=m
-CONFIG_RTC_INTF_PROC=m
-CONFIG_RTC_INTF_DEV=m
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-
-#
-# RTC drivers
-#
-# CONFIG_RTC_DRV_CMOS is not set
-# CONFIG_RTC_DRV_DS1553 is not set
-# CONFIG_RTC_DRV_DS1742 is not set
-CONFIG_RTC_DRV_M48T86=m
-# CONFIG_RTC_DRV_TEST is not set
-# CONFIG_RTC_DRV_V3020 is not set
-
-#
-# DMA Engine support
-#
-CONFIG_DMA_ENGINE=y
-
-#
-# DMA Clients
-#
-CONFIG_NET_DMA=y
-
-#
-# DMA Devices
-#
-CONFIG_INTEL_IOATDMA=m
-
-#
-# Auxiliary Display support
-#
-# CONFIG_KS0108 is not set
-
-#
-# Virtualization
-#
-# CONFIG_KVM is not set
-
-#
-# File systems
-#
-CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-# CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=y
-CONFIG_EXT3_FS_XATTR=y
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-# CONFIG_EXT4DEV_FS is not set
-CONFIG_JBD=y
-# CONFIG_JBD_DEBUG is not set
-CONFIG_FS_MBCACHE=y
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
-CONFIG_FS_POSIX_ACL=y
-# CONFIG_XFS_FS is not set
-# CONFIG_GFS2_FS is not set
-# CONFIG_OCFS2_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_ROMFS_FS is not set
-CONFIG_INOTIFY=y
-CONFIG_INOTIFY_USER=y
-# CONFIG_QUOTA is not set
-CONFIG_DNOTIFY=y
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AUTOFS4_FS is not set
-# CONFIG_FUSE_FS is not set
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=y
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=y
-CONFIG_UDF_NLS=y
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=y
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=y
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-# CONFIG_NTFS_FS is not set
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-# CONFIG_TMPFS_POSIX_ACL is not set
-# CONFIG_HUGETLBFS is not set
-# CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
-CONFIG_CONFIGFS_FS=m
-
-#
-# Miscellaneous filesystems
-#
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_CRAMFS is not set
-CONFIG_SQUASHFS=y
-CONFIG_SQUASHFS_EMBEDDED=y
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-# CONFIG_SQUASHFS_VMALLOC is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS is not set
-
-#
-# Network File Systems
-#
-# CONFIG_NFS_FS is not set
-# CONFIG_NFSD is not set
-# CONFIG_SMB_FS is not set
-# CONFIG_CIFS is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-# CONFIG_MAC_PARTITION is not set
-CONFIG_MSDOS_PARTITION=y
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_MINIX_SUBPARTITION is not set
-# CONFIG_SOLARIS_X86_PARTITION is not set
-# CONFIG_UNIXWARE_DISKLABEL is not set
-# CONFIG_LDM_PARTITION is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_KARMA_PARTITION is not set
-# CONFIG_EFI_PARTITION is not set
-
-#
-# Native Language Support
-#
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="iso8859-1"
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_737=y
-CONFIG_NLS_CODEPAGE_775=y
-CONFIG_NLS_CODEPAGE_850=y
-CONFIG_NLS_CODEPAGE_852=y
-CONFIG_NLS_CODEPAGE_855=y
-CONFIG_NLS_CODEPAGE_857=y
-CONFIG_NLS_CODEPAGE_860=y
-CONFIG_NLS_CODEPAGE_861=y
-CONFIG_NLS_CODEPAGE_862=y
-CONFIG_NLS_CODEPAGE_863=y
-CONFIG_NLS_CODEPAGE_864=y
-CONFIG_NLS_CODEPAGE_865=y
-CONFIG_NLS_CODEPAGE_866=y
-CONFIG_NLS_CODEPAGE_869=y
-CONFIG_NLS_CODEPAGE_936=y
-CONFIG_NLS_CODEPAGE_950=y
-CONFIG_NLS_CODEPAGE_932=y
-CONFIG_NLS_CODEPAGE_949=y
-CONFIG_NLS_CODEPAGE_874=y
-CONFIG_NLS_ISO8859_8=y
-CONFIG_NLS_CODEPAGE_1250=y
-CONFIG_NLS_CODEPAGE_1251=y
-CONFIG_NLS_ASCII=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_ISO8859_2=y
-CONFIG_NLS_ISO8859_3=y
-CONFIG_NLS_ISO8859_4=y
-CONFIG_NLS_ISO8859_5=y
-CONFIG_NLS_ISO8859_6=y
-CONFIG_NLS_ISO8859_7=y
-CONFIG_NLS_ISO8859_9=y
-CONFIG_NLS_ISO8859_13=y
-CONFIG_NLS_ISO8859_14=y
-CONFIG_NLS_ISO8859_15=y
-CONFIG_NLS_KOI8_R=y
-CONFIG_NLS_KOI8_U=y
-CONFIG_NLS_UTF8=y
-
-#
-# Distributed Lock Manager
-#
-# CONFIG_DLM is not set
-
-#
-# Instrumentation Support
-#
-# CONFIG_PROFILING is not set
-
-#
-# Kernel hacking
-#
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_PRINTK_TIME is not set
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_UNUSED_SYMBOLS=y
-# CONFIG_DEBUG_FS is not set
-# CONFIG_HEADERS_CHECK is not set
-# CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_EARLY_PRINTK=y
-CONFIG_DOUBLEFAULT=y
-
-#
-# Security options
-#
-# CONFIG_KEYS is not set
-# CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_XCBC=y
-# CONFIG_CRYPTO_NULL is not set
-CONFIG_CRYPTO_MD4=y
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA512=y
-# CONFIG_CRYPTO_WP512 is not set
-# CONFIG_CRYPTO_TGR192 is not set
-# CONFIG_CRYPTO_GF128MUL is not set
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_PCBC=m
-# CONFIG_CRYPTO_LRW is not set
-CONFIG_CRYPTO_DES=y
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_BLOWFISH=y
-CONFIG_CRYPTO_TWOFISH=y
-CONFIG_CRYPTO_TWOFISH_COMMON=y
-CONFIG_CRYPTO_TWOFISH_586=y
-CONFIG_CRYPTO_SERPENT=y
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_AES_586=y
-CONFIG_CRYPTO_CAST5=y
-CONFIG_CRYPTO_CAST6=y
-CONFIG_CRYPTO_TEA=y
-CONFIG_CRYPTO_ARC4=y
-# CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_ANUBIS is not set
-CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_MICHAEL_MIC=y
-CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_CAMELLIA=m
-# CONFIG_CRYPTO_TEST is not set
-
-#
-# Hardware crypto devices
-#
-CONFIG_CRYPTO_DEV_PADLOCK=m
-CONFIG_CRYPTO_DEV_PADLOCK_AES=m
-CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
-CONFIG_CRYPTO_DEV_GEODE=m
-
-#
-# Library routines
-#
-CONFIG_BITREVERSE=y
-CONFIG_CRC_CCITT=y
-CONFIG_CRC16=y
-CONFIG_CRC32=y
-CONFIG_LIBCRC32C=y
-CONFIG_AUDIT_GENERIC=y
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_PLIST=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_X86_BIOS_REBOOT=y
-CONFIG_KTIME_SCALAR=y

Copied: incognito/tags/20080109.1/arch/x86/kernel-2.6.23.config (from rev 13115, incognito/trunk/arch/x86/kernel-2.6.23.config)
===================================================================
--- incognito/tags/20080109.1/arch/x86/kernel-2.6.23.config	                        (rev 0)
+++ incognito/tags/20080109.1/arch/x86/kernel-2.6.23.config	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,2281 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.23-gentoo-r3
+# Fri Jan 11 05:56:02 2008
+#
+CONFIG_X86_32=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_SEMAPHORE_SLEEPERS=y
+CONFIG_X86=y
+CONFIG_MMU=y
+CONFIG_ZONE_DMA=y
+CONFIG_QUICKLIST=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_DMI=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+# CONFIG_TASKSTATS is not set
+# CONFIG_USER_NS is not set
+CONFIG_AUDIT=y
+CONFIG_AUDITSYSCALL=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_SYSFS_DEPRECATED=y
+# CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_EMBEDDED=y
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+# CONFIG_KALLSYMS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+# CONFIG_BUG is not set
+# CONFIG_ELF_CORE is not set
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+# CONFIG_IOSCHED_AS is not set
+# CONFIG_IOSCHED_DEADLINE is not set
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+
+#
+# Processor type and features
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+# CONFIG_SMP is not set
+CONFIG_X86_PC=y
+# CONFIG_X86_ELAN is not set
+# CONFIG_X86_VOYAGER is not set
+# CONFIG_X86_NUMAQ is not set
+# CONFIG_X86_SUMMIT is not set
+# CONFIG_X86_BIGSMP is not set
+# CONFIG_X86_VISWS is not set
+# CONFIG_X86_GENERICARCH is not set
+# CONFIG_X86_ES7000 is not set
+# CONFIG_PARAVIRT is not set
+# CONFIG_M386 is not set
+# CONFIG_M486 is not set
+# CONFIG_M586 is not set
+# CONFIG_M586TSC is not set
+# CONFIG_M586MMX is not set
+CONFIG_M686=y
+# CONFIG_MPENTIUMII is not set
+# CONFIG_MPENTIUMIII is not set
+# CONFIG_MPENTIUMM is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_MPENTIUM4 is not set
+# CONFIG_MK6 is not set
+# CONFIG_MK7 is not set
+# CONFIG_MK8 is not set
+# CONFIG_MCRUSOE is not set
+# CONFIG_MEFFICEON is not set
+# CONFIG_MWINCHIPC6 is not set
+# CONFIG_MWINCHIP2 is not set
+# CONFIG_MWINCHIP3D is not set
+# CONFIG_MGEODEGX1 is not set
+# CONFIG_MGEODE_LX is not set
+# CONFIG_MCYRIXIII is not set
+# CONFIG_MVIAC3_2 is not set
+# CONFIG_MVIAC7 is not set
+CONFIG_X86_GENERIC=y
+CONFIG_X86_CMPXCHG=y
+CONFIG_X86_L1_CACHE_SHIFT=7
+CONFIG_X86_XADD=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_X86_PPRO_FENCE=y
+CONFIG_X86_WP_WORKS_OK=y
+CONFIG_X86_INVLPG=y
+CONFIG_X86_BSWAP=y
+CONFIG_X86_POPAD_OK=y
+CONFIG_X86_GOOD_APIC=y
+CONFIG_X86_INTEL_USERCOPY=y
+CONFIG_X86_USE_PPRO_CHECKSUM=y
+CONFIG_X86_TSC=y
+CONFIG_X86_CMOV=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=4
+CONFIG_HPET_TIMER=y
+# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PREEMPT is not set
+# CONFIG_X86_UP_APIC is not set
+# CONFIG_X86_MCE is not set
+CONFIG_VM86=y
+CONFIG_TOSHIBA=m
+CONFIG_I8K=m
+CONFIG_X86_REBOOTFIXUPS=y
+# CONFIG_MICROCODE is not set
+CONFIG_X86_MSR=m
+# CONFIG_X86_CPUID is not set
+
+#
+# Firmware Drivers
+#
+# CONFIG_EDD is not set
+# CONFIG_DELL_RBU is not set
+# CONFIG_DCDBAS is not set
+CONFIG_DMIID=y
+# CONFIG_NOHIGHMEM is not set
+CONFIG_HIGHMEM4G=y
+# CONFIG_HIGHMEM64G is not set
+CONFIG_VMSPLIT_3G=y
+# CONFIG_VMSPLIT_3G_OPT is not set
+# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_2G_OPT is not set
+# CONFIG_VMSPLIT_1G is not set
+CONFIG_PAGE_OFFSET=0xC0000000
+CONFIG_HIGHMEM=y
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_SPARSEMEM_STATIC=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_NR_QUICK=1
+CONFIG_VIRT_TO_BUS=y
+# CONFIG_HIGHPTE is not set
+# CONFIG_MATH_EMULATION is not set
+CONFIG_MTRR=y
+# CONFIG_EFI is not set
+CONFIG_SECCOMP=y
+# CONFIG_HZ_100 is not set
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_300 is not set
+CONFIG_HZ_1000=y
+CONFIG_HZ=1000
+# CONFIG_KEXEC is not set
+# CONFIG_CRASH_DUMP is not set
+CONFIG_PHYSICAL_START=0x100000
+# CONFIG_RELOCATABLE is not set
+CONFIG_PHYSICAL_ALIGN=0x100000
+# CONFIG_COMPAT_VDSO is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+
+#
+# Power management options (ACPI, APM)
+#
+CONFIG_PM=y
+# CONFIG_PM_LEGACY is not set
+# CONFIG_PM_DEBUG is not set
+CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND_UP_POSSIBLE=y
+CONFIG_SUSPEND=y
+CONFIG_HIBERNATION_UP_POSSIBLE=y
+# CONFIG_HIBERNATION is not set
+CONFIG_ACPI=y
+CONFIG_ACPI_SLEEP=y
+CONFIG_ACPI_PROCFS=y
+CONFIG_ACPI_PROC_EVENT=y
+CONFIG_ACPI_AC=m
+CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BUTTON=m
+CONFIG_ACPI_VIDEO=m
+CONFIG_ACPI_FAN=m
+CONFIG_ACPI_DOCK=m
+# CONFIG_ACPI_BAY is not set
+CONFIG_ACPI_PROCESSOR=m
+CONFIG_ACPI_THERMAL=m
+CONFIG_ACPI_ASUS=m
+CONFIG_ACPI_TOSHIBA=m
+CONFIG_ACPI_BLACKLIST_YEAR=0
+# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_EC=y
+CONFIG_ACPI_POWER=y
+CONFIG_ACPI_SYSTEM=y
+CONFIG_X86_PM_TIMER=y
+# CONFIG_ACPI_CONTAINER is not set
+# CONFIG_ACPI_SBS is not set
+# CONFIG_APM is not set
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=m
+# CONFIG_CPU_FREQ_DEBUG is not set
+CONFIG_CPU_FREQ_STAT=m
+# CONFIG_CPU_FREQ_STAT_DETAILS is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+
+#
+# CPUFreq processor drivers
+#
+CONFIG_X86_ACPI_CPUFREQ=m
+CONFIG_X86_POWERNOW_K6=m
+CONFIG_X86_POWERNOW_K7=m
+CONFIG_X86_POWERNOW_K7_ACPI=y
+CONFIG_X86_POWERNOW_K8=m
+CONFIG_X86_POWERNOW_K8_ACPI=y
+CONFIG_X86_GX_SUSPMOD=m
+CONFIG_X86_SPEEDSTEP_CENTRINO=m
+CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
+CONFIG_X86_SPEEDSTEP_ICH=m
+CONFIG_X86_SPEEDSTEP_SMI=m
+CONFIG_X86_P4_CLOCKMOD=m
+CONFIG_X86_CPUFREQ_NFORCE2=m
+CONFIG_X86_LONGRUN=m
+CONFIG_X86_LONGHAUL=m
+# CONFIG_X86_E_POWERSAVER is not set
+
+#
+# shared options
+#
+# CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set
+CONFIG_X86_SPEEDSTEP_LIB=m
+# CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set
+
+#
+# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
+#
+CONFIG_PCI=y
+# CONFIG_PCI_GOBIOS is not set
+# CONFIG_PCI_GOMMCONFIG is not set
+# CONFIG_PCI_GODIRECT is not set
+CONFIG_PCI_GOANY=y
+CONFIG_PCI_BIOS=y
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_MMCONFIG=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_PCIEAER=y
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+CONFIG_ISA_DMA_API=y
+CONFIG_ISA=y
+CONFIG_EISA=y
+CONFIG_EISA_VLB_PRIMING=y
+CONFIG_EISA_PCI_EISA=y
+CONFIG_EISA_VIRTUAL_ROOT=y
+# CONFIG_EISA_NAMES is not set
+# CONFIG_MCA is not set
+# CONFIG_SCx200 is not set
+CONFIG_K8_NB=y
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+CONFIG_PCCARD=m
+# CONFIG_PCMCIA_DEBUG is not set
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_PCMCIA_IOCTL=y
+CONFIG_CARDBUS=y
+
+#
+# PC-card bridges
+#
+CONFIG_YENTA=m
+CONFIG_YENTA_O2=y
+CONFIG_YENTA_RICOH=y
+CONFIG_YENTA_TI=y
+CONFIG_YENTA_ENE_TUNE=y
+CONFIG_YENTA_TOSHIBA=y
+CONFIG_PD6729=m
+CONFIG_I82092=m
+CONFIG_I82365=m
+CONFIG_TCIC=m
+CONFIG_PCMCIA_PROBE=y
+CONFIG_PCCARD_NONSTATIC=m
+# CONFIG_HOTPLUG_PCI is not set
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=m
+# CONFIG_XFRM_SUB_POLICY is not set
+CONFIG_XFRM_MIGRATE=y
+CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+# CONFIG_IP_PNP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=m
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_IP_VS is not set
+CONFIG_IPV6=m
+CONFIG_IPV6_PRIVACY=y
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_TUNNEL=m
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_NETWORK_SECMARK is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+# CONFIG_NETFILTER_NETLINK_LOG is not set
+CONFIG_NF_CONNTRACK_ENABLED=m
+CONFIG_NF_CONNTRACK=m
+# CONFIG_NF_CT_ACCT is not set
+# CONFIG_NF_CONNTRACK_MARK is not set
+# CONFIG_NF_CONNTRACK_EVENTS is not set
+# CONFIG_NF_CT_PROTO_SCTP is not set
+# CONFIG_NF_CT_PROTO_UDPLITE is not set
+# CONFIG_NF_CONNTRACK_AMANDA is not set
+CONFIG_NF_CONNTRACK_FTP=m
+# CONFIG_NF_CONNTRACK_H323 is not set
+CONFIG_NF_CONNTRACK_IRC=m
+# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
+# CONFIG_NF_CONNTRACK_PPTP is not set
+# CONFIG_NF_CONNTRACK_SANE is not set
+# CONFIG_NF_CONNTRACK_SIP is not set
+# CONFIG_NF_CONNTRACK_TFTP is not set
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NETFILTER_XTABLES=m
+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
+# CONFIG_NETFILTER_XT_TARGET_MARK is not set
+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
+# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+# CONFIG_IP_NF_QUEUE is not set
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_IPRANGE=m
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_RECENT=m
+# CONFIG_IP_NF_MATCH_ECN is not set
+# CONFIG_IP_NF_MATCH_AH is not set
+# CONFIG_IP_NF_MATCH_TTL is not set
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+# CONFIG_IP_NF_TARGET_LOG is not set
+# CONFIG_IP_NF_TARGET_ULOG is not set
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+# CONFIG_IP_NF_TARGET_MASQUERADE is not set
+CONFIG_IP_NF_TARGET_REDIRECT=m
+# CONFIG_IP_NF_TARGET_NETMAP is not set
+# CONFIG_IP_NF_TARGET_SAME is not set
+# CONFIG_NF_NAT_SNMP_BASIC is not set
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+# CONFIG_NF_NAT_TFTP is not set
+# CONFIG_NF_NAT_AMANDA is not set
+# CONFIG_NF_NAT_PPTP is not set
+# CONFIG_NF_NAT_H323 is not set
+# CONFIG_NF_NAT_SIP is not set
+# CONFIG_IP_NF_MANGLE is not set
+CONFIG_IP_NF_RAW=m
+# CONFIG_IP_NF_ARPTABLES is not set
+
+#
+# IPv6: Netfilter Configuration (EXPERIMENTAL)
+#
+CONFIG_NF_CONNTRACK_IPV6=m
+# CONFIG_IP6_NF_QUEUE is not set
+CONFIG_IP6_NF_IPTABLES=m
+# CONFIG_IP6_NF_MATCH_RT is not set
+# CONFIG_IP6_NF_MATCH_OPTS is not set
+# CONFIG_IP6_NF_MATCH_FRAG is not set
+# CONFIG_IP6_NF_MATCH_HL is not set
+CONFIG_IP6_NF_MATCH_OWNER=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+# CONFIG_IP6_NF_MATCH_AH is not set
+# CONFIG_IP6_NF_MATCH_MH is not set
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_FILTER=m
+# CONFIG_IP6_NF_TARGET_LOG is not set
+CONFIG_IP6_NF_TARGET_REJECT=m
+# CONFIG_IP6_NF_MANGLE is not set
+# CONFIG_IP6_NF_RAW is not set
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_TIPC is not set
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+CONFIG_ATM_CLIP_NO_ICMP=y
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+CONFIG_ATM_BR2684_IPFILTER=y
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+CONFIG_LLC=y
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+CONFIG_NET_SCH_FIFO=y
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+CONFIG_BT=m
+CONFIG_BT_L2CAP=m
+CONFIG_BT_SCO=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+# CONFIG_BT_CMTP is not set
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIUSB=m
+CONFIG_BT_HCIUSB_SCO=y
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIDTL1=m
+CONFIG_BT_HCIBT3C=m
+CONFIG_BT_HCIBLUECARD=m
+CONFIG_BT_HCIBTUART=m
+CONFIG_BT_HCIVHCI=m
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+CONFIG_CFG80211=m
+CONFIG_WIRELESS_EXT=y
+CONFIG_MAC80211=m
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUG is not set
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+CONFIG_IEEE80211_CRYPT_WEP=m
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
+CONFIG_IEEE80211_SOFTMAC=m
+# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
+CONFIG_RFKILL=m
+CONFIG_RFKILL_INPUT=m
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=m
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_CONNECTOR is not set
+# CONFIG_MTD is not set
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_SERIAL=m
+CONFIG_PARPORT_PC_FIFO=y
+CONFIG_PARPORT_PC_SUPERIO=y
+CONFIG_PARPORT_PC_PCMCIA=m
+# CONFIG_PARPORT_GSC is not set
+# CONFIG_PARPORT_AX88796 is not set
+CONFIG_PARPORT_1284=y
+CONFIG_PARPORT_NOT_PC=y
+CONFIG_PNP=y
+# CONFIG_PNP_DEBUG is not set
+
+#
+# Protocols
+#
+CONFIG_ISAPNP=y
+# CONFIG_PNPBIOS is not set
+CONFIG_PNPACPI=y
+CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_XD is not set
+# CONFIG_PARIDE is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_CRYPTOLOOP=y
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=8192
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_IBM_ASM is not set
+# CONFIG_PHANTOM is not set
+CONFIG_EEPROM_93CX6=m
+# CONFIG_SGI_IOC4 is not set
+CONFIG_TIFM_CORE=m
+CONFIG_TIFM_7XX1=m
+# CONFIG_ASUS_LAPTOP is not set
+# CONFIG_MSI_LAPTOP is not set
+CONFIG_SONY_LAPTOP=m
+CONFIG_SONYPI_COMPAT=y
+CONFIG_THINKPAD_ACPI=m
+# CONFIG_THINKPAD_ACPI_DEBUG is not set
+CONFIG_THINKPAD_ACPI_BAY=y
+CONFIG_IDE=y
+CONFIG_IDE_MAX_HWIFS=4
+CONFIG_BLK_DEV_IDE=y
+
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
+# CONFIG_BLK_DEV_IDE_SATA is not set
+# CONFIG_BLK_DEV_HD_IDE is not set
+CONFIG_BLK_DEV_IDEDISK=y
+CONFIG_IDEDISK_MULTI_MODE=y
+CONFIG_BLK_DEV_IDECS=m
+# CONFIG_BLK_DEV_DELKIN is not set
+CONFIG_BLK_DEV_IDECD=y
+# CONFIG_BLK_DEV_IDETAPE is not set
+CONFIG_BLK_DEV_IDEFLOPPY=m
+# CONFIG_BLK_DEV_IDESCSI is not set
+CONFIG_BLK_DEV_IDEACPI=y
+# CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
+
+#
+# IDE chipset support/bugfixes
+#
+CONFIG_IDE_GENERIC=y
+CONFIG_BLK_DEV_CMD640=y
+CONFIG_BLK_DEV_CMD640_ENHANCED=y
+CONFIG_BLK_DEV_IDEPNP=y
+CONFIG_BLK_DEV_IDEPCI=y
+CONFIG_IDEPCI_SHARE_IRQ=y
+CONFIG_IDEPCI_PCIBUS_ORDER=y
+# CONFIG_BLK_DEV_OFFBOARD is not set
+CONFIG_BLK_DEV_GENERIC=y
+CONFIG_BLK_DEV_OPTI621=y
+CONFIG_BLK_DEV_RZ1000=y
+CONFIG_BLK_DEV_IDEDMA_PCI=y
+# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
+# CONFIG_IDEDMA_ONLYDISK is not set
+CONFIG_BLK_DEV_AEC62XX=y
+CONFIG_BLK_DEV_ALI15X3=y
+# CONFIG_WDC_ALI15X3 is not set
+CONFIG_BLK_DEV_AMD74XX=y
+CONFIG_BLK_DEV_ATIIXP=y
+CONFIG_BLK_DEV_CMD64X=y
+CONFIG_BLK_DEV_TRIFLEX=y
+CONFIG_BLK_DEV_CY82C693=y
+CONFIG_BLK_DEV_CS5520=y
+CONFIG_BLK_DEV_CS5530=y
+CONFIG_BLK_DEV_CS5535=y
+CONFIG_BLK_DEV_HPT34X=y
+# CONFIG_HPT34X_AUTODMA is not set
+CONFIG_BLK_DEV_HPT366=y
+# CONFIG_BLK_DEV_JMICRON is not set
+CONFIG_BLK_DEV_SC1200=y
+CONFIG_BLK_DEV_PIIX=y
+# CONFIG_BLK_DEV_IT8213 is not set
+CONFIG_BLK_DEV_IT821X=y
+CONFIG_BLK_DEV_NS87415=y
+CONFIG_BLK_DEV_PDC202XX_OLD=y
+# CONFIG_PDC202XX_BURST is not set
+CONFIG_BLK_DEV_PDC202XX_NEW=y
+CONFIG_BLK_DEV_SVWKS=y
+CONFIG_BLK_DEV_SIIMAGE=m
+CONFIG_BLK_DEV_SIS5513=y
+CONFIG_BLK_DEV_SLC90E66=y
+CONFIG_BLK_DEV_TRM290=y
+CONFIG_BLK_DEV_VIA82CXXX=y
+# CONFIG_BLK_DEV_TC86C001 is not set
+# CONFIG_IDE_ARM is not set
+CONFIG_IDE_CHIPSETS=y
+
+#
+# Note: most of these also require special kernel boot parameters
+#
+CONFIG_BLK_DEV_4DRIVES=y
+CONFIG_BLK_DEV_ALI14XX=y
+CONFIG_BLK_DEV_DTC2278=y
+CONFIG_BLK_DEV_HT6560B=y
+CONFIG_BLK_DEV_QD65XX=y
+CONFIG_BLK_DEV_UMC8672=y
+CONFIG_BLK_DEV_IDEDMA=y
+CONFIG_IDEDMA_IVB=y
+# CONFIG_BLK_DEV_HD is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_TGT is not set
+CONFIG_SCSI_NETLINK=y
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+CONFIG_BLK_DEV_SR=y
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=m
+# CONFIG_CHR_DEV_SCH is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_MULTI_LUN is not set
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_FC_ATTRS=m
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+CONFIG_SCSI_LOWLEVEL=y
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_7000FASST is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AHA152X is not set
+# CONFIG_SCSI_AHA1542 is not set
+# CONFIG_SCSI_AHA1740 is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC94XX is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_ADVANSYS is not set
+# CONFIG_SCSI_IN2000 is not set
+# CONFIG_SCSI_ARCMSR is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_SCSI_HPTIOP is not set
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_DTC3280 is not set
+# CONFIG_SCSI_EATA is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_GENERIC_NCR5380 is not set
+# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+CONFIG_SCSI_PPA=m
+CONFIG_SCSI_IMM=m
+# CONFIG_SCSI_IZIP_EPP16 is not set
+# CONFIG_SCSI_IZIP_SLOW_CTR is not set
+# CONFIG_SCSI_NCR53C406A is not set
+# CONFIG_SCSI_STEX is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_PAS16 is not set
+# CONFIG_SCSI_PSI240I is not set
+# CONFIG_SCSI_QLOGIC_FAS is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+# CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
+# CONFIG_SCSI_LPFC is not set
+# CONFIG_SCSI_SEAGATE is not set
+# CONFIG_SCSI_SIM710 is not set
+# CONFIG_SCSI_SYM53C416 is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_T128 is not set
+# CONFIG_SCSI_U14_34F is not set
+# CONFIG_SCSI_ULTRASTOR is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_SRP is not set
+CONFIG_SCSI_LOWLEVEL_PCMCIA=y
+# CONFIG_PCMCIA_AHA152X is not set
+# CONFIG_PCMCIA_FDOMAIN is not set
+# CONFIG_PCMCIA_NINJA_SCSI is not set
+# CONFIG_PCMCIA_QLOGIC is not set
+# CONFIG_PCMCIA_SYM53C500 is not set
+# CONFIG_ATA is not set
+CONFIG_MD=y
+# CONFIG_BLK_DEV_MD is not set
+CONFIG_BLK_DEV_DM=m
+# CONFIG_DM_DEBUG is not set
+# CONFIG_DM_CRYPT is not set
+# CONFIG_DM_SNAPSHOT is not set
+# CONFIG_DM_MIRROR is not set
+# CONFIG_DM_ZERO is not set
+# CONFIG_DM_MULTIPATH is not set
+# CONFIG_DM_DELAY is not set
+# CONFIG_BLK_DEV_DM_BBR is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+# CONFIG_FUSION_SPI is not set
+# CONFIG_FUSION_FC is not set
+# CONFIG_FUSION_SAS is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+# CONFIG_FIREWIRE is not set
+CONFIG_IEEE1394=m
+
+#
+# Subsystem Options
+#
+# CONFIG_IEEE1394_VERBOSEDEBUG is not set
+
+#
+# Controllers
+#
+
+#
+# Texas Instruments PCILynx requires I2C
+#
+CONFIG_IEEE1394_OHCI1394=m
+
+#
+# Protocols
+#
+CONFIG_IEEE1394_VIDEO1394=m
+CONFIG_IEEE1394_SBP2=m
+# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
+CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y
+CONFIG_IEEE1394_ETH1394=m
+CONFIG_IEEE1394_DV1394=m
+CONFIG_IEEE1394_RAWIO=m
+CONFIG_I2O=m
+# CONFIG_I2O_LCT_NOTIFY_ON_CHANGES is not set
+CONFIG_I2O_EXT_ADAPTEC=y
+CONFIG_I2O_CONFIG=m
+CONFIG_I2O_CONFIG_OLD_IOCTL=y
+CONFIG_I2O_BUS=m
+CONFIG_I2O_BLOCK=m
+CONFIG_I2O_SCSI=m
+CONFIG_I2O_PROC=m
+CONFIG_MACINTOSH_DRIVERS=y
+# CONFIG_MAC_EMUMOUSEBTN is not set
+CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_EQUALIZER is not set
+CONFIG_TUN=m
+CONFIG_NET_SB1000=m
+# CONFIG_ARCNET is not set
+CONFIG_PHYLIB=m
+
+#
+# MII PHY device drivers
+#
+CONFIG_MARVELL_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_CICADA_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_SMSC_PHY=m
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
+CONFIG_FIXED_PHY=m
+# CONFIG_FIXED_MII_10_FDX is not set
+# CONFIG_FIXED_MII_100_FDX is not set
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=m
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_EL1=m
+CONFIG_EL2=m
+CONFIG_ELPLUS=m
+CONFIG_EL16=m
+CONFIG_EL3=m
+CONFIG_3C515=m
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+CONFIG_LANCE=m
+CONFIG_NET_VENDOR_SMC=y
+CONFIG_WD80x3=m
+CONFIG_ULTRA=m
+CONFIG_ULTRA32=m
+CONFIG_SMC9194=m
+CONFIG_NET_VENDOR_RACAL=y
+# CONFIG_NI5010 is not set
+CONFIG_NI52=m
+CONFIG_NI65=m
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_TULIP=m
+CONFIG_TULIP_MWI=y
+CONFIG_TULIP_MMIO=y
+CONFIG_TULIP_NAPI=y
+CONFIG_TULIP_NAPI_HW_MITIGATION=y
+CONFIG_DE4X5=m
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+CONFIG_PCMCIA_XIRCOM=m
+# CONFIG_PCMCIA_XIRTULIP is not set
+CONFIG_AT1700=m
+CONFIG_DEPCA=m
+CONFIG_HP100=m
+CONFIG_NET_ISA=y
+CONFIG_E2100=m
+CONFIG_EWRK3=m
+CONFIG_EEXPRESS=m
+CONFIG_EEXPRESS_PRO=m
+CONFIG_HPLAN_PLUS=m
+CONFIG_HPLAN=m
+CONFIG_LP486E=m
+CONFIG_ETH16I=m
+CONFIG_NE2000=m
+CONFIG_ZNET=m
+CONFIG_SEEQ8005=m
+CONFIG_NET_PCI=y
+CONFIG_PCNET32=m
+# CONFIG_PCNET32_NAPI is not set
+CONFIG_AMD8111_ETH=m
+# CONFIG_AMD8111E_NAPI is not set
+CONFIG_ADAPTEC_STARFIRE=m
+# CONFIG_ADAPTEC_STARFIRE_NAPI is not set
+CONFIG_AC3200=m
+CONFIG_APRICOT=m
+CONFIG_B44=m
+CONFIG_FORCEDETH=m
+# CONFIG_FORCEDETH_NAPI is not set
+CONFIG_CS89x0=m
+CONFIG_DGRS=m
+# CONFIG_EEPRO100 is not set
+CONFIG_E100=m
+CONFIG_LNE390=m
+CONFIG_FEALNX=m
+CONFIG_NATSEMI=m
+CONFIG_NE2K_PCI=m
+CONFIG_NE3210=m
+CONFIG_ES3210=m
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+# CONFIG_8139TOO_PIO is not set
+CONFIG_8139TOO_TUNE_TWISTER=y
+CONFIG_8139TOO_8129=y
+# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_SIS900=m
+CONFIG_EPIC100=m
+CONFIG_SUNDANCE=m
+CONFIG_SUNDANCE_MMIO=y
+CONFIG_TLAN=m
+CONFIG_VIA_RHINE=m
+CONFIG_VIA_RHINE_MMIO=y
+# CONFIG_VIA_RHINE_NAPI is not set
+# CONFIG_SC92031 is not set
+CONFIG_NET_POCKET=y
+CONFIG_ATP=m
+CONFIG_DE600=m
+CONFIG_DE620=m
+CONFIG_NETDEV_1000=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+CONFIG_DL2K=m
+CONFIG_E1000=m
+# CONFIG_E1000_NAPI is not set
+# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
+CONFIG_E1000E=m
+CONFIG_NS83820=m
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_R8169=m
+# CONFIG_R8169_NAPI is not set
+CONFIG_SIS190=m
+CONFIG_SKGE=m
+CONFIG_SKY2=m
+# CONFIG_SK98LIN is not set
+CONFIG_VIA_VELOCITY=m
+CONFIG_TIGON3=m
+CONFIG_BNX2=m
+CONFIG_QLA3XXX=m
+CONFIG_ATL1=m
+CONFIG_NETDEV_10000=y
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T1_NAPI=y
+CONFIG_CHELSIO_T3=m
+CONFIG_IXGB=m
+# CONFIG_IXGB_NAPI is not set
+CONFIG_S2IO=m
+# CONFIG_S2IO_NAPI is not set
+CONFIG_MYRI10GE=m
+CONFIG_NETXEN_NIC=m
+# CONFIG_MLX4_CORE is not set
+CONFIG_TR=y
+CONFIG_IBMTR=m
+CONFIG_IBMOL=m
+CONFIG_IBMLS=m
+CONFIG_3C359=m
+CONFIG_TMS380TR=m
+CONFIG_TMSPCI=m
+CONFIG_SKISA=m
+CONFIG_PROTEON=m
+CONFIG_ABYSS=m
+CONFIG_SMCTR=m
+
+#
+# Wireless LAN
+#
+# CONFIG_WLAN_PRE80211 is not set
+CONFIG_WLAN_80211=y
+CONFIG_PCMCIA_RAYCS=m
+CONFIG_IPW2100=m
+CONFIG_IPW2100_MONITOR=y
+# CONFIG_IPW2100_DEBUG is not set
+CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW2200_RADIOTAP=y
+CONFIG_IPW2200_PROMISCUOUS=y
+# CONFIG_IPW2200_QOS is not set
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_AIRO=m
+CONFIG_HERMES=m
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCI_HERMES=m
+CONFIG_ATMEL=m
+CONFIG_PCI_ATMEL=m
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_AIRO_CS=m
+CONFIG_PCMCIA_ATMEL=m
+CONFIG_PCMCIA_WL3501=m
+CONFIG_PRISM54=m
+CONFIG_USB_ZD1201=m
+CONFIG_RTL8187=m
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_HOSTAP_CS=m
+CONFIG_BCM43XX=m
+CONFIG_BCM43XX_DEBUG=y
+CONFIG_BCM43XX_DMA=y
+CONFIG_BCM43XX_PIO=y
+CONFIG_BCM43XX_DMA_AND_PIO_MODE=y
+# CONFIG_BCM43XX_DMA_MODE is not set
+# CONFIG_BCM43XX_PIO_MODE is not set
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+
+#
+# USB Network Adapters
+#
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_USBNET_MII=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_DM9601=m
+# CONFIG_USB_NET_GL620A is not set
+CONFIG_USB_NET_NET1080=m
+# CONFIG_USB_NET_PLUSB is not set
+CONFIG_USB_NET_MCS7830=m
+# CONFIG_USB_NET_RNDIS_HOST is not set
+# CONFIG_USB_NET_CDC_SUBSET is not set
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_NET_PCMCIA=y
+CONFIG_PCMCIA_3C589=m
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_PCMCIA_PCNET=m
+CONFIG_PCMCIA_NMCLAN=m
+CONFIG_PCMCIA_SMC91C92=m
+CONFIG_PCMCIA_XIRC2PS=m
+CONFIG_PCMCIA_AXNET=m
+CONFIG_PCMCIA_IBMTR=m
+# CONFIG_WAN is not set
+CONFIG_ATM_DRIVERS=y
+# CONFIG_ATM_DUMMY is not set
+# CONFIG_ATM_TCP is not set
+# CONFIG_ATM_LANAI is not set
+# CONFIG_ATM_ENI is not set
+# CONFIG_ATM_FIRESTREAM is not set
+# CONFIG_ATM_ZATM is not set
+# CONFIG_ATM_NICSTAR is not set
+# CONFIG_ATM_IDT77252 is not set
+# CONFIG_ATM_AMBASSADOR is not set
+# CONFIG_ATM_HORIZON is not set
+# CONFIG_ATM_IA is not set
+# CONFIG_ATM_FORE200E_MAYBE is not set
+# CONFIG_ATM_HE is not set
+CONFIG_FDDI=y
+CONFIG_DEFXX=m
+# CONFIG_DEFXX_MMIO is not set
+CONFIG_SKFP=m
+CONFIG_HIPPI=y
+CONFIG_ROADRUNNER=m
+# CONFIG_ROADRUNNER_LARGE_RINGS is not set
+# CONFIG_PLIP is not set
+CONFIG_PPP=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_MPPE=m
+CONFIG_PPPOE=m
+CONFIG_PPPOATM=m
+# CONFIG_PPPOL2TP is not set
+CONFIG_SLIP=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLHC=m
+CONFIG_SLIP_SMART=y
+CONFIG_SLIP_MODE_SLIP6=y
+CONFIG_NET_FC=y
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+CONFIG_ISDN=m
+# CONFIG_ISDN_I4L is not set
+CONFIG_ISDN_CAPI=m
+# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
+CONFIG_CAPI_TRACE=y
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
+CONFIG_ISDN_CAPI_CAPI20=m
+CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
+CONFIG_ISDN_CAPI_CAPIFS=m
+
+#
+# CAPI hardware drivers
+#
+CONFIG_CAPI_AVM=y
+CONFIG_ISDN_DRV_AVMB1_B1ISA=m
+CONFIG_ISDN_DRV_AVMB1_B1PCI=m
+CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
+CONFIG_ISDN_DRV_AVMB1_T1ISA=m
+CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
+CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
+CONFIG_ISDN_DRV_AVMB1_T1PCI=m
+CONFIG_ISDN_DRV_AVMB1_C4=m
+CONFIG_CAPI_EICON=y
+CONFIG_ISDN_DIVAS=m
+CONFIG_ISDN_DIVAS_BRIPCI=y
+CONFIG_ISDN_DIVAS_PRIPCI=y
+CONFIG_ISDN_DIVAS_DIVACAPI=m
+CONFIG_ISDN_DIVAS_USERIDI=m
+CONFIG_ISDN_DIVAS_MAINT=m
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+CONFIG_INPUT_EVDEV=y
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_SUNKBD=m
+CONFIG_KEYBOARD_LKKBD=m
+CONFIG_KEYBOARD_XTKBD=m
+CONFIG_KEYBOARD_NEWTON=m
+CONFIG_KEYBOARD_STOWAWAY=m
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=y
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+CONFIG_MOUSE_PS2_TOUCHKIT=y
+CONFIG_MOUSE_SERIAL=m
+CONFIG_MOUSE_APPLETOUCH=m
+CONFIG_MOUSE_INPORT=m
+CONFIG_MOUSE_ATIXL=y
+CONFIG_MOUSE_LOGIBM=m
+CONFIG_MOUSE_PC110PAD=m
+# CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_INPUT_JOYSTICK is not set
+CONFIG_INPUT_TABLET=y
+CONFIG_TABLET_USB_ACECAD=m
+CONFIG_TABLET_USB_AIPTEK=m
+CONFIG_TABLET_USB_GTCO=m
+CONFIG_TABLET_USB_KBTAB=m
+CONFIG_TABLET_USB_WACOM=m
+CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_TOUCHSCREEN_FUJITSU is not set
+# CONFIG_TOUCHSCREEN_GUNZE is not set
+# CONFIG_TOUCHSCREEN_ELO is not set
+# CONFIG_TOUCHSCREEN_MTOUCH is not set
+# CONFIG_TOUCHSCREEN_MK712 is not set
+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
+# CONFIG_TOUCHSCREEN_UCB1400 is not set
+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+CONFIG_TOUCHSCREEN_USB_EGALAX=y
+CONFIG_TOUCHSCREEN_USB_PANJIT=y
+CONFIG_TOUCHSCREEN_USB_3M=y
+CONFIG_TOUCHSCREEN_USB_ITM=y
+CONFIG_TOUCHSCREEN_USB_ETURBO=y
+CONFIG_TOUCHSCREEN_USB_GUNZE=y
+CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
+CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_PCSPKR=m
+# CONFIG_INPUT_WISTRON_BTNS is not set
+# CONFIG_INPUT_ATLAS_BTNS is not set
+CONFIG_INPUT_ATI_REMOTE=m
+CONFIG_INPUT_ATI_REMOTE2=m
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_YEALINK is not set
+# CONFIG_INPUT_UINPUT is not set
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=m
+CONFIG_SERIO_CT82C710=m
+CONFIG_SERIO_PARKBD=m
+CONFIG_SERIO_PCIPS2=m
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_RAW is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_PNP=y
+CONFIG_SERIAL_8250_CS=m
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_FOURPORT=m
+CONFIG_SERIAL_8250_ACCENT=m
+CONFIG_SERIAL_8250_BOCA=m
+# CONFIG_SERIAL_8250_EXAR_ST16C554 is not set
+CONFIG_SERIAL_8250_HUB6=m
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
+CONFIG_SERIAL_8250_RSA=y
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+CONFIG_UNIX98_PTYS=y
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_PRINTER is not set
+CONFIG_PPDEV=m
+# CONFIG_TIPAR is not set
+# CONFIG_IPMI_HANDLER is not set
+# CONFIG_WATCHDOG is not set
+CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_INTEL=m
+CONFIG_HW_RANDOM_AMD=m
+CONFIG_HW_RANDOM_GEODE=m
+CONFIG_HW_RANDOM_VIA=m
+CONFIG_NVRAM=m
+CONFIG_RTC=m
+# CONFIG_GEN_RTC is not set
+CONFIG_DTLK=m
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_SONYPI is not set
+CONFIG_AGP=m
+CONFIG_AGP_ALI=m
+CONFIG_AGP_ATI=m
+CONFIG_AGP_AMD=m
+CONFIG_AGP_AMD64=m
+CONFIG_AGP_INTEL=m
+CONFIG_AGP_NVIDIA=m
+CONFIG_AGP_SIS=m
+CONFIG_AGP_SWORKS=m
+CONFIG_AGP_VIA=m
+CONFIG_AGP_EFFICEON=m
+CONFIG_DRM=m
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_RADEON=m
+CONFIG_DRM_I810=m
+CONFIG_DRM_I830=m
+CONFIG_DRM_I915=m
+CONFIG_DRM_MGA=m
+CONFIG_DRM_SIS=m
+CONFIG_DRM_VIA=m
+CONFIG_DRM_SAVAGE=m
+
+#
+# PCMCIA character devices
+#
+# CONFIG_SYNCLINK_CS is not set
+# CONFIG_CARDMAN_4000 is not set
+# CONFIG_CARDMAN_4040 is not set
+CONFIG_MWAVE=m
+CONFIG_PC8736x_GPIO=m
+CONFIG_NSC_GPIO=m
+CONFIG_CS5535_GPIO=m
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_HPET is not set
+# CONFIG_HANGCHECK_TIMER is not set
+# CONFIG_TCG_TPM is not set
+# CONFIG_TELCLOCK is not set
+CONFIG_DEVPORT=y
+# CONFIG_I2C is not set
+
+#
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+CONFIG_HWMON=m
+CONFIG_HWMON_VID=m
+CONFIG_SENSORS_ABITUGURU=m
+CONFIG_SENSORS_ABITUGURU3=m
+CONFIG_SENSORS_K8TEMP=m
+CONFIG_SENSORS_F71805F=m
+CONFIG_SENSORS_CORETEMP=m
+CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_PC87427=m
+CONFIG_SENSORS_SIS5595=m
+CONFIG_SENSORS_SMSC47M1=m
+CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_VIA686A=m
+CONFIG_SENSORS_VT1211=m
+CONFIG_SENSORS_VT8231=m
+CONFIG_SENSORS_W83627HF=m
+CONFIG_SENSORS_W83627EHF=m
+CONFIG_SENSORS_HDAPS=m
+CONFIG_SENSORS_APPLESMC=m
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
+# CONFIG_USB_DABUSB is not set
+
+#
+# Graphics support
+#
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=m
+# CONFIG_BACKLIGHT_PROGEAR is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+# CONFIG_FB_DDC is not set
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_BACKLIGHT is not set
+# CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_ARC is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_VGA16 is not set
+# CONFIG_FB_UVESA is not set
+CONFIG_FB_VESA=y
+# CONFIG_FB_HECUBA is not set
+# CONFIG_FB_HGA is not set
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_I810 is not set
+# CONFIG_FB_LE80578 is not set
+# CONFIG_FB_INTEL is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_S3 is not set
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
+# CONFIG_FB_CYBLA is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
+# CONFIG_FB_GEODE is not set
+# CONFIG_FB_VIRTUAL is not set
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+# CONFIG_VGACON_SOFT_SCROLLBACK is not set
+CONFIG_VIDEO_SELECT=y
+# CONFIG_MDA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+# CONFIG_FB_CON_DECOR is not set
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_LOGO is not set
+
+#
+# Sound
+#
+CONFIG_SOUND=y
+
+#
+# Advanced Linux Sound Architecture
+#
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_SEQUENCER=m
+# CONFIG_SND_SEQ_DUMMY is not set
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_SEQUENCER_OSS=y
+CONFIG_SND_RTCTIMER=m
+CONFIG_SND_SEQ_RTCTIMER_DEFAULT=y
+# CONFIG_SND_DYNAMIC_MINORS is not set
+CONFIG_SND_SUPPORT_OLD_API=y
+# CONFIG_SND_VERBOSE_PROCFS is not set
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+
+#
+# Generic devices
+#
+CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_OPL4_LIB=m
+CONFIG_SND_VX_LIB=m
+CONFIG_SND_AC97_CODEC=m
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_VIRMIDI is not set
+# CONFIG_SND_MTPAV is not set
+CONFIG_SND_MTS64=m
+# CONFIG_SND_SERIAL_U16550 is not set
+CONFIG_SND_MPU401=m
+# CONFIG_SND_PORTMAN2X4 is not set
+CONFIG_SND_AD1848_LIB=m
+CONFIG_SND_CS4231_LIB=m
+CONFIG_SND_SB_COMMON=m
+CONFIG_SND_SB8_DSP=m
+CONFIG_SND_SB16_DSP=m
+
+#
+# ISA devices
+#
+CONFIG_SND_ADLIB=m
+CONFIG_SND_AD1816A=m
+CONFIG_SND_AD1848=m
+CONFIG_SND_ALS100=m
+CONFIG_SND_AZT2320=m
+CONFIG_SND_CMI8330=m
+CONFIG_SND_CS4231=m
+CONFIG_SND_CS4232=m
+CONFIG_SND_CS4236=m
+CONFIG_SND_DT019X=m
+CONFIG_SND_ES968=m
+CONFIG_SND_ES1688=m
+CONFIG_SND_ES18XX=m
+CONFIG_SND_GUS_SYNTH=m
+CONFIG_SND_GUSCLASSIC=m
+CONFIG_SND_GUSEXTREME=m
+CONFIG_SND_GUSMAX=m
+CONFIG_SND_INTERWAVE=m
+CONFIG_SND_INTERWAVE_STB=m
+CONFIG_SND_OPL3SA2=m
+CONFIG_SND_OPTI92X_AD1848=m
+CONFIG_SND_OPTI92X_CS4231=m
+CONFIG_SND_OPTI93X=m
+CONFIG_SND_MIRO=m
+CONFIG_SND_SB8=m
+CONFIG_SND_SB16=m
+CONFIG_SND_SBAWE=m
+CONFIG_SND_SB16_CSP=y
+CONFIG_SND_SB16_CSP_FIRMWARE_IN_KERNEL=y
+CONFIG_SND_SGALAXY=m
+CONFIG_SND_SSCAPE=m
+CONFIG_SND_WAVEFRONT=m
+CONFIG_SND_WAVEFRONT_FIRMWARE_IN_KERNEL=y
+
+#
+# PCI devices
+#
+CONFIG_SND_AD1889=m
+CONFIG_SND_ALS300=m
+CONFIG_SND_ALS4000=m
+CONFIG_SND_ALI5451=m
+CONFIG_SND_ATIIXP=m
+CONFIG_SND_ATIIXP_MODEM=m
+CONFIG_SND_AU8810=m
+CONFIG_SND_AU8820=m
+CONFIG_SND_AU8830=m
+CONFIG_SND_AZT3328=m
+CONFIG_SND_BT87X=m
+# CONFIG_SND_BT87X_OVERCLOCK is not set
+CONFIG_SND_CA0106=m
+CONFIG_SND_CMIPCI=m
+CONFIG_SND_CS4281=m
+CONFIG_SND_CS46XX=m
+CONFIG_SND_CS46XX_NEW_DSP=y
+CONFIG_SND_CS5530=m
+CONFIG_SND_CS5535AUDIO=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1X=m
+CONFIG_SND_ENS1370=m
+CONFIG_SND_ENS1371=m
+CONFIG_SND_ES1938=m
+CONFIG_SND_ES1968=m
+CONFIG_SND_FM801=m
+# CONFIG_SND_FM801_TEA575X_BOOL is not set
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDSP=m
+CONFIG_SND_HDSPM=m
+CONFIG_SND_ICE1712=m
+CONFIG_SND_ICE1724=m
+CONFIG_SND_INTEL8X0=m
+CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_KORG1212=m
+CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL=y
+CONFIG_SND_MAESTRO3=m
+CONFIG_SND_MAESTRO3_FIRMWARE_IN_KERNEL=y
+CONFIG_SND_MIXART=m
+CONFIG_SND_NM256=m
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+CONFIG_SND_RME32=m
+CONFIG_SND_RME96=m
+CONFIG_SND_RME9652=m
+CONFIG_SND_SONICVIBES=m
+CONFIG_SND_TRIDENT=m
+CONFIG_SND_VIA82XX=m
+CONFIG_SND_VIA82XX_MODEM=m
+CONFIG_SND_VX222=m
+CONFIG_SND_YMFPCI=m
+CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL=y
+CONFIG_SND_AC97_POWER_SAVE=y
+
+#
+# USB devices
+#
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_USX2Y=m
+CONFIG_SND_USB_CAIAQ=m
+# CONFIG_SND_USB_CAIAQ_INPUT is not set
+
+#
+# PCMCIA devices
+#
+CONFIG_SND_VXPOCKET=m
+CONFIG_SND_PDAUDIOCF=m
+
+#
+# System on Chip audio support
+#
+CONFIG_SND_SOC=m
+
+#
+# SoC Audio support for SuperH
+#
+
+#
+# Open Sound System
+#
+# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=m
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=m
+CONFIG_USB_HIDINPUT_POWERBOOK=y
+# CONFIG_HID_FF is not set
+CONFIG_USB_HIDDEV=y
+
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB=m
+# CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_DEVICE_CLASS=y
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_SUSPEND is not set
+# CONFIG_USB_PERSIST is not set
+# CONFIG_USB_OTG is not set
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_EHCI_HCD=m
+# CONFIG_USB_EHCI_SPLIT_ISO is not set
+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
+CONFIG_USB_ISP116X_HCD=m
+CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_U132_HCD=m
+CONFIG_USB_SL811_HCD=m
+CONFIG_USB_SL811_CS=m
+CONFIG_USB_R8A66597_HCD=m
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# may also be needed; see USB_STORAGE Help for more information
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_DATAFAB=y
+CONFIG_USB_STORAGE_FREECOM=y
+CONFIG_USB_STORAGE_ISD200=y
+CONFIG_USB_STORAGE_DPCM=y
+CONFIG_USB_STORAGE_USBAT=y
+CONFIG_USB_STORAGE_SDDR09=y
+CONFIG_USB_STORAGE_SDDR55=y
+CONFIG_USB_STORAGE_JUMPSHOT=y
+CONFIG_USB_STORAGE_ALAUDA=y
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+# CONFIG_USB_MON is not set
+
+#
+# USB port drivers
+#
+CONFIG_USB_USS720=m
+
+#
+# USB Serial Converter support
+#
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_AIRPRIME=m
+CONFIG_USB_SERIAL_ARK3116=m
+# CONFIG_USB_SERIAL_BELKIN is not set
+CONFIG_USB_SERIAL_WHITEHEAT=m
+# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
+CONFIG_USB_SERIAL_CP2101=m
+# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
+# CONFIG_USB_SERIAL_EMPEG is not set
+# CONFIG_USB_SERIAL_FTDI_SIO is not set
+CONFIG_USB_SERIAL_FUNSOFT=m
+# CONFIG_USB_SERIAL_VISOR is not set
+# CONFIG_USB_SERIAL_IPAQ is not set
+# CONFIG_USB_SERIAL_IR is not set
+# CONFIG_USB_SERIAL_EDGEPORT is not set
+# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
+# CONFIG_USB_SERIAL_GARMIN is not set
+CONFIG_USB_SERIAL_IPW=m
+# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
+# CONFIG_USB_SERIAL_KEYSPAN is not set
+# CONFIG_USB_SERIAL_KLSI is not set
+# CONFIG_USB_SERIAL_KOBIL_SCT is not set
+# CONFIG_USB_SERIAL_MCT_U232 is not set
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_NAVMAN=m
+# CONFIG_USB_SERIAL_PL2303 is not set
+# CONFIG_USB_SERIAL_OTI6858 is not set
+# CONFIG_USB_SERIAL_HP4X is not set
+# CONFIG_USB_SERIAL_SAFE is not set
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+# CONFIG_USB_SERIAL_TI is not set
+# CONFIG_USB_SERIAL_CYBERJACK is not set
+# CONFIG_USB_SERIAL_XIRCOM is not set
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+# CONFIG_USB_SERIAL_DEBUG is not set
+CONFIG_USB_EZUSB=y
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
+CONFIG_USB_AUERSWALD=m
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_BERRY_CHARGE is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGET is not set
+# CONFIG_USB_IDMOUSE is not set
+CONFIG_USB_FTDI_ELAN=m
+# CONFIG_USB_APPLEDISPLAY is not set
+CONFIG_USB_SISUSBVGA=m
+CONFIG_USB_SISUSBVGA_CON=y
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
+
+#
+# USB DSL modem support
+#
+CONFIG_USB_ATM=m
+CONFIG_USB_SPEEDTOUCH=m
+CONFIG_USB_CXACRU=m
+CONFIG_USB_UEAGLEATM=m
+CONFIG_USB_XUSBATM=m
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+CONFIG_MMC=m
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set
+
+#
+# MMC/SD Card Drivers
+#
+CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK_BOUNCE=y
+
+#
+# MMC/SD Host Controller Drivers
+#
+CONFIG_MMC_SDHCI=m
+CONFIG_MMC_WBSD=m
+CONFIG_MMC_TIFM_SD=m
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=m
+
+#
+# LED drivers
+#
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_IDE_DISK=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_INFINIBAND=m
+# CONFIG_INFINIBAND_USER_MAD is not set
+# CONFIG_INFINIBAND_USER_ACCESS is not set
+CONFIG_INFINIBAND_ADDR_TRANS=y
+CONFIG_INFINIBAND_MTHCA=m
+# CONFIG_INFINIBAND_MTHCA_DEBUG is not set
+# CONFIG_INFINIBAND_AMSO1100 is not set
+# CONFIG_INFINIBAND_CXGB3 is not set
+# CONFIG_MLX4_INFINIBAND is not set
+CONFIG_INFINIBAND_IPOIB=m
+# CONFIG_INFINIBAND_IPOIB_CM is not set
+# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
+CONFIG_INFINIBAND_SRP=m
+# CONFIG_INFINIBAND_ISER is not set
+# CONFIG_EDAC is not set
+CONFIG_RTC_LIB=m
+CONFIG_RTC_CLASS=m
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# SPI RTC drivers
+#
+
+#
+# Platform RTC drivers
+#
+# CONFIG_RTC_DRV_CMOS is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+CONFIG_RTC_DRV_M48T86=m
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_V3020 is not set
+
+#
+# on-CPU RTC drivers
+#
+
+#
+# DMA Engine support
+#
+CONFIG_DMA_ENGINE=y
+
+#
+# DMA Clients
+#
+CONFIG_NET_DMA=y
+
+#
+# DMA Devices
+#
+CONFIG_INTEL_IOATDMA=m
+# CONFIG_AUXDISPLAY is not set
+# CONFIG_VIRTUALIZATION is not set
+
+#
+# Userspace I/O
+#
+# CONFIG_UIO is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_XATTR=y
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+# CONFIG_EXT4DEV_FS is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+CONFIG_FS_POSIX_ACL=y
+# CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+CONFIG_DNOTIFY=y
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=y
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=y
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+CONFIG_CONFIGFS_FS=m
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_CRAMFS is not set
+CONFIG_SQUASHFS=y
+CONFIG_SQUASHFS_EMBEDDED=y
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+# CONFIG_SQUASHFS_VMALLOC is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+# CONFIG_NFS_FS is not set
+# CONFIG_NFSD is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_MAC_PARTITION is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_KARMA_PARTITION is not set
+# CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
+
+#
+# Native Language Support
+#
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_737=y
+CONFIG_NLS_CODEPAGE_775=y
+CONFIG_NLS_CODEPAGE_850=y
+CONFIG_NLS_CODEPAGE_852=y
+CONFIG_NLS_CODEPAGE_855=y
+CONFIG_NLS_CODEPAGE_857=y
+CONFIG_NLS_CODEPAGE_860=y
+CONFIG_NLS_CODEPAGE_861=y
+CONFIG_NLS_CODEPAGE_862=y
+CONFIG_NLS_CODEPAGE_863=y
+CONFIG_NLS_CODEPAGE_864=y
+CONFIG_NLS_CODEPAGE_865=y
+CONFIG_NLS_CODEPAGE_866=y
+CONFIG_NLS_CODEPAGE_869=y
+CONFIG_NLS_CODEPAGE_936=y
+CONFIG_NLS_CODEPAGE_950=y
+CONFIG_NLS_CODEPAGE_932=y
+CONFIG_NLS_CODEPAGE_949=y
+CONFIG_NLS_CODEPAGE_874=y
+CONFIG_NLS_ISO8859_8=y
+CONFIG_NLS_CODEPAGE_1250=y
+CONFIG_NLS_CODEPAGE_1251=y
+CONFIG_NLS_ASCII=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_2=y
+CONFIG_NLS_ISO8859_3=y
+CONFIG_NLS_ISO8859_4=y
+CONFIG_NLS_ISO8859_5=y
+CONFIG_NLS_ISO8859_6=y
+CONFIG_NLS_ISO8859_7=y
+CONFIG_NLS_ISO8859_9=y
+CONFIG_NLS_ISO8859_13=y
+CONFIG_NLS_ISO8859_14=y
+CONFIG_NLS_ISO8859_15=y
+CONFIG_NLS_KOI8_R=y
+CONFIG_NLS_KOI8_U=y
+CONFIG_NLS_UTF8=y
+
+#
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+# CONFIG_INSTRUMENTATION is not set
+
+#
+# Kernel hacking
+#
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+# CONFIG_PRINTK_TIME is not set
+# CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_UNUSED_SYMBOLS=y
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_KERNEL is not set
+CONFIG_EARLY_PRINTK=y
+CONFIG_DOUBLEFAULT=y
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_XCBC=y
+# CONFIG_CRYPTO_NULL is not set
+CONFIG_CRYPTO_MD4=y
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=y
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_GF128MUL is not set
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_PCBC=m
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_BLOWFISH=y
+CONFIG_CRYPTO_TWOFISH=y
+CONFIG_CRYPTO_TWOFISH_COMMON=y
+CONFIG_CRYPTO_TWOFISH_586=y
+CONFIG_CRYPTO_SERPENT=y
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_AES_586=y
+CONFIG_CRYPTO_CAST5=y
+CONFIG_CRYPTO_CAST6=y
+CONFIG_CRYPTO_TEA=y
+CONFIG_CRYPTO_ARC4=y
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_MICHAEL_MIC=y
+CONFIG_CRYPTO_CRC32C=y
+CONFIG_CRYPTO_CAMELLIA=m
+# CONFIG_CRYPTO_TEST is not set
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_PADLOCK=m
+CONFIG_CRYPTO_DEV_PADLOCK_AES=m
+CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+CONFIG_CRYPTO_DEV_GEODE=m
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+CONFIG_CRC_CCITT=y
+CONFIG_CRC16=y
+# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+CONFIG_LIBCRC32C=y
+CONFIG_AUDIT_GENERIC=y
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_X86_BIOS_REBOOT=y
+CONFIG_KTIME_SCALAR=y

Deleted: incognito/tags/20080109.1/arch/x86/livecd-stage1-tiny.spec
===================================================================
--- incognito/trunk/arch/x86/livecd-stage1-tiny.spec	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/arch/x86/livecd-stage1-tiny.spec	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,158 +0,0 @@
-subarch: i686
-version_stamp: 20070824
-target: livecd-stage1
-rel_type: incognitotiny
-profile: default-linux/x86/2007.0
-portage_overlay: /usr/src/incognito/portage.overlay
-portage_confdir: /usr/src/incognito/portage.config
-snapshot: 20070824
-source_subpath: incognito/stage3-i686-20070824
-livecd/use:
-	bindist
-	atm
-	branding
-	livecd
-	png
-	jpeg2k
-	curl
-	icu
-	nptlonly
-	no-old-linux
-	tordns
-	acpi
-	minimal
-	X
-	nocxx
-	glibc-omitfp
-	multicall
-	vram
-	-apm
-	-tk
-	-tcl
-	-qt3
-	-opengl
-	-dri
-	-xprint
-	-dmx
-	-python
-	-perl
-	-pam
-	-nls
-	-mudflap
-	input_devices_evdev 
-	input_devices_keyboard 
-	input_devices_mouse 
-	-video_cards_apm 
-	-video_cards_ark 
-	-video_cards_ati 
-	-video_cards_chips 
-	-video_cards_cirrus 
-	-video_cards_cyrix 
-	-video_cards_dummy 
-	video_cards_fbdev 
-	-video_cards_glint 
-	-video_cards_i128 
-	-video_cards_i740 
-	-video_cards_i810 
-	-video_cards_imstt 
-	-video_cards_mga 
-	-video_cards_mach64
-	-video_cards_neomagic 
-	-video_cards_nsc 
-	-video_cards_nv 
-	-video_cards_r128
-	-video_cards_radeon
-	-video_cards_rendition 
-	-video_cards_s3 
-	-video_cards_s3virge 
-	-video_cards_savage 
-	-video_cards_siliconmotion 
-	-video_cards_sis 
-	-video_cards_sisusb 
-	-video_cards_tdfx 
-	-video_cards_tga 
-	-video_cards_trident 
-	-video_cards_tseng 
-	-video_cards_v4l 
-	-video_cards_vesa 
-	-video_cards_vga 
-	-video_cards_via 
-	-video_cards_vmware 
-	-video_cards_voodoo
-
-livecd/packages:
-	app-admin/syslog-ng
-	app-admin/sudo
-	app-misc/livecd-tools
-	app-portage/gentoolkit
-	net-dialup/bpalogin
-	net-dialup/mingetty
-	net-misc/dhcpcd
-	net-misc/iputils
-	net-wireless/wireless-tools
-	net-wireless/wpa_supplicant
-	net-wireless/ipw2100-firmware
-	net-wireless/ipw2200-firmware
-	net-wireless/prism54-firmware
-	net-wireless/zd1201-firmware
-	sys-apps/eject
-	sys-apps/ethtool
-	sys-apps/fxload
-	sys-apps/hdparm
-	sys-apps/hwsetup
-	sys-apps/netplug
-	sys-fs/dosfstools
-	sys-power/acpid
-	www-client/mozilla-firefox-bin
-	x11-plugins/noscript
-	x11-plugins/cookiesafe
-	x11-plugins/adblock_plus
-	x11-plugins/refcontrol
-	net-irc/xchat
-	x11-base/xorg-x11
-	x11-drivers/synaptics
-	x11-wm/fluxbox
-	x11-misc/xdialog
-	x11-misc/xsri
-	x11-terms/xterm
-	sys-boot/syslinux
-	dev-libs/libevent
-	net-misc/tor
-	net-proxy/polipo
-	app-misc/secure-delete
-	net-misc/netkit-telnetd
-	net-analyzer/macchanger
-	net-proxy/3proxy
-	www-servers/lighttpd
-	# The following are rebuilds for use flags
-	sys-libs/ncurses
-	app-editors/nano
-	app-shells/bash
-	sys-libs/cracklib
-	sys-apps/shadow
-	sys-apps/file
-	sys-apps/util-linux
-	net-misc/openssh
-	sys-apps/module-init-tools
-	sys-apps/sed
-	sys-libs/com_err
-	sys-apps/findutils
-	dev-libs/popt
-	sys-libs/timezone-data
-	app-arch/gzip
-	sys-apps/net-tools
-	sys-apps/kbd
-	sys-apps/gawk
-	app-arch/tar
-	app-arch/cpio
-	sys-apps/sysvinit
-	sys-libs/ss
-	sys-apps/grep
-	sys-fs/e2fsprogs
-	net-misc/wget
-	sys-apps/coreutils
-	sys-process/psmisc
-	sys-libs/glibc
-
-
-

Copied: incognito/tags/20080109.1/arch/x86/livecd-stage1-tiny.spec (from rev 13115, incognito/trunk/arch/x86/livecd-stage1-tiny.spec)
===================================================================
--- incognito/tags/20080109.1/arch/x86/livecd-stage1-tiny.spec	                        (rev 0)
+++ incognito/tags/20080109.1/arch/x86/livecd-stage1-tiny.spec	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,157 @@
+subarch: i686
+version_stamp: 20080109
+target: livecd-stage1
+rel_type: incognitotiny
+profile: default-linux/x86/2007.0
+portage_overlay: /usr/src/incognito/portage.overlay
+portage_confdir: /usr/src/incognito/portage.config
+snapshot: 20080109
+source_subpath: incognito/stage3-i686-20080109
+livecd/use:
+	bindist
+	atm
+	branding
+	livecd
+	png
+	jpeg2k
+	curl
+	icu
+	nptlonly
+	no-old-linux
+	tordns
+	acpi
+	minimal
+	X
+	nocxx
+	glibc-omitfp
+	multicall
+	vram
+	-apm
+	-tk
+	-tcl
+	-qt3
+	-opengl
+	-dri
+	-xprint
+	-dmx
+	-python
+	-perl
+	-pam
+	-nls
+	-mudflap
+	input_devices_evdev 
+	input_devices_keyboard 
+	input_devices_mouse 
+	-video_cards_apm 
+	-video_cards_ark 
+	-video_cards_ati 
+	-video_cards_chips 
+	-video_cards_cirrus 
+	-video_cards_cyrix 
+	-video_cards_dummy 
+	video_cards_fbdev 
+	-video_cards_glint 
+	-video_cards_i128 
+	-video_cards_i740 
+	-video_cards_i810 
+	-video_cards_imstt 
+	-video_cards_mga 
+	-video_cards_mach64
+	-video_cards_neomagic 
+	-video_cards_nsc 
+	-video_cards_nv 
+	-video_cards_r128
+	-video_cards_radeon
+	-video_cards_rendition 
+	-video_cards_s3 
+	-video_cards_s3virge 
+	-video_cards_savage 
+	-video_cards_siliconmotion 
+	-video_cards_sis 
+	-video_cards_sisusb 
+	-video_cards_tdfx 
+	-video_cards_tga 
+	-video_cards_trident 
+	-video_cards_tseng 
+	-video_cards_v4l 
+	-video_cards_vesa 
+	-video_cards_vga 
+	-video_cards_via 
+	-video_cards_vmware 
+	-video_cards_voodoo
+
+livecd/packages:
+	app-admin/syslog-ng
+	app-admin/sudo
+	app-misc/livecd-tools
+	app-portage/gentoolkit
+	net-dialup/mingetty
+	net-misc/dhcpcd
+	net-misc/iputils
+	net-wireless/wireless-tools
+	net-wireless/wpa_supplicant
+	net-wireless/ipw2100-firmware
+	net-wireless/ipw2200-firmware
+	net-wireless/prism54-firmware
+	net-wireless/zd1201-firmware
+	sys-apps/eject
+	sys-apps/ethtool
+	sys-apps/fxload
+	sys-apps/hdparm
+	sys-apps/hwsetup
+	sys-apps/netplug
+	sys-fs/dosfstools
+	sys-power/acpid
+	www-client/mozilla-firefox-bin
+	x11-plugins/noscript
+	x11-plugins/cookiesafe
+	x11-plugins/adblock_plus
+	x11-plugins/refcontrol
+	net-irc/xchat
+	x11-base/xorg-x11
+	x11-drivers/synaptics
+	x11-wm/fluxbox
+	x11-misc/xdialog
+	x11-misc/xsri
+	x11-terms/xterm
+	sys-boot/syslinux
+	dev-libs/libevent
+	net-misc/tor
+	net-proxy/polipo
+	app-misc/secure-delete
+	net-misc/netkit-telnetd
+	net-analyzer/macchanger
+	net-proxy/3proxy
+	www-servers/lighttpd
+	# The following are rebuilds for use flags
+	sys-libs/ncurses
+	app-editors/nano
+	app-shells/bash
+	sys-libs/cracklib
+	sys-apps/shadow
+	sys-apps/file
+	sys-apps/util-linux
+	net-misc/openssh
+	sys-apps/module-init-tools
+	sys-apps/sed
+	sys-libs/com_err
+	sys-apps/findutils
+	dev-libs/popt
+	sys-libs/timezone-data
+	app-arch/gzip
+	sys-apps/net-tools
+	sys-apps/kbd
+	sys-apps/gawk
+	app-arch/tar
+	app-arch/cpio
+	sys-apps/sysvinit
+	sys-libs/ss
+	sys-apps/grep
+	sys-fs/e2fsprogs
+	net-misc/wget
+	sys-apps/coreutils
+	sys-process/psmisc
+	sys-libs/glibc
+
+
+

Deleted: incognito/tags/20080109.1/arch/x86/livecd-stage1.spec
===================================================================
--- incognito/trunk/arch/x86/livecd-stage1.spec	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/arch/x86/livecd-stage1.spec	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,276 +0,0 @@
-subarch: i686
-version_stamp: 20070824
-target: livecd-stage1
-rel_type: incognito
-profile: default-linux/x86/2007.0
-portage_overlay: /usr/src/incognito/portage.overlay
-portage_confdir: /usr/src/incognito/portage.config
-snapshot: 20070824
-source_subpath: incognito/stage3-i686-20070824
-livecd/use:
-	bindist
-	atm
-	branding
-	livecd
-	socks5
-	X
-	png
-	opengl
-	jpeg2k
-	qt3
-	qt4
-	qt3support
-	gtk
-	curl
-	lucene
-	icu
-	cups
-	nptlonly
-	no-old-linux
-	tordns
-	acpi
-	kdehiddenvisibility
-	glibc-omitfp
-	alias
-	autoreplace
-	contactnotes
-	crypt
-	highlight
-	irc
-	sms
-	texteffect
-	translator
-	yahoo
-	multicall
-	vram
-	dbus
-	#hal  # if we enable this we'll have trouble since we don't have a kernel installed
-	-apm
-	-gnome
-	-eds
-	krb4
-	linguas_en
-	linguas_ja
-	linguas_de
-	linguas_es
-	linguas_fa
-	linguas_fr
-	linguas_it
-	linguas_pt
-	linguas_zh
-	-mudflap
-	
-livecd/packages:
-	app-admin/logrotate
-	app-admin/sudo
-	app-admin/syslog-ng
-	app-portage/gentoolkit
-	app-arch/unrar
-	app-arch/unzip
-	app-crypt/gnupg
-	app-editors/vim
-	app-misc/livecd-tools
-	app-misc/screen
-	app-misc/vlock
-	media-gfx/fbgrab
-	net-analyzer/ettercap
-	net-analyzer/netcat
-	net-analyzer/tcpdump
-	net-analyzer/tcptraceroute
-	net-analyzer/traceroute
-	net-analyzer/thcrut
-	net-analyzer/macchanger
-	net-dialup/bpalogin
-	net-dialup/mingetty
-	net-dialup/minicom
-	net-dialup/penggy
-	net-misc/dhcp
-	net-misc/iputils
-	net-misc/rdate
-	net-misc/whois
-	net-proxy/dante
-	net-proxy/tsocks
-	net-wireless/airsnort
-	net-wireless/wireless-tools
-	net-wireless/wpa_supplicant
-	net-dialup/isdn-firmware
-	net-wireless/acx-firmware
-	net-wireless/atmel-firmware
-	net-wireless/bluez-firmware
-	net-wireless/ipw2100-firmware
-	net-wireless/ipw2200-firmware
-	net-wireless/prism54-firmware
-	net-wireless/zd1201-firmware
-	net-wireless/zd1211-firmware
-	net-wireless/ipw3945-ucode
-#	net-wireless/iwl3945-ucode
-#	net-wireless/iwl4965-ucode
-	sys-apps/eject
-	sys-apps/ethtool
-	sys-apps/fxload
-	sys-apps/hdparm
-	sys-apps/hwsetup
-	sys-apps/netplug
-	sys-fs/lsscsi
-	sys-fs/dosfstools
-	sys-libs/gpm
-	sys-power/acpid
-	www-client/links
-	www-client/mozilla-firefox-bin
-	x11-plugins/noscript
-	x11-plugins/firefox-quick-locale-switcher
-	x11-plugins/cookiesafe
-	x11-plugins/firegpg
-	x11-plugins/adblock_plus
-	x11-plugins/refcontrol
-	net-irc/xchat
-	mail-client/mozilla-thunderbird-bin
-	x11-plugins/enigmail-bin
-	x11-plugins/thunderplunger
-	x11-base/xorg-x11
-	x11-drivers/synaptics
-	x11-drivers/xf86-video-ati
-	x11-wm/fluxbox
-	sys-boot/syslinux
-	dev-libs/libevent
-	net-misc/tor
-	net-proxy/polipo
-	x11-misc/xdialog
-	x11-misc/xsri
-	x11-terms/xterm
-	net-www/netscape-flash
-#	dev-java/sun-jre-bin
-	media-video/mplayer
-	media-video/kplayer
-	net-www/mplayerplug-in-bin
-	kde-base/kpf
-	kde-base/khelpcenter
-	kde-base/kdenetwork-filesharing
-	kde-base/kgpg
-	kde-base/kcalc
-	kde-base/certmanager
-	kde-base/kate
-	kde-base/khotkeys
-	kde-base/kdeaddons-docs-konq-plugins
-	kde-base/kwin
-	kde-base/kreadconfig
-	kde-base/ktnef
-	kde-base/ksmserver
-	kde-base/kcoloredit
-	kde-base/kmilo
-	kde-base/kdvi
-	kde-base/kdebase-startkde
-	kde-base/ksvg
-	kde-base/kmix
-	app-arch/rar
-	app-arch/zip
-	kde-base/ark
-	kde-base/kopete
-	net-im/kopete-otr
-	kde-base/kghostview
-	kde-base/kdeartwork-kwin-styles
-	kde-base/kaddressbook
-	kde-base/kode
-	kde-base/kdeartwork-styles
-	kde-base/networkstatus
-	kde-base/ktimer
-	kde-base/kicker-applets
-	kde-base/kdepim-kresources
-	kde-base/kdialog
-	kde-base/kviewshell
-	kde-base/ksystraycmd
-	kde-base/kpager
-	kde-base/kxkb
-	kde-base/kdeprint
-	kde-base/khexedit
-	kde-base/krdc
-	kde-misc/ksynaptics
-	kde-base/kdemultimedia-kfile-plugins
-	kde-base/kwalletmanager
-	kde-base/kteatime
-	kde-base/klaptopdaemon
-	kde-base/kdegraphics-kfile-plugins
-	kde-base/kcontrol
-	kde-base/kget
-	kde-base/konqueror
-	kde-base/kontact
-	kde-base/kdesktop
-	kde-base/kdepim-kioslaves
-	kde-base/kdm
-	kde-base/ksirc
-	kde-base/kview
-	kde-base/kstart
-	kde-base/kate-plugins
-	kde-base/kdeadmin-kfile-plugins
-	kde-base/ksnapshot
-	kde-base/kdebase-pam
-	kde-base/kdeaddons-kfile-plugins
-	kde-base/kdemultimedia-kioslaves
-	kde-base/kolourpaint
-	kde-base/kfind
-	kde-base/klipper
-	kde-base/secpolicy
-	kde-base/kicker
-	kde-base/kbstateapplet
-	kde-base/konsole
-	kde-base/kedit
-	kde-base/ksplashml
-	kde-misc/tork
-	kde-base/arts
-	kde-base/akregator
-	kde-base/kruler
-	kde-base/karm
-	kde-base/kregexpeditor
-	kde-base/konq-plugins
-	kde-base/kgamma
-	kde-base/konqueror-akregator
-	kde-base/kdcop
-	kde-base/kuickshow
-	kde-base/ksysguard
-	net-wireless/kdebluetooth
-	kde-base/kdesu
-	kde-base/kcharselect
-	kde-base/krfb
-	kde-base/kdenetwork-kfile-plugins
-	kde-base/kmail
-	kde-base/kmrml
-	kde-base/kommander
-	kde-base/kpdf
-	kde-base/kde-i18n
-	app-admin/keepassx
-	net-analyzer/knetscan
-	net-p2p/ktorrent
-	net-dns/pdnsd
-	net-misc/openvpn
-        sys-apps/iproute2
-	app-misc/secure-delete
-	net-dns/bind-tools
-	net-misc/netkit-telnetd
-	app-crypt/aespipe
-	net-misc/socat
-	net-misc/vidalia
-	net-proxy/3proxy
-	net-im/pidgin
-	x11-plugins/pidgin-otr
-	mail-mta/mixminion
-	mail-mta/mixminion-smtp
-	www-servers/lighttpd
-	# Deps for networkmanager so they aren't pulled in stage2, no hal, it requires a kernel
-	sys-apps/dbus
-	dev-libs/glib
-	x11-libs/libnotify
-	# The following are rebuilds for use flags
-	sys-libs/ncurses
-	app-editors/nano
-	sys-libs/db
-	dev-libs/gmp
-	app-shells/bash
-	sys-libs/cracklib
-	sys-apps/shadow
-	sys-apps/file
-	sys-apps/util-linux
-	net-misc/openssh
-	sys-apps/module-init-tools
-	net-misc/wget
-
-

Copied: incognito/tags/20080109.1/arch/x86/livecd-stage1.spec (from rev 13298, incognito/trunk/arch/x86/livecd-stage1.spec)
===================================================================
--- incognito/tags/20080109.1/arch/x86/livecd-stage1.spec	                        (rev 0)
+++ incognito/tags/20080109.1/arch/x86/livecd-stage1.spec	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,271 @@
+subarch: i686
+version_stamp: 20080109
+target: livecd-stage1
+rel_type: incognito
+profile: default-linux/x86/2007.0
+portage_overlay: /usr/src/incognito/portage.overlay
+portage_confdir: /usr/src/incognito/portage.config
+snapshot: 20080109
+source_subpath: incognito/stage3-i686-20080109
+livecd/use:
+	bindist
+	atm
+	branding
+	livecd
+	socks5
+	X
+	png
+	opengl
+	jpeg2k
+	qt3
+	qt4
+	qt3support
+	gtk
+	curl
+	lucene
+	icu
+	cups
+	nptlonly
+	no-old-linux
+	tordns
+	acpi
+	kdehiddenvisibility
+	glibc-omitfp
+	alias
+	autoreplace
+	contactnotes
+	crypt
+	highlight
+	irc
+	sms
+	texteffect
+	translator
+	yahoo
+	multicall
+	vram
+	dbus
+	#hal  # if we enable this we'll have trouble since we don't have a kernel installed
+	-apm
+	-gnome
+	-eds
+	krb4
+	linguas_en
+	linguas_ja
+	linguas_de
+	linguas_es
+	linguas_fa
+	linguas_fr
+	linguas_it
+	linguas_pt
+	linguas_zh
+	-mudflap
+	
+livecd/packages:
+	app-admin/logrotate
+	app-admin/sudo
+	app-admin/syslog-ng
+	app-portage/gentoolkit
+	app-arch/unrar
+	app-arch/unzip
+	app-crypt/gnupg
+	app-editors/vim
+	app-misc/livecd-tools
+	app-misc/screen
+	app-misc/vlock
+	media-gfx/fbgrab
+	net-analyzer/ettercap
+	net-analyzer/netcat
+	net-analyzer/tcpdump
+	net-analyzer/tcptraceroute
+	net-analyzer/traceroute
+	net-analyzer/thcrut
+	net-analyzer/macchanger
+	net-dialup/mingetty
+	net-dialup/minicom
+	net-dialup/penggy
+	net-misc/dhcp
+	net-misc/iputils
+	net-misc/rdate
+	net-misc/whois
+	net-proxy/dante
+	net-proxy/tsocks
+	net-wireless/airsnort
+	net-wireless/wireless-tools
+	net-wireless/wpa_supplicant
+	net-dialup/isdn-firmware
+	net-wireless/acx-firmware
+	net-wireless/atmel-firmware
+	net-wireless/bluez-firmware
+	net-wireless/ipw2100-firmware
+	net-wireless/ipw2200-firmware
+	net-wireless/prism54-firmware
+	net-wireless/zd1201-firmware
+	net-wireless/zd1211-firmware
+	net-wireless/ipw3945-ucode
+#	net-wireless/iwl3945-ucode
+#	net-wireless/iwl4965-ucode
+	sys-apps/eject
+	sys-apps/ethtool
+	sys-apps/fxload
+	sys-apps/hdparm
+	sys-apps/hwsetup
+	sys-apps/netplug
+	sys-fs/lsscsi
+	sys-fs/dosfstools
+	sys-libs/gpm
+	sys-power/acpid
+	www-client/links
+	www-client/mozilla-firefox-bin
+	x11-plugins/noscript-bin
+	x11-plugins/firefox-quick-locale-switcher
+	x11-plugins/cs-lite
+	x11-plugins/firegpg
+	x11-plugins/adblock_plus
+	x11-plugins/refcontrol
+	net-irc/xchat
+	mail-client/mozilla-thunderbird-bin
+	x11-plugins/enigmail-bin
+	x11-plugins/thunderplunger
+	x11-base/xorg-x11
+	x11-drivers/synaptics
+	x11-drivers/xf86-video-ati
+	sys-boot/syslinux
+	dev-libs/libevent
+	net-misc/tor
+	net-proxy/polipo
+	x11-misc/xdialog
+	x11-misc/xsri
+	x11-terms/xterm
+	net-www/netscape-flash
+	media-video/mplayer
+	media-video/kplayer
+	net-www/mplayerplug-in-bin
+	kde-base/kpf
+	kde-base/khelpcenter
+	kde-base/kdenetwork-filesharing
+	kde-base/kgpg
+	kde-base/kcalc
+	kde-base/certmanager
+	kde-base/kate
+	kde-base/khotkeys
+	kde-base/kdeaddons-docs-konq-plugins
+	kde-base/kwin
+	kde-base/kreadconfig
+	kde-base/ktnef
+	kde-base/ksmserver
+	kde-base/kcoloredit
+	kde-base/kmilo
+	kde-base/kdvi
+	kde-base/kdebase-startkde
+	kde-base/ksvg
+	kde-base/kmix
+	app-arch/rar
+	app-arch/zip
+	kde-base/ark
+	kde-base/kopete
+	net-im/kopete-otr
+	kde-base/kghostview
+	kde-base/kdeartwork-kwin-styles
+	kde-base/kaddressbook
+	kde-base/kode
+	kde-base/kdeartwork-styles
+	kde-base/networkstatus
+	kde-base/ktimer
+	kde-base/kicker-applets
+	kde-base/kdepim-kresources
+	kde-base/kdialog
+	kde-base/kviewshell
+	kde-base/ksystraycmd
+	kde-base/kpager
+	kde-base/kxkb
+	kde-base/kdeprint
+	kde-base/khexedit
+	kde-base/krdc
+	kde-misc/ksynaptics
+	kde-base/kdemultimedia-kfile-plugins
+	kde-base/kwalletmanager
+	kde-base/kteatime
+	kde-base/klaptopdaemon
+	kde-base/kdegraphics-kfile-plugins
+	kde-base/kcontrol
+	kde-base/kget
+	kde-base/konqueror
+	kde-base/kontact
+	kde-base/kdesktop
+	kde-base/kdepim-kioslaves
+	kde-base/kdm
+	kde-base/ksirc
+	kde-base/kview
+	kde-base/kstart
+	kde-base/kate-plugins
+	kde-base/kdeadmin-kfile-plugins
+	kde-base/ksnapshot
+	kde-base/kdebase-pam
+	kde-base/kdeaddons-kfile-plugins
+	kde-base/kdemultimedia-kioslaves
+	kde-base/kolourpaint
+	kde-base/kfind
+	kde-base/klipper
+	kde-base/secpolicy
+	kde-base/kicker
+	kde-base/kbstateapplet
+	kde-base/konsole
+	kde-base/kedit
+	kde-base/ksplashml
+	kde-misc/tork
+	kde-base/arts
+	kde-base/akregator
+	kde-base/kruler
+	kde-base/karm
+	kde-base/kregexpeditor
+	kde-base/konq-plugins
+	kde-base/kgamma
+	kde-base/konqueror-akregator
+	kde-base/kdcop
+	kde-base/kuickshow
+	kde-base/ksysguard
+	net-wireless/kdebluetooth
+	kde-base/kdesu
+	kde-base/kcharselect
+	kde-base/krfb
+	kde-base/kdenetwork-kfile-plugins
+	kde-base/kmail
+	kde-base/kmrml
+	kde-base/kommander
+	kde-base/kpdf
+	kde-base/kde-i18n
+	app-admin/keepassx
+	net-analyzer/knetscan
+	net-p2p/ktorrent
+	net-dns/pdnsd
+	net-misc/openvpn
+        sys-apps/iproute2
+	app-misc/secure-delete
+	net-dns/bind-tools
+	net-misc/netkit-telnetd
+	app-crypt/aespipe
+	net-misc/socat
+	net-misc/vidalia
+	net-proxy/3proxy
+	net-im/pidgin
+	x11-plugins/pidgin-otr
+	mail-mta/mixminion
+	mail-mta/mixminion-smtp
+	www-servers/lighttpd
+	# Deps for networkmanager so they aren't pulled in stage2
+	sys-apps/dbus
+	dev-libs/glib
+	x11-libs/libnotify
+	# The following are rebuilds for use flags
+	sys-libs/ncurses
+	app-editors/nano
+	sys-libs/db
+	dev-libs/gmp
+	app-shells/bash
+	sys-libs/cracklib
+	sys-apps/shadow
+	sys-apps/file
+	sys-apps/util-linux
+	net-misc/openssh
+	sys-apps/module-init-tools
+	net-misc/wget

Deleted: incognito/tags/20080109.1/arch/x86/livecd-stage2-tiny.spec
===================================================================
--- incognito/trunk/arch/x86/livecd-stage2-tiny.spec	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/arch/x86/livecd-stage2-tiny.spec	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,505 +0,0 @@
-subarch: i686
-version_stamp: __INCOGNITO_VERSION__
-target: livecd-stage2
-rel_type: incognitotiny
-profile: default-linux/x86/2007.0
-snapshot: 20070824
-source_subpath: incognitotiny/livecd-stage1-i686-20070824
-portage_overlay: /usr/src/incognito/portage.overlay
-portage_confdir: /usr/src/incognito/portage.config
-
-livecd/fstype: squashfs
-livecd/cdtar: /usr/src/incognito/arch/x86/isolinux-3.52-cdtar.tar.bz2
-livecd/iso: /var/tmp/catalyst/builds/incognito/incognitotiny-i686-__INCOGNITO_VERSION__.iso
-livecd/splash_type: gensplash
-livecd/splash_theme: livecd-2006.1
-livecd/xdm: gentoox
-livecd/xsession: fluxbox
-livecd/fsscript: /usr/src/incognito/fsscript.sh
-
-livecd/type: generic-livecd
-livecd/users: gentoo
-livecd/volid: __INCOGNITO_TITLE__ x86
-
-livecd/overlay: arch/x86/overlay.tiny
-livecd/root_overlay: root_overlay
-
-livecd/rcadd:
-	tor|default
-	polipo|default
-	iptables|default
-	xdm|default
-	acpid|boot
-	gpm|boot
-	external-config-setup|boot
-	macchanger|default
-	hidden-service|default
-
-# See livecd-stage2.spec for why unionfs is buggy
-#livecd/bootargs: unionfs
-#livecd/gk_mainargs: --unionfs-dev
-
-boot/kernel: gentoo
-boot/kernel/gentoo/sources: gentoo-sources
-
-boot/kernel/gentoo/config: /usr/src/incognito/arch/x86/kernel-2.6.21-tiny.config
-
-boot/kernel/gentoo/use: pcmcia usb oss atm png jpeg2k
-
-boot/kernel/gentoo/packages:
-	media-gfx/splashutils
-	=media-gfx/splash-themes-livecd-2006.1
-	sys-apps/pcmciautils
-	net-dialup/rp-pppoe
-	net-wireless/hostap-utils
-	net-dialup/ppp
-	sys-power/acpid
-# Following two are too large
-#	net-dialup/slmodem
-#	net-dialup/ltmodem
-# Compile error
-#	net-dialup/globespan-adsl
-# Compile error
-#	net-dialup/fritzcapi
-# Following two are too large
-#	net-dialup/fcdsl
-#	net-dialup/drdsl
-# Not compatible with >=2.6.20
-#	net-dialup/bewan-adsl
-# Not compatible with >=2.6.16
-#	net-dialup/intel-536ep
-# For space
-#	net-wireless/fwlanusb
-	net-wireless/at76c503a
-	net-wireless/adm8211
-	net-wireless/rt2500
-	net-wireless/acx
-	net-wireless/ipw3945
-	net-wireless/ipw3945d
-	net-wireless/madwifi-ng
-	net-wireless/madwifi-ng-tools
-	net-wireless/rt61
-# Compile error
-#	net-wireless/rt2400
-	net-wireless/rt2500
-	net-wireless/rt2570
-# Compile error
-#	net-wireless/rt2x00
-	net-wireless/rtl8180
-# Needs in-kernel 802.11 disabled
-#	net-wireless/rtl8187
-# These two are removed for licensing reasons.
-#	x11-drivers/nvidia-drivers
-#	x11-drivers/ati-drivers
-	net-firewall/iptables
-	app-crypt/truecrypt
-
-livecd/unmerge:
-#	acl
-#	addpatches
-#	attr
-	alsa-headers
-	autoconf
-	autoconf-wrapper
-	automake
-	automake-wrapper
-#	bc
-#	bin86
-	binutils
-	binutils-config
-	bison
-	busybox
-#	ccache
-	cpio
-#	cronbase
-#	devfsd
-	diffutils
-#	distcc
-#	ed
-#	expat
-	flex
-#	gcc
-	gcc-config
-#	gcc-sparc64
-	genkernel
-	gentoo-sources
-	gettext
-	gnuconfig
-	groff
-#	grub
-	help2man
-#	lcms
-#	ld.so
-#	lib-compat
-#	libmng
-#	libperl
-#	libstdc++-v3
-	libtool
-	linux-headers
-	m4
-	make
-	man
-	man-pages
-	miscfiles
-	pax-utils
-	patch
-	perl
-	perl-cleaner
-	perl-Test-Simple
-	PodParser
-	pycrypto
-	python-fchksum
-	rpm2targz
-	rsync
-	sandbox
-#	sash
-#	sysklogd
-#	tcp-wrappers
-	Test-Harness
-	texinfo
-#	ucl
-#	vanilla-sources
-# NOTE: below are my additions, above are from the minimal CD spec
-	addpatches
-	sys-apps/hotplug
-	bin86
-	ccache
-	cronbase
-	dev-util/cvs
-	distcc
-	elfutils
-	gentoo-sources 
-	gentoolkit
-	klibc
-	intltool
-	vixie-cron
-	media-fonts/font-adobe-100dpi
-	# OpenGL
-	mesa
-	mesa-progs
-	freeglut
-	glut
-	glu
-	opengl
-	eselect-opengl
-	eselect-compiler
-	eselect
-	mail-mta/ssmtp
-	app-admin/pwgen
-	dev-libs/mpfr
-	dev-libs/gmp
-	sys-libs/db
-	sys-libs/gdbm
-	tsocks
-#	x11-libs/libXScrnSaver
-#	x11-libs/libXcomposite
-#	x11-libs/libXinerama
-	x11-libs/libdmx
-	x11-libs/libdrm
-	x11-apps/xhost
-	x11-apps/mkfontdir
-	x11-apps/mkfontscale
-	net-misc/rsync
-	dev-util/pkgconfig
-	app-doc/xorg-docs
-	dev-lang/nasm
-	# Following four for subversion based packages
-	dev-libs/apr
-	dev-libs/apr-util
-	net-misc/neon
-	dev-util/subversion
-
-
-
-livecd/empty:
-	/etc/bootsplash/gentoo
-	/etc/bootsplash/gentoo-highquality
-	/etc/cron.daily
-	/etc/cron.hourly
-	/etc/cron.monthly
-	/etc/cron.weekly
-	/etc/logrotate.d
-	#/etc/modules.autoload.d
-	/etc/rsync
-	/etc/runlevels/single
-	/etc/skel
-	/etc/splash/emergence
-	/etc/splash/gentoo
-	/lib/dev-state
-	/lib/udev-state
-	/lib64/dev-state
-	/lib64/udev-state
-	/root/.ccache
-	/tmp
-	/usr/diet/include
-	/usr/diet/man
-	/usr/i*86-gentoo-linux-uclibc
-	/usr/i*86-pc-linux-gnu
-	/usr/i*86-pc-linux-uclibc
-	/usr/include
-#	/usr/lib/X11/config
-#	/usr/lib/X11/doc
-#	/usr/lib/X11/etc
-	/usr/lib/awk
-	/usr/lib/ccache
-	/usr/lib/gcc-config
-	/usr/lib/gconv
-	/usr/lib/nfs
-	/usr/lib/perl5
-	/usr/lib/portage
-	/usr/lib/python2.2
-	/usr/lib/python2.3
-	/usr/lib/python2.4/tests
-#	/usr/lib64/X11/config
-#	/usr/lib64/X11/doc
-#	/usr/lib64/X11/etc
-	/usr/lib64/awk
-	/usr/lib64/ccache
-	/usr/lib64/gcc-config
-	/usr/lib64/gconv
-	/usr/lib64/nfs
-	/usr/lib64/perl5
-	/usr/lib64/portage
-	/usr/lib64/python2.2
-	/usr/lib64/python2.3
-	/usr/lib64/python2.4/tests
-#	/usr/local
-	/usr/portage
-	/usr/powerpc-unknown-linux-gnu
-	/usr/powerpc64-unknown-linux-gnu
-	/usr/share/aclocal
-	/usr/share/baselayout
-	/usr/share/binutils-data
-	/usr/share/consolefonts/partialfonts
-	/usr/share/consoletrans
-	/usr/share/dict
-	/usr/share/doc
-	/usr/share/emacs
-	/usr/share/et
-	/usr/share/gcc-data
-	/usr/share/genkernel
-	/usr/share/gettext
-	/usr/share/glib-2.0
-	/usr/share/gnuconfig
-	/usr/share/gtk-doc
-#	/usr/share/i18n
-	/usr/share/lcms
-	/usr/share/libtool
-#	/usr/share/locale
-#	/usr/share/perl
-	/usr/share/rfc
-	/usr/share/ss
-	/usr/share/state
-	/usr/share/texinfo
-	/usr/share/unimaps
-#	/usr/share/zoneinfo
-	/usr/sparc-unknown-linux-gnu
-	/usr/src
-	/usr/x86_64-pc-linux-gnu
-#	/var/cache
-	/var/db
-	/var/empty
-	/var/lib/portage
-#	/var/lock
-#	/var/log
-#	/var/run
-#	/var/spool
-	/var/state
-	/var/tmp
-# NOTE: below are my additions, above are from the minimal CD spec
-	/usr/share/man
-	/usr/share/info
-	/usr/lib/dri
-	/var/cache/edb
-	/usr/libexec/gcc
-	/usr/kde/3.5/include
-	/usr/qt/3/bin
-	/usr/qt/3/include
-	/boot
-
-livecd/rm:
-#	/boot/System*
-#	/boot/initr*
-#	/boot/kernel*
-	/etc/*-
-	/etc/*.old
-	/etc/default/audioctl
-	/etc/dispatch-conf.conf
-	/etc/env.d/05binutils
-	/etc/env.d/05gcc
-	/etc/etc-update.conf
-	/etc/hosts.bck
-	/etc/issue*
-	/etc/genkernel.conf
-	/etc/make.conf
-	/etc/make.conf.example
-	/etc/make.globals
-	/etc/make.profile
-	/etc/conf.d/net.example
-	/etc/kernels
-	/etc/man.conf
-#	/etc/resolv.conf
-	/etc/splash/livecd-2006.1/12*
-	/etc/splash/livecd-2006.1/14*
-	/etc/splash/livecd-2006.1/16*
-	/etc/splash/livecd-2006.1/19*
-	/etc/splash/livecd-2006.1/6*
-	/etc/splash/livecd-2006.1/8*
-	/etc/splash/livecd-2006.1/images/background-12*
-	/etc/splash/livecd-2006.1/images/background-14*
-	/etc/splash/livecd-2006.1/images/background-16*
-	/etc/splash/livecd-2006.1/images/background-19*
-	/etc/splash/livecd-2006.1/images/background-6*
-	/etc/splash/livecd-2006.1/images/background-8*
-	/etc/splash/livecd-2006.1/images/verbose-12*
-	/etc/splash/livecd-2006.1/images/verbose-14*
-	/etc/splash/livecd-2006.1/images/verbose-16*
-	/etc/splash/livecd-2006.1/images/verbose-19*
-	/etc/splash/livecd-2006.1/images/verbose-6*
-	/etc/splash/livecd-2006.1/images/verbose-8*
-	/lib*/*.a
-#	/lib*/*.la
-	/lib*/cpp
-	/lib*/security/pam_access.so
-	/lib*/security/pam_chroot.so
-	/lib*/security/pam_debug.so
-	/lib*/security/pam_ftp.so
-	/lib*/security/pam_issue.so
-	/lib*/security/pam_mail.so
-	/lib*/security/pam_mkhomedir.so
-	/lib*/security/pam_motd.so
-	/lib*/security/pam_postgresok.so
-	/lib*/security/pam_rhosts_auth.so
-	/lib*/security/pam_userdb.so
-	/root/.bash_history
-	/root/.viminfo
-	/sbin/fsck.cramfs
-	/sbin/fsck.minix
-	/sbin/mkfs.bfs
-	/sbin/mkfs.cramfs
-	/sbin/mkfs.minix
-	/usr/bin/addr2line
-	/usr/bin/ar
-	/usr/bin/as
-	/usr/bin/audioctl
-	/usr/bin/c++*
-	/usr/bin/cc
-	/usr/bin/cjpeg
-	/usr/bin/cpp
-	/usr/bin/djpeg
-	/usr/bin/ebuild
-	/usr/bin/emerge
-	/usr/bin/elftoaout
-	/usr/bin/f77
-	/usr/bin/g++*
-	/usr/bin/g77
-	/usr/bin/gcc*
-	/usr/bin/genkernel
-	/usr/bin/gprof
-	/usr/bin/i*86-gentoo-linux-uclibc-*
-	/usr/bin/i*86-pc-linux-*
-	/usr/bin/jpegtran
-	/usr/bin/ld
-	/usr/bin/libpng*
-	/usr/bin/nm
-	/usr/bin/objcopy
-	/usr/bin/objdump
-	/usr/bin/piggyback*
-	/usr/bin/portageq
-	/usr/bin/ranlib
-	/usr/bin/readelf
-	/usr/bin/repoman
-	/usr/bin/size
-	/usr/bin/powerpc-unknown-linux-gnu-*
-	/usr/bin/powerpc64-unknown-linux-gnu-*
-	/usr/bin/sparc-unknown-linux-gnu-*
-	/usr/bin/sparc64-unknown-linux-gnu-*
-	/usr/bin/strings
-	/usr/bin/strip
-	/usr/bin/tbz2tool
-	/usr/bin/x86_64-pc-linux-gnu-*
-	/usr/bin/xpak
-	/usr/bin/yacc
-	/usr/lib*/*.a
-#	/usr/lib*/*.la
-	/usr/lib*/gcc-lib/*/*/libgcj*
-	/usr/sbin/archive-conf
-	/usr/sbin/bootsplash*
-	/usr/sbin/dispatch-conf
-	/usr/sbin/emaint
-	/usr/sbin/emerge-webrsync
-	/usr/sbin/env-update
-#	/usr/sbin/fb*
-	/usr/sbin/fixpackages
-	/usr/sbin/quickpkg
-	/usr/sbin/regenworld
-#	/usr/share/consolefonts/1*
-#	/usr/share/consolefonts/7*
-#	/usr/share/consolefonts/8*
-#	/usr/share/consolefonts/9*
-#	/usr/share/consolefonts/A*
-#	/usr/share/consolefonts/C*
-#	/usr/share/consolefonts/E*
-#	/usr/share/consolefonts/G*
-#	/usr/share/consolefonts/L*
-#	/usr/share/consolefonts/M*
-#	/usr/share/consolefonts/R*
-#	/usr/share/consolefonts/a*
-#	/usr/share/consolefonts/c*
-#	/usr/share/consolefonts/dr*
-#	/usr/share/consolefonts/g*
-#	/usr/share/consolefonts/i*
-#	/usr/share/consolefonts/k*
-#	/usr/share/consolefonts/l*
-#	/usr/share/consolefonts/r*
-#	/usr/share/consolefonts/s*
-#	/usr/share/consolefonts/t*
-#	/usr/share/consolefonts/v*
-	/usr/share/misc/*.old
-# NOTE: below are my additions, above are from the minimal CD spec
-	/usr/i*86-gentoo-linux-uclibc
-	/usr/i*86-pc-linux-gnu
-	/usr/i*86-pc-linux-uclibc
-	/etc/init.d/pdnsd-online
-	/usr/lib*/python2.4/test
-	/usr/bin/Xnest
-	/usr/bin/Xvfb
-	/usr/lib*/*python*
-	/usr/bin/*python*
-	/usr/lib*/*perl*
-	/usr/bin/*perl*
-	/usr/lib*/xorg/modules/extensions/libGLcore.so
-	/usr/lib*/opengl
-	/usr/lib/pkgconfig
-	/usr/share/sounds/alsa
-	/usr/share/pixmaps/gentoo-livecd-2006.1
-	/usr/share/polipo/www/doc
-	/var/log/*.log
-	/usr/lib/gcc/i686-pc-linux-gnu/*/include
-	/usr/lib/gcc/i686-pc-linux-gnu/*/libgfortran*
-	/usr/share/gtk-2.0/demo
-	/usr/bin/wall
-	/usr/bin/mesg
-	/usr/bin/last
-	/usr/bin/utmpdump
-	/usr/bin/tack
-	/usr/bin/gtk-demo
-	/usr/bin/localedef
-	/usr/bin/torify
-	/etc/tor/tor-tsocks.conf
-	/etc/socks
-	/opt/firefox/extensions/talkback at mozilla.org
-	/opt/firefox/extensions/inspector at mozilla.org
-	/usr/sbin/visudo
-	/sbin/bootlogd
-	/sbin/insmod.static
-	/sbin/sln
-	/sbin/ldconfig
-	/usr/sbin/sshd
-	/usr/sbin/nscd
-	/etc/init.d/nscd
-	/etc/nscd.conf
-	/usr/share/i18n/locales/translit*
-	/usr/share/fonts/misc/*ja.pcf.*
-	/usr/share/fonts/misc/*ko.pcf.*
-	/usr/{lib,share}/locale/en_{AU,CA,GB,HK,PH}

Copied: incognito/tags/20080109.1/arch/x86/livecd-stage2-tiny.spec (from rev 13115, incognito/trunk/arch/x86/livecd-stage2-tiny.spec)
===================================================================
--- incognito/tags/20080109.1/arch/x86/livecd-stage2-tiny.spec	                        (rev 0)
+++ incognito/tags/20080109.1/arch/x86/livecd-stage2-tiny.spec	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,505 @@
+subarch: i686
+version_stamp: __INCOGNITO_VERSION__
+target: livecd-stage2
+rel_type: incognitotiny
+profile: default-linux/x86/2007.0
+snapshot: 20080109
+source_subpath: incognitotiny/livecd-stage1-i686-20080109
+portage_overlay: /usr/src/incognito/portage.overlay
+portage_confdir: /usr/src/incognito/portage.config
+
+livecd/fstype: squashfs
+livecd/cdtar: /usr/src/incognito/arch/x86/isolinux-3.52-cdtar.tar.bz2
+livecd/iso: /var/tmp/catalyst/builds/incognito/incognitotiny-i686-__INCOGNITO_VERSION__.iso
+livecd/splash_type: gensplash
+livecd/splash_theme: livecd-2006.1
+livecd/xdm: gentoox
+livecd/xsession: fluxbox
+livecd/fsscript: /usr/src/incognito/fsscript.sh
+
+livecd/type: generic-livecd
+livecd/users: gentoo
+livecd/volid: __INCOGNITO_TITLE__ x86
+
+livecd/overlay: arch/x86/overlay.tiny
+livecd/root_overlay: root_overlay
+
+livecd/rcadd:
+	tor|default
+	polipo|default
+	iptables|default
+	xdm|default
+	acpid|boot
+	gpm|boot
+	external-config-setup|boot
+	macchanger|default
+	hidden-service|default
+
+# See livecd-stage2.spec for why unionfs is buggy
+#livecd/bootargs: unionfs
+#livecd/gk_mainargs: --unionfs-dev
+
+boot/kernel: gentoo
+boot/kernel/gentoo/sources: gentoo-sources
+
+boot/kernel/gentoo/config: /usr/src/incognito/arch/x86/kernel-2.6.21-tiny.config
+
+boot/kernel/gentoo/use: pcmcia usb oss atm png jpeg2k
+
+boot/kernel/gentoo/packages:
+	media-gfx/splashutils
+	=media-gfx/splash-themes-livecd-2006.1
+	sys-apps/pcmciautils
+	net-dialup/rp-pppoe
+	net-wireless/hostap-utils
+	net-dialup/ppp
+	sys-power/acpid
+# Following two are too large
+#	net-dialup/slmodem
+#	net-dialup/ltmodem
+# Compile error
+#	net-dialup/globespan-adsl
+# Compile error
+#	net-dialup/fritzcapi
+# Following two are too large
+#	net-dialup/fcdsl
+#	net-dialup/drdsl
+# Not compatible with >=2.6.20
+#	net-dialup/bewan-adsl
+# Not compatible with >=2.6.16
+#	net-dialup/intel-536ep
+# For space
+#	net-wireless/fwlanusb
+	net-wireless/at76c503a
+	net-wireless/adm8211
+	net-wireless/rt2500
+	net-wireless/acx
+	net-wireless/ipw3945
+	net-wireless/ipw3945d
+	net-wireless/madwifi-ng
+	net-wireless/madwifi-ng-tools
+	net-wireless/rt61
+# Compile error
+#	net-wireless/rt2400
+	net-wireless/rt2500
+	net-wireless/rt2570
+# Compile error
+#	net-wireless/rt2x00
+	net-wireless/rtl8180
+# Needs in-kernel 802.11 disabled
+#	net-wireless/rtl8187
+# These two are removed for licensing reasons.
+#	x11-drivers/nvidia-drivers
+#	x11-drivers/ati-drivers
+	net-firewall/iptables
+	app-crypt/truecrypt
+
+livecd/unmerge:
+#	acl
+#	addpatches
+#	attr
+	alsa-headers
+	autoconf
+	autoconf-wrapper
+	automake
+	automake-wrapper
+#	bc
+#	bin86
+	binutils
+	binutils-config
+	bison
+	busybox
+#	ccache
+	cpio
+#	cronbase
+#	devfsd
+	diffutils
+#	distcc
+#	ed
+#	expat
+	flex
+#	gcc
+	gcc-config
+#	gcc-sparc64
+	genkernel
+	gentoo-sources
+	gettext
+	gnuconfig
+	groff
+#	grub
+	help2man
+#	lcms
+#	ld.so
+#	lib-compat
+#	libmng
+#	libperl
+#	libstdc++-v3
+	libtool
+	linux-headers
+	m4
+	make
+	man
+	man-pages
+	miscfiles
+	pax-utils
+	patch
+	perl
+	perl-cleaner
+	perl-Test-Simple
+	PodParser
+	pycrypto
+	python-fchksum
+	rpm2targz
+	rsync
+	sandbox
+#	sash
+#	sysklogd
+#	tcp-wrappers
+	Test-Harness
+	texinfo
+#	ucl
+#	vanilla-sources
+# NOTE: below are my additions, above are from the minimal CD spec
+	addpatches
+	sys-apps/hotplug
+	bin86
+	ccache
+	cronbase
+	dev-util/cvs
+	distcc
+	elfutils
+	gentoo-sources 
+	gentoolkit
+	klibc
+	intltool
+	vixie-cron
+	media-fonts/font-adobe-100dpi
+	# OpenGL
+	mesa
+	mesa-progs
+	freeglut
+	glut
+	glu
+	opengl
+	eselect-opengl
+	eselect-compiler
+	eselect
+	mail-mta/ssmtp
+	app-admin/pwgen
+	dev-libs/mpfr
+	dev-libs/gmp
+	sys-libs/db
+	sys-libs/gdbm
+	tsocks
+#	x11-libs/libXScrnSaver
+#	x11-libs/libXcomposite
+#	x11-libs/libXinerama
+	x11-libs/libdmx
+	x11-libs/libdrm
+	x11-apps/xhost
+	x11-apps/mkfontdir
+	x11-apps/mkfontscale
+	net-misc/rsync
+	dev-util/pkgconfig
+	app-doc/xorg-docs
+	dev-lang/nasm
+	# Following four for subversion based packages
+	dev-libs/apr
+	dev-libs/apr-util
+	net-misc/neon
+	dev-util/subversion
+
+
+
+livecd/empty:
+	/etc/bootsplash/gentoo
+	/etc/bootsplash/gentoo-highquality
+	/etc/cron.daily
+	/etc/cron.hourly
+	/etc/cron.monthly
+	/etc/cron.weekly
+	/etc/logrotate.d
+	#/etc/modules.autoload.d
+	/etc/rsync
+	/etc/runlevels/single
+	/etc/skel
+	/etc/splash/emergence
+	/etc/splash/gentoo
+	/lib/dev-state
+	/lib/udev-state
+	/lib64/dev-state
+	/lib64/udev-state
+	/root/.ccache
+	/tmp
+	/usr/diet/include
+	/usr/diet/man
+	/usr/i*86-gentoo-linux-uclibc
+	/usr/i*86-pc-linux-gnu
+	/usr/i*86-pc-linux-uclibc
+	/usr/include
+#	/usr/lib/X11/config
+#	/usr/lib/X11/doc
+#	/usr/lib/X11/etc
+	/usr/lib/awk
+	/usr/lib/ccache
+	/usr/lib/gcc-config
+	/usr/lib/gconv
+	/usr/lib/nfs
+	/usr/lib/perl5
+	/usr/lib/portage
+	/usr/lib/python2.2
+	/usr/lib/python2.3
+	/usr/lib/python2.4/tests
+#	/usr/lib64/X11/config
+#	/usr/lib64/X11/doc
+#	/usr/lib64/X11/etc
+	/usr/lib64/awk
+	/usr/lib64/ccache
+	/usr/lib64/gcc-config
+	/usr/lib64/gconv
+	/usr/lib64/nfs
+	/usr/lib64/perl5
+	/usr/lib64/portage
+	/usr/lib64/python2.2
+	/usr/lib64/python2.3
+	/usr/lib64/python2.4/tests
+#	/usr/local
+	/usr/portage
+	/usr/powerpc-unknown-linux-gnu
+	/usr/powerpc64-unknown-linux-gnu
+	/usr/share/aclocal
+	/usr/share/baselayout
+	/usr/share/binutils-data
+	/usr/share/consolefonts/partialfonts
+	/usr/share/consoletrans
+	/usr/share/dict
+	/usr/share/doc
+	/usr/share/emacs
+	/usr/share/et
+	/usr/share/gcc-data
+	/usr/share/genkernel
+	/usr/share/gettext
+	/usr/share/glib-2.0
+	/usr/share/gnuconfig
+	/usr/share/gtk-doc
+#	/usr/share/i18n
+	/usr/share/lcms
+	/usr/share/libtool
+#	/usr/share/locale
+#	/usr/share/perl
+	/usr/share/rfc
+	/usr/share/ss
+	/usr/share/state
+	/usr/share/texinfo
+	/usr/share/unimaps
+#	/usr/share/zoneinfo
+	/usr/sparc-unknown-linux-gnu
+	/usr/src
+	/usr/x86_64-pc-linux-gnu
+#	/var/cache
+	/var/db
+	/var/empty
+	/var/lib/portage
+#	/var/lock
+#	/var/log
+#	/var/run
+#	/var/spool
+	/var/state
+	/var/tmp
+# NOTE: below are my additions, above are from the minimal CD spec
+	/usr/share/man
+	/usr/share/info
+	/usr/lib/dri
+	/var/cache/edb
+	/usr/libexec/gcc
+	/usr/kde/3.5/include
+	/usr/qt/3/bin
+	/usr/qt/3/include
+	/boot
+
+livecd/rm:
+#	/boot/System*
+#	/boot/initr*
+#	/boot/kernel*
+	/etc/*-
+	/etc/*.old
+	/etc/default/audioctl
+	/etc/dispatch-conf.conf
+	/etc/env.d/05binutils
+	/etc/env.d/05gcc
+	/etc/etc-update.conf
+	/etc/hosts.bck
+	/etc/issue*
+	/etc/genkernel.conf
+	/etc/make.conf
+	/etc/make.conf.example
+	/etc/make.globals
+	/etc/make.profile
+	/etc/conf.d/net.example
+	/etc/kernels
+	/etc/man.conf
+#	/etc/resolv.conf
+	/etc/splash/livecd-2006.1/12*
+	/etc/splash/livecd-2006.1/14*
+	/etc/splash/livecd-2006.1/16*
+	/etc/splash/livecd-2006.1/19*
+	/etc/splash/livecd-2006.1/6*
+	/etc/splash/livecd-2006.1/8*
+	/etc/splash/livecd-2006.1/images/background-12*
+	/etc/splash/livecd-2006.1/images/background-14*
+	/etc/splash/livecd-2006.1/images/background-16*
+	/etc/splash/livecd-2006.1/images/background-19*
+	/etc/splash/livecd-2006.1/images/background-6*
+	/etc/splash/livecd-2006.1/images/background-8*
+	/etc/splash/livecd-2006.1/images/verbose-12*
+	/etc/splash/livecd-2006.1/images/verbose-14*
+	/etc/splash/livecd-2006.1/images/verbose-16*
+	/etc/splash/livecd-2006.1/images/verbose-19*
+	/etc/splash/livecd-2006.1/images/verbose-6*
+	/etc/splash/livecd-2006.1/images/verbose-8*
+	/lib*/*.a
+#	/lib*/*.la
+	/lib*/cpp
+	/lib*/security/pam_access.so
+	/lib*/security/pam_chroot.so
+	/lib*/security/pam_debug.so
+	/lib*/security/pam_ftp.so
+	/lib*/security/pam_issue.so
+	/lib*/security/pam_mail.so
+	/lib*/security/pam_mkhomedir.so
+	/lib*/security/pam_motd.so
+	/lib*/security/pam_postgresok.so
+	/lib*/security/pam_rhosts_auth.so
+	/lib*/security/pam_userdb.so
+	/root/.bash_history
+	/root/.viminfo
+	/sbin/fsck.cramfs
+	/sbin/fsck.minix
+	/sbin/mkfs.bfs
+	/sbin/mkfs.cramfs
+	/sbin/mkfs.minix
+	/usr/bin/addr2line
+	/usr/bin/ar
+	/usr/bin/as
+	/usr/bin/audioctl
+	/usr/bin/c++*
+	/usr/bin/cc
+	/usr/bin/cjpeg
+	/usr/bin/cpp
+	/usr/bin/djpeg
+	/usr/bin/ebuild
+	/usr/bin/emerge
+	/usr/bin/elftoaout
+	/usr/bin/f77
+	/usr/bin/g++*
+	/usr/bin/g77
+	/usr/bin/gcc*
+	/usr/bin/genkernel
+	/usr/bin/gprof
+	/usr/bin/i*86-gentoo-linux-uclibc-*
+	/usr/bin/i*86-pc-linux-*
+	/usr/bin/jpegtran
+	/usr/bin/ld
+	/usr/bin/libpng*
+	/usr/bin/nm
+	/usr/bin/objcopy
+	/usr/bin/objdump
+	/usr/bin/piggyback*
+	/usr/bin/portageq
+	/usr/bin/ranlib
+	/usr/bin/readelf
+	/usr/bin/repoman
+	/usr/bin/size
+	/usr/bin/powerpc-unknown-linux-gnu-*
+	/usr/bin/powerpc64-unknown-linux-gnu-*
+	/usr/bin/sparc-unknown-linux-gnu-*
+	/usr/bin/sparc64-unknown-linux-gnu-*
+	/usr/bin/strings
+	/usr/bin/strip
+	/usr/bin/tbz2tool
+	/usr/bin/x86_64-pc-linux-gnu-*
+	/usr/bin/xpak
+	/usr/bin/yacc
+	/usr/lib*/*.a
+#	/usr/lib*/*.la
+	/usr/lib*/gcc-lib/*/*/libgcj*
+	/usr/sbin/archive-conf
+	/usr/sbin/bootsplash*
+	/usr/sbin/dispatch-conf
+	/usr/sbin/emaint
+	/usr/sbin/emerge-webrsync
+	/usr/sbin/env-update
+#	/usr/sbin/fb*
+	/usr/sbin/fixpackages
+	/usr/sbin/quickpkg
+	/usr/sbin/regenworld
+#	/usr/share/consolefonts/1*
+#	/usr/share/consolefonts/7*
+#	/usr/share/consolefonts/8*
+#	/usr/share/consolefonts/9*
+#	/usr/share/consolefonts/A*
+#	/usr/share/consolefonts/C*
+#	/usr/share/consolefonts/E*
+#	/usr/share/consolefonts/G*
+#	/usr/share/consolefonts/L*
+#	/usr/share/consolefonts/M*
+#	/usr/share/consolefonts/R*
+#	/usr/share/consolefonts/a*
+#	/usr/share/consolefonts/c*
+#	/usr/share/consolefonts/dr*
+#	/usr/share/consolefonts/g*
+#	/usr/share/consolefonts/i*
+#	/usr/share/consolefonts/k*
+#	/usr/share/consolefonts/l*
+#	/usr/share/consolefonts/r*
+#	/usr/share/consolefonts/s*
+#	/usr/share/consolefonts/t*
+#	/usr/share/consolefonts/v*
+	/usr/share/misc/*.old
+# NOTE: below are my additions, above are from the minimal CD spec
+	/usr/i*86-gentoo-linux-uclibc
+	/usr/i*86-pc-linux-gnu
+	/usr/i*86-pc-linux-uclibc
+	/etc/init.d/pdnsd-online
+	/usr/lib*/python2.4/test
+	/usr/bin/Xnest
+	/usr/bin/Xvfb
+	/usr/lib*/*python*
+	/usr/bin/*python*
+	/usr/lib*/*perl*
+	/usr/bin/*perl*
+	/usr/lib*/xorg/modules/extensions/libGLcore.so
+	/usr/lib*/opengl
+	/usr/lib/pkgconfig
+	/usr/share/sounds/alsa
+	/usr/share/pixmaps/gentoo-livecd-2006.1
+	/usr/share/polipo/www/doc
+	/var/log/*.log
+	/usr/lib/gcc/i686-pc-linux-gnu/*/include
+	/usr/lib/gcc/i686-pc-linux-gnu/*/libgfortran*
+	/usr/share/gtk-2.0/demo
+	/usr/bin/wall
+	/usr/bin/mesg
+	/usr/bin/last
+	/usr/bin/utmpdump
+	/usr/bin/tack
+	/usr/bin/gtk-demo
+	/usr/bin/localedef
+	/usr/bin/torify
+	/etc/tor/tor-tsocks.conf
+	/etc/socks
+	/opt/firefox/extensions/talkback at mozilla.org
+	/opt/firefox/extensions/inspector at mozilla.org
+	/usr/sbin/visudo
+	/sbin/bootlogd
+	/sbin/insmod.static
+	/sbin/sln
+	/sbin/ldconfig
+	/usr/sbin/sshd
+	/usr/sbin/nscd
+	/etc/init.d/nscd
+	/etc/nscd.conf
+	/usr/share/i18n/locales/translit*
+	/usr/share/fonts/misc/*ja.pcf.*
+	/usr/share/fonts/misc/*ko.pcf.*
+	/usr/{lib,share}/locale/en_{AU,CA,GB,HK,PH}

Deleted: incognito/tags/20080109.1/arch/x86/livecd-stage2.spec
===================================================================
--- incognito/trunk/arch/x86/livecd-stage2.spec	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/arch/x86/livecd-stage2.spec	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,498 +0,0 @@
-subarch: i686
-version_stamp: __INCOGNITO_VERSION__
-target: livecd-stage2
-rel_type: incognito
-profile: default-linux/x86/2007.0
-snapshot: 20070824
-source_subpath: incognito/livecd-stage1-i686-20070824
-portage_overlay: /usr/src/incognito/portage.overlay
-portage_confdir: /usr/src/incognito/portage.config
-
-livecd/fstype: squashfs
-livecd/cdtar: /usr/src/incognito/arch/x86/isolinux-3.52-cdtar.tar.bz2
-livecd/iso: /var/tmp/catalyst/builds/incognito/incognito-i686-__INCOGNITO_VERSION__.iso
-livecd/splash_type: gensplash
-livecd/splash_theme: livecd-2006.1
-livecd/xdm: kdm
-livecd/xsession: kde-3.5
-livecd/fsscript: /usr/src/incognito/fsscript.sh
-
-livecd/type: generic-livecd
-livecd/users: gentoo
-livecd/volid: __INCOGNITO_TITLE__ x86
-
-livecd/overlay: arch/x86/overlay
-livecd/root_overlay: root_overlay
-
-livecd/rcadd:
-	tor|default
-	polipo|default
-	dns-proxy-tor|default
-	pdnsd|default
-	iptables|default
-	xdm|default
-	cupsd|default
-	mixminion-smtp|default
-	external-config-setup|boot
-	macchanger|default
-	acpid|boot
-	gpm|boot
-	NetworkManager|default
-	hidden-service|default
-
-# unionfs (genkernel 2.4.7) causes problems such as:
-#   1. creating /etc/sysconfig/keyboard in /etc/init.d/external-config-setup
-#   2. /mnt/cdrom does not have the LiveCD content
-#livecd/bootargs: unionfs
-#livecd/gk_mainargs: --unionfs-dev
-
-boot/kernel: gentoo
-boot/kernel/gentoo/sources: gentoo-sources
-
-boot/kernel/gentoo/config: /usr/src/incognito/arch/x86/kernel-2.6.21.config
-
-boot/kernel/gentoo/use: pcmcia usb oss atm png jpeg2k hal
-
-boot/kernel/gentoo/packages:
-	media-gfx/splashutils
-	=media-gfx/splash-themes-livecd-2006.1
-	sys-apps/pcmciautils
-	net-dialup/rp-pppoe
-	kde-base/kppp
-	net-wireless/hostap-utils
-# Re-merging because ppp looks for the kernel source
-	net-dialup/ppp
-	net-dialup/pptpclient
-	sys-power/acpid
-	net-dialup/slmodem
-	net-dialup/ltmodem
-# Compile error
-#       net-dialup/globespan-adsl
-# Compile error
-#       net-dialup/fritzcapi
-	net-dialup/fcdsl
-	net-dialup/drdsl
-# Not compatible with >=2.6.20
-#       net-dialup/bewan-adsl
-# Not compatible with >=2.6.16
-#       net-dialup/intel-536ep
-# For space
-#	net-wireless/fwlanusb
-	net-wireless/at76c503a
-	net-wireless/adm8211
-	net-wireless/rt2500
-	net-wireless/acx
-	net-wireless/ipw3945
-	net-wireless/ipw3945d
-	net-wireless/madwifi-ng
-	net-wireless/madwifi-ng-tools
-	net-wireless/rt61
-# Compile error
-#       net-wireless/rt2400
-	net-wireless/rt2500
-	net-wireless/rt2570
-# Compile error
-#       net-wireless/rt2x00
-	net-wireless/rtl8180
-# Needs in-kernel 802.11 disabled
-#       net-wireless/rtl8187
-# These two are removed for licensing reasons.
-#	x11-drivers/nvidia-drivers
-#	x11-drivers/ati-drivers
-	media-libs/alsa-lib
-	media-libs/alsa-oss
-	media-sound/alsa-utils
-	app-laptop/laptop-mode-tools
-	net-firewall/ipsec-tools
-	net-firewall/iptables
-	net-misc/trans-proxy-tor
-	app-crypt/truecrypt
-	kde-misc/tcgui
-	net-misc/networkmanager
-	kde-misc/knetworkmanager
-	kde-base/kdebase-kioslaves # rebuild with hal
-
-
-livecd/unmerge:
-#	acl
-#	addpatches
-#	attr
-	alsa-headers
-	autoconf
-	autoconf-wrapper
-	automake
-	automake-wrapper
-#	bc
-#	bin86
-	binutils
-	binutils-config
-	bison
-	busybox
-#	ccache
-#	cpio
-#	cronbase
-#	devfsd
-#	diffutils
-#	distcc
-#	ed
-#	expat
-	flex
-#	gcc
-	gcc-config
-#	gcc-sparc64
-	genkernel
-	gentoo-sources
-	gettext
-	gnuconfig
-#	groff
-#	grub
-#	help2man
-#	lcms
-#	ld.so
-#	lib-compat
-#	libmng
-#	libperl
-#	libstdc++-v3
-	libtool
-	linux-headers
-	m4
-	make
-#	man
-#	man-pages
-	miscfiles
-	pax-utils
-#	patch
-#	perl
-	perl-cleaner
-	perl-Test-Simple
-#	PodParser
-	pycrypto
-	python-fchksum
-	rpm2targz
-#	rsync
-	sandbox
-#	sash
-#	sysklogd
-#	tcp-wrappers
-	Test-Harness
-#	texinfo
-#	ucl
-#	vanilla-sources
-# NOTE: below are my additions, above are from the minimal CD spec
-	addpatches
-	sys-apps/hotplug
-	bin86
-	ccache
-	cronbase
-	dev-util/cvs
-	distcc
-	elfutils
-	gentoo-sources 
-	gentoolkit
-	klibc
-	intltool
-	vixie-cron
-	eselect-compiler
-	mail-mta/ssmtp
-	app-admin/pwgen
-	x11-libs/libdmx
-	x11-apps/xhost
-	x11-apps/mkfontdir
-	x11-apps/mkfontscale
-	dev-util/pkgconfig
-	app-doc/xorg-docs
-	dev-lang/nasm
-	# Following four for subversion based packages
-	dev-libs/apr
-	dev-libs/apr-util
-	net-misc/neon
-	dev-util/subversion
-
-livecd/empty:
-	/etc/bootsplash/gentoo
-	/etc/bootsplash/gentoo-highquality
-	/etc/cron.daily
-	/etc/cron.hourly
-	/etc/cron.monthly
-	/etc/cron.weekly
-	/etc/logrotate.d
-	#/etc/modules.autoload.d
-	/etc/rsync
-	/etc/runlevels/single
-	/etc/skel
-	/etc/splash/emergence
-	/etc/splash/gentoo
-	/lib/dev-state
-	/lib/udev-state
-	/lib64/dev-state
-	/lib64/udev-state
-	/root/.ccache
-	/tmp
-	/usr/diet/include
-	/usr/diet/man
-	/usr/i*86-gentoo-linux-uclibc
-	/usr/i*86-pc-linux-gnu
-	/usr/i*86-pc-linux-uclibc
-	/usr/include
-#	/usr/lib/X11/config
-#	/usr/lib/X11/doc
-#	/usr/lib/X11/etc
-	/usr/lib/awk
-	/usr/lib/ccache
-	/usr/lib/gcc-config
-	/usr/lib/gconv
-	/usr/lib/nfs
-#	/usr/lib/perl5
-	/usr/lib/portage
-	/usr/lib/python2.2
-	/usr/lib/python2.3
-	/usr/lib/python2.4/tests
-#	/usr/lib64/X11/config
-#	/usr/lib64/X11/doc
-#	/usr/lib64/X11/etc
-	/usr/lib64/awk
-	/usr/lib64/ccache
-	/usr/lib64/gcc-config
-	/usr/lib64/gconv
-	/usr/lib64/nfs
-#	/usr/lib64/perl5
-	/usr/lib64/portage
-	/usr/lib64/python2.2
-	/usr/lib64/python2.3
-	/usr/lib64/python2.4/tests
-#	/usr/local
-	/usr/portage
-	/usr/powerpc-unknown-linux-gnu
-	/usr/powerpc64-unknown-linux-gnu
-	/usr/share/aclocal
-	/usr/share/baselayout
-	/usr/share/binutils-data
-	/usr/share/consolefonts/partialfonts
-#	/usr/share/consoletrans
-	/usr/share/dict
-#	/usr/share/doc
-	/usr/share/emacs
-	/usr/share/et
-	/usr/share/gcc-data
-	/usr/share/genkernel
-	/usr/share/gettext
-	/usr/share/glib-2.0
-	/usr/share/gnuconfig
-	/usr/share/gtk-doc
-#	/usr/share/i18n
-	/usr/share/lcms
-	/usr/share/libtool
-#	/usr/share/locale
-#	/usr/share/perl
-	/usr/share/rfc
-	/usr/share/ss
-	/usr/share/state
-#	/usr/share/texinfo
-	/usr/share/unimaps
-#	/usr/share/zoneinfo
-	/usr/sparc-unknown-linux-gnu
-	/usr/src
-	/usr/x86_64-pc-linux-gnu
-#	/var/cache
-	/var/db
-	/var/empty
-	/var/lib/portage
-#	/var/lock
-#	/var/log
-#	/var/run
-#	/var/spool
-	/var/state
-	/var/tmp
-# NOTE: below are my additions, above are from the minimal CD spec
-#	/usr/share/man
-	/usr/share/man/man3
-	/usr/share/man/man3p
-	/usr/share/man/man2
-	/usr/share/man/man7
-#	/usr/share/info
-	/var/cache/edb
-	/usr/libexec/gcc
-	/usr/kde/3.5/include
-	/usr/qt/3/bin
-	/usr/qt/3/include
-	/boot
-
-livecd/rm:
-#	/boot/System*
-#	/boot/initr*
-#	/boot/kernel*
-	/etc/*-
-	/etc/*.old
-	/etc/default/audioctl
-	/etc/dispatch-conf.conf
-	/etc/env.d/05binutils
-#	/etc/env.d/05gcc
-	/etc/etc-update.conf
-	/etc/hosts.bck
-	/etc/issue*
-	/etc/genkernel.conf
-	/etc/make.conf
-	/etc/make.conf.example
-	/etc/make.globals
-	/etc/make.profile
-	/etc/conf.d/net.example
-	/etc/kernels
-#	/etc/man.conf
-#	/etc/resolv.conf
-	/etc/splash/livecd-2006.1/12*
-	/etc/splash/livecd-2006.1/14*
-	/etc/splash/livecd-2006.1/16*
-	/etc/splash/livecd-2006.1/19*
-	/etc/splash/livecd-2006.1/6*
-	/etc/splash/livecd-2006.1/8*
-	/etc/splash/livecd-2006.1/images/background-12*
-	/etc/splash/livecd-2006.1/images/background-14*
-	/etc/splash/livecd-2006.1/images/background-16*
-	/etc/splash/livecd-2006.1/images/background-19*
-	/etc/splash/livecd-2006.1/images/background-6*
-	/etc/splash/livecd-2006.1/images/background-8*
-	/etc/splash/livecd-2006.1/images/verbose-12*
-	/etc/splash/livecd-2006.1/images/verbose-14*
-	/etc/splash/livecd-2006.1/images/verbose-16*
-	/etc/splash/livecd-2006.1/images/verbose-19*
-	/etc/splash/livecd-2006.1/images/verbose-6*
-	/etc/splash/livecd-2006.1/images/verbose-8*
-	/lib*/*.a
-#	/lib*/*.la
-	/lib*/cpp
-#	/lib*/security/pam_access.so
-#	/lib*/security/pam_chroot.so
-#	/lib*/security/pam_debug.so
-#	/lib*/security/pam_ftp.so
-#	/lib*/security/pam_issue.so
-#	/lib*/security/pam_mail.so
-#	/lib*/security/pam_mkhomedir.so
-#	/lib*/security/pam_motd.so
-#	/lib*/security/pam_postgresok.so
-#	/lib*/security/pam_rhosts_auth.so
-#	/lib*/security/pam_userdb.so
-	/root/.bash_history
-	/root/.viminfo
-	/sbin/fsck.cramfs
-	/sbin/fsck.minix
-	/sbin/mkfs.bfs
-	/sbin/mkfs.cramfs
-	/sbin/mkfs.minix
-	/usr/bin/addr2line
-	/usr/bin/ar
-	/usr/bin/as
-	/usr/bin/audioctl
-	/usr/bin/c++*
-	/usr/bin/cc
-	/usr/bin/cjpeg
-	/usr/bin/cpp
-	/usr/bin/djpeg
-	/usr/bin/ebuild
-	/usr/bin/emerge
-	/usr/bin/elftoaout
-	/usr/bin/f77
-	/usr/bin/g++*
-	/usr/bin/g77
-	/usr/bin/gcc*
-	/usr/bin/genkernel
-	/usr/bin/gprof
-	/usr/bin/i*86-gentoo-linux-uclibc-*
-	/usr/bin/i*86-pc-linux-*
-	/usr/bin/jpegtran
-	/usr/bin/ld
-	/usr/bin/libpng*
-	/usr/bin/nm
-	/usr/bin/objcopy
-	/usr/bin/objdump
-	/usr/bin/piggyback*
-	/usr/bin/portageq
-	/usr/bin/ranlib
-	/usr/bin/readelf
-	/usr/bin/repoman
-	/usr/bin/size
-	/usr/bin/powerpc-unknown-linux-gnu-*
-	/usr/bin/powerpc64-unknown-linux-gnu-*
-	/usr/bin/sparc-unknown-linux-gnu-*
-	/usr/bin/sparc64-unknown-linux-gnu-*
-	/usr/bin/strings
-	/usr/bin/strip
-	/usr/bin/tbz2tool
-	/usr/bin/x86_64-pc-linux-gnu-*
-	/usr/bin/xpak
-	/usr/bin/yacc
-	/usr/lib*/*.a
-#	/usr/lib*/*.la
-	/usr/lib*/gcc-lib/*/*/libgcj*
-	/usr/sbin/archive-conf
-	/usr/sbin/bootsplash*
-	/usr/sbin/dispatch-conf
-	/usr/sbin/emaint
-	/usr/sbin/emerge-webrsync
-	/usr/sbin/env-update
-#	/usr/sbin/fb*
-	/usr/sbin/fixpackages
-	/usr/sbin/quickpkg
-	/usr/sbin/regenworld
-#	/usr/share/consolefonts/1*
-#	/usr/share/consolefonts/7*
-#	/usr/share/consolefonts/8*
-#	/usr/share/consolefonts/9*
-#	/usr/share/consolefonts/A*
-#	/usr/share/consolefonts/C*
-#	/usr/share/consolefonts/E*
-#	/usr/share/consolefonts/G*
-#	/usr/share/consolefonts/L*
-#	/usr/share/consolefonts/M*
-#	/usr/share/consolefonts/R*
-#	/usr/share/consolefonts/a*
-#	/usr/share/consolefonts/c*
-#	/usr/share/consolefonts/dr*
-#	/usr/share/consolefonts/g*
-#	/usr/share/consolefonts/i*
-#	/usr/share/consolefonts/k*
-#	/usr/share/consolefonts/l*
-#	/usr/share/consolefonts/r*
-#	/usr/share/consolefonts/s*
-#	/usr/share/consolefonts/t*
-#	/usr/share/consolefonts/v*
-	/usr/share/misc/*.old
-# NOTE: below are my additions, above are from the minimal CD spec
-	/usr/i*86-gentoo-linux-uclibc
-	/usr/i*86-pc-linux-gnu
-	/usr/i*86-pc-linux-uclibc
-	/usr/lib/pkgconfig
-	/etc/init.d/pdnsd-online
-	/usr/lib*/python2.4/test
-	/usr/bin/Xnest
-	/usr/bin/Xvfb
-#	/usr/lib/*python*
-#	/usr/bin/*python*
-	/var/log/*.log
-	/usr/lib/gcc/i686-pc-linux-gnu/*/include
-	/usr/lib/gcc/i686-pc-linux-gnu/*/libgfortran*
-	/usr/share/gtk-2.0/demo
-	/usr/bin/wall
-	/usr/bin/mesg
-	/usr/bin/last
-	/usr/bin/utmpdump
-	/usr/bin/tack
-	/usr/bin/gtk-demo
-	/usr/bin/localedef
-	/opt/firefox/extensions/talkback at mozilla.org
-	/usr/sbin/visudo
-	/sbin/bootlogd
-	/sbin/insmod.static
-	/sbin/sln
-	/sbin/ldconfig
-	/usr/share/doc/*-*
-	/usr/kde/*/share/doc/*-*
-	/usr/share/polipo/www/doc
-	/usr/share/applications/Assistant.desktop
-	/usr/share/applications/Designer.desktop
-	/usr/share/applications/Linguist.desktop
-	/usr/lib/qt4/libQtDesigner*
-	/usr/lib/qt4/libQtAssistant*
-	/usr/bin/linguist
-	/usr/bin/assistant
-	/usr/bin/designer
- 
\ No newline at end of file

Copied: incognito/tags/20080109.1/arch/x86/livecd-stage2.spec (from rev 13127, incognito/trunk/arch/x86/livecd-stage2.spec)
===================================================================
--- incognito/tags/20080109.1/arch/x86/livecd-stage2.spec	                        (rev 0)
+++ incognito/tags/20080109.1/arch/x86/livecd-stage2.spec	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,492 @@
+subarch: i686
+version_stamp: __INCOGNITO_VERSION__
+target: livecd-stage2
+rel_type: incognito
+profile: default-linux/x86/2007.0
+snapshot: 20080109
+source_subpath: incognito/livecd-stage1-i686-20080109
+portage_overlay: /usr/src/incognito/portage.overlay
+portage_confdir: /usr/src/incognito/portage.config
+
+livecd/fstype: squashfs
+livecd/cdtar: /usr/src/incognito/arch/x86/isolinux-3.52-cdtar.tar.bz2
+livecd/iso: /var/tmp/catalyst/builds/incognito/incognito-i686-__INCOGNITO_VERSION__.iso
+livecd/splash_type: gensplash
+livecd/splash_theme: livecd-2006.1
+livecd/xdm: kdm
+livecd/xsession: kde-3.5
+livecd/fsscript: /usr/src/incognito/fsscript.sh
+
+livecd/type: generic-livecd
+livecd/users: gentoo
+livecd/volid: __INCOGNITO_TITLE__ x86
+
+livecd/overlay: arch/x86/overlay
+livecd/root_overlay: root_overlay
+
+livecd/rcadd:
+	tor|default
+	polipo|default
+	dns-proxy-tor|default
+	pdnsd|default
+	iptables|default
+	xdm|default
+	cupsd|default
+	mixminion-smtp|default
+	external-config-setup|boot
+	macchanger|default
+	acpid|boot
+	gpm|boot
+	NetworkManager|default
+	hidden-service|default
+
+# unionfs (genkernel 2.4.7) causes problems such as:
+#   1. creating /etc/sysconfig/keyboard in /etc/init.d/external-config-setup
+#   2. /mnt/cdrom does not have the LiveCD content
+#livecd/bootargs: unionfs
+#livecd/gk_mainargs: --unionfs-dev
+
+boot/kernel: gentoo
+boot/kernel/gentoo/sources: gentoo-sources
+
+boot/kernel/gentoo/config: /usr/src/incognito/arch/x86/kernel-2.6.23.config
+
+boot/kernel/gentoo/use: pcmcia usb oss atm png jpeg2k hal
+
+boot/kernel/gentoo/packages:
+	media-gfx/splashutils
+	=media-gfx/splash-themes-livecd-2006.1
+	sys-apps/pcmciautils
+	net-dialup/rp-pppoe
+	kde-base/kppp
+	net-wireless/hostap-utils
+# Re-merging because ppp looks for the kernel source
+	net-dialup/ppp
+	net-dialup/pptpclient
+	sys-power/acpid
+	net-dialup/slmodem
+	net-dialup/ltmodem
+# Compile error
+#       net-dialup/globespan-adsl
+# Compile error
+#       net-dialup/fritzcapi
+	net-dialup/fcdsl
+	net-dialup/drdsl
+# Not compatible with >=2.6.20
+#       net-dialup/bewan-adsl
+# Not compatible with >=2.6.16
+#       net-dialup/intel-536ep
+# For space
+#	net-wireless/fwlanusb
+	net-wireless/at76c503a
+	net-wireless/adm8211
+	net-wireless/acx
+	net-wireless/ipw3945
+	net-wireless/ipw3945d
+	net-wireless/madwifi-ng
+	net-wireless/madwifi-ng-tools
+	net-wireless/ralink-rt61
+	net-wireless/rt2400
+	net-wireless/rt2500
+	net-wireless/rt2570
+# Broken on 2.6.23
+#	net-wireless/rtl8180
+# Compile error
+#       net-wireless/rt2x00
+# Needs in-kernel 802.11 disabled
+#       net-wireless/rtl8187
+# These two are removed for licensing reasons.
+#	x11-drivers/nvidia-drivers
+#	x11-drivers/ati-drivers
+	media-libs/alsa-lib
+	media-libs/alsa-oss
+	media-sound/alsa-utils
+	app-laptop/laptop-mode-tools
+	net-firewall/ipsec-tools
+	net-firewall/iptables
+	net-misc/trans-proxy-tor
+	app-crypt/truecrypt
+	kde-misc/tcgui
+	net-misc/networkmanager
+	kde-misc/knetworkmanager
+	kde-base/kdebase-kioslaves # rebuild with hal
+
+
+livecd/unmerge:
+#	acl
+#	addpatches
+#	attr
+	alsa-headers
+	autoconf
+	autoconf-wrapper
+	automake
+	automake-wrapper
+#	bc
+#	bin86
+	binutils
+	binutils-config
+	bison
+	busybox
+#	ccache
+#	cpio
+#	cronbase
+#	devfsd
+#	diffutils
+#	distcc
+#	ed
+#	expat
+	flex
+#	gcc
+	gcc-config
+#	gcc-sparc64
+	genkernel
+	gentoo-sources
+	gettext
+	gnuconfig
+#	groff
+#	grub
+#	help2man
+#	lcms
+#	ld.so
+#	lib-compat
+#	libmng
+#	libperl
+#	libstdc++-v3
+	libtool
+	linux-headers
+	m4
+	make
+#	man
+#	man-pages
+	miscfiles
+	pax-utils
+#	patch
+#	perl
+	perl-cleaner
+	perl-Test-Simple
+#	PodParser
+	pycrypto
+	python-fchksum
+	rpm2targz
+#	rsync
+	sandbox
+#	sash
+#	sysklogd
+#	tcp-wrappers
+	Test-Harness
+#	texinfo
+#	ucl
+#	vanilla-sources
+# NOTE: below are my additions, above are from the minimal CD spec
+	addpatches
+	sys-apps/hotplug
+	bin86
+	ccache
+	cronbase
+	dev-util/cvs
+	distcc
+	elfutils
+	gentoo-sources 
+	gentoolkit
+	klibc
+	intltool
+	vixie-cron
+	eselect-compiler
+	mail-mta/ssmtp
+	app-admin/pwgen
+	x11-libs/libdmx
+	x11-apps/xhost
+	x11-apps/mkfontdir
+	x11-apps/mkfontscale
+	dev-util/pkgconfig
+	app-doc/xorg-docs
+	dev-lang/nasm
+	# Following four for subversion based packages
+	dev-libs/apr
+	dev-libs/apr-util
+	net-misc/neon
+	dev-util/subversion
+
+livecd/empty:
+	/etc/bootsplash/gentoo
+	/etc/bootsplash/gentoo-highquality
+	/etc/cron.daily
+	/etc/cron.hourly
+	/etc/cron.monthly
+	/etc/cron.weekly
+	/etc/logrotate.d
+	#/etc/modules.autoload.d
+	/etc/rsync
+	/etc/runlevels/single
+	/etc/skel
+	/etc/splash/emergence
+	/etc/splash/gentoo
+	/lib/dev-state
+	/lib/udev-state
+	/lib64/dev-state
+	/lib64/udev-state
+	/root/.ccache
+	/tmp
+	/usr/diet/include
+	/usr/diet/man
+	/usr/i*86-gentoo-linux-uclibc
+	/usr/i*86-pc-linux-gnu
+	/usr/i*86-pc-linux-uclibc
+	/usr/include
+#	/usr/lib/X11/config
+#	/usr/lib/X11/doc
+#	/usr/lib/X11/etc
+	/usr/lib/awk
+	/usr/lib/ccache
+	/usr/lib/gcc-config
+	/usr/lib/gconv
+	/usr/lib/nfs
+#	/usr/lib/perl5
+	/usr/lib/portage
+	/usr/lib/python2.2
+	/usr/lib/python2.3
+	/usr/lib/python2.4/tests
+#	/usr/lib64/X11/config
+#	/usr/lib64/X11/doc
+#	/usr/lib64/X11/etc
+	/usr/lib64/awk
+	/usr/lib64/ccache
+	/usr/lib64/gcc-config
+	/usr/lib64/gconv
+	/usr/lib64/nfs
+#	/usr/lib64/perl5
+	/usr/lib64/portage
+	/usr/lib64/python2.2
+	/usr/lib64/python2.3
+	/usr/lib64/python2.4/tests
+#	/usr/local
+	/usr/portage
+	/usr/powerpc-unknown-linux-gnu
+	/usr/powerpc64-unknown-linux-gnu
+	/usr/share/aclocal
+	/usr/share/baselayout
+	/usr/share/binutils-data
+	/usr/share/consolefonts/partialfonts
+#	/usr/share/consoletrans
+	/usr/share/dict
+#	/usr/share/doc
+	/usr/share/emacs
+	/usr/share/et
+	/usr/share/gcc-data
+	/usr/share/genkernel
+	/usr/share/gettext
+	/usr/share/glib-2.0
+	/usr/share/gnuconfig
+	/usr/share/gtk-doc
+#	/usr/share/i18n
+	/usr/share/lcms
+	/usr/share/libtool
+#	/usr/share/locale
+#	/usr/share/perl
+	/usr/share/rfc
+	/usr/share/ss
+	/usr/share/state
+#	/usr/share/texinfo
+	/usr/share/unimaps
+#	/usr/share/zoneinfo
+	/usr/sparc-unknown-linux-gnu
+	/usr/src
+	/usr/x86_64-pc-linux-gnu
+#	/var/cache
+	/var/db
+	/var/empty
+	/var/lib/portage
+#	/var/lock
+#	/var/log
+#	/var/run
+#	/var/spool
+	/var/state
+	/var/tmp
+# NOTE: below are my additions, above are from the minimal CD spec
+#	/usr/share/man
+	/usr/share/man/man3
+	/usr/share/man/man3p
+	/usr/share/man/man2
+	/usr/share/man/man7
+#	/usr/share/info
+	/var/cache/edb
+	/usr/libexec/gcc
+	/usr/kde/3.5/include
+	/usr/qt/3/bin
+	/usr/qt/3/include
+	/boot
+
+livecd/rm:
+#	/boot/System*
+#	/boot/initr*
+#	/boot/kernel*
+	/etc/*-
+	/etc/*.old
+	/etc/default/audioctl
+	/etc/dispatch-conf.conf
+	/etc/env.d/05binutils
+#	/etc/env.d/05gcc
+	/etc/etc-update.conf
+	/etc/hosts.bck
+	/etc/issue*
+	/etc/genkernel.conf
+	/etc/make.conf
+	/etc/make.conf.example
+	/etc/make.globals
+	/etc/make.profile
+	/etc/conf.d/net.example
+	/etc/kernels
+#	/etc/man.conf
+#	/etc/resolv.conf
+	/etc/splash/livecd-2006.1/12*
+	/etc/splash/livecd-2006.1/14*
+	/etc/splash/livecd-2006.1/16*
+	/etc/splash/livecd-2006.1/19*
+	/etc/splash/livecd-2006.1/6*
+	/etc/splash/livecd-2006.1/8*
+	/etc/splash/livecd-2006.1/images/background-12*
+	/etc/splash/livecd-2006.1/images/background-14*
+	/etc/splash/livecd-2006.1/images/background-16*
+	/etc/splash/livecd-2006.1/images/background-19*
+	/etc/splash/livecd-2006.1/images/background-6*
+	/etc/splash/livecd-2006.1/images/background-8*
+	/etc/splash/livecd-2006.1/images/verbose-12*
+	/etc/splash/livecd-2006.1/images/verbose-14*
+	/etc/splash/livecd-2006.1/images/verbose-16*
+	/etc/splash/livecd-2006.1/images/verbose-19*
+	/etc/splash/livecd-2006.1/images/verbose-6*
+	/etc/splash/livecd-2006.1/images/verbose-8*
+	/lib*/*.a
+	/lib*/cpp
+#	/lib*/security/pam_access.so
+#	/lib*/security/pam_chroot.so
+#	/lib*/security/pam_debug.so
+#	/lib*/security/pam_ftp.so
+#	/lib*/security/pam_issue.so
+#	/lib*/security/pam_mail.so
+#	/lib*/security/pam_mkhomedir.so
+#	/lib*/security/pam_motd.so
+#	/lib*/security/pam_postgresok.so
+#	/lib*/security/pam_rhosts_auth.so
+#	/lib*/security/pam_userdb.so
+	/root/.bash_history
+	/root/.viminfo
+	/sbin/fsck.cramfs
+	/sbin/fsck.minix
+	/sbin/mkfs.bfs
+	/sbin/mkfs.cramfs
+	/sbin/mkfs.minix
+	/usr/bin/addr2line
+	/usr/bin/ar
+	/usr/bin/as
+	/usr/bin/audioctl
+	/usr/bin/c++*
+	/usr/bin/cc
+	/usr/bin/cjpeg
+	/usr/bin/cpp
+	/usr/bin/djpeg
+	/usr/bin/ebuild
+	/usr/bin/emerge
+	/usr/bin/elftoaout
+	/usr/bin/f77
+	/usr/bin/g++*
+	/usr/bin/g77
+	/usr/bin/gcc*
+	/usr/bin/genkernel
+	/usr/bin/gprof
+	/usr/bin/i*86-gentoo-linux-uclibc-*
+	/usr/bin/i*86-pc-linux-*
+	/usr/bin/jpegtran
+	/usr/bin/ld
+	/usr/bin/libpng*
+	/usr/bin/nm
+	/usr/bin/objcopy
+	/usr/bin/objdump
+	/usr/bin/piggyback*
+	/usr/bin/portageq
+	/usr/bin/ranlib
+	/usr/bin/readelf
+	/usr/bin/repoman
+	/usr/bin/size
+	/usr/bin/powerpc-unknown-linux-gnu-*
+	/usr/bin/powerpc64-unknown-linux-gnu-*
+	/usr/bin/sparc-unknown-linux-gnu-*
+	/usr/bin/sparc64-unknown-linux-gnu-*
+	/usr/bin/strings
+	/usr/bin/strip
+	/usr/bin/tbz2tool
+	/usr/bin/x86_64-pc-linux-gnu-*
+	/usr/bin/xpak
+	/usr/bin/yacc
+	/usr/lib*/*.a
+	/usr/lib*/gcc-lib/*/*/libgcj*
+	/usr/sbin/archive-conf
+	/usr/sbin/bootsplash*
+	/usr/sbin/dispatch-conf
+	/usr/sbin/emaint
+	/usr/sbin/emerge-webrsync
+	/usr/sbin/env-update
+	/usr/sbin/fixpackages
+	/usr/sbin/quickpkg
+	/usr/sbin/regenworld
+#	/usr/share/consolefonts/1*
+#	/usr/share/consolefonts/7*
+#	/usr/share/consolefonts/8*
+#	/usr/share/consolefonts/9*
+#	/usr/share/consolefonts/A*
+#	/usr/share/consolefonts/C*
+#	/usr/share/consolefonts/E*
+#	/usr/share/consolefonts/G*
+#	/usr/share/consolefonts/L*
+#	/usr/share/consolefonts/M*
+#	/usr/share/consolefonts/R*
+#	/usr/share/consolefonts/a*
+#	/usr/share/consolefonts/c*
+#	/usr/share/consolefonts/dr*
+#	/usr/share/consolefonts/g*
+#	/usr/share/consolefonts/i*
+#	/usr/share/consolefonts/k*
+#	/usr/share/consolefonts/l*
+#	/usr/share/consolefonts/r*
+#	/usr/share/consolefonts/s*
+#	/usr/share/consolefonts/t*
+#	/usr/share/consolefonts/v*
+	/usr/share/misc/*.old
+# NOTE: below are my additions, above are from the minimal CD spec
+	/usr/i*86-gentoo-linux-uclibc
+	/usr/i*86-pc-linux-gnu
+	/usr/i*86-pc-linux-uclibc
+	/usr/lib/pkgconfig
+	/etc/init.d/pdnsd-online
+	/usr/lib*/python2.4/test
+	/usr/bin/Xnest
+	/usr/bin/Xvfb
+	/var/log/*.log
+	/usr/lib/gcc/i686-pc-linux-gnu/*/include
+	/usr/lib/gcc/i686-pc-linux-gnu/*/libgfortran*
+	/usr/share/gtk-2.0/demo
+	/usr/bin/wall
+	/usr/bin/mesg
+	/usr/bin/last
+	/usr/bin/utmpdump
+	/usr/bin/tack
+	/usr/bin/gtk-demo
+	/usr/bin/localedef
+	/opt/firefox/extensions/talkback at mozilla.org
+	/usr/sbin/visudo
+	/sbin/bootlogd
+	/sbin/insmod.static
+	/sbin/sln
+	/sbin/ldconfig
+	/usr/share/doc/*-*
+	/usr/kde/*/share/doc/*-*
+	/usr/share/polipo/www/doc
+	/usr/share/applications/Assistant.desktop
+	/usr/share/applications/Designer.desktop
+	/usr/share/applications/Linguist.desktop
+	/usr/lib/qt4/libQtDesigner*
+	/usr/lib/qt4/libQtAssistant*
+	/usr/bin/linguist
+	/usr/bin/assistant
+	/usr/bin/designer
+ 
\ No newline at end of file

Deleted: incognito/tags/20080109.1/arch/x86/overlay/incognito.ico
===================================================================
(Binary files differ)

Copied: incognito/tags/20080109.1/arch/x86/overlay/incognito.ico (from rev 13298, incognito/trunk/arch/x86/overlay/incognito.ico)
===================================================================
(Binary files differ)

Deleted: incognito/tags/20080109.1/arch/x86/stage1.spec
===================================================================
--- incognito/trunk/arch/x86/stage1.spec	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/arch/x86/stage1.spec	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,13 +0,0 @@
-subarch: i686
-target: stage1
-version_stamp: 20070824
-rel_type: incognito
-profile: default-linux/x86/2007.0
-#portage_overlay: portage.overlay
-portage_confdir: /usr/src/incognito/portage.config
-snapshot: 20070824
-source_subpath: default/stage3-i686-2007.0
-cflags: -Os -pipe -fomit-frame-pointer -march=i686
-cxxflags: -Os -pipe -fomit-frame-pointer -march=i686
-ldflags: -Wl,-O1 -Wl,--sort-common
-

Copied: incognito/tags/20080109.1/arch/x86/stage1.spec (from rev 13115, incognito/trunk/arch/x86/stage1.spec)
===================================================================
--- incognito/tags/20080109.1/arch/x86/stage1.spec	                        (rev 0)
+++ incognito/tags/20080109.1/arch/x86/stage1.spec	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,13 @@
+subarch: i686
+target: stage1
+version_stamp: 20080109
+rel_type: incognito
+profile: default-linux/x86/2007.0
+#portage_overlay: portage.overlay
+portage_confdir: /usr/src/incognito/portage.config
+snapshot: 20080109
+source_subpath: default/stage3-i686-2007.0
+cflags: -Os -pipe -fomit-frame-pointer -march=i686
+cxxflags: -Os -pipe -fomit-frame-pointer -march=i686
+ldflags: -Wl,-O1 -Wl,--sort-common
+

Deleted: incognito/tags/20080109.1/arch/x86/stage2.spec
===================================================================
--- incognito/trunk/arch/x86/stage2.spec	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/arch/x86/stage2.spec	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,13 +0,0 @@
-subarch: i686
-target: stage2
-version_stamp: 20070824
-rel_type: incognito
-profile: default-linux/x86/2007.0
-#portage_overlay: portage.overlay
-portage_confdir: /usr/src/incognito/portage.config
-snapshot: 20070824
-source_subpath: incognito/stage1-i686-20070824
-cflags: -Os -pipe -fomit-frame-pointer -march=i686
-cxxflags: -Os -pipe -fomit-frame-pointer -march=i686
-ldflags: -Wl,-O1 -Wl,--sort-common
-

Copied: incognito/tags/20080109.1/arch/x86/stage2.spec (from rev 13115, incognito/trunk/arch/x86/stage2.spec)
===================================================================
--- incognito/tags/20080109.1/arch/x86/stage2.spec	                        (rev 0)
+++ incognito/tags/20080109.1/arch/x86/stage2.spec	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,13 @@
+subarch: i686
+target: stage2
+version_stamp: 20080109
+rel_type: incognito
+profile: default-linux/x86/2007.0
+#portage_overlay: portage.overlay
+portage_confdir: /usr/src/incognito/portage.config
+snapshot: 20080109
+source_subpath: incognito/stage1-i686-20080109
+cflags: -Os -pipe -fomit-frame-pointer -march=i686
+cxxflags: -Os -pipe -fomit-frame-pointer -march=i686
+ldflags: -Wl,-O1 -Wl,--sort-common
+

Deleted: incognito/tags/20080109.1/arch/x86/stage3.spec
===================================================================
--- incognito/trunk/arch/x86/stage3.spec	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/arch/x86/stage3.spec	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,13 +0,0 @@
-subarch: i686
-target: stage3
-version_stamp: 20070824
-rel_type: incognito
-profile: default-linux/x86/2007.0
-portage_overlay: /usr/src/incognito/portage.overlay
-portage_confdir: /usr/src/incognito/portage.config
-snapshot: 20070824
-source_subpath: incognito/stage2-i686-20070824
-cflags: -Os -pipe -fomit-frame-pointer -march=i686
-cxxflags: -Os -pipe -fomit-frame-pointer -march=i686
-ldflags: -Wl,-O1 -Wl,--sort-common
-

Copied: incognito/tags/20080109.1/arch/x86/stage3.spec (from rev 13115, incognito/trunk/arch/x86/stage3.spec)
===================================================================
--- incognito/tags/20080109.1/arch/x86/stage3.spec	                        (rev 0)
+++ incognito/tags/20080109.1/arch/x86/stage3.spec	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,13 @@
+subarch: i686
+target: stage3
+version_stamp: 20080109
+rel_type: incognito
+profile: default-linux/x86/2007.0
+portage_overlay: /usr/src/incognito/portage.overlay
+portage_confdir: /usr/src/incognito/portage.config
+snapshot: 20080109
+source_subpath: incognito/stage2-i686-20080109
+cflags: -Os -pipe -fomit-frame-pointer -march=i686
+cxxflags: -Os -pipe -fomit-frame-pointer -march=i686
+ldflags: -Wl,-O1 -Wl,--sort-common
+

Deleted: incognito/tags/20080109.1/building.html
===================================================================
--- incognito/trunk/building.html	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/building.html	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,89 +0,0 @@
-<html>
-<head>
-<title>Incognito CD Building Instructions</title>
-</head>
-<body>
-
-<p>
-Following are the steps to build the Incognito CD. Note that this process will take a long time as all software is compiled from scratch. You'll get a nice, compact, optimized CD though.
-</p>
-
-<p>
-Requirements in order to build the CD are:
-<ul>
-<li><a href="http://www.gentoo.org">Gentoo Linux</a> system OR Gentoo Linux chroot environment (stage3 tarball should be sufficient)</li>
-<li><a href="http://packages.gentoo.org/packages/?category=dev-util;name=catalyst">&gt;=catalyst-2.0.4</a>, (<code>emerge '&gt;=catalyst-2.0.4'</code>)</li>
-</ul>
-</p>
-
-<ol>
-
-<li>Download <code>stage3-i686-2007.0.tar.bz2</code> into <code>/var/tmp/catalyst/builds/default/</code>. You can find this tarball from a <a href="http://www.gentoo.org/main/en/mirrors.xml">Gentoo Mirror</a>. Look for a directory structure like <code>releases/x86/2007.0/stages/</code>.</li>
-
-<li>Pick version number from current date using YYYYMMDD format.</li>
-
-<li>Generate Portage snapshot.<pre>
-	emerge --sync
-	catalyst -s YYYYMMDD</pre>
-</li>
-
-<li>Update arch/*/*.spec files with new version number. Note that 20070413 will need
-to be changed to the current setting in the spec files.
-	<pre>sed -i 's/20070413/YYYYMMDD/' arch/*/*.spec</pre>
-</li>
-
-<li>(Optional) Check and update software in portage.overlay to the latest versions.</li>
-
-<li>Generate stage3 seed stage. After this step any caches in /var/tmp/catalyst
-related to stage1, stage2 or stage3 may be removed. Only the stage3 tarball
-needs to be kept.
-	<pre>
-	./build-stage.sh arch/x86/stage1.spec
-	./build-stage.sh arch/x86/stage2.spec
-	./build-stage.sh arch/x86/stage3.spec
-	</pre>
-</li>
-
-<li>Generate full version.
-	<pre>
-	./build-stage.sh arch/x86/livecd-stage1.spec
-	./livecd-stage2.sh arch/x86/livecd-stage2.spec
-	</pre>
-</li>
-
-<li>Generate tiny version.
-	<pre>
-	./build-stage.sh arch/x86/livecd-stage1-tiny.spec
-	./livecd-stage2.sh arch/x86/livecd-stage2-tiny.spec
-	</pre>
-</li>
-
-</ol>
-
-<p>
-Updating the Incognito CD with specific software, generally Tor, Polipo, TorK,
-Vidalia, can be done with the following steps:
-</p>
-
-<ol>
-<li>Update ebuilds in portage.overlay to desired versions.</li>
-
-<li>Generate full version. (~2 hours)
-	<pre>
-	./build-stage.sh arch/x86/livecd-stage1.spec
-	./livecd-stage2.sh arch/x86/livecd-stage2.spec
-	</pre>
-</li>
-
-<li>Generate tiny version. (~30 minutes)
-	<pre>
-	./build-stage.sh arch/x86/livecd-stage1-tiny.spec
-	./livecd-stage2.sh arch/x86/livecd-stage2-tiny.spec
-	</pre>
-</li>
-
-</ol>
-
-</body>
-</html>
-

Copied: incognito/tags/20080109.1/building.html (from rev 13115, incognito/trunk/building.html)
===================================================================
--- incognito/tags/20080109.1/building.html	                        (rev 0)
+++ incognito/tags/20080109.1/building.html	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,89 @@
+<html>
+<head>
+<title>Incognito CD Building Instructions</title>
+</head>
+<body>
+
+<p>
+Following are the steps to build the Incognito CD. Note that this process will take a long time as all software is compiled from scratch. You'll get a nice, compact, optimized CD though.
+</p>
+
+<p>
+Requirements in order to build the CD are:
+<ul>
+<li><a href="http://www.gentoo.org">Gentoo Linux</a> system OR Gentoo Linux chroot environment</li>
+<li><a href="http://packages.gentoo.org/packages/?category=dev-util;name=catalyst">&gt;=catalyst-2.0.4</a></li>
+</ul>
+</p>
+
+<ol>
+
+<li>Download <code>stage3-i686-*.tar.bz2</code> into <code>/var/tmp/catalyst/builds/incognito/</code>. You can find this tarball either at <a href="http://files1.cjb.net/incognito/">the official Incognito download site</a>.</li>
+
+<li>Pick version number from current date using YYYYMMDD format.</li>
+
+<li>Generate Portage snapshot.<pre>
+	emerge --sync
+	catalyst -s YYYYMMDD</pre>
+</li>
+
+<li>Update arch/*/*.spec files with new version number. Note that 20070413 will need
+to be changed to the current setting in the spec files.
+	<pre>sed -i 's/20070413/YYYYMMDD/' arch/*/*.spec</pre>
+</li>
+
+<li>(Optional) Check and update software in portage.overlay to the latest versions.</li>
+
+<li>Generate stage3 seed stage. After this step any caches in /var/tmp/catalyst
+related to stage1, stage2 or stage3 may be removed. Only the stage3 tarball
+needs to be kept.
+	<pre>
+	./build-stage.sh arch/x86/stage1.spec
+	./build-stage.sh arch/x86/stage2.spec
+	./build-stage.sh arch/x86/stage3.spec
+	</pre>
+</li>
+
+<li>Generate full version.
+	<pre>
+	./build-stage.sh arch/x86/livecd-stage1.spec
+	./livecd-stage2.sh arch/x86/livecd-stage2.spec
+	</pre>
+</li>
+
+<li>Generate tiny version.
+	<pre>
+	./build-stage.sh arch/x86/livecd-stage1-tiny.spec
+	./livecd-stage2.sh arch/x86/livecd-stage2-tiny.spec
+	</pre>
+</li>
+
+</ol>
+
+<p>
+Updating the Incognito CD with specific software, generally Tor, Polipo, TorK,
+Vidalia, can be done with the following steps:
+</p>
+
+<ol>
+<li>Update ebuilds in portage.overlay to desired versions.</li>
+
+<li>Generate full version. (~2 hours)
+	<pre>
+	./build-stage.sh arch/x86/livecd-stage1.spec
+	./livecd-stage2.sh arch/x86/livecd-stage2.spec
+	</pre>
+</li>
+
+<li>Generate tiny version. (~30 minutes)
+	<pre>
+	./build-stage.sh arch/x86/livecd-stage1-tiny.spec
+	./livecd-stage2.sh arch/x86/livecd-stage2-tiny.spec
+	</pre>
+</li>
+
+</ol>
+
+</body>
+</html>
+

Deleted: incognito/tags/20080109.1/fsscript.sh
===================================================================
--- incognito/trunk/fsscript.sh	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/fsscript.sh	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,229 +0,0 @@
-# Update network scripts according to baselayout instructions
-/bin/ls /etc/init.d/net.* | grep -v '/net.lo$' | xargs -n1 ln -sfvn net.lo
-
-# Perform patches
-for PATCH in $(ls /var/patches); do
-	( cd / && patch -f -p0 < /var/patches/${PATCH} )
-done
-rm -rf /var/patches
-
-# Handled by NetworkManager
-if [[ -x /usr/sbin/NetworkManager ]]; then
-	sed -i 's/^RC_PLUG_SERVICES=.*/RC_PLUG_SERVICES="net.lo !net.*"/' /etc/conf.d/rc
-	mkdir /var/lib/dhclient
-	chown -R dhcp:dhcp /var/lib/dhclient
-fi
-
-# Package list
-echo "Generating package list"
-equery -C list > /usr/share/incognito/packages.txt
-/usr/sbin/replace-versions.pl /usr/share/incognito/readme.html > /tmp/readme.html
-mv /tmp/readme.html /usr/share/incognito/readme.html
-
-# Set XSTATICVT to "no" so it will start late
-sed -i \
-	-e "s:^#\\?XSTATICVT=.\+$:XSTATICVT=\"no\":" \
-	/etc/conf.d/xdm
-
-# Cleanup KDE files if KDE is not installed
-which /usr/kde/*/bin/startkde >/dev/null 2>&1
-if [[ $? -ne 0 ]]; then
-	echo "Removing KDE directories because I couldn't find startkde"
-	rm -rf /usr/kde
-	rm -rf /usr/share/applnk
-	rm -rf /var/lib/kdesession
-fi
-
-if ! grep 'nls' /var/db/pkg/sys-libs/glibc*/USE >/dev/null 2>&1 ; then
-	echo "Removing all but English locales since I found -nls use flag"
-	grep "^en" /etc/locale.gen > /tmp/locale.gen.en
-	mv /tmp/locale.gen.en /etc/locale.gen
-fi
-
-# Reduce disk usage by removing unnecessary locales
-/usr/sbin/locale-gen
-
-# Clean unused locales
-PRETEND=0 /usr/sbin/clean-locale
-
-# Ensure Firefox defaults to en
-echo "Setting Firefox default locale to en"
-MOZILLA_FIVE_HOME="/opt/firefox"
-sed -i "s:general.useragent.locale\", \".*\":general.useragent.locale\", \"en-US\":" \
-	"${MOZILLA_FIVE_HOME}"/defaults/pref/firefox.js \
-	"${MOZILLA_FIVE_HOME}"/defaults/pref/firefox-l10n.js
-
-# Ensure thunderbird defaults to en
-echo "Setting Thunderbird default locale to en"
-THUNDERBIRD_HOME="/opt/thunderbird"
-sed -i "s:general.useragent.locale\", \".*\":general.useragent.locale\", \"en-US\":" \
-	"${THUNDERBIRD_HOME}"/defaults/pref/all-thunderbird.js \
-	"${THUNDERBIRD_HOME}"/defaults/pref/all-l10n.js
-
-# Group membership
-for GRP in uucp dialout tor gentoo ipw3945d cdrw floppy plugdev; do
-	groupmems -a gentoo -g ${GRP} 2>/dev/null || sed -i "s/^${GRP}:.*:\$/\0gentoo/" /etc/group
-done
-
-# User home directory configurations
-for USERDIR in /home/*; do
-	USERNAME="${USERDIR/\/home\//}"
-
-	# KDE config
-	if [[ -d /usr/kde ]]; then
-		mkdir -p $USERDIR/.kde3.5/share/config
-		cp -a /var/lib/kdesession/* $USERDIR/.kde3.5/share/config
-		sed -i s/User=/User=${USERNAME}/ $USERDIR/.kde3.5/share/config/torkrc
-		sed -i s/_USER_/${USERNAME}/ $USERDIR/.kde3.5/share/config/ksmserverrc
-		mkdir -p $USERDIR/.kde3.5/share/apps/konqueror
-		mv $USERDIR/.kde3.5/share/config/bookmarks.xml $USERDIR/.kde3.5/share/apps/konqueror/
-
-		[[ -x /usr/kde/3.5/bin/knetworkmanager ]] && KNETNM="/usr/kde/3.5/bin/knetworkmanager"
-		[[ -x /usr/bin/knetworkmanager ]] && KNETNM="/usr/bin/knetworkmanager"
-		[[ -n "${KNETNM}" ]] && ( mkdir -p $USERDIR/.kde3.5/Autostart ; ln -s "${KNETNM}" $USERDIR/.kde3.5/Autostart )
-	fi
-
-	# Fluxbox config
-	BROWSER="firefox-bin"
-	su ${USERNAME} -c "mkdir ~/.fluxbox"
-	cat > ${USERDIR}/.fluxbox/usermenu <<EOF
-	[exec] (Create USB) {sudo /usr/sbin/create-usb}
-	[exec] (${INCOGNITO:-Incognito} Documentation) {${BROWSER} /usr/share/incognito/readme.html}
-EOF
-	su ${USERNAME} -c "/usr/bin/fluxbox-generate_menu -k -B -d /usr/share/applications -ds -is -t xterm -w www.torproject.org -b ${BROWSER} -m \"${INCOGNITO:-Incognito}\" -q /usr/kde/3.5"
-	cat > ${USERDIR}/.fluxbox/startup <<EOF
-/usr/bin/fbsetbg -f /usr/share/pixmaps/desktop-1024x768.png
-#/usr/bin/fbsetroot -solid black
-# Turn off beeps
-xset -b
-if [[ -x /usr/bin/firefox-bin ]]; then
-	/usr/bin/firefox-bin -width 700 -height 1000 -P "Default User" about:blank &
-fi
-
-exec /usr/bin/fluxbox
-EOF
-
-	chmod +x ${USERDIR}/.fluxbox/startup
-
-	# Desktop files
-	mkdir ${USERDIR}/Desktop
-	for DESKTOP in /usr/share/applications/create-usb.desktop /usr/share/applications/readme.desktop /usr/share/applications/packages.desktop /usr/share/applications/pidgin.desktop /usr/kde/3.5/share/applications/kde/ksirc.desktop /usr/share/applications/kde/ktorrent.desktop /usr/kde/3.5/share/applications/kde/kopete.desktop /usr/kde/3.5/share/applications/kde/krdc.desktop /usr/kde/3.5/share/applications/kde/KMail.desktop /usr/share/applications/mozilla-thunderbird-bin.desktop; do
-		ln -s "${DESKTOP}" ${USERDIR}/Desktop
-	done
-
-	# XChat config
-	cp -a /var/lib/xchat-config ${USERDIR}/.xchat2
-
-	# Remove password
-	passwd -d "${USERNAME}"
-done
-
-# Remove root password
-passwd -d "root"
-
-# Add Tor hidden IRC proxies to Kopete IRC networks
-if [[ -f "/usr/kde/3.5/share/apps/kopete/ircnetworks.xml" ]]; then
-	head -n 2 /usr/kde/3.5/share/apps/kopete/ircnetworks.xml > /tmp/ircnetworks.xml
-	cat >> /tmp/ircnetworks.xml <<EOF
-	<network>
-		<name>Freenode (via Tor Hidden Service)</name>
-		<description></description>
-		<servers>
-			<server>
-				<host>mejokbp2brhw4omd.onion</host>
-				<port>6667</port>
-				<useSSL>false</useSSL>
-			</server>
-		</servers>
-	</network>
-	<network>
-		<name>OFTC (via Tor Hidden Service)</name>
-		<description></description>
-		<servers>
-			<server>
-				<host>37lnq2veifl4kar7.onion</host>
-				<port>6667</port>
-				<useSSL>false</useSSL>
-			</server>
-		</servers>
-	</network>
-EOF
-	tail -n $(( $(wc -l /usr/kde/3.5/share/apps/kopete/ircnetworks.xml | awk '{print $1}') - 2  )) /usr/kde/3.5/share/apps/kopete/ircnetworks.xml >> /tmp/ircnetworks.xml
-	mv /tmp/ircnetworks.xml /usr/kde/3.5/share/apps/kopete/ircnetworks.xml
-fi
-
-# Firefox config
-if [[ -x /usr/bin/firefox-bin ]]; then
-	mv /var/lib/firefox-config /home/gentoo/.mozilla
-fi
-if [[ -x /usr/bin/thunderbird-bin ]]; then
-	mv /var/lib/thunderbird-config /home/gentoo/.thunderbird
-fi
-
-# Pidgin config
-if [[ -x /usr/bin/pidgin ]]; then
-	mv /var/lib/pidgin-config /home/gentoo/.purple
-fi
-
-# These configs are useless outside of a home directory
-rm -rf /var/lib/*-config
-
-
-# Allow these applications to start without root password
-cat >>/etc/sudoers <<EOF
-
-Defaults:%wheel !env_reset
-%wheel ALL=(ALL) NOPASSWD: /usr/sbin/create-usb
-%wheel ALL=(ALL) NOPASSWD: /usr/bin/truecrypt
-
-EOF
-
-# Tor NICK
-echo "Nickname incognito`date | md5sum | cut -b 1-10`" >> /etc/tor/torrc
-
-# Tor Cookie store
-mkdir -p /var/tor
-chown tor:tor /var/tor
-chmod 0770 /var/tor
-mkdir /home/gentoo/.tor
-chmod 0700 /home/gentoo/.tor
-chown gentoo:gentoo /home/gentoo/.tor
-ln -s /var/tor/control_auth_cookie /home/gentoo/.tor/control_auth_cookie
-
-# Ensure correct user dir permissions
-for USERDIR in /home/*; do
-	chown -R ${USERDIR/\/home\//}:users $USERDIR
-	find $USERDIR -type f -print0 | xargs -0 chmod u+rw
-done
-chown -R root /root
-
-# Remove static libraries, these are only needed when building
-echo "Removing static libraries"
-find /lib /usr/lib /usr/qt/*/lib /usr/kde/*/lib -name "*.a" -print0 | xargs -0 rm
-
-# Remove "*.la" only if we don't have KDE, otherwise some things won't load, like KDM
-if [[ ! -e "/usr/kde" ]] && [[ ! -e "/usr/qt" ]]; then
-       find /lib /usr/lib -name "*.la" -print0 | xargs -0 rm
-fi
-
-echo "Removing .keep files"
-find /var/db/pkg -name "CONTENTS" | xargs cat | grep "/\.keep" | awk '{print $2}' | xargs rm -f
-
-
-#echo "Removing dangling links"
-#symlinks -dr /
-
-# Make netstat SUID root so user programs such as TorK can monitor the network
-chmod u+s /bin/netstat
-
-# Seems re-merge of ncurses does not remove /usr/share/terminfo
-rm -rf /usr/share/terminfo
-ln -s /etc/terminfo /usr/share/terminfo
-
-# Remove .svn directories
-if [[ -d "/.svn" ]]; then
-	echo "Removing .svn directories"
-	rm -rf /.svn
-	find /etc /usr /var /home -xdev -type d -a -name ".svn" -print0 | xargs -0 rm -rf
-fi
-

Copied: incognito/tags/20080109.1/fsscript.sh (from rev 13298, incognito/trunk/fsscript.sh)
===================================================================
--- incognito/tags/20080109.1/fsscript.sh	                        (rev 0)
+++ incognito/tags/20080109.1/fsscript.sh	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,260 @@
+# Update network scripts according to baselayout instructions
+/bin/ls /etc/init.d/net.* | grep -v '/net.lo$' | xargs -n1 ln -sfvn net.lo
+
+# Perform patches
+echo "Applying patched in /var/patches ..."
+for PATCH in $(ls /var/patches); do
+	( cd / && patch -f -p0 < /var/patches/${PATCH} )
+done
+rm -rf /var/patches
+
+# Handled by NetworkManager
+if [[ -x /usr/sbin/NetworkManager ]]; then
+	sed -i 's/^RC_PLUG_SERVICES=.*/RC_PLUG_SERVICES="net.lo !net.*"/' /etc/conf.d/rc
+	mkdir /var/lib/dhclient
+	chown -R dhcp:dhcp /var/lib/dhclient
+fi
+
+# Package list
+echo "Generating package list"
+equery -C list > /usr/share/incognito/packages.txt
+/usr/sbin/replace-versions.pl /usr/share/incognito/readme.html > /tmp/readme.html
+mv /tmp/readme.html /usr/share/incognito/readme.html
+
+# Set XSTATICVT to "no" so it will start late
+sed -i \
+	-e "s:^#\\?XSTATICVT=.\+$:XSTATICVT=\"no\":" \
+	/etc/conf.d/xdm
+
+# Cleanup KDE files if KDE is not installed
+which /usr/kde/*/bin/startkde >/dev/null 2>&1
+if [[ $? -ne 0 ]]; then
+	echo "Removing KDE directories because I couldn't find startkde"
+	rm -rf /usr/kde
+	rm -rf /usr/share/applnk
+	rm -rf /var/lib/kdesession
+fi
+
+if ! grep 'nls' /var/db/pkg/sys-libs/glibc*/USE >/dev/null 2>&1 ; then
+	echo "Removing all but English locales since I found -nls use flag"
+	grep "^en" /etc/locale.gen > /tmp/locale.gen.en
+	mv /tmp/locale.gen.en /etc/locale.gen
+fi
+
+# Reduce disk usage by removing unnecessary locales
+/usr/sbin/locale-gen
+
+# Clean unused locales
+PRETEND=0 /usr/sbin/clean-locale
+
+# Ensure Firefox defaults to en
+echo "Setting Firefox default locale to en"
+MOZILLA_FIVE_HOME="/opt/firefox"
+sed -i "s:general.useragent.locale\", \".*\":general.useragent.locale\", \"en-US\":" \
+	"${MOZILLA_FIVE_HOME}"/defaults/pref/firefox.js \
+	"${MOZILLA_FIVE_HOME}"/defaults/pref/firefox-l10n.js
+
+# Ensure thunderbird defaults to en
+echo "Setting Thunderbird default locale to en"
+THUNDERBIRD_HOME="/opt/thunderbird"
+sed -i "s:general.useragent.locale\", \".*\":general.useragent.locale\", \"en-US\":" \
+	"${THUNDERBIRD_HOME}"/defaults/pref/all-thunderbird.js \
+	"${THUNDERBIRD_HOME}"/defaults/pref/all-l10n.js
+
+# Tor nick
+echo "Nickname incognito`date | md5sum | cut -b 1-10`" >> /etc/tor/torrc
+
+# Tor Cookie store
+echo "Setting up Tor Cookie store"
+mkdir -p /var/tor
+chown tor:tor /var/tor
+chmod 0770 /var/tor
+
+# User configurations
+for USERDIR in /home/*; do
+	USERNAME="${USERDIR/\/home\//}"
+
+	echo "User configurations for user ${USERNAME}"
+
+	# Group membership
+	echo "Setting group membership"
+	for GRP in uucp dialout tor ${USERNAME} ipw3945d cdrw floppy plugdev; do
+		gpasswd -a ${USERNAME} ${GRP} 2>/dev/null || sed -i "s/^${GRP}:.*:\$/\0${USERNAME}/" /etc/group
+	done
+
+	# KDE config
+	if [[ -d /usr/kde ]]; then
+		echo "Configuring KDE"
+		mkdir -p $USERDIR/.kde3.5/share/config
+		cp -a /var/lib/kdesession/* $USERDIR/.kde3.5/share/config
+		sed -i s/User=/User=${USERNAME}/ $USERDIR/.kde3.5/share/config/torkrc
+		sed -i s/_USER_/${USERNAME}/ $USERDIR/.kde3.5/share/config/ksmserverrc
+		mkdir -p $USERDIR/.kde3.5/share/apps/konqueror
+		mv $USERDIR/.kde3.5/share/config/bookmarks.xml $USERDIR/.kde3.5/share/apps/konqueror/
+
+		[[ -x /usr/kde/3.5/bin/knetworkmanager ]] && KNETNM="/usr/kde/3.5/bin/knetworkmanager"
+		[[ -x /usr/bin/knetworkmanager ]] && KNETNM="/usr/bin/knetworkmanager"
+		if [[ -n "${KNETNM}" ]]; then
+			echo "Adding knetworkmanager to KDE autostart"
+			mkdir -p $USERDIR/.kde3.5/Autostart
+			ln -s "${KNETNM}" $USERDIR/.kde3.5/Autostart
+		fi
+	fi
+
+	# Fluxbox config
+	if [[ -d /usr/share/fluxbox ]]; then
+		echo "Configuring fluxbox"
+		BROWSER="firefox-bin"
+		su ${USERNAME} -c "mkdir ~/.fluxbox"
+		cat > ${USERDIR}/.fluxbox/usermenu <<EOF
+[exec] (Create USB) {sudo /usr/sbin/create-usb}
+[exec] (${INCOGNITO:-Incognito} Documentation) {${BROWSER} /usr/share/incognito/readme.html}
+EOF
+		su ${USERNAME} -c "/usr/bin/fluxbox-generate_menu -k -B -d /usr/share/applications -ds -is -t xterm -w www.torproject.org -b ${BROWSER} -m \"${INCOGNITO:-Incognito}\" -q /usr/kde/3.5"
+		cat > ${USERDIR}/.fluxbox/startup <<EOF
+/usr/bin/fbsetbg -f /usr/share/pixmaps/desktop-1024x768.png
+#/usr/bin/fbsetroot -solid black
+# Turn off beeps
+xset -b
+if [[ -x /usr/bin/firefox-bin ]]; then
+	/usr/bin/firefox-bin -width 700 -height 1000 -P "Default User" about:blank &
+fi
+
+exec /usr/bin/fluxbox
+EOF
+
+		chmod +x ${USERDIR}/.fluxbox/startup
+	fi
+
+	# Desktop files
+	echo "Preparing desktop"
+	mkdir ${USERDIR}/Desktop
+	for DESKTOP in /usr/share/applications/create-usb.desktop /usr/share/applications/readme.desktop /usr/share/applications/packages.desktop /usr/share/applications/pidgin.desktop /usr/kde/3.5/share/applications/kde/ksirc.desktop /usr/share/applications/kde/ktorrent.desktop /usr/kde/3.5/share/applications/kde/kopete.desktop /usr/kde/3.5/share/applications/kde/krdc.desktop /usr/kde/3.5/share/applications/kde/KMail.desktop /usr/share/applications/mozilla-thunderbird-bin.desktop; do
+		ln -s "${DESKTOP}" ${USERDIR}/Desktop
+	done
+
+	# Add Tor cookie fo user
+	echo "Setting up Tor Cookie for user"
+	mkdir ${USERDIR}/.tor
+	chmod 0700 ${USERDIR}/.tor
+	ln -s /var/tor/control_auth_cookie ${USERDIR}/.tor/control_auth_cookie
+
+	# Vidalia config
+	echo "Setting up Vidalia"
+	cp -a /var/lib/vidalia-config ${USERDIR}/.vidalia 
+
+	# If Vidalia should be used as default Tor GUI controller instead of TorK
+	#if [[ -x /usr/bin/vidalia ]]; then
+	#	echo "Setting Vidalia as the default Tor GUI controller"
+	#	mkdir -p $USERDIR/.kde3.5/Autostart
+	#	ln -s "/usr/bin/vidalia" $USERDIR/.kde3.5/Autostart
+	#fi
+
+	# XChat config
+	echo "Setting up XChat"
+	cp -a /var/lib/xchat-config ${USERDIR}/.xchat2
+
+	# Firefox config
+	echo "Setting up Firefox"
+	if [[ -x /usr/bin/firefox-bin ]]; then
+		cp -a /var/lib/firefox-config ${USERDIR}/.mozilla
+	fi
+	if [[ -x /usr/bin/thunderbird-bin ]]; then
+		cp -a /var/lib/thunderbird-config ${USERDIR}/.thunderbird
+	fi
+
+	# Pidgin config
+	echo "Setting up Pidgin"
+	if [[ -x /usr/bin/pidgin ]]; then
+		cp -a /var/lib/pidgin-config ${USERDIR}/.purple
+	fi
+
+	# Ensure correct user dir permissions
+	echo "Setting user permissions"
+	chown -R ${USERNAME}:${USERNAME} ${USERDIR}
+	find ${USERDIR} -type f -print0 | xargs -0 chmod u+rw
+
+	# Remove password
+	passwd -d "${USERNAME}"
+done
+
+# Remove root password and ensure home dir permissions
+echo "Setting up super user"
+passwd -d "root"
+chown -R root:root /root
+
+# Add Tor hidden IRC proxies to Kopete IRC networks
+echo "Add Tor hidden IRC proxies to Kopete"
+if [[ -f "/usr/kde/3.5/share/apps/kopete/ircnetworks.xml" ]]; then
+	head -n 2 /usr/kde/3.5/share/apps/kopete/ircnetworks.xml > /tmp/ircnetworks.xml
+	cat >> /tmp/ircnetworks.xml <<EOF
+	<network>
+		<name>Freenode (via Tor Hidden Service)</name>
+		<description></description>
+		<servers>
+			<server>
+				<host>mejokbp2brhw4omd.onion</host>
+				<port>6667</port>
+				<useSSL>false</useSSL>
+			</server>
+		</servers>
+	</network>
+	<network>
+		<name>OFTC (via Tor Hidden Service)</name>
+		<description></description>
+		<servers>
+			<server>
+				<host>37lnq2veifl4kar7.onion</host>
+				<port>6667</port>
+				<useSSL>false</useSSL>
+			</server>
+		</servers>
+	</network>
+EOF
+	tail -n $(( $(wc -l /usr/kde/3.5/share/apps/kopete/ircnetworks.xml | awk '{print $1}') - 2  )) /usr/kde/3.5/share/apps/kopete/ircnetworks.xml >> /tmp/ircnetworks.xml
+	mv /tmp/ircnetworks.xml /usr/kde/3.5/share/apps/kopete/ircnetworks.xml
+fi
+
+# Allow these applications to start without root password
+echo "Setting up sudoers"
+cat >>/etc/sudoers <<EOF
+
+Defaults:%wheel !env_reset
+%wheel ALL=(ALL) NOPASSWD: /usr/sbin/create-usb
+%wheel ALL=(ALL) NOPASSWD: /usr/bin/truecrypt
+
+EOF
+
+# These configs are useless outside of a home directory
+echo "Removing uneccesary configuration files"
+rm -rf /var/lib/*-config
+
+# Remove static libraries, these are only needed when building
+echo "Removing static libraries"
+find /lib /usr/lib /usr/qt/*/lib /usr/kde/*/lib -name "*.a" -print0 | xargs -0 rm
+
+# Remove "*.la" only if we don't have KDE, otherwise some things won't load, like KDM
+if [[ ! -e "/usr/kde" ]] && [[ ! -e "/usr/qt" ]]; then
+       find /lib /usr/lib -name "*.la" -print0 | xargs -0 rm
+fi
+
+echo "Removing crust (.keep, *~ etc.)"
+find /var/db/pkg -name "CONTENTS" | xargs cat | grep "/\.keep" | awk '{print $2}' | xargs rm -f
+find / -regex ".+~" -exec rm -f '{}' \;
+
+#echo "Removing dangling links"
+#symlinks -dr /
+
+# Make netstat SUID root so user programs such as TorK can monitor the network
+chmod u+s /bin/netstat
+
+# Seems re-merge of ncurses does not remove /usr/share/terminfo
+rm -rf /usr/share/terminfo
+ln -s /etc/terminfo /usr/share/terminfo
+
+# Remove .svn directories
+if [[ -d "/.svn" ]]; then
+	echo "Removing .svn directories"
+	rm -rf /.svn
+	find /etc /usr /var /home -xdev -type d -a -name ".svn" -print0 | xargs -0 rm -rf
+fi

Deleted: incognito/tags/20080109.1/hacking.html
===================================================================
--- incognito/trunk/hacking.html	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/hacking.html	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,77 +0,0 @@
-<html>
-<head>
-<title>Incognito Hacking</title>
-</head>
-
-
-<body>
-
-<p>
-Help is always appreciated. Most help will probably be in the way of patches sent to anonym at lavabit dot com. Please do send patches, not entire files. That way I can see your changes and if the file(s) are you changing have changed since you updated, there is a better chance the change can be applied. Checkout <a href="https://tor-svn.freehaven.net/svn/incognito/trunk">https://tor-svn.freehaven.net/svn/incognito/trunk</a>, make your changes, and run "svn diff > whatever.patch" to create the patch. If you are very active and seem to know what you are doing we may give you an SVN account.
-</p>
-
-<h1>Pre-reqs</h1>
-
-<p>You must know something about the following technologies:</p>
-<ul>
-<li>Gentoo Linux - the base operating system</li>
-<li>Catalyst - the Gentoo release media tool</li>
-<li>Subversion - the source code management tool</li>
-</ul>
-
-<p>
-Before submitting patches make sure you can build and test the CD. See building.html for build instructions. You can use an emulator/virtualizer such as QEMU or Virtual PC to test it.
-</p>
-
-<h1>Updating Packages</h1>
-
-<p>Updating packages happens in portage.overlay. The following steps with bump the version number. Anything more indepth you'll need to learn how ebuilds work.</p>
-<ol>
-<li>cd to portage.overlay/category/package</li>
-<li>svn mv package-version.ebuild package-newversion.ebuild</li>
-<li>svn rm files/digest-package-version</li>
-<li>ebuild package-newversion.ebuild manifest</li>
-</ol>
-
-<p>
-<strong>NOTICE</strong>: No alpha or beta packages unless absolutely necessary! First, people are recording this to a CD or USB, they cannot easily update to the next alpha if something goes wrong. Second, people are counting on anonymity, the packages should be well tested.
-</p>
-
-<h1>Important Files</h1>
-
-<dl>
-
-<dt>arch/x86/stage{1,2,3}.spec</dt>
-<dd>
-Specification for the stage 1-3 tarballs. Don't change these unless you really know what you are doing.
-</dd>
-
-<dt>arch/x86/livecd-stage1{,-tiny}.spec</dt>
-<dd>
-Specification for the main CD build. This gives the packages and use flags that are desired. Do not add packages that depend on the kernel sources being installed, that goes in livecd-stage2.spec.
-</dd>
-
-<dt>arch/x86/livecd-stage2{,-tiny}.spec</dt>
-<dd>
-Specification for the final stage of the CD build. livecd-stage2 basically takes livecd-stage1 and modifies it for use on a live CD. The kernel is built, packages depending on the kernel are installed, package configuration is done, unnecessary packages and files removed, etc. Most changes will have to do with livecd-stage2 and mostly you can rebuild this stage to get your changes.
-</dd>
-
-<dt>fsscript.sh</dt>
-<dd>
-This script is run in the chroot environment of livecd-stage2. Look at it to see some things you might need to do.
-</dd>
-
-<dt>livecd-stage2.sh</dt>
-<dd>
-This script does pre-processing for livecd-stage2{,-tiny}.spec. If you need to generate files for the overlay programatically, this is the place to do it.
-</dd>
-
-</dl>
-
-<h1>Misc</h1>
-
-<p>The arch/*.pyo files are generated by catalyst, I don't know why. Ignore them.</p>
-
-</body>
-</html>
-

Copied: incognito/tags/20080109.1/hacking.html (from rev 13115, incognito/trunk/hacking.html)
===================================================================
--- incognito/tags/20080109.1/hacking.html	                        (rev 0)
+++ incognito/tags/20080109.1/hacking.html	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,96 @@
+<html>
+<head>
+<title>Incognito Hacking</title>
+</head>
+
+
+<body>
+
+<p>
+Help is always appreciated. Most help will probably be in the way of patches sent to anonym at lavabit dot com. Please do send patches, not entire files. That way I can see your changes and if the file(s) are you changing have changed since you updated, there is a better chance the change can be applied. Checkout <a href="https://tor-svn.freehaven.net/svn/incognito/trunk">https://tor-svn.freehaven.net/svn/incognito/trunk</a>, make your changes, and run "svn diff > whatever.patch" to create the patch. If you are very active and seem to know what you are doing you may get an SVN account.
+</p>
+
+<h1>Pre-reqs</h1>
+
+<p>You must know something about the following technologies:</p>
+<ul>
+<li>Gentoo Linux - the base operating system</li>
+<li>Catalyst - the Gentoo release media tool</li>
+<li>Subversion - the source code management tool</li>
+</ul>
+
+<p>
+Before submitting patches make sure you can build and test the CD. See building.html for build instructions. You can use an emulator/virtualizer such as QEMU or Virtual PC to test it.
+</p>
+
+<h1>Updating Packages</h1>
+
+<p>Updating packages happens in portage.overlay. The following steps with bump the version number. Anything more indepth you'll need to learn how ebuilds work.</p>
+<ol>
+<li>cd to portage.overlay/category/package</li>
+<li>svn mv package-version.ebuild package-newversion.ebuild</li>
+<li>svn rm files/digest-package-version</li>
+<li>ebuild package-newversion.ebuild manifest</li>
+</ol>
+
+<p>
+<strong>NOTICE</strong>: No alpha or beta packages unless absolutely necessary! First, people are recording this to a CD or USB, they cannot easily update to the next alpha if something goes wrong. Second, people are counting on anonymity, the packages should be well tested.
+</p>
+
+<h1>Important Files</h1>
+
+<dl>
+
+<dt>arch/x86/stage{1,2,3}.spec</dt>
+<dd>
+Specification for the stage 1-3 tarballs. Don't change these unless you really know what you are doing.
+</dd>
+
+<dt>arch/x86/livecd-stage1{,-tiny}.spec</dt>
+<dd>
+Specification for the main CD build. This gives the packages and use flags that are desired. Do not add packages that depend on the kernel sources being installed, that goes in livecd-stage2.spec.
+</dd>
+
+<dt>arch/x86/livecd-stage2{,-tiny}.spec</dt>
+<dd>
+Specification for the final stage of the CD build. livecd-stage2 basically takes livecd-stage1 and modifies it for use on a live CD. The kernel is built, packages depending on the kernel are installed, package configuration is done, unnecessary packages and files removed, etc. Most changes will have to do with livecd-stage2 and mostly you can rebuild this stage to get your changes.
+</dd>
+
+<dt>fsscript.sh</dt>
+<dd>
+This script is run in the chroot environment of livecd-stage2. Look at it to see some things you might need to do.
+</dd>
+
+<dt>livecd-stage2.sh</dt>
+<dd>
+This script does pre-processing for livecd-stage2{,-tiny}.spec. If you need to generate files for the overlay programatically, this is the place to do it.
+</dd>
+
+</dl>
+
+<h1>Gentoo Linux chroot environment</h1>
+<p>If you run another Linux distribution than Gentoo Linux (or if you run Gentoo Linux on another arch than x86) but want to build Incognito with catalyst, simply fetch a x86 stage-3 tarball from (preferably) <a href="http://files1.cjb.net/incognito/">the official Incognito download site</a> or a <a href="http://www.gentoo.org/main/en/mirrors.xml">Gentoo Mirror</a> (preferably the latest release), extract and chroot into it. When inside the chroot, sync portage, update and install relevant applications:</p>
+<p><code># get a stage3 tarball<br>
+wget http://files1.cjb.net/incognito/stage3-i686-*.tar.bz2
+<br>
+# extract it<br>
+mkdir incognito<br>
+tar xfj stage3-x86-*.tar -C incognito<br>
+<br>
+# enter new environment (as super user)<br>
+chroot incognito /bin/bash<br>
+<br>
+# update and install packages<br>
+emerge --sync<br>
+emerge -auvDN world<br>
+emerge -av catalyst # some more might be needed</code></p>
+<p>Then use this chroot enivonment as you would use a regular Gentoo Linux installation for building Incognito.</p>
+<p>When using menuconfig for kernel configurations on a different arch than x86, use <code>linux32 make menuconfig</code> (linux32 can be found in the sys-apps/setarch package) to make sure to get a sane kernel config.
+
+<h1>Misc</h1>
+
+<p>The arch/*.pyo files are generated by catalyst, I don't know why. Ignore them.</p>
+
+</body>
+</html>
+

Deleted: incognito/tags/20080109.1/livecd-stage2.sh
===================================================================
--- incognito/trunk/livecd-stage2.sh	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/livecd-stage2.sh	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,138 +0,0 @@
-#!/bin/sh
-
-source /etc/catalyst/catalyst.conf
-
-# Build a livecd-stage2 ensuring the .svn directories don't make it on
-
-# Verify arguments
-SPEC="$1"
-if [[ -z "${SPEC}" ]] || [[ ! -r "${SPEC}" ]]; then
-	echo "Usage: $0 <spec_file>"
-	exit 1
-fi
-
-# Verify correct type
-if ! grep "target:.*livecd-stage2" "${SPEC}" >/dev/null; then
-	echo "Target must be livecd-stage2: ${SPEC}"
-	grep "target:" "${SPEC}"
-	exit 1
-fi
-
-# Find overlay
-OVERLAY="$(grep 'livecd/overlay:' ${SPEC} | cut -d ':' -f 2 | tr -d [:space:])"
-if [[ -n "${OVERLAY}" ]] && [[ ! -d "${OVERLAY}" ]]; then
-	echo "Overlay ${OVERLAY} not found"
-	exit 1
-fi
-
-# Find root_overlay
-ROOT_OVERLAY="$(grep 'livecd/root_overlay:' ${SPEC} | cut -d ':' -f 2 | tr -d [:space:])"
-if [[ -n "${ROOT_OVERLAY}" ]] && [[ ! -d "${ROOT_OVERLAY}" ]]; then
-	echo "Root overlay ${ROOT_OVERLAY} not found"
-	exit 1
-fi
-
-# Create temporary
-DIR="$(mktemp -t -d incognitoXXXXXXXX)"
-if [[ $? -ne 0 ]]; then
-	echo "Could not create temporary directory, $? from mktemp" >&2
-	exit 1
-fi
-
-cp "${SPEC}" "${DIR}/livecd-stage2.spec"
-if [[ -d "${OVERLAY}" ]]; then
-	cp -prL "${OVERLAY}" "${DIR}/overlay"
-	sed -i "s/livecd\/overlay:.*/livecd\/overlay: ${DIR//\//\\/}\/overlay/" "${DIR}/livecd-stage2.spec"
-fi
-if [[ -d "${ROOT_OVERLAY}" ]]; then
-	cp -prL "${ROOT_OVERLAY}" "${DIR}/root_overlay"
-	sed -i "s/livecd\/root_overlay:.*/livecd\/root_overlay: ${DIR//\//\\/}\/root_overlay/" "${DIR}/livecd-stage2.spec"
-fi
-
-# Remove SVN directories
-find "${DIR}" -xdev -type d -a -name ".svn" -print0 | xargs -0 rm -rf
-
-# Fix checkout root
-sed -i "s:/usr/src/incognito:$(pwd):g" "${DIR}/livecd-stage2.spec"
-
-# Do branding replacement
-# TODO: Get these two from somewhere else
-INCOGNITO="Incognito"
-INCOGNITO_TITLE="Incognito"
-INCOGNITO_VERSION="custom"
-
-# Add revision
-SVN_URL="$(svn info --xml 2>/dev/null | grep url | sed 's/<url>\(.*\)<\/url>/\1/')"
-grep trunk >/dev/null <<EOF && INCOGNITO_VERSION="trunk" && INCOGNITO_TITLE="${INCOGNITO_TITLE} r$(svnversion | cut -d ":" -f 2)"
-${SVN_URL}
-EOF
-grep tags  >/dev/null <<EOF && INCOGNITO_VERSION="$(basename ${SVN_URL})" && INCOGNITO_TITLE="${INCOGNITO_TITLE} ${INCOGNITO_VERSION}"
-${SVN_URL}
-EOF
-grep branches >/dev/null <<EOF && INCOGNITO_VERSION="$(basename ${SVN_URL})" && INCOGNITO_TITLE="${INCOGNITO_TITLE} ${INCOGNITO_VERSION} r$(svnversion | cut -d ":" -f 2)"
-${SVN_URL}
-EOF
-
-echo "========"
-echo "Building: ${INCOGNITO_TITLE}"
-echo "========"
-
-export INCOGNITO INCOGNITO_TITLE INCOGNITO_VERSION
-
-find "${DIR}" -type f | while read FILE; do
-	sed -i "s/__INCOGNITO__/${INCOGNITO//\//\/}/g" "${FILE}"
-	sed -i "s/__INCOGNITO_TITLE__/${INCOGNITO_TITLE//\//\/}/g" "${FILE}"
-	sed -i "s/__INCOGNITO_VERSION__/${INCOGNITO_VERSION//\//\/}/g" "${FILE}"
-done
-
-# find isolinux.cfg
-ISOLINUX="$(find ${DIR}/overlay -name 'isolinux.cfg')"
-
-# Install QEMU
-[[ -e "${DIR}/overlay/run.bat" ]] && QEMU_INSTALL=1
-QEMU_URL="http://www.h6.dion.ne.jp/~kazuw/qemu-win/qemu-0.9.0-windows.zip"
-QEMU_FILE="${distdir}/$(basename ${QEMU_URL})"
-#KQEMU_URL="http://www.h6.dion.ne.jp/~kazuw/qemu-win/Kqemu-1.3.0pre11-install.exe"
-#KQEMU_FILE="${distdir}/$(basename ${KQEMU_URL})"
-if [[ "${QEMU_INSTALL}" == "1" ]]; then
-	[[ -e "${QEMU_FILE}" ]] || wget -O "${QEMU_FILE}" "${QEMU_URL}"
-#	[[ -e "${KQEMU_FILE}" ]] || wget -O "${KQEMU_FILE}" "${KQEMU_URL}"
-	( cd "${DIR}" ; unzip "${QEMU_FILE}" >/dev/null )
-	mkdir "${DIR}/overlay/qemu"
-	for QEMU_TARGET in *.bin *.dll keymaps qemu.exe License; do
-		mv "${DIR}"/qemu-0.9.0-windows/${QEMU_TARGET}  "${DIR}/overlay/qemu"
-	done
-
-	# Fixup run*.bat with menu
-	[[ -n "${ISOLINUX}" ]] && find "${DIR}/overlay" -name "*.bat" -exec ./create-runbat.sh {} "${ISOLINUX}" \;
-
-fi
-
-# Put the ugly macchanger boot menu hack in place
-[[ -n "${ISOLINUX}" ]] && ./create-macchanger.sh $( dirname ${ISOLINUX})/macchang.cfg ${ISOLINUX}
-
-# AdBlock filter
-ADBLOCK_URL="http://easylist.adblockplus.org/adblock_rick752.txt"
-ADBLOCK_FILE="${distdir}/$(basename ${ADBLOCK_URL})"
-[[ -s "${ADBLOCK_FILE}" ]] || wget -O "${ADBLOCK_FILE}" "${ADBLOCK_URL}"
-if [[ -s "${ADBLOCK_FILE}" ]]; then
-# Do use AdBlock filter for polipo, there is no way to disable it at runtime
-#	[[ -d "${DIR}/root_overlay/etc/polipo/forbidden.d" ]] && ./adblockplusfilter2polipo.sh "${ADBLOCK_FILE}" > "${DIR}/root_overlay/etc/polipo/forbidden.d/$(basename ${ADBLOCK_FILE})"
-	[[ -d "${DIR}/root_overlay/var/lib/kdesession" ]] && ./adblockplusfilter2konq.sh "${ADBLOCK_FILE}" >> "${DIR}/root_overlay/var/lib/kdesession/khtmlrc"
-
-fi
-
-# Build it
-NICECMD=""
-[[ -x "/usr/bin/ionice" ]] && NICECMD="/usr/bin/ionice -c 3"
-[[ -x "/usr/bin/schedtool" ]] && NICECMD="/usr/bin/schedtool -B -n 8 -e ${NICECMD}"
-${NICECMD} catalyst -v -f "${DIR}/livecd-stage2.spec"
-CATALYST_STATUS=$?
-
-# Clean up
-rm -rf "${DIR}"
-
-if [[ ${CATALYST_STATUS} -ne 0 ]]; then
-	echo "Catalyst failed" >&2
-	exit 1
-fi

Copied: incognito/tags/20080109.1/livecd-stage2.sh (from rev 13115, incognito/trunk/livecd-stage2.sh)
===================================================================
--- incognito/tags/20080109.1/livecd-stage2.sh	                        (rev 0)
+++ incognito/tags/20080109.1/livecd-stage2.sh	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,139 @@
+#!/bin/sh
+
+source /etc/catalyst/catalyst.conf
+
+# Build a livecd-stage2 ensuring the .svn directories don't make it on
+
+# Verify arguments
+SPEC="$1"
+if [[ -z "${SPEC}" ]] || [[ ! -r "${SPEC}" ]]; then
+	echo "Usage: $0 <spec_file>"
+	exit 1
+fi
+
+# Verify correct type
+if ! grep "target:.*livecd-stage2" "${SPEC}" >/dev/null; then
+	echo "Target must be livecd-stage2: ${SPEC}"
+	grep "target:" "${SPEC}"
+	exit 1
+fi
+
+# Find overlay
+OVERLAY="$(grep 'livecd/overlay:' ${SPEC} | cut -d ':' -f 2 | tr -d [:space:])"
+if [[ -n "${OVERLAY}" ]] && [[ ! -d "${OVERLAY}" ]]; then
+	echo "Overlay ${OVERLAY} not found"
+	exit 1
+fi
+
+# Find root_overlay
+ROOT_OVERLAY="$(grep 'livecd/root_overlay:' ${SPEC} | cut -d ':' -f 2 | tr -d [:space:])"
+if [[ -n "${ROOT_OVERLAY}" ]] && [[ ! -d "${ROOT_OVERLAY}" ]]; then
+	echo "Root overlay ${ROOT_OVERLAY} not found"
+	exit 1
+fi
+
+# Create temporary
+DIR="$(mktemp -t -d incognitoXXXXXXXX)"
+if [[ $? -ne 0 ]]; then
+	echo "Could not create temporary directory, $? from mktemp" >&2
+	exit 1
+fi
+
+cp "${SPEC}" "${DIR}/livecd-stage2.spec"
+if [[ -d "${OVERLAY}" ]]; then
+	cp -prL "${OVERLAY}" "${DIR}/overlay"
+	sed -i "s/livecd\/overlay:.*/livecd\/overlay: ${DIR//\//\\/}\/overlay/" "${DIR}/livecd-stage2.spec"
+fi
+if [[ -d "${ROOT_OVERLAY}" ]]; then
+	cp -prL "${ROOT_OVERLAY}" "${DIR}/root_overlay"
+	sed -i "s/livecd\/root_overlay:.*/livecd\/root_overlay: ${DIR//\//\\/}\/root_overlay/" "${DIR}/livecd-stage2.spec"
+fi
+
+# Remove SVN directories
+find "${DIR}" -xdev -type d -a -name ".svn" -print0 | xargs -0 rm -rf
+
+# Fix checkout root
+sed -i "s:/usr/src/incognito:$(pwd):g" "${DIR}/livecd-stage2.spec"
+
+# Do branding replacement
+# TODO: Get these two from somewhere else
+INCOGNITO="Incognito"
+INCOGNITO_TITLE="Incognito"
+INCOGNITO_VERSION="custom"
+
+# Add revision
+SVN_URL="$(svn info --xml 2>/dev/null | grep url | sed 's/<url>\(.*\)<\/url>/\1/')"
+grep trunk >/dev/null <<EOF && INCOGNITO_VERSION="trunk" && INCOGNITO_TITLE="${INCOGNITO_TITLE} r$(svnversion | cut -d ":" -f 2)"
+${SVN_URL}
+EOF
+grep tags  >/dev/null <<EOF && INCOGNITO_VERSION="$(basename ${SVN_URL})" && INCOGNITO_TITLE="${INCOGNITO_TITLE} ${INCOGNITO_VERSION}"
+${SVN_URL}
+EOF
+grep branches >/dev/null <<EOF && INCOGNITO_VERSION="$(basename ${SVN_URL})" && INCOGNITO_TITLE="${INCOGNITO_TITLE} ${INCOGNITO_VERSION} r$(svnversion | cut -d ":" -f 2)"
+${SVN_URL}
+EOF
+
+echo "========"
+echo "Building: ${INCOGNITO_TITLE}"
+echo "========"
+
+export INCOGNITO INCOGNITO_TITLE INCOGNITO_VERSION
+
+find "${DIR}" -type f | while read FILE; do
+	sed -i "s/__INCOGNITO__/${INCOGNITO//\//\/}/g" "${FILE}"
+	sed -i "s/__INCOGNITO_TITLE__/${INCOGNITO_TITLE//\//\/}/g" "${FILE}"
+	sed -i "s/__INCOGNITO_VERSION__/${INCOGNITO_VERSION//\//\/}/g" "${FILE}"
+done
+
+# find isolinux.cfg
+ISOLINUX="$(find ${DIR}/overlay -name 'isolinux.cfg')"
+
+# Install QEMU
+[[ -e "${DIR}/overlay/run.bat" ]] && QEMU_INSTALL=1
+QEMU_URL="http://www.h6.dion.ne.jp/~kazuw/qemu-win/qemu-0.9.0-windows.zip"
+QEMU_FILE="${distdir}/$(basename ${QEMU_URL})"
+#KQEMU_URL="http://www.h6.dion.ne.jp/~kazuw/qemu-win/Kqemu-1.3.0pre11-install.exe"
+#KQEMU_FILE="${distdir}/$(basename ${KQEMU_URL})"
+if [[ "${QEMU_INSTALL}" == "1" ]]; then
+	[[ -e "${QEMU_FILE}" ]] || wget -O "${QEMU_FILE}" "${QEMU_URL}"
+#	[[ -e "${KQEMU_FILE}" ]] || wget -O "${KQEMU_FILE}" "${KQEMU_URL}"
+	( cd "${DIR}" ; unzip "${QEMU_FILE}" >/dev/null )
+	mkdir "${DIR}/overlay/qemu"
+	for QEMU_TARGET in *.bin *.dll keymaps qemu.exe License; do
+		mv "${DIR}"/qemu-0.9.0-windows/${QEMU_TARGET}  "${DIR}/overlay/qemu"
+	done
+
+	# Fixup run*.bat with menu
+	[[ -n "${ISOLINUX}" ]] && find "${DIR}/overlay" -name "*.bat" -exec ./create-runbat.sh {} "${ISOLINUX}" \;
+
+fi
+
+# Put the ugly macchanger boot menu hack in place
+[[ -n "${ISOLINUX}" ]] && ./create-macchanger.sh $( dirname ${ISOLINUX})/macchang.cfg ${ISOLINUX}
+
+# AdBlock filter
+ADBLOCK_URL="http://easylist.adblockplus.org/adblock_rick752.txt"
+ADBLOCK_FILE="${distdir}/$(basename ${ADBLOCK_URL})"
+[[ -s "${ADBLOCK_FILE}" ]] || wget -O "${ADBLOCK_FILE}" "${ADBLOCK_URL}"
+if [[ -s "${ADBLOCK_FILE}" ]]; then
+	# Use AdBlock filter for polipo (but there is no way to disable it at runtime)
+	#[[ -d "${DIR}/root_overlay/etc/polipo/forbidden.d" ]] && ./adblockplusfilter2polipo.sh "${ADBLOCK_FILE}" > "${DIR}/root_overlay/etc/polipo/forbidden.d/$(basename ${ADBLOCK_FILE})"
+
+	# Use AdBlock filter in konqueror
+	[[ -d "${DIR}/root_overlay/var/lib/kdesession" ]] && ./adblockplusfilter2konq.sh "${ADBLOCK_FILE}" >> "${DIR}/root_overlay/var/lib/kdesession/khtmlrc"
+fi
+
+# Build it
+NICECMD=""
+[[ -x "/usr/bin/ionice" ]] && NICECMD="/usr/bin/ionice -c 3"
+[[ -x "/usr/bin/schedtool" ]] && NICECMD="/usr/bin/schedtool -B -n 8 -e ${NICECMD}"
+${NICECMD} catalyst -v -f "${DIR}/livecd-stage2.spec"
+CATALYST_STATUS=$?
+
+# Clean up
+rm -rf "${DIR}"
+
+if [[ ${CATALYST_STATUS} -ne 0 ]]; then
+	echo "Catalyst failed" >&2
+	exit 1
+fi

Deleted: incognito/tags/20080109.1/portage.config/package.keywords
===================================================================
--- incognito/trunk/portage.config/package.keywords	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/portage.config/package.keywords	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,107 +0,0 @@
-x11-drivers/ati-drivers ~x86
-app-portage/cfg-update ~*
-net-misc/tor ~*
-<kde-misc/tork-9999 ~*
-net-proxy/tsocks ~*
-net-proxy/dante ~*
-net-misc/trans-proxy-tor ~*
-kde-misc/kerry ~*
-app-misc/beagle ~*
-dev-lang/mono ~*
-dev-dotnet/libgdiplus ~*
-dev-dotnet/pe-format ~*
-dev-libs/geoip ~*
-kde-misc/kdmtheme ~*
-app-backup/dar ~*
-net-analyzer/ettercap ~*
-dev-util/catalyst ~*
-dev-util/livecd-specs ~*
-dev-util/livecd-kconfigs ~*
-kde-misc/ksynaptics ~*
-x11-libs/libsynaptics ~*
-kde-misc/ksystemlog ~*
-sys-devel/prelink ~*
-net-analyzer/ntop ~x86
-=sys-kernel/linux-headers-2.6.19* ~* ~x86
-net-wireless/at76c503a ~*
-net-wireless/rtl8180 ~*
-net-wireless/adm8211 ~*
-net-wireless/atmel-firmware ~*
-net-misc/vidalia ~*
-x11-drivers/xf86-video-ati ~*
-sys-kernel/genkernel ~*
-net-misc/socat ~*
-x11-misc/xdialog ~*
-dev-java/sun-jre-bin ~*
-dev-java/java-config-wrapper ~*
-dev-java/java-config ~*
-www-client/mozilla-firefox-bin ~*
-mail-client/mozilla-thunderbird-bin ~*
-x11-plugins/enigmail-bin ~*
-x11-plugins/noscript ~*
-x11-plugins/firefox-quick-locale-switcher ~*
-x11-plugins/chatzilla ~*
-x11-plugins/cookiesafe ~*
-x11-plugins/firegpg ~*
-mail-mta/mixminion ~*
-mail-mta/mixminion-smtp ~*
-net-im/kopete-otr ~*
-net-libs/libotr ~*
-net-wireless/acx ~*
-app-crypt/truecrypt ~*
-app-admin/keepassx ~*
-net-im/pidgin ~*
-x11-plugins/pidgin-otr ~*
-dev-util/subversion ~*
-sys-boot/syslinux ~*
-app-misc/livecd-tools ~*
-
-# NetworkManager
-net-misc/networkmanager ~*
-net-misc/networkmanager-pptp ~*
-net-misc/networkmanager-openvpn ~*
-net-misc/networkmanager-vpnc ~*
-kde-misc/knetworkmanager ~*
-dev-libs/libnl ~*
-net-misc/dhcdbd ~*
-
-# Hardware
-net-dialup/isdn-firmware ~*
-net-dialup/globespan-adsl ~*
-net-wireless/acx-firmware ~*
-net-wireless/atmel-firmware ~*
-net-wireless/bluez-firmware ~*
-net-wireless/ipw2100-firmware ~*
-net-wireless/ipw2200-firmware ~*
-net-wireless/prism54-firmware ~*
-net-wireless/zd1201-firmware ~*
-net-wireless/zd1211-firmware ~*
-net-wireless/ipw3945-ucode ~*
-net-wireless/iwl3945-ucode ~*
-net-wireless/iwl4965-ucode ~*
-net-dialup/slmodem ~*
-net-dialup/globespan-adsl ~*
-net-dialup/fritzcapi ~*
-net-dialup/fcdsl ~*
-net-dialup/drdsl ~*
-net-dialup/ltmodem ~*
-net-dialup/bewan-adsl ~*
-net-dialup/intel-536ep ~*
-net-wireless/fwlanusb ~*
-net-wireless/at76c503a ~*
-net-wireless/rtl8180 ~*
-net-wireless/adm8211 ~*
-net-wireless/rt2500 ~*
-net-wireless/acx ~*
-net-wireless/ipw3945 ~*
-net-wireless/ipw3945d ~*
-net-wireless/madwifi-ng ~*
-net-wireless/madwifi-ng-tools ~*
-net-wireless/rt61 ~*
-net-wireless/rt2400 ~*
-net-wireless/rt2500 ~*
-net-wireless/rt2570 ~*
-net-wireless/rt2x00 ~*
-net-wireless/rtl8180 ~*
-net-wireless/rtl8187 ~*
-

Copied: incognito/tags/20080109.1/portage.config/package.keywords (from rev 13298, incognito/trunk/portage.config/package.keywords)
===================================================================
--- incognito/tags/20080109.1/portage.config/package.keywords	                        (rev 0)
+++ incognito/tags/20080109.1/portage.config/package.keywords	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,87 @@
+# Tor and important applications we want latest version of
+app-crypt/truecrypt ~*
+<kde-misc/tork-9999 ~*
+mail-client/mozilla-thunderbird-bin ~*
+mail-mta/mixminion ~*
+mail-mta/mixminion-smtp ~*
+net-im/kopete-otr ~*
+net-im/pidgin ~*
+net-libs/libotr ~*
+net-misc/tor ~*
+net-misc/trans-proxy-tor ~*
+net-misc/vidalia ~*
+net-proxy/polipo ~*
+net-proxy/tsocks ~*
+www-client/mozilla-firefox-bin ~*
+x11-plugins/cs-lite ~*
+x11-plugins/enigmail-bin ~*
+x11-plugins/firefox-quick-locale-switcher ~*
+x11-plugins/firegpg ~*
+x11-plugins/noscript-bin ~*
+x11-plugins/pidgin-otr ~*
+
+# NetworkManager
+dev-libs/libnl ~*
+kde-misc/knetworkmanager ~*
+net-misc/dhcdbd ~*
+net-misc/networkmanager ~*
+net-misc/networkmanager-openvpn ~*
+net-misc/networkmanager-pptp ~*
+net-misc/networkmanager-vpnc ~*
+
+# Hardware
+net-dialup/isdn-firmware ~*
+net-dialup/globespan-adsl ~*
+net-wireless/at76c503a ~*
+net-wireless/acx ~*
+net-wireless/acx-firmware ~*
+net-wireless/adm8211 ~*
+net-wireless/atmel-firmware ~*
+net-wireless/bluez-firmware ~*
+net-wireless/fwlanusb ~*
+net-wireless/ipw2100-firmware ~*
+net-wireless/ipw2200-firmware ~*
+net-wireless/prism54-firmware ~*
+net-wireless/zd1201-firmware ~*
+net-wireless/zd1211-firmware ~*
+net-wireless/ipw3945 ~*
+net-wireless/ipw3945d ~*
+net-wireless/ipw3945-ucode ~*
+net-wireless/iwl3945-ucode ~*
+net-wireless/iwl4965-ucode ~*
+net-wireless/madwifi-ng ~*
+net-wireless/madwifi-ng-tools ~*
+net-wireless/ralink-rt61 ~*
+net-wireless/rt2400 ~*
+net-wireless/rt2500 ~*
+net-wireless/rt2570 ~*
+net-wireless/rt2x00 ~*
+net-wireless/rt61 ~*
+net-wireless/rtl8180 ~*
+net-wireless/rtl8187 ~*
+net-dialup/bewan-adsl ~*
+net-dialup/drdsl ~*
+net-dialup/fcdsl ~*
+net-dialup/fritzcapi ~*
+net-dialup/globespan-adsl ~*
+net-dialup/intel-536ep ~*
+net-dialup/ltmodem ~*
+net-dialup/slmodem ~*
+
+# Misc (mainly to get stuff to build and work properly)
+app-admin/keepassx ~*
+app-misc/livecd-tools ~*
+dev-util/catalyst ~*
+dev-java/java-config ~*
+dev-java/java-config-wrapper ~*
+dev-java/sun-jre-bin ~*
+=dev-util/livecd-kconfigs-2006.1 ~*
+=dev-util/livecd-specs-2006.1 ~*
+kde-misc/kdmtheme ~*
+kde-misc/ksynaptics ~*
+net-misc/socat ~*
+net-proxy/dante ~*
+sys-boot/syslinux ~*
+sys-devel/prelink ~*
+x11-libs/libsynaptics ~*
+x11-misc/xdialog ~*

Deleted: incognito/tags/20080109.1/portage.config/package.mask
===================================================================
--- incognito/trunk/portage.config/package.mask	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/portage.config/package.mask	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,16 +0,0 @@
-<sys-devel/gcc-4
-
-# System.map can not be found:
-=sys-kernel/genkernel-3.4.8
-
-# We don't want new kernels sneaking in, the config may not be compatible
->=sys-kernel/gentoo-sources-2.6.22
-
-# breaks networkmanager
->=net-misc/dhcp-3.0.6
-
-# we want to make sure to have the same version as arch/x86/isolinux-*-cdtar.tar.bz2
-# so when changing this, update it. also, a version >=3.50 is required for the boot
-# menu help texts.
-<sys-boot/syslinux-3.52
->sys-boot/syslinux-3.52

Copied: incognito/tags/20080109.1/portage.config/package.mask (from rev 13115, incognito/trunk/portage.config/package.mask)
===================================================================
--- incognito/tags/20080109.1/portage.config/package.mask	                        (rev 0)
+++ incognito/tags/20080109.1/portage.config/package.mask	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,14 @@
+<sys-devel/gcc-4
+
+# we use split ebuilds for KDE, so we block kdebase to prevent blocks
+kde-base/kdebase
+
+# We don't want other kernels sneaking in, the config may not be compatible
+>sys-kernel/gentoo-sources-2.6.23-r3
+<sys-kernel/gentoo-sources-2.6.23-r3
+
+# we want to make sure to have the same version as arch/x86/isolinux-*-cdtar.tar.bz2
+# so when changing this, update it. also, a version >=3.50 is required for the boot
+# menu help texts.
+<sys-boot/syslinux-3.52
+>sys-boot/syslinux-3.52

Deleted: incognito/tags/20080109.1/portage.overlay/kde-misc/tork/Manifest
===================================================================
--- incognito/trunk/portage.overlay/kde-misc/tork/Manifest	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/portage.overlay/kde-misc/tork/Manifest	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,12 +0,0 @@
-AUX tork-0.20-ext_tsocks.patch 952 RMD160 a634072b7971a580f2b0f8ff18dbd3323d769a94 SHA1 ebfe42ae5ede7ef3c9a82ee17e77912c9b8d7c57 SHA256 fc7e000cfdd876077b2d3d0aef1f1634bc5882a384bf333bc11a0c0b7d34c008
-MD5 3409319ab9854ef8db2e4eab5f7b60a8 files/tork-0.20-ext_tsocks.patch 952
-RMD160 a634072b7971a580f2b0f8ff18dbd3323d769a94 files/tork-0.20-ext_tsocks.patch 952
-SHA256 fc7e000cfdd876077b2d3d0aef1f1634bc5882a384bf333bc11a0c0b7d34c008 files/tork-0.20-ext_tsocks.patch 952
-DIST tork-0.23.tar.bz2 3193372 RMD160 1d1d8e6a38b75db97e402262b520e84f582fb319 SHA1 31f1e4e3da5dced0d1a4f1cfc9b7d71e5d288062 SHA256 16bf30c927822a76260777ada138d528de122680629cc61d7f2406456f9ebf47
-EBUILD tork-0.23.ebuild 1213 RMD160 bf9a571ce1823d0ea81e90655a0622f6d59875bd SHA1 bb85f5f83ec974ce341fe0e869e1dc49d0d06ad8 SHA256 a1f00851029abd4797a5102e072f54e4cf448bc4c9a712a04322278e7ee429ff
-MD5 09f1c759b9cc19a5e500828ba73f002f tork-0.23.ebuild 1213
-RMD160 bf9a571ce1823d0ea81e90655a0622f6d59875bd tork-0.23.ebuild 1213
-SHA256 a1f00851029abd4797a5102e072f54e4cf448bc4c9a712a04322278e7ee429ff tork-0.23.ebuild 1213
-MD5 6b9c074e7e4a5f96ed7c2914f3902dc8 files/digest-tork-0.23 235
-RMD160 a01af428a73485c987193492550276d1bf3a5d3f files/digest-tork-0.23 235
-SHA256 d03c13d0c736115c25d58de842a33b74fbb1c5a26b5c2f55188dfcdac13dc5ab files/digest-tork-0.23 235

Copied: incognito/tags/20080109.1/portage.overlay/kde-misc/tork/Manifest (from rev 13115, incognito/trunk/portage.overlay/kde-misc/tork/Manifest)
===================================================================
--- incognito/tags/20080109.1/portage.overlay/kde-misc/tork/Manifest	                        (rev 0)
+++ incognito/tags/20080109.1/portage.overlay/kde-misc/tork/Manifest	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,12 @@
+AUX tork-0.26-ext_tsocks.patch 950 RMD160 6eb23007d44545f56b53a609ac328a9618aef15c SHA1 73ceb316840b35c1c9b115a0aacc0b908f5b0ea0 SHA256 2278d9f33663ecb4092ccd41502a6cec732f2e0818a453efa8187e71caa20562
+MD5 af3586f4d2929a03b309914acd446d09 files/tork-0.26-ext_tsocks.patch 950
+RMD160 6eb23007d44545f56b53a609ac328a9618aef15c files/tork-0.26-ext_tsocks.patch 950
+SHA256 2278d9f33663ecb4092ccd41502a6cec732f2e0818a453efa8187e71caa20562 files/tork-0.26-ext_tsocks.patch 950
+DIST tork-0.26.tar.bz2 2663154 RMD160 b90e6b71ff7f6a5bc43498848ea8153ef415641f SHA1 230ac2f46c78ee7653c105c418b063d44ed52437 SHA256 1e348e105c03badd009bdd003d057805c9a88246a830240d7c2058fe962da4d5
+EBUILD tork-0.26.ebuild 1092 RMD160 071adc345ca269d22fff2b987c94f87d850ddea8 SHA1 73a8c865708ec37d7944a50cf6972b9e38a7025e SHA256 22370594d7ebc633e209a0af5d43e4590e209d986ec208072a67189513eb40b6
+MD5 3a381c46f3640eeeb9570a931ab108a2 tork-0.26.ebuild 1092
+RMD160 071adc345ca269d22fff2b987c94f87d850ddea8 tork-0.26.ebuild 1092
+SHA256 22370594d7ebc633e209a0af5d43e4590e209d986ec208072a67189513eb40b6 tork-0.26.ebuild 1092
+MD5 5e328a19a74e0720fdc6d1f591235db5 files/digest-tork-0.26 235
+RMD160 eb4427124edac5f60fe34d2a761637fb9bfe5bee files/digest-tork-0.26 235
+SHA256 f6943dcecc0f68b6ab10ac1b9b6077ed474ba8617b44f69ee4562e15a566ba32 files/digest-tork-0.26 235

Deleted: incognito/tags/20080109.1/portage.overlay/kde-misc/tork/files/digest-tork-0.23
===================================================================
--- incognito/trunk/portage.overlay/kde-misc/tork/files/digest-tork-0.23	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/portage.overlay/kde-misc/tork/files/digest-tork-0.23	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,3 +0,0 @@
-MD5 defe93250ee182d9629eabd70325a0c9 tork-0.23.tar.bz2 3193372
-RMD160 1d1d8e6a38b75db97e402262b520e84f582fb319 tork-0.23.tar.bz2 3193372
-SHA256 16bf30c927822a76260777ada138d528de122680629cc61d7f2406456f9ebf47 tork-0.23.tar.bz2 3193372

Copied: incognito/tags/20080109.1/portage.overlay/kde-misc/tork/files/digest-tork-0.26 (from rev 13115, incognito/trunk/portage.overlay/kde-misc/tork/files/digest-tork-0.26)
===================================================================
--- incognito/tags/20080109.1/portage.overlay/kde-misc/tork/files/digest-tork-0.26	                        (rev 0)
+++ incognito/tags/20080109.1/portage.overlay/kde-misc/tork/files/digest-tork-0.26	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,3 @@
+MD5 d5feaf9b2743e6a8c18c2378b47ce085 tork-0.26.tar.bz2 2663154
+RMD160 b90e6b71ff7f6a5bc43498848ea8153ef415641f tork-0.26.tar.bz2 2663154
+SHA256 1e348e105c03badd009bdd003d057805c9a88246a830240d7c2058fe962da4d5 tork-0.26.tar.bz2 2663154

Deleted: incognito/tags/20080109.1/portage.overlay/kde-misc/tork/files/tork-0.20-ext_tsocks.patch
===================================================================
--- incognito/trunk/portage.overlay/kde-misc/tork/files/tork-0.20-ext_tsocks.patch	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/portage.overlay/kde-misc/tork/files/tork-0.20-ext_tsocks.patch	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,24 +0,0 @@
-diff -Naur tork-0.20.orig/src/Makefile.am tork-0.20/src/Makefile.am
---- tork-0.20.orig/src/Makefile.am	2007-09-09 09:27:09.000000000 +0200
-+++ tork-0.20/src/Makefile.am	2007-09-27 18:44:35.000000000 +0200
-@@ -11,9 +11,9 @@
- geoipdir=GeoIP-1.4.0
- endif
- 
--tsocks=tsocks
-+tsocks=-ltsocks
- 
--SUBDIRS=icons about arkollon $(geoipdir) $(tsocks) privoxytemplates libwhich torkapplet konqplugin tor_ioslave .
-+SUBDIRS=icons about arkollon $(geoipdir) privoxytemplates libwhich torkapplet konqplugin tor_ioslave .
- 
- DISTCLEANFILES=dcoptork.kidl
- 
-@@ -27,7 +27,7 @@
- tork_LDFLAGS = $(KDE_RPATH) $(all_libraries)
- 
- # the libraries to link against.
--tork_LDADD   = $(LIB_KFILE) $(LIB_KHTML) $(geoiplib) libwhich/libwhich.la
-+tork_LDADD   = $(LIB_KFILE) $(LIB_KHTML) $(geoiplib) $(tsocks) libwhich/libwhich.la
- 
- # which sources should be compiled for tork
- tork_SOURCES = trayicon.cpp trayhoverpopup.cpp chart.cpp configdialog.cpp crashhandler.cpp crypto.cpp \

Copied: incognito/tags/20080109.1/portage.overlay/kde-misc/tork/files/tork-0.26-ext_tsocks.patch (from rev 13115, incognito/trunk/portage.overlay/kde-misc/tork/files/tork-0.26-ext_tsocks.patch)
===================================================================
--- incognito/tags/20080109.1/portage.overlay/kde-misc/tork/files/tork-0.26-ext_tsocks.patch	                        (rev 0)
+++ incognito/tags/20080109.1/portage.overlay/kde-misc/tork/files/tork-0.26-ext_tsocks.patch	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,24 @@
+diff -Naur tork-0.24.orig/src/Makefile.am tork-0.24/src/Makefile.am
+--- tork-0.24.orig/src/Makefile.am	2007-12-08 16:44:30.000000000 +0100
++++ tork-0.24/src/Makefile.am	2007-12-14 23:26:27.000000000 +0100
+@@ -11,9 +11,9 @@
+ geoipdir=GeoIP-1.4.0
+ endif
+ 
+-tsocks=tsocks
++tsocks=-ltsocks
+ 
+-SUBDIRS=icons arkollon $(geoipdir) $(tsocks) privoxytemplates libwhich torkapplet konqplugin tor_ioslave menu .
++SUBDIRS=icons arkollon $(geoipdir) privoxytemplates libwhich torkapplet konqplugin tor_ioslave menu .
+ 
+ DISTCLEANFILES=dcoptork.kidl
+ 
+@@ -27,7 +27,7 @@
+ tork_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+ 
+ # the libraries to link against.
+-tork_LDADD   = $(LIB_KFILE) $(LIB_KHTML) $(geoiplib) libwhich/libwhich.la
++tork_LDADD   = $(LIB_KFILE) $(LIB_KHTML) $(geoiplib) $(tsocks) libwhich/libwhich.la
+ 
+ # which sources should be compiled for tork
+ tork_SOURCES = trayicon.cpp trayhoverpopup.cpp chart.cpp configdialog.cpp crashhandler.cpp crypto.cpp \

Deleted: incognito/tags/20080109.1/portage.overlay/kde-misc/tork/tork-0.23.ebuild
===================================================================
--- incognito/trunk/portage.overlay/kde-misc/tork/tork-0.23.ebuild	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/portage.overlay/kde-misc/tork/tork-0.23.ebuild	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,44 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/tork/tork-0.23.ebuild,v 1.1 2007/11/19 15:16:10 philantrop Exp $
-
-inherit kde multilib
-
-DESCRIPTION="A Tor controller for the KDE desktop"
-HOMEPAGE="http://tork.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-libs/openssl
-	>=dev-libs/geoip-1.4.0
-	kde-base/libkonq"
-
-RDEPEND="${DEPEND}
-	>=net-misc/tor-0.1.2.14
-	>=net-proxy/privoxy-3.0.3-r5
-	>=net-proxy/tsocks-1.8_beta5-r2"
-
-need-kde 3.5
-
-PATCHES="${FILESDIR}/${PN}-0.20-ext_tsocks.patch"
-
-src_compile() {
-	# Fix desktop file
-	sed -i -e "s:^\(Categories=.*\):\1;:" "${S}/src/tork.desktop"
-
-	local myconf="--with-external-geoip --with-conf=/etc/socks/tsocks.conf"
-	kde_src_compile
-}
-
-pkg_postinst() {
-	if ! built_with_use --missing false net-proxy/tsocks tordns; then
-		ewarn "WARNING: you have net-proxy/tsocks installed without"
-		ewarn "the patch to avoid DNS leaking while using Tor."
-		ewarn "For better privacy, please emerge again net-proxy/tsocks"
-		ewarn "with the USE flag 'tordns' enabled."
-	fi
-}

Copied: incognito/tags/20080109.1/portage.overlay/kde-misc/tork/tork-0.26.ebuild (from rev 13115, incognito/trunk/portage.overlay/kde-misc/tork/tork-0.26.ebuild)
===================================================================
--- incognito/tags/20080109.1/portage.overlay/kde-misc/tork/tork-0.26.ebuild	                        (rev 0)
+++ incognito/tags/20080109.1/portage.overlay/kde-misc/tork/tork-0.26.ebuild	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,42 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit kde multilib
+
+DESCRIPTION="A Tor controller for the KDE desktop"
+HOMEPAGE="http://tork.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-libs/openssl
+	>=dev-libs/geoip-1.4.0
+	|| ( kde-base/kdebase kde-base/libkonq )"
+
+RDEPEND="${DEPEND}
+	>=net-misc/tor-0.1.2.14
+	>=net-proxy/tsocks-1.8_beta5-r2"
+
+need-kde 3.5
+
+PATCHES="${FILESDIR}/${P}-ext_tsocks.patch"
+
+src_compile() {
+	# Fix desktop file
+	sed -i -e "s:^\(Categories=.*\):\1;:" "${S}/src/tork.desktop"
+
+	local myconf="--with-external-geoip --with-conf=/etc/socks/tsocks.conf"
+	kde_src_compile
+}
+
+pkg_postinst() {
+	if ! built_with_use --missing false net-proxy/tsocks tordns; then
+		ewarn "WARNING: you have net-proxy/tsocks installed without"
+		ewarn "the patch to avoid DNS leaking while using Tor."
+		ewarn "For better privacy, please emerge again net-proxy/tsocks"
+		ewarn "with the USE flag 'tordns' enabled."
+	fi
+}

Deleted: incognito/tags/20080109.1/portage.overlay/net-im/kopete-otr/ChangeLog
===================================================================
--- incognito/trunk/portage.overlay/net-im/kopete-otr/ChangeLog	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/portage.overlay/net-im/kopete-otr/ChangeLog	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,51 +0,0 @@
-# ChangeLog for net-im/kopete-otr
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kopete-otr/ChangeLog,v 1.10 2007/06/27 08:48:06 drizzt Exp $
-
-*kopete-otr-0.5 (27 Jun 2007)
-
-  27 Jun 2007; Timothy Redaelli <drizzt at gentoo.org>
-  -files/kopete-otr-0.2-as-needed.patch, -kopete-otr-0.2.ebuild,
-  -kopete-otr-0.3.ebuild, -kopete-otr-0.4.ebuild, +kopete-otr-0.5.ebuild:
-  Version bump wrt bug #183373.
-  Thanks to Michael Zanetti for reporting.
-  Remove old versions.
-
-*kopete-otr-0.4 (23 May 2007)
-
-  23 May 2007; Timothy Redaelli <drizzt at gentoo.org> +kopete-otr-0.4.ebuild:
-  Version bump, thanks to Michael Zanetti for reporting wrt #179484.
-
-  04 May 2007; Jeroen Roovers <jer at gentoo.org> kopete-otr-0.3.ebuild:
-  Marked ~hppa (bug #176926).
-
-  02 May 2007; Gustavo Zacarias <gustavoz at gentoo.org> kopete-otr-0.2.ebuild,
-  kopete-otr-0.3.ebuild:
-  Keyworded ~sparc wrt #176371
-
-  02 May 2007; Raúl Porcel <armin76 at gentoo.org> kopete-otr-0.3.ebuild:
-  Add ~ia64 wrt ~176731
-
-*kopete-otr-0.3 (02 May 2007)
-
-  02 May 2007; Timothy Redaelli <drizzt at gentoo.org> +kopete-otr-0.3.ebuild:
-  Version bump wrt bug #176785.
-  Thanks to Alan Jones for reporting.
-
-  02 May 2007; Markus Rothe <corsair at gentoo.org> kopete-otr-0.2.ebuild:
-  Added ~ppc64; bug #176731
-
-  28 Apr 2007; Timothy Redaelli <drizzt at gentoo.org> kopete-otr-0.2.ebuild:
-  Add ~amd64 keyword.
-
-  27 Apr 2007; Timothy Redaelli <drizzt at gentoo.org> metadata.xml:
-  Fix metadata.xml
-
-*kopete-otr-0.2 (27 Apr 2007)
-
-  27 Apr 2007; Timothy Redaelli <drizzt at gentoo.org>
-  +files/kopete-otr-0.2-as-needed.patch, +metadata.xml,
-  +kopete-otr-0.2.ebuild:
-  New ebuild, thanks to Michael Zanetti (upstream) for the ebuild wrt #171954.
-  Add my patch for --as-needed
-

Deleted: incognito/tags/20080109.1/portage.overlay/net-im/kopete-otr/Manifest
===================================================================
--- incognito/trunk/portage.overlay/net-im/kopete-otr/Manifest	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/portage.overlay/net-im/kopete-otr/Manifest	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,26 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST kopete-otr-0.5.tar.bz2 788901 RMD160 3782f11003e6a4a25626140d611d941f6c0c522f SHA1 1d4158847c360136c0285b56d6993457dfeafe1b SHA256 b27e15dd4bdd984a8ab739f096a7701703ab330753881660171449b37f8b3251
-EBUILD kopete-otr-0.5.ebuild 725 RMD160 661cec141a58400ae0024e0ed875fe4fe49503ff SHA1 745cf084382bf3a33696cab6ca818628769fa26c SHA256 8f43be1015b4a05d5c39a14e0fc1cfa8ea43cb5631a3d59567bbf0882816255e
-MD5 5a7f390595d5e64c4939cd8e2fb85992 kopete-otr-0.5.ebuild 725
-RMD160 661cec141a58400ae0024e0ed875fe4fe49503ff kopete-otr-0.5.ebuild 725
-SHA256 8f43be1015b4a05d5c39a14e0fc1cfa8ea43cb5631a3d59567bbf0882816255e kopete-otr-0.5.ebuild 725
-MISC ChangeLog 1777 RMD160 01ca6d58a59087b14bbfdae24a20fdf462260e06 SHA1 951da3e9d07fd7dc7a68e2146ea3f29c41420caa SHA256 5c740499b7021c6e85d10c54e904d031dfc97b2c808d358e32596eac23fbe381
-MD5 7991f33e398102a15e54c0a22a4c1a0c ChangeLog 1777
-RMD160 01ca6d58a59087b14bbfdae24a20fdf462260e06 ChangeLog 1777
-SHA256 5c740499b7021c6e85d10c54e904d031dfc97b2c808d358e32596eac23fbe381 ChangeLog 1777
-MISC metadata.xml 222 RMD160 c0fe8198bb72a6bed198a1dd7005ed607711db2a SHA1 a3b2631fffe918fa2b814a269297dfc9e6c355cb SHA256 35319607d0186f4c2b026c636392c56bafa68c71a17a67364e5c530156eb22b4
-MD5 99cf1c24b27d2fe42b99b95fadff0290 metadata.xml 222
-RMD160 c0fe8198bb72a6bed198a1dd7005ed607711db2a metadata.xml 222
-SHA256 35319607d0186f4c2b026c636392c56bafa68c71a17a67364e5c530156eb22b4 metadata.xml 222
-MD5 b554a8af2be8ecb003dfdacc4bcf8e8b files/digest-kopete-otr-0.5 247
-RMD160 c968e356eecbda4ed99a8edaa72880f6d6d2cbd3 files/digest-kopete-otr-0.5 247
-SHA256 d6cbb2ac98144f0b4be1739da69b7815d5ffebec8510168beb09b94cdac6d99a files/digest-kopete-otr-0.5 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGgiRMjJyKLBkBVroRApZnAJ9w6GZ7u9S9HZxBAfsf800JSZhDWQCeI+Fs
-EM1GZN7f8yDtl2Qy9bGy7ng=
-=SHSK
------END PGP SIGNATURE-----

Copied: incognito/tags/20080109.1/portage.overlay/net-im/kopete-otr/Manifest (from rev 13115, incognito/trunk/portage.overlay/net-im/kopete-otr/Manifest)
===================================================================
--- incognito/tags/20080109.1/portage.overlay/net-im/kopete-otr/Manifest	                        (rev 0)
+++ incognito/tags/20080109.1/portage.overlay/net-im/kopete-otr/Manifest	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,8 @@
+DIST kopete-otr-0.7.tar.bz2 491509 RMD160 f4e989772ce7e0fc5d9e26f8c1094414771233e5 SHA1 ef5cff4492dcdccee7941882169053cf55cbfe55 SHA256 bc59c2a9d2e4a09b7ad9bde30824d5c2fb571a7d0426d1a3ba1e3a49e4b21697
+EBUILD kopete-otr-0.7.ebuild 725 RMD160 c10f4064793b8ac107afcb2443688a8357745aaa SHA1 6e4493f57df3e9af9ce8309cf95fbdb861264c07 SHA256 0ac45acb2caafd1890729cfdc2dfab5491f942244f06b6f2f8072aef64b62096
+MD5 9c29d40e4302d2b07ac9e70c8f38e980 kopete-otr-0.7.ebuild 725
+RMD160 c10f4064793b8ac107afcb2443688a8357745aaa kopete-otr-0.7.ebuild 725
+SHA256 0ac45acb2caafd1890729cfdc2dfab5491f942244f06b6f2f8072aef64b62096 kopete-otr-0.7.ebuild 725
+MD5 c65cf7971e95f3fd9272bd80ab05735c files/digest-kopete-otr-0.7 247
+RMD160 89b741ff6636efb28ec2c5db0600eee295c31640 files/digest-kopete-otr-0.7 247
+SHA256 e29671ec0e09fc334a9a68dcd1446393b897bf8abab6c30f92adeaf26465edd0 files/digest-kopete-otr-0.7 247

Deleted: incognito/tags/20080109.1/portage.overlay/net-im/kopete-otr/files/digest-kopete-otr-0.5
===================================================================
--- incognito/trunk/portage.overlay/net-im/kopete-otr/files/digest-kopete-otr-0.5	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/portage.overlay/net-im/kopete-otr/files/digest-kopete-otr-0.5	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,3 +0,0 @@
-MD5 42c36f4963b591df184365c430655d2a kopete-otr-0.5.tar.bz2 788901
-RMD160 3782f11003e6a4a25626140d611d941f6c0c522f kopete-otr-0.5.tar.bz2 788901
-SHA256 b27e15dd4bdd984a8ab739f096a7701703ab330753881660171449b37f8b3251 kopete-otr-0.5.tar.bz2 788901

Copied: incognito/tags/20080109.1/portage.overlay/net-im/kopete-otr/files/digest-kopete-otr-0.7 (from rev 13115, incognito/trunk/portage.overlay/net-im/kopete-otr/files/digest-kopete-otr-0.7)
===================================================================
--- incognito/tags/20080109.1/portage.overlay/net-im/kopete-otr/files/digest-kopete-otr-0.7	                        (rev 0)
+++ incognito/tags/20080109.1/portage.overlay/net-im/kopete-otr/files/digest-kopete-otr-0.7	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,3 @@
+MD5 4f22cbbf6027c9cdc2a39e0fd6cc93c9 kopete-otr-0.7.tar.bz2 491509
+RMD160 f4e989772ce7e0fc5d9e26f8c1094414771233e5 kopete-otr-0.7.tar.bz2 491509
+SHA256 bc59c2a9d2e4a09b7ad9bde30824d5c2fb571a7d0426d1a3ba1e3a49e4b21697 kopete-otr-0.7.tar.bz2 491509

Deleted: incognito/tags/20080109.1/portage.overlay/net-im/kopete-otr/kopete-otr-0.5.ebuild
===================================================================
--- incognito/trunk/portage.overlay/net-im/kopete-otr/kopete-otr-0.5.ebuild	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/portage.overlay/net-im/kopete-otr/kopete-otr-0.5.ebuild	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,25 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kopete-otr/kopete-otr-0.5.ebuild,v 1.1 2007/06/27 08:48:06 drizzt Exp $
-
-inherit kde
-
-DESCRIPTION="This plugin enables Off-The-Record encryption for the KDE instant messenger Kopete."
-HOMEPAGE="http://kopete-otr.follefuder.org/"
-SRC_URI="http://kopete-otr.follefuder.org/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-#FIXME Fix deps before KDE-4
-DEPEND=">=net-libs/libotr-3.0.0
-	|| ( >=kde-base/kopete-3.5.5-r2 >=kde-base/kdenetwork-3.5.5-r2 )"
-
-need-kde 3.5.5
-
-src_unpack() {
-	kde_src_unpack
-	rm -f "${S}/configure"
-}

Copied: incognito/tags/20080109.1/portage.overlay/net-im/kopete-otr/kopete-otr-0.7.ebuild (from rev 13115, incognito/trunk/portage.overlay/net-im/kopete-otr/kopete-otr-0.7.ebuild)
===================================================================
--- incognito/tags/20080109.1/portage.overlay/net-im/kopete-otr/kopete-otr-0.7.ebuild	                        (rev 0)
+++ incognito/tags/20080109.1/portage.overlay/net-im/kopete-otr/kopete-otr-0.7.ebuild	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,25 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/kopete-otr/kopete-otr-0.7.ebuild,v 1.1 2007/11/13 14:54:10 drizzt Exp $
+
+inherit kde
+
+DESCRIPTION="This plugin enables Off-The-Record encryption for the KDE instant messenger Kopete."
+HOMEPAGE="http://kopete-otr.follefuder.org/"
+SRC_URI="http://kopete-otr.follefuder.org/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+#FIXME Fix deps before KDE-4
+DEPEND=">=net-libs/libotr-3.1.0
+	|| ( >=kde-base/kopete-3.5.5-r2 >=kde-base/kdenetwork-3.5.5-r2 )"
+
+need-kde 3.5.5
+
+src_unpack() {
+	kde_src_unpack
+	rm -f "${S}/configure"
+}

Deleted: incognito/tags/20080109.1/portage.overlay/net-im/kopete-otr/metadata.xml
===================================================================
--- incognito/trunk/portage.overlay/net-im/kopete-otr/metadata.xml	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/portage.overlay/net-im/kopete-otr/metadata.xml	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>drizzt at gentoo.org</email>
-</maintainer>
-</pkgmetadata>

Deleted: incognito/tags/20080109.1/portage.overlay/net-misc/tor/Manifest
===================================================================
--- incognito/trunk/portage.overlay/net-misc/tor/Manifest	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/portage.overlay/net-misc/tor/Manifest	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,24 +0,0 @@
-AUX tor-cookieperm.patch 5965 RMD160 c8a0616686bba7a1059c3f9a56508b6c8b6087c3 SHA1 3e323b69e06dca3a4bfd7f07f6396fd04769eaa1 SHA256 7d778566cc2f251506165c7e26e0ef43fd4133dee6e75bf46cfa73b8412ae929
-MD5 ba1bd2dcecdd9c8c736030b1aaacbf12 files/tor-cookieperm.patch 5965
-RMD160 c8a0616686bba7a1059c3f9a56508b6c8b6087c3 files/tor-cookieperm.patch 5965
-SHA256 7d778566cc2f251506165c7e26e0ef43fd4133dee6e75bf46cfa73b8412ae929 files/tor-cookieperm.patch 5965
-AUX tor.initd-r2 1494 RMD160 56ac023f10e4a170daa8ec29c854968e1320107c SHA1 e76e069ce828c2a21cef0450033056d8e4e604dd SHA256 51fd05cb4c079fcb392459d066a7505de9f57f9f10b7ad5b274edcd1fe9cd1e4
-MD5 560d45ac7d56dda6c184f93c13124329 files/tor.initd-r2 1494
-RMD160 56ac023f10e4a170daa8ec29c854968e1320107c files/tor.initd-r2 1494
-SHA256 51fd05cb4c079fcb392459d066a7505de9f57f9f10b7ad5b274edcd1fe9cd1e4 files/tor.initd-r2 1494
-AUX tor.logrotate.patch 301 RMD160 47a096ae4e7ddabdd5974df3c8cd1b221641edbb SHA1 b3c158d27b23600cc87f5e0a2ebba732e5fe3f69 SHA256 e64ff0f7442a180bcc8f9bd5fc258058ceae227847e32b69de39b589236f09dc
-MD5 63047059d12800aefe0998218de099af files/tor.logrotate.patch 301
-RMD160 47a096ae4e7ddabdd5974df3c8cd1b221641edbb files/tor.logrotate.patch 301
-SHA256 e64ff0f7442a180bcc8f9bd5fc258058ceae227847e32b69de39b589236f09dc files/tor.logrotate.patch 301
-AUX torrc.sample-0.1.2.6.patch 1145 RMD160 3656774f05abe54ec22a121954a1d437fe1da520 SHA1 a0c658eafc8feb134e4ce8c7a5cdf94074ad79f5 SHA256 5b94e1d8c097626402b0b388fefb15f11b95db112b23d358e04cfe55331911f1
-MD5 b9cf2eb98b62197faa6cc2b57c81d547 files/torrc.sample-0.1.2.6.patch 1145
-RMD160 3656774f05abe54ec22a121954a1d437fe1da520 files/torrc.sample-0.1.2.6.patch 1145
-SHA256 5b94e1d8c097626402b0b388fefb15f11b95db112b23d358e04cfe55331911f1 files/torrc.sample-0.1.2.6.patch 1145
-DIST tor-0.1.2.18.tar.gz 1257011 RMD160 e0ccd51288f7b41b5c4a21e49ce712066ce66a58 SHA1 ff2160d30cfcb8cd7b735236dcb641b4bcb3fbeb SHA256 e485f916dc02908a390c96b6bd3385a562281706e62987fffd486c635d380991
-EBUILD tor-0.1.2.18-r1.ebuild 1699 RMD160 f6187d18439b867488c5c7cc2abaa12371c7f85d SHA1 9f1103f538c30b87844291041b2d9b08324753ef SHA256 d3325e87ee38626ecc5beb3be828567042aa2a3214ba0b4a7ac1c4b63d814ffa
-MD5 b56304ecc44a55a733032168f40abd74 tor-0.1.2.18-r1.ebuild 1699
-RMD160 f6187d18439b867488c5c7cc2abaa12371c7f85d tor-0.1.2.18-r1.ebuild 1699
-SHA256 d3325e87ee38626ecc5beb3be828567042aa2a3214ba0b4a7ac1c4b63d814ffa tor-0.1.2.18-r1.ebuild 1699
-MD5 1f3ce1ceb9f83fcb5e464120519315cd files/digest-tor-0.1.2.18-r1 241
-RMD160 45d8106838f1e21407788ef132f3371912de6111 files/digest-tor-0.1.2.18-r1 241
-SHA256 9c6a98308bf329233b1a0a8bcb179a0076f1a64b61ce32bedd9a5df48d4d0e19 files/digest-tor-0.1.2.18-r1 241

Copied: incognito/tags/20080109.1/portage.overlay/net-misc/tor/Manifest (from rev 13170, incognito/trunk/portage.overlay/net-misc/tor/Manifest)
===================================================================
--- incognito/tags/20080109.1/portage.overlay/net-misc/tor/Manifest	                        (rev 0)
+++ incognito/tags/20080109.1/portage.overlay/net-misc/tor/Manifest	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,24 @@
+AUX tor-cookieperm.patch 5965 RMD160 c8a0616686bba7a1059c3f9a56508b6c8b6087c3 SHA1 3e323b69e06dca3a4bfd7f07f6396fd04769eaa1 SHA256 7d778566cc2f251506165c7e26e0ef43fd4133dee6e75bf46cfa73b8412ae929
+MD5 ba1bd2dcecdd9c8c736030b1aaacbf12 files/tor-cookieperm.patch 5965
+RMD160 c8a0616686bba7a1059c3f9a56508b6c8b6087c3 files/tor-cookieperm.patch 5965
+SHA256 7d778566cc2f251506165c7e26e0ef43fd4133dee6e75bf46cfa73b8412ae929 files/tor-cookieperm.patch 5965
+AUX tor.initd-r2 1494 RMD160 56ac023f10e4a170daa8ec29c854968e1320107c SHA1 e76e069ce828c2a21cef0450033056d8e4e604dd SHA256 51fd05cb4c079fcb392459d066a7505de9f57f9f10b7ad5b274edcd1fe9cd1e4
+MD5 560d45ac7d56dda6c184f93c13124329 files/tor.initd-r2 1494
+RMD160 56ac023f10e4a170daa8ec29c854968e1320107c files/tor.initd-r2 1494
+SHA256 51fd05cb4c079fcb392459d066a7505de9f57f9f10b7ad5b274edcd1fe9cd1e4 files/tor.initd-r2 1494
+AUX tor.logrotate.patch 301 RMD160 47a096ae4e7ddabdd5974df3c8cd1b221641edbb SHA1 b3c158d27b23600cc87f5e0a2ebba732e5fe3f69 SHA256 e64ff0f7442a180bcc8f9bd5fc258058ceae227847e32b69de39b589236f09dc
+MD5 63047059d12800aefe0998218de099af files/tor.logrotate.patch 301
+RMD160 47a096ae4e7ddabdd5974df3c8cd1b221641edbb files/tor.logrotate.patch 301
+SHA256 e64ff0f7442a180bcc8f9bd5fc258058ceae227847e32b69de39b589236f09dc files/tor.logrotate.patch 301
+AUX torrc.sample-0.1.2.6.patch 1145 RMD160 3656774f05abe54ec22a121954a1d437fe1da520 SHA1 a0c658eafc8feb134e4ce8c7a5cdf94074ad79f5 SHA256 5b94e1d8c097626402b0b388fefb15f11b95db112b23d358e04cfe55331911f1
+MD5 b9cf2eb98b62197faa6cc2b57c81d547 files/torrc.sample-0.1.2.6.patch 1145
+RMD160 3656774f05abe54ec22a121954a1d437fe1da520 files/torrc.sample-0.1.2.6.patch 1145
+SHA256 5b94e1d8c097626402b0b388fefb15f11b95db112b23d358e04cfe55331911f1 files/torrc.sample-0.1.2.6.patch 1145
+DIST tor-0.1.2.19.tar.gz 1264275 RMD160 4f1b5474a4bbad2e3c82ef0fce2dd838907e48d5 SHA1 5022dab0de2499e2c6638e1a2e9eee6c79fb707c SHA256 7e57198a0858f5ba8651d75225248c85b619e905f0ff4dbb45fffa2d03a1aa61
+EBUILD tor-0.1.2.19.ebuild 1690 RMD160 47a1575f922753ac77e2e1e32c25366183cf107c SHA1 4d952fa98974649143943dfcbd4014386b107ff9 SHA256 a119d61493dc94c8784fa5e6246693666d01d38fb9f8cdeeb31379e14b4679ab
+MD5 3d93026f70be30691e0c285675c7d4cb tor-0.1.2.19.ebuild 1690
+RMD160 47a1575f922753ac77e2e1e32c25366183cf107c tor-0.1.2.19.ebuild 1690
+SHA256 a119d61493dc94c8784fa5e6246693666d01d38fb9f8cdeeb31379e14b4679ab tor-0.1.2.19.ebuild 1690
+MD5 f5f7b65de8dbbe316505f81f3f4c1694 files/digest-tor-0.1.2.19 241
+RMD160 66c989bc3f896b55d64982b4aa910ddcf3daefbb files/digest-tor-0.1.2.19 241
+SHA256 2793d84a70420371d1f8f10514e7dd8d1e4296ebbb8af8a4f6b3adf79c1c13f7 files/digest-tor-0.1.2.19 241

Deleted: incognito/tags/20080109.1/portage.overlay/net-misc/tor/files/digest-tor-0.1.2.18-r1
===================================================================
--- incognito/trunk/portage.overlay/net-misc/tor/files/digest-tor-0.1.2.18-r1	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/portage.overlay/net-misc/tor/files/digest-tor-0.1.2.18-r1	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,3 +0,0 @@
-MD5 6cfe65643f3874a9709f0c19e7c648e0 tor-0.1.2.18.tar.gz 1257011
-RMD160 e0ccd51288f7b41b5c4a21e49ce712066ce66a58 tor-0.1.2.18.tar.gz 1257011
-SHA256 e485f916dc02908a390c96b6bd3385a562281706e62987fffd486c635d380991 tor-0.1.2.18.tar.gz 1257011

Copied: incognito/tags/20080109.1/portage.overlay/net-misc/tor/files/digest-tor-0.1.2.19 (from rev 13170, incognito/trunk/portage.overlay/net-misc/tor/files/digest-tor-0.1.2.19)
===================================================================
--- incognito/tags/20080109.1/portage.overlay/net-misc/tor/files/digest-tor-0.1.2.19	                        (rev 0)
+++ incognito/tags/20080109.1/portage.overlay/net-misc/tor/files/digest-tor-0.1.2.19	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,3 @@
+MD5 4b3f9963b843010af5aa3bd6266d11e0 tor-0.1.2.19.tar.gz 1264275
+RMD160 4f1b5474a4bbad2e3c82ef0fce2dd838907e48d5 tor-0.1.2.19.tar.gz 1264275
+SHA256 7e57198a0858f5ba8651d75225248c85b619e905f0ff4dbb45fffa2d03a1aa61 tor-0.1.2.19.tar.gz 1264275

Deleted: incognito/tags/20080109.1/portage.overlay/net-misc/tor/tor-0.1.2.18-r1.ebuild
===================================================================
--- incognito/trunk/portage.overlay/net-misc/tor/tor-0.1.2.18-r1.ebuild	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/portage.overlay/net-misc/tor/tor-0.1.2.18-r1.ebuild	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,67 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.1.2.14.ebuild,v 1.4 2007/05/31 14:32:18 ranger Exp $
-
-inherit eutils
-
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="https://www.torproject.org"
-MY_PV=${PV/_/-}
-SRC_URI="https://www.torproject.org/dist/${PN}-${MY_PV}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="debug"
-
-DEPEND="dev-libs/openssl
-	>=dev-libs/libevent-1.2"
-RDEPEND="${DEPEND}
-	net-proxy/tsocks"
-
-pkg_setup() {
-	enewgroup tor
-	enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/torrc.sample-0.1.2.6.patch
-	epatch "${FILESDIR}"/tor.logrotate.patch
-	epatch "${FILESDIR}"/tor-cookieperm.patch
-}
-
-src_compile() {
-	econf $(use_enable debug)
-	emake || die "emake failed"
-}
-
-src_install() {
-	newinitd "${FILESDIR}"/tor.initd-r2 tor
-	emake DESTDIR="${D}" install || die
-	keepdir /var/{lib,log,run}/tor
-
-	dodoc README ChangeLog AUTHORS ReleaseNotes \
-		doc/{HACKING,TODO} \
-		doc/spec/*.txt
-
-	fperms 750 /var/lib/tor /var/log/tor
-	fperms 755 /var/run/tor
-	fowners tor:tor /var/lib/tor /var/log/tor /var/run/tor
-
-	sed -i -e "s:/lib::" \
-		-e "s:/rc.d::" \
-		-e "s:\\*:\\*.:" contrib/tor.logrotate
-	insinto /etc/logrotate.d
-	newins contrib/tor.logrotate tor
-}
-
-pkg_postinst() {
-	elog "You must create /etc/tor/torrc, you can use the sample that is in that directory"
-	elog "To have privoxy and tor working together you must add:"
-	elog "forward-socks4a / localhost:9050 ."
-	elog "(notice the . at the end of the line)"
-	elog "to /etc/privoxy/config"
-}

Copied: incognito/tags/20080109.1/portage.overlay/net-misc/tor/tor-0.1.2.19.ebuild (from rev 13170, incognito/trunk/portage.overlay/net-misc/tor/tor-0.1.2.19.ebuild)
===================================================================
--- incognito/tags/20080109.1/portage.overlay/net-misc/tor/tor-0.1.2.19.ebuild	                        (rev 0)
+++ incognito/tags/20080109.1/portage.overlay/net-misc/tor/tor-0.1.2.19.ebuild	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,67 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.1.2.14.ebuild,v 1.4 2007/05/31 14:32:18 ranger Exp $
+
+inherit eutils
+
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="http://tor.eff.org"
+MY_PV=${PV/_/-}
+SRC_URI="http://www.torproject.org/dist/${PN}-${MY_PV}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="debug"
+
+DEPEND="dev-libs/openssl
+	>=dev-libs/libevent-1.2"
+RDEPEND="${DEPEND}
+	net-proxy/tsocks"
+
+pkg_setup() {
+	enewgroup tor
+	enewuser tor -1 -1 /var/lib/tor tor
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/torrc.sample-0.1.2.6.patch
+	epatch "${FILESDIR}"/tor.logrotate.patch
+	epatch "${FILESDIR}"/tor-cookieperm.patch
+}
+
+src_compile() {
+	econf $(use_enable debug)
+	emake || die "emake failed"
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/tor.initd-r2 tor
+	emake DESTDIR="${D}" install || die
+	keepdir /var/{lib,log,run}/tor
+
+	dodoc README ChangeLog AUTHORS ReleaseNotes \
+		doc/{HACKING,TODO} \
+		doc/spec/*.txt
+
+	fperms 750 /var/lib/tor /var/log/tor
+	fperms 755 /var/run/tor
+	fowners tor:tor /var/lib/tor /var/log/tor /var/run/tor
+
+	sed -i -e "s:/lib::" \
+		-e "s:/rc.d::" \
+		-e "s:\\*:\\*.:" contrib/tor.logrotate
+	insinto /etc/logrotate.d
+	newins contrib/tor.logrotate tor
+}
+
+pkg_postinst() {
+	elog "You must create /etc/tor/torrc, you can use the sample that is in that directory"
+	elog "To have privoxy and tor working together you must add:"
+	elog "forward-socks4a / localhost:9050 ."
+	elog "(notice the . at the end of the line)"
+	elog "to /etc/privoxy/config"
+}

Deleted: incognito/tags/20080109.1/portage.overlay/net-misc/vidalia/Manifest
===================================================================
--- incognito/trunk/portage.overlay/net-misc/vidalia/Manifest	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/portage.overlay/net-misc/vidalia/Manifest	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,8 +0,0 @@
-DIST vidalia-0.0.15.tar.gz 1885646 RMD160 c70c3c0f50158609011254c9839dcf806be7b370 SHA1 c26be9349a0a7e8a8a45d53ba42787497355cd03 SHA256 3b63c491e295fe968bd263c5d9b6115ec79a12971fa414c24f3fca30da026340
-EBUILD vidalia-0.0.15.ebuild 1208 RMD160 e237e9368cdd0f25fbdaf87e433bbb04cd5c45b9 SHA1 374396d882abb14559cd73e92646f4d6ccb89e0f SHA256 e3bd30e292e5cc7cfc14c3df938caef24ece38ecd72e601d3aa3836f859cfd9f
-MD5 614ea509a3227cdd903e3f4e3d429c42 vidalia-0.0.15.ebuild 1208
-RMD160 e237e9368cdd0f25fbdaf87e433bbb04cd5c45b9 vidalia-0.0.15.ebuild 1208
-SHA256 e3bd30e292e5cc7cfc14c3df938caef24ece38ecd72e601d3aa3836f859cfd9f vidalia-0.0.15.ebuild 1208
-MD5 bdac6d67a8f8d691bfd0c3fe95848b67 files/digest-vidalia-0.0.15 247
-RMD160 ccf2293da3a2f855bc0a203284d26c8856b1f476 files/digest-vidalia-0.0.15 247
-SHA256 b68f8546d48e4f6d2fd5ce0b6f128345259cee524629d784f488146465aee2f3 files/digest-vidalia-0.0.15 247

Copied: incognito/tags/20080109.1/portage.overlay/net-misc/vidalia/Manifest (from rev 13115, incognito/trunk/portage.overlay/net-misc/vidalia/Manifest)
===================================================================
--- incognito/tags/20080109.1/portage.overlay/net-misc/vidalia/Manifest	                        (rev 0)
+++ incognito/tags/20080109.1/portage.overlay/net-misc/vidalia/Manifest	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,8 @@
+DIST vidalia-0.0.16.tar.gz 1907078 RMD160 5bd6072d49ee95592d8c0ca35aacc0e95d09f9a1 SHA1 1092fcbf77565136f1a5a5c382d01d4ecee2fafd SHA256 c5a7a60628581a2b02a3f9133c0741bb20a67564ab1f84d58e66619836fbe5a6
+EBUILD vidalia-0.0.16.ebuild 1208 RMD160 e237e9368cdd0f25fbdaf87e433bbb04cd5c45b9 SHA1 374396d882abb14559cd73e92646f4d6ccb89e0f SHA256 e3bd30e292e5cc7cfc14c3df938caef24ece38ecd72e601d3aa3836f859cfd9f
+MD5 614ea509a3227cdd903e3f4e3d429c42 vidalia-0.0.16.ebuild 1208
+RMD160 e237e9368cdd0f25fbdaf87e433bbb04cd5c45b9 vidalia-0.0.16.ebuild 1208
+SHA256 e3bd30e292e5cc7cfc14c3df938caef24ece38ecd72e601d3aa3836f859cfd9f vidalia-0.0.16.ebuild 1208
+MD5 894b73a152317883c030aedca42222ce files/digest-vidalia-0.0.16 247
+RMD160 bed44109162191543fa8ab0ae7cc0e6b39fb317f files/digest-vidalia-0.0.16 247
+SHA256 df146cb97a066e2fa8a8f053a8de9dfd8325043db1cfe4e01a173cbc89c7fd1f files/digest-vidalia-0.0.16 247

Deleted: incognito/tags/20080109.1/portage.overlay/net-misc/vidalia/files/digest-vidalia-0.0.15
===================================================================
--- incognito/trunk/portage.overlay/net-misc/vidalia/files/digest-vidalia-0.0.15	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/portage.overlay/net-misc/vidalia/files/digest-vidalia-0.0.15	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,3 +0,0 @@
-MD5 836a9ab190415a339c9c7d5d9808403a vidalia-0.0.15.tar.gz 1885646
-RMD160 c70c3c0f50158609011254c9839dcf806be7b370 vidalia-0.0.15.tar.gz 1885646
-SHA256 3b63c491e295fe968bd263c5d9b6115ec79a12971fa414c24f3fca30da026340 vidalia-0.0.15.tar.gz 1885646

Copied: incognito/tags/20080109.1/portage.overlay/net-misc/vidalia/files/digest-vidalia-0.0.16 (from rev 13115, incognito/trunk/portage.overlay/net-misc/vidalia/files/digest-vidalia-0.0.16)
===================================================================
--- incognito/tags/20080109.1/portage.overlay/net-misc/vidalia/files/digest-vidalia-0.0.16	                        (rev 0)
+++ incognito/tags/20080109.1/portage.overlay/net-misc/vidalia/files/digest-vidalia-0.0.16	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,3 @@
+MD5 d35881a463d18c36ace84682e2a875ae vidalia-0.0.16.tar.gz 1907078
+RMD160 5bd6072d49ee95592d8c0ca35aacc0e95d09f9a1 vidalia-0.0.16.tar.gz 1907078
+SHA256 c5a7a60628581a2b02a3f9133c0741bb20a67564ab1f84d58e66619836fbe5a6 vidalia-0.0.16.tar.gz 1907078

Deleted: incognito/tags/20080109.1/portage.overlay/net-misc/vidalia/vidalia-0.0.15.ebuild
===================================================================
--- incognito/trunk/portage.overlay/net-misc/vidalia/vidalia-0.0.15.ebuild	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/portage.overlay/net-misc/vidalia/vidalia-0.0.15.ebuild	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,42 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vidalia/vidalia-0.0.10.ebuild,v 1.1 2007/01/16 03:29:50 humpback Exp $
-
-inherit eutils
-
-DESCRIPTION="Qt 4 front-end for Tor"
-HOMEPAGE="http://www.vidalia-project.net/"
-SRC_URI="http://www.vidalia-project.net/dist/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="debug"
-
-DEPEND=">=x11-libs/qt-4.1.1"
-RDEPEND="${DEPEND}
-	>=net-misc/tor-0.1.1.20"
-
-pkg_setup() {
-	if use debug && ! built_with_use ">=x11-libs/qt-4.1.1" debug; then
-		eerror "In order to have debug support for Vidalia"
-		eerror "you need to compile Qt 4 with debug support too."
-		die "Qt 4 built without debug support"
-	fi
-}
-
-src_compile() {
-	econf $(use_enable debug) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die "emake install failed"
-}
-
-pkg_postinst() {
-	ewarn "To have vidalia starting tor you probably have to copy
-	/etc/tor/torrc.sample to the users \$HOME/.tor/torrc and comment the settings
-	there and change the socks. Also in vidalia change the default user under
-	wich tor will run"
-}

Copied: incognito/tags/20080109.1/portage.overlay/net-misc/vidalia/vidalia-0.0.16.ebuild (from rev 13115, incognito/trunk/portage.overlay/net-misc/vidalia/vidalia-0.0.16.ebuild)
===================================================================
--- incognito/tags/20080109.1/portage.overlay/net-misc/vidalia/vidalia-0.0.16.ebuild	                        (rev 0)
+++ incognito/tags/20080109.1/portage.overlay/net-misc/vidalia/vidalia-0.0.16.ebuild	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,42 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vidalia/vidalia-0.0.10.ebuild,v 1.1 2007/01/16 03:29:50 humpback Exp $
+
+inherit eutils
+
+DESCRIPTION="Qt 4 front-end for Tor"
+HOMEPAGE="http://www.vidalia-project.net/"
+SRC_URI="http://www.vidalia-project.net/dist/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="debug"
+
+DEPEND=">=x11-libs/qt-4.1.1"
+RDEPEND="${DEPEND}
+	>=net-misc/tor-0.1.1.20"
+
+pkg_setup() {
+	if use debug && ! built_with_use ">=x11-libs/qt-4.1.1" debug; then
+		eerror "In order to have debug support for Vidalia"
+		eerror "you need to compile Qt 4 with debug support too."
+		die "Qt 4 built without debug support"
+	fi
+}
+
+src_compile() {
+	econf $(use_enable debug) || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install || die "emake install failed"
+}
+
+pkg_postinst() {
+	ewarn "To have vidalia starting tor you probably have to copy
+	/etc/tor/torrc.sample to the users \$HOME/.tor/torrc and comment the settings
+	there and change the socks. Also in vidalia change the default user under
+	wich tor will run"
+}

Copied: incognito/tags/20080109.1/portage.overlay/net-wireless (from rev 13125, incognito/trunk/portage.overlay/net-wireless)

Deleted: incognito/tags/20080109.1/portage.overlay/x11-plugins/adblock_plus/Manifest
===================================================================
--- incognito/trunk/portage.overlay/x11-plugins/adblock_plus/Manifest	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/portage.overlay/x11-plugins/adblock_plus/Manifest	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,8 +0,0 @@
-DIST adblock_plus-0.7.5.3-fx+tb+sm+fl.xpi 233769 RMD160 a4bc890ec64713b068d20a0876bf316dc1e53193 SHA1 d72a0bc44bd3e4da260fba0c97b78cd850d58659 SHA256 659b394b09d07632f392f53a874e784d3e905a0074c9a049b814e3eb9d50a328
-EBUILD adblock_plus-0.7.5.3.ebuild 869 RMD160 1ca9e93d9e477723d2d5cf304ded7838fe034160 SHA1 f9ad8b0185ffb26bb64459262ab8de82344b146b SHA256 f1041ac3776c894ba1e8bab64da35ce17f0d419bd32fd794a760eb3b118607fb
-MD5 c57648e34b72cab69b7346bbb4a61dfa adblock_plus-0.7.5.3.ebuild 869
-RMD160 1ca9e93d9e477723d2d5cf304ded7838fe034160 adblock_plus-0.7.5.3.ebuild 869
-SHA256 f1041ac3776c894ba1e8bab64da35ce17f0d419bd32fd794a760eb3b118607fb adblock_plus-0.7.5.3.ebuild 869
-MD5 2e3b79bff892f79aa6a4eb2b09cd8a7b files/digest-adblock_plus-0.7.5.3 289
-RMD160 8c1e287b071f0933e195f2fbd061e1d285886f42 files/digest-adblock_plus-0.7.5.3 289
-SHA256 e48aa44b0f3a0ac1a803d1c48ad700d4ead85ed5f7050051786a0e9974ddc6ac files/digest-adblock_plus-0.7.5.3 289

Copied: incognito/tags/20080109.1/portage.overlay/x11-plugins/adblock_plus/Manifest (from rev 13115, incognito/trunk/portage.overlay/x11-plugins/adblock_plus/Manifest)
===================================================================
--- incognito/tags/20080109.1/portage.overlay/x11-plugins/adblock_plus/Manifest	                        (rev 0)
+++ incognito/tags/20080109.1/portage.overlay/x11-plugins/adblock_plus/Manifest	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,8 @@
+DIST adblock_plus-0.7.5.3-fx+tb+sm+fl.xpi 233769 RMD160 a4bc890ec64713b068d20a0876bf316dc1e53193 SHA1 d72a0bc44bd3e4da260fba0c97b78cd850d58659 SHA256 659b394b09d07632f392f53a874e784d3e905a0074c9a049b814e3eb9d50a328
+EBUILD adblock_plus-0.7.5.3.ebuild 863 RMD160 a9434e776c3c5541015b353aec94be35cf8c8448 SHA1 1c5d92be8e87ba23576ef183e03a615eb03823ec SHA256 619391f072d81954d74f4a9843c6d62a113d3c77e5b6de6996e99d124efc5e18
+MD5 02f7d297985c4b6052fb0cfbe3ee0be0 adblock_plus-0.7.5.3.ebuild 863
+RMD160 a9434e776c3c5541015b353aec94be35cf8c8448 adblock_plus-0.7.5.3.ebuild 863
+SHA256 619391f072d81954d74f4a9843c6d62a113d3c77e5b6de6996e99d124efc5e18 adblock_plus-0.7.5.3.ebuild 863
+MD5 c400ea6960de92d90cc25b45437c7d04 files/digest-adblock_plus-0.7.5.3 208
+RMD160 a1dd8a7f6aed59af4b39a66b5507a5290c234fdb files/digest-adblock_plus-0.7.5.3 208
+SHA256 83c2f3d124eb3355849250371097943c1d5a3239270325faadf089926577ed7f files/digest-adblock_plus-0.7.5.3 208

Deleted: incognito/tags/20080109.1/portage.overlay/x11-plugins/adblock_plus/adblock_plus-0.7.5.3.ebuild
===================================================================
--- incognito/trunk/portage.overlay/x11-plugins/adblock_plus/adblock_plus-0.7.5.3.ebuild	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/portage.overlay/x11-plugins/adblock_plus/adblock_plus-0.7.5.3.ebuild	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,36 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-
-inherit mozextension multilib
-
-DESCRIPTION="Advertisement blocker for Firefox"
-HOMEPAGE="http://adblockplus.org/"
-SRC_URI="https://addons.mozilla.org/en-US/firefox/downloads/file/19510/${P}-fx+tb+sm+fl.xpi"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="|| (
-  >=www-client/mozilla-firefox-bin-1.5.0.7
-  >=www-client/mozilla-firefox-1.5.0.7
-)"
-
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}
-
-src_unpack() {
-	xpi_unpack "${P}-fx+tb+sm+fl.xpi"
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME
-	if has_version '>=www-client/mozilla-firefox-1.5.0.7'; then
-		MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-firefox"
-	elif has_version '>=www-client/mozilla-firefox-bin-1.5.0.7'; then
-		MOZILLA_FIVE_HOME="/opt/firefox"
-	fi
-
-	xpi_install "${S}"/"${P}-fx+tb+sm+fl"
-}

Copied: incognito/tags/20080109.1/portage.overlay/x11-plugins/adblock_plus/adblock_plus-0.7.5.3.ebuild (from rev 13115, incognito/trunk/portage.overlay/x11-plugins/adblock_plus/adblock_plus-0.7.5.3.ebuild)
===================================================================
--- incognito/tags/20080109.1/portage.overlay/x11-plugins/adblock_plus/adblock_plus-0.7.5.3.ebuild	                        (rev 0)
+++ incognito/tags/20080109.1/portage.overlay/x11-plugins/adblock_plus/adblock_plus-0.7.5.3.ebuild	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,36 @@
+# Distributed under the terms of the GNU General Public License v2
+
+inherit mozextension multilib
+
+DESCRIPTION="Advertisement blocker for Firefox"
+HOMEPAGE="http://adblockplus.org/"
+SRC_URI="http://releases.mozilla.org/pub/mozilla.org/addons/1865/${P}-fx+tb+sm+fl.xpi"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
+IUSE=""
+
+RDEPEND="|| (
+  >=www-client/mozilla-firefox-bin-1.5.0.7
+  >=www-client/mozilla-firefox-1.5.0.7
+)"
+
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}
+
+src_unpack() {
+	xpi_unpack "${P}-fx+tb+sm+fl.xpi"
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME
+	if has_version '>=www-client/mozilla-firefox-1.5.0.7'; then
+		MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-firefox"
+	elif has_version '>=www-client/mozilla-firefox-bin-1.5.0.7'; then
+		MOZILLA_FIVE_HOME="/opt/firefox"
+	fi
+
+	xpi_install "${S}"/"${P}-fx+tb+sm+fl"
+}

Deleted: incognito/tags/20080109.1/portage.overlay/x11-plugins/adblock_plus/files/digest-adblock_plus-0.7.5.3
===================================================================
--- incognito/trunk/portage.overlay/x11-plugins/adblock_plus/files/digest-adblock_plus-0.7.5.3	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/portage.overlay/x11-plugins/adblock_plus/files/digest-adblock_plus-0.7.5.3	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,3 +0,0 @@
-MD5 90d7fb085d4a8ef6f5f20ddad8b919a0 adblock_plus-0.7.5.3-fx+tb+sm+fl.xpi 233769
-RMD160 a4bc890ec64713b068d20a0876bf316dc1e53193 adblock_plus-0.7.5.3-fx+tb+sm+fl.xpi 233769
-SHA256 659b394b09d07632f392f53a874e784d3e905a0074c9a049b814e3eb9d50a328 adblock_plus-0.7.5.3-fx+tb+sm+fl.xpi 233769

Copied: incognito/tags/20080109.1/portage.overlay/x11-plugins/adblock_plus/files/digest-adblock_plus-0.7.5.3 (from rev 13115, incognito/trunk/portage.overlay/x11-plugins/adblock_plus/files/digest-adblock_plus-0.7.5.3)
===================================================================
--- incognito/tags/20080109.1/portage.overlay/x11-plugins/adblock_plus/files/digest-adblock_plus-0.7.5.3	                        (rev 0)
+++ incognito/tags/20080109.1/portage.overlay/x11-plugins/adblock_plus/files/digest-adblock_plus-0.7.5.3	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,2 @@
+RMD160 a4bc890ec64713b068d20a0876bf316dc1e53193 adblock_plus-0.7.5.3-fx+tb+sm+fl.xpi 233769
+SHA256 659b394b09d07632f392f53a874e784d3e905a0074c9a049b814e3eb9d50a328 adblock_plus-0.7.5.3-fx+tb+sm+fl.xpi 233769

Copied: incognito/tags/20080109.1/portage.overlay/x11-plugins/cs-lite (from rev 13126, incognito/trunk/portage.overlay/x11-plugins/cs-lite)

Deleted: incognito/tags/20080109.1/portage.overlay/x11-plugins/enigmail-bin/Manifest
===================================================================
--- incognito/trunk/portage.overlay/x11-plugins/enigmail-bin/Manifest	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/portage.overlay/x11-plugins/enigmail-bin/Manifest	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,9 +0,0 @@
-DIST enigmail-0.95.2-linux-x86_64.xpi 820799 RMD160 a9701b2b169a3aebe9869f811d6d233eff8b73ca SHA1 ffa395b972d7168a2b18663751a880b4639a564f SHA256 54381dd48a6838071873107ae79c50cbdda711d05c3777b393dbffdedaaebc52
-DIST enigmail-0.95.2-tb+sm.xpi 1130723 RMD160 d539c6b5cf2d72a54f83b57555c56f7d2d9dfe6e SHA1 bf24622e1bca82a095ed7813c10ea892908fe10b SHA256 e87adf9e9669a9cdc2f05164e2d9b6dff70f7518edc457b23d37ad0f35676b59
-EBUILD enigmail-bin-0.95.2.ebuild 967 RMD160 570deff9a73ff415a4d20c6e745651a17f904d78 SHA1 a3ab7fb7dec3dab93ffba87ef1308abb3f6c094b SHA256 c9e4fd39926a480a02902af54e9db673704bf72445532992cf1c720a5bcee203
-MD5 0e4b953168740ae0fe5d8dd266c604f9 enigmail-bin-0.95.2.ebuild 967
-RMD160 570deff9a73ff415a4d20c6e745651a17f904d78 enigmail-bin-0.95.2.ebuild 967
-SHA256 c9e4fd39926a480a02902af54e9db673704bf72445532992cf1c720a5bcee203 enigmail-bin-0.95.2.ebuild 967
-MD5 576dc32bb53d004ffeebde3976380189 files/digest-enigmail-bin-0.95.2 536
-RMD160 67532f7ca9c2dcd8fd9f4e5737bd29a1addb5c58 files/digest-enigmail-bin-0.95.2 536
-SHA256 adec8641d1d069dbc00b901551a3cc28afa1d9cd4a9e16d01f69a5bf5f71f776 files/digest-enigmail-bin-0.95.2 536

Copied: incognito/tags/20080109.1/portage.overlay/x11-plugins/enigmail-bin/Manifest (from rev 13115, incognito/trunk/portage.overlay/x11-plugins/enigmail-bin/Manifest)
===================================================================
--- incognito/tags/20080109.1/portage.overlay/x11-plugins/enigmail-bin/Manifest	                        (rev 0)
+++ incognito/tags/20080109.1/portage.overlay/x11-plugins/enigmail-bin/Manifest	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,8 @@
+DIST enigmail-0.95.6-tb+sm.xpi 1176154 RMD160 f585d1ebbb7c7f1aea81a6d0e811c2def3189b21 SHA1 46df32c4477a4376e23b1bc2a217025123de221f SHA256 b618da538fddd1123a2c09a20a2d71f874b63fa7b90acdaf2c58643003a1a934
+EBUILD enigmail-bin-0.95.6.ebuild 842 RMD160 da7f98e0f49a3df9cec29dc10055216eac34f2fb SHA1 6fe232efd4c74661e538c6acdb5b7e8d53fa72a7 SHA256 1ee47cdc878d9ffdd2b5e6a583728c2865fd330439905be93d444e833ad74a32
+MD5 ed55c4ba04297b5158360ea4f58e73f8 enigmail-bin-0.95.6.ebuild 842
+RMD160 da7f98e0f49a3df9cec29dc10055216eac34f2fb enigmail-bin-0.95.6.ebuild 842
+SHA256 1ee47cdc878d9ffdd2b5e6a583728c2865fd330439905be93d444e833ad74a32 enigmail-bin-0.95.6.ebuild 842
+MD5 8de6b39b242447769f20191142fcfa17 files/digest-enigmail-bin-0.95.6 259
+RMD160 c76b76dbd06d1936a079a6b68fdf42a8b6f640b6 files/digest-enigmail-bin-0.95.6 259
+SHA256 c644ac73272be4bd5fe0ce2208aeb2c752539fb130a925c6c89835cb388bcb1d files/digest-enigmail-bin-0.95.6 259

Deleted: incognito/tags/20080109.1/portage.overlay/x11-plugins/enigmail-bin/enigmail-bin-0.95.2.ebuild
===================================================================
--- incognito/trunk/portage.overlay/x11-plugins/enigmail-bin/enigmail-bin-0.95.2.ebuild	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/portage.overlay/x11-plugins/enigmail-bin/enigmail-bin-0.95.2.ebuild	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,36 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2 
-
-inherit multilib mozextension 
-	 
-DESCRIPTION="GnuPG encryption binary plugin for thunderbird" 
-HOMEPAGE="http://enigmail.mozdev.org" 
-SRC_URI="amd64?
-	(http://www.mozilla-enigmail.org/downloads/enigmail-${PV}-linux-x86_64.xpi) 
-	x86? (https://addons.mozilla.org/en-US/thunderbird/downloads/file/17103/enigmail-${PV}-tb+sm.xpi)" 
-
-LICENSE="MPL-1.1 GPL-2" 
-SLOT="0" 
-KEYWORDS="~x86 ~amd64"
-IUSE="" 
-
-RDEPEND=">=app-crypt/gnupg-1.4.7 
-	>=mail-client/mozilla-thunderbird-bin-2.0.0.6"
-
-DEPEND="${RDEPEND}" 
-
-S=${WORKDIR} 
-src_unpack() { 
-	xpi_unpack "${A}" 
-} 
-
-src_install() { 
-	if has_version ">=mail-client/mozilla-thunderbird-2.0.0.5"; then 
-		MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-thunderbird" 
-		xpi_install "${S}"/"${A/.xpi/}" 
-	fi 
-	if has_version ">=mail-client/mozilla-thunderbird-bin-2.0.0.6"; then 
-		MOZILLA_FIVE_HOME="/opt/thunderbird" 
-		xpi_install "${S}"/"${A/.xpi/}" 
-	fi 
-}
-

Copied: incognito/tags/20080109.1/portage.overlay/x11-plugins/enigmail-bin/enigmail-bin-0.95.6.ebuild (from rev 13115, incognito/trunk/portage.overlay/x11-plugins/enigmail-bin/enigmail-bin-0.95.6.ebuild)
===================================================================
--- incognito/tags/20080109.1/portage.overlay/x11-plugins/enigmail-bin/enigmail-bin-0.95.6.ebuild	                        (rev 0)
+++ incognito/tags/20080109.1/portage.overlay/x11-plugins/enigmail-bin/enigmail-bin-0.95.6.ebuild	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,34 @@
+# Distributed under the terms of the GNU General Public License v2 
+
+inherit multilib mozextension 
+	 
+DESCRIPTION="GnuPG encryption binary plugin for thunderbird" 
+HOMEPAGE="http://enigmail.mozdev.org" 
+SRC_URI="http://www.mozilla-enigmail.org/downloads/enigmail-${PV}-tb+sm.xpi"
+
+LICENSE="MPL-1.1 GPL-2" 
+SLOT="0" 
+KEYWORDS="~x86"
+IUSE="" 
+
+RDEPEND=">=app-crypt/gnupg-1.4.8 
+	>=mail-client/mozilla-thunderbird-bin-2.0.0.9"
+
+DEPEND="${RDEPEND}" 
+
+S=${WORKDIR} 
+src_unpack() { 
+	xpi_unpack "${A}" 
+} 
+
+src_install() { 
+	if has_version ">=mail-client/mozilla-thunderbird-2.0.0.5"; then 
+		MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-thunderbird" 
+		xpi_install "${S}"/"${A/.xpi/}" 
+	fi 
+	if has_version ">=mail-client/mozilla-thunderbird-bin-2.0.0.6"; then 
+		MOZILLA_FIVE_HOME="/opt/thunderbird" 
+		xpi_install "${S}"/"${A/.xpi/}" 
+	fi 
+}
+

Deleted: incognito/tags/20080109.1/portage.overlay/x11-plugins/enigmail-bin/files/digest-enigmail-bin-0.95.2
===================================================================
--- incognito/trunk/portage.overlay/x11-plugins/enigmail-bin/files/digest-enigmail-bin-0.95.2	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/portage.overlay/x11-plugins/enigmail-bin/files/digest-enigmail-bin-0.95.2	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,6 +0,0 @@
-MD5 894aa04b7738e744359fc42cf097653b enigmail-0.95.2-linux-x86_64.xpi 820799
-RMD160 a9701b2b169a3aebe9869f811d6d233eff8b73ca enigmail-0.95.2-linux-x86_64.xpi 820799
-SHA256 54381dd48a6838071873107ae79c50cbdda711d05c3777b393dbffdedaaebc52 enigmail-0.95.2-linux-x86_64.xpi 820799
-MD5 a0ccbf33abe59796ca815bf818c38865 enigmail-0.95.2-tb+sm.xpi 1130723
-RMD160 d539c6b5cf2d72a54f83b57555c56f7d2d9dfe6e enigmail-0.95.2-tb+sm.xpi 1130723
-SHA256 e87adf9e9669a9cdc2f05164e2d9b6dff70f7518edc457b23d37ad0f35676b59 enigmail-0.95.2-tb+sm.xpi 1130723

Copied: incognito/tags/20080109.1/portage.overlay/x11-plugins/enigmail-bin/files/digest-enigmail-bin-0.95.6 (from rev 13115, incognito/trunk/portage.overlay/x11-plugins/enigmail-bin/files/digest-enigmail-bin-0.95.6)
===================================================================
--- incognito/tags/20080109.1/portage.overlay/x11-plugins/enigmail-bin/files/digest-enigmail-bin-0.95.6	                        (rev 0)
+++ incognito/tags/20080109.1/portage.overlay/x11-plugins/enigmail-bin/files/digest-enigmail-bin-0.95.6	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,3 @@
+MD5 70b2b1200b2f1ed87cbc32a9feaa127a enigmail-0.95.6-tb+sm.xpi 1176154
+RMD160 f585d1ebbb7c7f1aea81a6d0e811c2def3189b21 enigmail-0.95.6-tb+sm.xpi 1176154
+SHA256 b618da538fddd1123a2c09a20a2d71f874b63fa7b90acdaf2c58643003a1a934 enigmail-0.95.6-tb+sm.xpi 1176154

Deleted: incognito/tags/20080109.1/portage.overlay/x11-plugins/firefox-quick-locale-switcher/Manifest
===================================================================
--- incognito/trunk/portage.overlay/x11-plugins/firefox-quick-locale-switcher/Manifest	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/portage.overlay/x11-plugins/firefox-quick-locale-switcher/Manifest	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,8 +0,0 @@
-DIST quick_locale_switcher-1.6.3.1-fx+mz+tb+sb+nvu+ns+sm+fl.xpi 217479 RMD160 fccb7e85ebac9436b89870d93ae3560586da5390 SHA1 394f058ea6d92870e7afdabca99458a387f2ef91 SHA256 653f3ab82c3bc9084b5f56e5e377d6d44a654437c783536b80a90a9f668981bf
-EBUILD firefox-quick-locale-switcher-1.6.3.1.ebuild 1102 RMD160 c1dd65e5130040765065a433b25d24ff7b24a755 SHA1 0d7262c75ab3ad3cb87796f7f4e1edd1d6f169ac SHA256 d662d33353b473bd713843a36819200966b859b95e7fe67ff5196a2bbdbc4273
-MD5 bf10b8961f1f46feb0bccfc899b4af67 firefox-quick-locale-switcher-1.6.3.1.ebuild 1102
-RMD160 c1dd65e5130040765065a433b25d24ff7b24a755 firefox-quick-locale-switcher-1.6.3.1.ebuild 1102
-SHA256 d662d33353b473bd713843a36819200966b859b95e7fe67ff5196a2bbdbc4273 firefox-quick-locale-switcher-1.6.3.1.ebuild 1102
-MD5 f1ebe1912afd4ce12721b9ec26e68e32 files/digest-firefox-quick-locale-switcher-1.6.3.1 355
-RMD160 be883732e219ebf27bf9c2d117c865c3f47599ad files/digest-firefox-quick-locale-switcher-1.6.3.1 355
-SHA256 650ebd9269ee41144a87be600ec51aa85a940511ade8858c9d3f453b1b5c8aa5 files/digest-firefox-quick-locale-switcher-1.6.3.1 355

Copied: incognito/tags/20080109.1/portage.overlay/x11-plugins/firefox-quick-locale-switcher/Manifest (from rev 13115, incognito/trunk/portage.overlay/x11-plugins/firefox-quick-locale-switcher/Manifest)
===================================================================
--- incognito/tags/20080109.1/portage.overlay/x11-plugins/firefox-quick-locale-switcher/Manifest	                        (rev 0)
+++ incognito/tags/20080109.1/portage.overlay/x11-plugins/firefox-quick-locale-switcher/Manifest	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,8 @@
+DIST quick_locale_switcher-1.6.3.7-fx+mz+tb+sb+nvu+ns+sm+fl.xpi 232799 RMD160 c4d0f61e7f74afb510b8b8fe9538d47cc9001be4 SHA1 6c93c3726281f9e43c0043583841d33e08e2a654 SHA256 9358d884c30e98080c92bbea52a053332eadbbd62768c197fdd579c09269da82
+EBUILD firefox-quick-locale-switcher-1.6.3.7.ebuild 1102 RMD160 c1dd65e5130040765065a433b25d24ff7b24a755 SHA1 0d7262c75ab3ad3cb87796f7f4e1edd1d6f169ac SHA256 d662d33353b473bd713843a36819200966b859b95e7fe67ff5196a2bbdbc4273
+MD5 bf10b8961f1f46feb0bccfc899b4af67 firefox-quick-locale-switcher-1.6.3.7.ebuild 1102
+RMD160 c1dd65e5130040765065a433b25d24ff7b24a755 firefox-quick-locale-switcher-1.6.3.7.ebuild 1102
+SHA256 d662d33353b473bd713843a36819200966b859b95e7fe67ff5196a2bbdbc4273 firefox-quick-locale-switcher-1.6.3.7.ebuild 1102
+MD5 300cf7b7d1156498e375139c867e56b3 files/digest-firefox-quick-locale-switcher-1.6.3.7 355
+RMD160 8b043c683c0f78fc71d598b326a3357bd45789a3 files/digest-firefox-quick-locale-switcher-1.6.3.7 355
+SHA256 817028adfe65b10690bbd19f3a8bd97d5cb470d8df4bb7d6b9038b3c74d93a74 files/digest-firefox-quick-locale-switcher-1.6.3.7 355

Deleted: incognito/tags/20080109.1/portage.overlay/x11-plugins/firefox-quick-locale-switcher/files/digest-firefox-quick-locale-switcher-1.6.3.1
===================================================================
--- incognito/trunk/portage.overlay/x11-plugins/firefox-quick-locale-switcher/files/digest-firefox-quick-locale-switcher-1.6.3.1	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/portage.overlay/x11-plugins/firefox-quick-locale-switcher/files/digest-firefox-quick-locale-switcher-1.6.3.1	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,3 +0,0 @@
-MD5 525919374456b11763f72883bbd05cc5 quick_locale_switcher-1.6.3.1-fx+mz+tb+sb+nvu+ns+sm+fl.xpi 217479
-RMD160 fccb7e85ebac9436b89870d93ae3560586da5390 quick_locale_switcher-1.6.3.1-fx+mz+tb+sb+nvu+ns+sm+fl.xpi 217479
-SHA256 653f3ab82c3bc9084b5f56e5e377d6d44a654437c783536b80a90a9f668981bf quick_locale_switcher-1.6.3.1-fx+mz+tb+sb+nvu+ns+sm+fl.xpi 217479

Copied: incognito/tags/20080109.1/portage.overlay/x11-plugins/firefox-quick-locale-switcher/files/digest-firefox-quick-locale-switcher-1.6.3.7 (from rev 13115, incognito/trunk/portage.overlay/x11-plugins/firefox-quick-locale-switcher/files/digest-firefox-quick-locale-switcher-1.6.3.7)
===================================================================
--- incognito/tags/20080109.1/portage.overlay/x11-plugins/firefox-quick-locale-switcher/files/digest-firefox-quick-locale-switcher-1.6.3.7	                        (rev 0)
+++ incognito/tags/20080109.1/portage.overlay/x11-plugins/firefox-quick-locale-switcher/files/digest-firefox-quick-locale-switcher-1.6.3.7	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,3 @@
+MD5 6885ba935d71f643b96f0649304af20b quick_locale_switcher-1.6.3.7-fx+mz+tb+sb+nvu+ns+sm+fl.xpi 232799
+RMD160 c4d0f61e7f74afb510b8b8fe9538d47cc9001be4 quick_locale_switcher-1.6.3.7-fx+mz+tb+sb+nvu+ns+sm+fl.xpi 232799
+SHA256 9358d884c30e98080c92bbea52a053332eadbbd62768c197fdd579c09269da82 quick_locale_switcher-1.6.3.7-fx+mz+tb+sb+nvu+ns+sm+fl.xpi 232799

Deleted: incognito/tags/20080109.1/portage.overlay/x11-plugins/firefox-quick-locale-switcher/firefox-quick-locale-switcher-1.6.3.1.ebuild
===================================================================
--- incognito/trunk/portage.overlay/x11-plugins/firefox-quick-locale-switcher/firefox-quick-locale-switcher-1.6.3.1.ebuild	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/portage.overlay/x11-plugins/firefox-quick-locale-switcher/firefox-quick-locale-switcher-1.6.3.1.ebuild	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,36 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-
-inherit mozextension multilib
-
-DESCRIPTION="Firefox plugin to quickly switch the locale"
-HOMEPAGE="http://www.captaincaveman.nl/content/firefox_extensions/quick_locale_switcher/"
-#SRC_URI="http://www.captaincaveman.nl/extensions/qls.xpi"
-SRC_URI="http://releases.mozilla.org/pub/mozilla.org/addons/1333/quick_locale_switcher-${PV}-fx+mz+tb+sb+nvu+ns+sm+fl.xpi"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="|| (
-	>=www-client/mozilla-firefox-bin-1.5.0.7
-	>=www-client/mozilla-firefox-1.5.0.7
-)"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}
-
-src_unpack() {
-	xpi_unpack "quick_locale_switcher-${PV}-fx+mz+tb+sb+nvu+ns+sm+fl.xpi"
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME
-	if has_version '>=www-client/mozilla-firefox-1.5.0.7'; then
-		MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-firefox"
-	elif has_version '>=www-client/mozilla-firefox-bin-1.5.0.7'; then
-		MOZILLA_FIVE_HOME="/opt/firefox"
-	fi
-
-	xpi_install "${S}"/"quick_locale_switcher-${PV}-fx+mz+tb+sb+nvu+ns+sm+fl"
-}

Copied: incognito/tags/20080109.1/portage.overlay/x11-plugins/firefox-quick-locale-switcher/firefox-quick-locale-switcher-1.6.3.7.ebuild (from rev 13115, incognito/trunk/portage.overlay/x11-plugins/firefox-quick-locale-switcher/firefox-quick-locale-switcher-1.6.3.7.ebuild)
===================================================================
--- incognito/tags/20080109.1/portage.overlay/x11-plugins/firefox-quick-locale-switcher/firefox-quick-locale-switcher-1.6.3.7.ebuild	                        (rev 0)
+++ incognito/tags/20080109.1/portage.overlay/x11-plugins/firefox-quick-locale-switcher/firefox-quick-locale-switcher-1.6.3.7.ebuild	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,36 @@
+# Distributed under the terms of the GNU General Public License v2
+
+inherit mozextension multilib
+
+DESCRIPTION="Firefox plugin to quickly switch the locale"
+HOMEPAGE="http://www.captaincaveman.nl/content/firefox_extensions/quick_locale_switcher/"
+#SRC_URI="http://www.captaincaveman.nl/extensions/qls.xpi"
+SRC_URI="http://releases.mozilla.org/pub/mozilla.org/addons/1333/quick_locale_switcher-${PV}-fx+mz+tb+sb+nvu+ns+sm+fl.xpi"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="|| (
+	>=www-client/mozilla-firefox-bin-1.5.0.7
+	>=www-client/mozilla-firefox-1.5.0.7
+)"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}
+
+src_unpack() {
+	xpi_unpack "quick_locale_switcher-${PV}-fx+mz+tb+sb+nvu+ns+sm+fl.xpi"
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME
+	if has_version '>=www-client/mozilla-firefox-1.5.0.7'; then
+		MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-firefox"
+	elif has_version '>=www-client/mozilla-firefox-bin-1.5.0.7'; then
+		MOZILLA_FIVE_HOME="/opt/firefox"
+	fi
+
+	xpi_install "${S}"/"quick_locale_switcher-${PV}-fx+mz+tb+sb+nvu+ns+sm+fl"
+}

Deleted: incognito/tags/20080109.1/portage.overlay/x11-plugins/firegpg/Manifest
===================================================================
--- incognito/trunk/portage.overlay/x11-plugins/firegpg/Manifest	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/portage.overlay/x11-plugins/firegpg/Manifest	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,7 +0,0 @@
-EBUILD firegpg-0.4.4.ebuild 1282 RMD160 b8e451591862dacf3682e5a7f638cb0e59f85d9e SHA1 146a38a810ac74cc9ca03baa00e2e8f123b14aef SHA256 fc2ad03c638b05b1eca9e5c45f0d07c0f01617a95ca34530d6e533ae992f35f4
-MD5 a840f8f546a614f81629b0569d2d6dd5 firegpg-0.4.4.ebuild 1282
-RMD160 b8e451591862dacf3682e5a7f638cb0e59f85d9e firegpg-0.4.4.ebuild 1282
-SHA256 fc2ad03c638b05b1eca9e5c45f0d07c0f01617a95ca34530d6e533ae992f35f4 firegpg-0.4.4.ebuild 1282
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-firegpg-0.4.4 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-firegpg-0.4.4 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-firegpg-0.4.4 0

Copied: incognito/tags/20080109.1/portage.overlay/x11-plugins/firegpg/Manifest (from rev 13298, incognito/trunk/portage.overlay/x11-plugins/firegpg/Manifest)
===================================================================
--- incognito/tags/20080109.1/portage.overlay/x11-plugins/firegpg/Manifest	                        (rev 0)
+++ incognito/tags/20080109.1/portage.overlay/x11-plugins/firegpg/Manifest	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,7 @@
+EBUILD firegpg-0.4.8.ebuild 1305 RMD160 4ba80c0d7a58f25c5673f4a935f07fda5f6619b9 SHA1 9992af4924248ef43dbb836e976e089136d1128e SHA256 fa8ccf13b83813b794bcae59bc47a2a54058befea76a9099dd56707fb77adfae
+MD5 a0a6d12c3dc3b77a319e87ceb09cc31c firegpg-0.4.8.ebuild 1305
+RMD160 4ba80c0d7a58f25c5673f4a935f07fda5f6619b9 firegpg-0.4.8.ebuild 1305
+SHA256 fa8ccf13b83813b794bcae59bc47a2a54058befea76a9099dd56707fb77adfae firegpg-0.4.8.ebuild 1305
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-firegpg-0.4.8 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-firegpg-0.4.8 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-firegpg-0.4.8 0

Deleted: incognito/tags/20080109.1/portage.overlay/x11-plugins/firegpg/files/digest-firegpg-0.4.4
===================================================================

Copied: incognito/tags/20080109.1/portage.overlay/x11-plugins/firegpg/files/digest-firegpg-0.4.8 (from rev 13298, incognito/trunk/portage.overlay/x11-plugins/firegpg/files/digest-firegpg-0.4.8)
===================================================================

Deleted: incognito/tags/20080109.1/portage.overlay/x11-plugins/firegpg/firegpg-0.4.4.ebuild
===================================================================
--- incognito/trunk/portage.overlay/x11-plugins/firegpg/firegpg-0.4.4.ebuild	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/portage.overlay/x11-plugins/firegpg/firegpg-0.4.4.ebuild	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,44 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-
-inherit subversion mozextension multilib
-
-DESCRIPTION="Firefox extension which brings an interface to encrypt, decrypt, sign or verify the signature of text in any web page using GnuPG."
-HOMEPAGE="http://firegpg.tuxfamily.org/"
-# We are using SVN with a revision number since a version based .xpi is not available
-#SRC_URI="http://firegpg.tuxfamily.org/stable/${PN}.xpi"
-ESVN_REPO_URI="svn://svn.tuxfamily.org/svnroot/firegpg/firegpg"
-ESVN_OPTIONS="-r 299"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="|| (
-  >=www-client/mozilla-firefox-bin-1.5.0.7
-  >=www-client/mozilla-firefox-1.5.0.7
-)
-	app-crypt/gnupg"
-
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	subversion_src_unpack
-	./build.sh
-	DISTDIR="${WORKDIR}/distdir"
-	mkdir -p "${DISTDIR}"
-	mv "${PN}.xpi" "${DISTDIR}/${P}-svn.xpi"
-	xpi_unpack "${P}-svn.xpi"
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME
-	if has_version '>=www-client/mozilla-firefox-1.5.0.7'; then
-		MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-firefox"
-	elif has_version '>=www-client/mozilla-firefox-bin-1.5.0.7'; then
-		MOZILLA_FIVE_HOME="/opt/firefox"
-	fi
-
-	DISTDIR="${WORKDIR}/distdir"
-	xpi_install "${WORKDIR}"/"${P}-svn"
-}

Copied: incognito/tags/20080109.1/portage.overlay/x11-plugins/firegpg/firegpg-0.4.8.ebuild (from rev 13298, incognito/trunk/portage.overlay/x11-plugins/firegpg/firegpg-0.4.8.ebuild)
===================================================================
--- incognito/tags/20080109.1/portage.overlay/x11-plugins/firegpg/firegpg-0.4.8.ebuild	                        (rev 0)
+++ incognito/tags/20080109.1/portage.overlay/x11-plugins/firegpg/firegpg-0.4.8.ebuild	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,44 @@
+# Distributed under the terms of the GNU General Public License v2
+
+inherit subversion mozextension multilib
+
+DESCRIPTION="Firefox extension which brings an interface to encrypt, decrypt, sign or verify the signature of text in any web page using GnuPG."
+HOMEPAGE="http://firegpg.tuxfamily.org/"
+#SRC_URI="http://firegpg.tuxfamily.org/stable/${PN}.xpi"
+# We can get a specific release using SVN with a revision number since a version based .xpi is not available
+ESVN_REPO_URI="svn://svn.tuxfamily.org/svnroot/firegpg/firegpg"
+ESVN_OPTIONS="-r 339"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="|| (
+  >=www-client/mozilla-firefox-bin-1.5.0.7
+  >=www-client/mozilla-firefox-1.5.0.7
+)
+	app-crypt/gnupg"
+
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	subversion_src_unpack
+	./build.sh
+	DISTDIR="${WORKDIR}/distdir"
+	mkdir -p "${DISTDIR}"
+	mv "${PN}.xpi" "${DISTDIR}/${P}-svn.xpi"
+	xpi_unpack "${P}-svn.xpi"
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME
+	if has_version '>=www-client/mozilla-firefox-1.5.0.7'; then
+		MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-firefox"
+	elif has_version '>=www-client/mozilla-firefox-bin-1.5.0.7'; then
+		MOZILLA_FIVE_HOME="/opt/firefox"
+	fi
+
+	DISTDIR="${WORKDIR}/distdir"
+	xpi_install "${WORKDIR}"/"${P}-svn"
+}

Copied: incognito/tags/20080109.1/portage.overlay/x11-plugins/noscript-bin (from rev 13115, incognito/trunk/portage.overlay/x11-plugins/noscript-bin)

Deleted: incognito/tags/20080109.1/portage.overlay/x11-plugins/noscript-bin/Manifest
===================================================================
--- incognito/trunk/portage.overlay/x11-plugins/noscript-bin/Manifest	2008-01-12 15:05:07 UTC (rev 13115)
+++ incognito/tags/20080109.1/portage.overlay/x11-plugins/noscript-bin/Manifest	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,8 +0,0 @@
-DIST noscript-1.2.9.xpi 251038 RMD160 3e3ec842c521b844724b6332f47f695ffc6f95ad SHA1 5ba843f9a102b4fa73cfc6b8c3a06e3246aa36a7 SHA256 415303859984af6724ddac11677b1c87f382883775529bbc7e8fd74608eecdc9
-EBUILD noscript-bin-1.2.9.ebuild 944 RMD160 b7dfac2fda047891351aec71da88b43d493164cb SHA1 b8055d1be3006b4bb86c4a7f78a17a42cc4f637e SHA256 b417dd5ef94f58da35eec448dd7cd39d5cd6b54a2b4157e4925e6c0c29ccc741
-MD5 428894bafc4b8e46a7e8daf591067aa8 noscript-bin-1.2.9.ebuild 944
-RMD160 b7dfac2fda047891351aec71da88b43d493164cb noscript-bin-1.2.9.ebuild 944
-SHA256 b417dd5ef94f58da35eec448dd7cd39d5cd6b54a2b4157e4925e6c0c29ccc741 noscript-bin-1.2.9.ebuild 944
-MD5 4037463951ad00c5e70ae26e5a5dbaac files/digest-noscript-bin-1.2.9 235
-RMD160 e2ba8aa7f25bf9593bbd8f0bf6a79eafd945398c files/digest-noscript-bin-1.2.9 235
-SHA256 c079c9907242047d5fa17f98fb14e5a6d17c00acfc9bdfe41f45555c160a3e97 files/digest-noscript-bin-1.2.9 235

Copied: incognito/tags/20080109.1/portage.overlay/x11-plugins/noscript-bin/Manifest (from rev 13298, incognito/trunk/portage.overlay/x11-plugins/noscript-bin/Manifest)
===================================================================
--- incognito/tags/20080109.1/portage.overlay/x11-plugins/noscript-bin/Manifest	                        (rev 0)
+++ incognito/tags/20080109.1/portage.overlay/x11-plugins/noscript-bin/Manifest	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,8 @@
+DIST noscript-1.3.1.xpi 254415 RMD160 bfda545ef1ca89b125cd23966df98c7c15097d05 SHA1 6d256b30544ad1babc90e5cb3150f73c38c22835 SHA256 e129f0f695905819c56b1f1a93efdce46dfa5faa8b231f6ed9b94fd5c496b643
+EBUILD noscript-bin-1.3.1.ebuild 944 RMD160 b7dfac2fda047891351aec71da88b43d493164cb SHA1 b8055d1be3006b4bb86c4a7f78a17a42cc4f637e SHA256 b417dd5ef94f58da35eec448dd7cd39d5cd6b54a2b4157e4925e6c0c29ccc741
+MD5 428894bafc4b8e46a7e8daf591067aa8 noscript-bin-1.3.1.ebuild 944
+RMD160 b7dfac2fda047891351aec71da88b43d493164cb noscript-bin-1.3.1.ebuild 944
+SHA256 b417dd5ef94f58da35eec448dd7cd39d5cd6b54a2b4157e4925e6c0c29ccc741 noscript-bin-1.3.1.ebuild 944
+MD5 c77223a22c54f992d3bbb84e8288055d files/digest-noscript-bin-1.3.1 235
+RMD160 c994e7e240ff8b8d8feb390679c3f16179ddaff6 files/digest-noscript-bin-1.3.1 235
+SHA256 251a41ebe4f85036c187f3684def45e1abae39d53d08684b051111d0cb97521a files/digest-noscript-bin-1.3.1 235

Deleted: incognito/tags/20080109.1/portage.overlay/x11-plugins/noscript-bin/files/digest-noscript-bin-1.2.9
===================================================================
--- incognito/trunk/portage.overlay/x11-plugins/noscript-bin/files/digest-noscript-bin-1.2.9	2008-01-12 15:05:07 UTC (rev 13115)
+++ incognito/tags/20080109.1/portage.overlay/x11-plugins/noscript-bin/files/digest-noscript-bin-1.2.9	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,3 +0,0 @@
-MD5 a44216d8656344c20684bd1e3f5061f5 noscript-1.2.9.xpi 251038
-RMD160 3e3ec842c521b844724b6332f47f695ffc6f95ad noscript-1.2.9.xpi 251038
-SHA256 415303859984af6724ddac11677b1c87f382883775529bbc7e8fd74608eecdc9 noscript-1.2.9.xpi 251038

Copied: incognito/tags/20080109.1/portage.overlay/x11-plugins/noscript-bin/files/digest-noscript-bin-1.3.1 (from rev 13298, incognito/trunk/portage.overlay/x11-plugins/noscript-bin/files/digest-noscript-bin-1.3.1)
===================================================================
--- incognito/tags/20080109.1/portage.overlay/x11-plugins/noscript-bin/files/digest-noscript-bin-1.3.1	                        (rev 0)
+++ incognito/tags/20080109.1/portage.overlay/x11-plugins/noscript-bin/files/digest-noscript-bin-1.3.1	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,3 @@
+MD5 846ff2aca8ef3d4168a74317deecf9ea noscript-1.3.1.xpi 254415
+RMD160 bfda545ef1ca89b125cd23966df98c7c15097d05 noscript-1.3.1.xpi 254415
+SHA256 e129f0f695905819c56b1f1a93efdce46dfa5faa8b231f6ed9b94fd5c496b643 noscript-1.3.1.xpi 254415

Deleted: incognito/tags/20080109.1/portage.overlay/x11-plugins/noscript-bin/noscript-bin-1.2.9.ebuild
===================================================================
--- incognito/trunk/portage.overlay/x11-plugins/noscript-bin/noscript-bin-1.2.9.ebuild	2008-01-12 15:05:07 UTC (rev 13115)
+++ incognito/tags/20080109.1/portage.overlay/x11-plugins/noscript-bin/noscript-bin-1.2.9.ebuild	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,38 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit mozextension multilib
-
-PACKAGE="noscript-${PV}"
-DESCRIPTION="Firefox plugin to disable javascript"
-HOMEPAGE="http://noscript.net/"
-SRC_URI="http://software.informaction.com/data/releases/${PACKAGE}.xpi"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="|| (
-	>=www-client/mozilla-firefox-bin-1.5.0.7
-	>=www-client/mozilla-firefox-1.5.0.7
-)"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}
-
-src_unpack() {
-	xpi_unpack "${PACKAGE}".xpi
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME
-	if has_version '>=www-client/mozilla-firefox-1.5.0.7'; then
-		MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-firefox"
-		xpi_install "${S}"/"${PACKAGE}"
-	fi
-	if has_version '>=www-client/mozilla-firefox-bin-1.5.0.7'; then
-		MOZILLA_FIVE_HOME="/opt/firefox"
-		xpi_install "${S}"/"${PACKAGE}"
-	fi
-}

Copied: incognito/tags/20080109.1/portage.overlay/x11-plugins/noscript-bin/noscript-bin-1.3.1.ebuild (from rev 13298, incognito/trunk/portage.overlay/x11-plugins/noscript-bin/noscript-bin-1.3.1.ebuild)
===================================================================
--- incognito/tags/20080109.1/portage.overlay/x11-plugins/noscript-bin/noscript-bin-1.3.1.ebuild	                        (rev 0)
+++ incognito/tags/20080109.1/portage.overlay/x11-plugins/noscript-bin/noscript-bin-1.3.1.ebuild	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,38 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit mozextension multilib
+
+PACKAGE="noscript-${PV}"
+DESCRIPTION="Firefox plugin to disable javascript"
+HOMEPAGE="http://noscript.net/"
+SRC_URI="http://software.informaction.com/data/releases/${PACKAGE}.xpi"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="|| (
+	>=www-client/mozilla-firefox-bin-1.5.0.7
+	>=www-client/mozilla-firefox-1.5.0.7
+)"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}
+
+src_unpack() {
+	xpi_unpack "${PACKAGE}".xpi
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME
+	if has_version '>=www-client/mozilla-firefox-1.5.0.7'; then
+		MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-firefox"
+		xpi_install "${S}"/"${PACKAGE}"
+	fi
+	if has_version '>=www-client/mozilla-firefox-bin-1.5.0.7'; then
+		MOZILLA_FIVE_HOME="/opt/firefox"
+		xpi_install "${S}"/"${PACKAGE}"
+	fi
+}

Deleted: incognito/tags/20080109.1/portage.overlay/x11-plugins/refcontrol/Manifest
===================================================================
--- incognito/trunk/portage.overlay/x11-plugins/refcontrol/Manifest	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/portage.overlay/x11-plugins/refcontrol/Manifest	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,12 +0,0 @@
-AUX chrome.manifest 1302 RMD160 bf669635a9cbeaa5ca94aad76ac393181bd32a14 SHA1 be59b36b0e5987a5bf069646d3be7a7229cb82b5 SHA256 01b2789b44b8c46917a2f94bdb2a492e3277c89fcd9862b9cd51b33b0dd598de
-MD5 5f0609af0772a8b6a4bec529ac4eca33 files/chrome.manifest 1302
-RMD160 bf669635a9cbeaa5ca94aad76ac393181bd32a14 files/chrome.manifest 1302
-SHA256 01b2789b44b8c46917a2f94bdb2a492e3277c89fcd9862b9cd51b33b0dd598de files/chrome.manifest 1302
-DIST refcontrol-0.8.9-fx.xpi 28856 RMD160 d0e3a3a61b772b2432d061d2593c79ae320de680 SHA1 e6cf6cc5a35d902fd191549329ab0823c9d06dd4 SHA256 3b23866b334e8d15562333690c444e61108abec80ff47b661e177c5e9c70b5a0
-EBUILD refcontrol-0.8.9.ebuild 1026 RMD160 c2a85cfbdc9926402fd57c40f4cb3a8c318647ed SHA1 1781b75b2d11f0fcf00c15f427a7b1dcc8c5d56f SHA256 cd9092c5df47891a0dfad03d15771f4f41c1006f7b6af76452b4e2310b336c17
-MD5 6630a51f2b496366d86d1617e16a1a6e refcontrol-0.8.9.ebuild 1026
-RMD160 c2a85cfbdc9926402fd57c40f4cb3a8c318647ed refcontrol-0.8.9.ebuild 1026
-SHA256 cd9092c5df47891a0dfad03d15771f4f41c1006f7b6af76452b4e2310b336c17 refcontrol-0.8.9.ebuild 1026
-MD5 8b331c472ca5472ac3efd51ec5575160 files/digest-refcontrol-0.8.9 247
-RMD160 f3b4324ae013176f9d64858a60c1a910bcd4b1e1 files/digest-refcontrol-0.8.9 247
-SHA256 053ed44f6d8d0e8926cc066d45d241d99a8961b62be9e28482daa5771b09a888 files/digest-refcontrol-0.8.9 247

Copied: incognito/tags/20080109.1/portage.overlay/x11-plugins/refcontrol/Manifest (from rev 13115, incognito/trunk/portage.overlay/x11-plugins/refcontrol/Manifest)
===================================================================
--- incognito/tags/20080109.1/portage.overlay/x11-plugins/refcontrol/Manifest	                        (rev 0)
+++ incognito/tags/20080109.1/portage.overlay/x11-plugins/refcontrol/Manifest	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,12 @@
+AUX chrome.manifest 1302 RMD160 bf669635a9cbeaa5ca94aad76ac393181bd32a14 SHA1 be59b36b0e5987a5bf069646d3be7a7229cb82b5 SHA256 01b2789b44b8c46917a2f94bdb2a492e3277c89fcd9862b9cd51b33b0dd598de
+MD5 5f0609af0772a8b6a4bec529ac4eca33 files/chrome.manifest 1302
+RMD160 bf669635a9cbeaa5ca94aad76ac393181bd32a14 files/chrome.manifest 1302
+SHA256 01b2789b44b8c46917a2f94bdb2a492e3277c89fcd9862b9cd51b33b0dd598de files/chrome.manifest 1302
+DIST refcontrol-0.8.9-fx.xpi 28856 RMD160 d0e3a3a61b772b2432d061d2593c79ae320de680 SHA1 e6cf6cc5a35d902fd191549329ab0823c9d06dd4 SHA256 3b23866b334e8d15562333690c444e61108abec80ff47b661e177c5e9c70b5a0
+EBUILD refcontrol-0.8.9.ebuild 1020 RMD160 2690c147df2d5d1ef7b5a7ff0a1588c8eb5559a5 SHA1 dd609c5f78c156f8afbfa23cd119113f02a7b7f0 SHA256 468606c4bc0e2ef1fa849d3a4b70bb68d714a529a27c18e6c371a46275368a90
+MD5 33261603e2eba770be359a68be4eb6f7 refcontrol-0.8.9.ebuild 1020
+RMD160 2690c147df2d5d1ef7b5a7ff0a1588c8eb5559a5 refcontrol-0.8.9.ebuild 1020
+SHA256 468606c4bc0e2ef1fa849d3a4b70bb68d714a529a27c18e6c371a46275368a90 refcontrol-0.8.9.ebuild 1020
+MD5 8b331c472ca5472ac3efd51ec5575160 files/digest-refcontrol-0.8.9 247
+RMD160 f3b4324ae013176f9d64858a60c1a910bcd4b1e1 files/digest-refcontrol-0.8.9 247
+SHA256 053ed44f6d8d0e8926cc066d45d241d99a8961b62be9e28482daa5771b09a888 files/digest-refcontrol-0.8.9 247

Deleted: incognito/tags/20080109.1/portage.overlay/x11-plugins/refcontrol/files/digest-refcontrol-0.8.9
===================================================================
--- incognito/trunk/portage.overlay/x11-plugins/refcontrol/files/digest-refcontrol-0.8.9	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/portage.overlay/x11-plugins/refcontrol/files/digest-refcontrol-0.8.9	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,3 +0,0 @@
-MD5 bb4f2b98439f3eec2259b288b434b564 refcontrol-0.8.9-fx.xpi 28856
-RMD160 d0e3a3a61b772b2432d061d2593c79ae320de680 refcontrol-0.8.9-fx.xpi 28856
-SHA256 3b23866b334e8d15562333690c444e61108abec80ff47b661e177c5e9c70b5a0 refcontrol-0.8.9-fx.xpi 28856

Copied: incognito/tags/20080109.1/portage.overlay/x11-plugins/refcontrol/files/digest-refcontrol-0.8.9 (from rev 13115, incognito/trunk/portage.overlay/x11-plugins/refcontrol/files/digest-refcontrol-0.8.9)
===================================================================
--- incognito/tags/20080109.1/portage.overlay/x11-plugins/refcontrol/files/digest-refcontrol-0.8.9	                        (rev 0)
+++ incognito/tags/20080109.1/portage.overlay/x11-plugins/refcontrol/files/digest-refcontrol-0.8.9	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,3 @@
+MD5 bb4f2b98439f3eec2259b288b434b564 refcontrol-0.8.9-fx.xpi 28856
+RMD160 d0e3a3a61b772b2432d061d2593c79ae320de680 refcontrol-0.8.9-fx.xpi 28856
+SHA256 3b23866b334e8d15562333690c444e61108abec80ff47b661e177c5e9c70b5a0 refcontrol-0.8.9-fx.xpi 28856

Deleted: incognito/tags/20080109.1/portage.overlay/x11-plugins/refcontrol/refcontrol-0.8.9.ebuild
===================================================================
--- incognito/trunk/portage.overlay/x11-plugins/refcontrol/refcontrol-0.8.9.ebuild	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/portage.overlay/x11-plugins/refcontrol/refcontrol-0.8.9.ebuild	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,38 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-
-inherit mozextension multilib
-
-DESCRIPTION="Firefox extension to control what gets sent as the HTTP Referer on a per-site basis."
-HOMEPAGE="http://www.stardrifter.org/refcontrol/"
-SRC_URI="https://addons.mozilla.org/en-US/firefox/downloads/file/4618/${P}-fx.xpi"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="|| (
-  >=www-client/mozilla-firefox-bin-1.5.0.7
-  >=www-client/mozilla-firefox-1.5.0.7
-)"
-
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}
-
-src_unpack() {
-	xpi_unpack "${P}-fx.xpi"
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME
-	if has_version '>=www-client/mozilla-firefox-1.5.0.7'; then
-		MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-firefox"
-	elif has_version '>=www-client/mozilla-firefox-bin-1.5.0.7'; then
-		MOZILLA_FIVE_HOME="/opt/firefox"
-	fi
-
-	xpi_install "${S}"/"${P}-fx"
-	insinto "${MOZILLA_FIVE_HOME}/extensions/{455D905A-D37C-4643-A9E2-F6FEFAA0424A}"
-	doins "${FILESDIR}/chrome.manifest"
-}

Copied: incognito/tags/20080109.1/portage.overlay/x11-plugins/refcontrol/refcontrol-0.8.9.ebuild (from rev 13115, incognito/trunk/portage.overlay/x11-plugins/refcontrol/refcontrol-0.8.9.ebuild)
===================================================================
--- incognito/tags/20080109.1/portage.overlay/x11-plugins/refcontrol/refcontrol-0.8.9.ebuild	                        (rev 0)
+++ incognito/tags/20080109.1/portage.overlay/x11-plugins/refcontrol/refcontrol-0.8.9.ebuild	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,38 @@
+# Distributed under the terms of the GNU General Public License v2
+
+inherit mozextension multilib
+
+DESCRIPTION="Firefox extension to control what gets sent as the HTTP Referer on a per-site basis."
+HOMEPAGE="http://www.stardrifter.org/refcontrol/"
+SRC_URI="http://releases.mozilla.org/pub/mozilla.org/addons/953/${P}-fx.xpi"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
+IUSE=""
+
+RDEPEND="|| (
+  >=www-client/mozilla-firefox-bin-1.5.0.7
+  >=www-client/mozilla-firefox-1.5.0.7
+)"
+
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}
+
+src_unpack() {
+	xpi_unpack "${P}-fx.xpi"
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME
+	if has_version '>=www-client/mozilla-firefox-1.5.0.7'; then
+		MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-firefox"
+	elif has_version '>=www-client/mozilla-firefox-bin-1.5.0.7'; then
+		MOZILLA_FIVE_HOME="/opt/firefox"
+	fi
+
+	xpi_install "${S}"/"${P}-fx"
+	insinto "${MOZILLA_FIVE_HOME}/extensions/{455D905A-D37C-4643-A9E2-F6FEFAA0424A}"
+	doins "${FILESDIR}/chrome.manifest"
+}

Deleted: incognito/tags/20080109.1/portage.overlay/x11-plugins/thunderplunger/Manifest
===================================================================
--- incognito/trunk/portage.overlay/x11-plugins/thunderplunger/Manifest	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/portage.overlay/x11-plugins/thunderplunger/Manifest	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,8 +0,0 @@
-DIST thunderplunger-0.7-tb.xpi 51426 RMD160 cdbbb2cb709d02b77fc14f7a811331d2a09c4474 SHA1 c9a0a6bdc8013b8c0149e41468f3975c1169855c SHA256 7c9d9daec73bc463e6492c7d14d1016451dd1615d29201d359270902597e8a9c
-EBUILD thunderplunger-0.7.ebuild 817 RMD160 fae997b335a6b0a4a587e5328633d8f642abff6b SHA1 a5cba70806418a6b6063ba5f8fb167af245891ae SHA256 780d3f598f3bb9b5eaabff754bd7fbd41356390671a52dcb0baa43d546a62064
-MD5 c00653501c282f94562ec850ce87e59f thunderplunger-0.7.ebuild 817
-RMD160 fae997b335a6b0a4a587e5328633d8f642abff6b thunderplunger-0.7.ebuild 817
-SHA256 780d3f598f3bb9b5eaabff754bd7fbd41356390671a52dcb0baa43d546a62064 thunderplunger-0.7.ebuild 817
-MD5 fc2caccf06d0ce0a59d902bbedb57e14 files/digest-thunderplunger-0.7 253
-RMD160 b97160ee7e9542c708c93ff132b4bdc852d67554 files/digest-thunderplunger-0.7 253
-SHA256 36b6ee5cd0b9f8f6c625e502b17ead0c6034ca6db91948333b5f41eda713f15b files/digest-thunderplunger-0.7 253

Copied: incognito/tags/20080109.1/portage.overlay/x11-plugins/thunderplunger/Manifest (from rev 13115, incognito/trunk/portage.overlay/x11-plugins/thunderplunger/Manifest)
===================================================================
--- incognito/tags/20080109.1/portage.overlay/x11-plugins/thunderplunger/Manifest	                        (rev 0)
+++ incognito/tags/20080109.1/portage.overlay/x11-plugins/thunderplunger/Manifest	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,8 @@
+DIST thunderplunger-0.8-tb.xpi 66425 RMD160 a13eb7c621fd10a6339c5a5f93ffc3ca904575ca SHA1 a9ad91945ede068270615a7de95fcdfa99d2d867 SHA256 ef60976ae80439eb8bb1668ea206a6d1b17642cbadce361bb1c8020030e27afc
+EBUILD thunderplunger-0.8.ebuild 808 RMD160 a576168a4699de20679fe081385b7dddae505450 SHA1 036bc312eb786a18c46dd7b9860308507889c8bb SHA256 5bf2d6feb3c8c12c4490c734a285ec91f38d83bc5297320f768c9d00fac7b112
+MD5 16b73516177a1c97ff4dfbc66de770fd thunderplunger-0.8.ebuild 808
+RMD160 a576168a4699de20679fe081385b7dddae505450 thunderplunger-0.8.ebuild 808
+SHA256 5bf2d6feb3c8c12c4490c734a285ec91f38d83bc5297320f768c9d00fac7b112 thunderplunger-0.8.ebuild 808
+MD5 3b01fd0a645cfe31e0f71d52d2b2a77c files/digest-thunderplunger-0.8 253
+RMD160 2e02a987a83437e89fc76bfa8f6ef515e12296f4 files/digest-thunderplunger-0.8 253
+SHA256 59a2ce1d9cdadfb361efd9a3857de216bcddf35c3f0396da0d16d9e2e62c0f19 files/digest-thunderplunger-0.8 253

Deleted: incognito/tags/20080109.1/portage.overlay/x11-plugins/thunderplunger/files/digest-thunderplunger-0.7
===================================================================
--- incognito/trunk/portage.overlay/x11-plugins/thunderplunger/files/digest-thunderplunger-0.7	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/portage.overlay/x11-plugins/thunderplunger/files/digest-thunderplunger-0.7	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,3 +0,0 @@
-MD5 1df1d1a4178e2bb73881eabe50cb0977 thunderplunger-0.7-tb.xpi 51426
-RMD160 cdbbb2cb709d02b77fc14f7a811331d2a09c4474 thunderplunger-0.7-tb.xpi 51426
-SHA256 7c9d9daec73bc463e6492c7d14d1016451dd1615d29201d359270902597e8a9c thunderplunger-0.7-tb.xpi 51426

Copied: incognito/tags/20080109.1/portage.overlay/x11-plugins/thunderplunger/files/digest-thunderplunger-0.8 (from rev 13115, incognito/trunk/portage.overlay/x11-plugins/thunderplunger/files/digest-thunderplunger-0.8)
===================================================================
--- incognito/tags/20080109.1/portage.overlay/x11-plugins/thunderplunger/files/digest-thunderplunger-0.8	                        (rev 0)
+++ incognito/tags/20080109.1/portage.overlay/x11-plugins/thunderplunger/files/digest-thunderplunger-0.8	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,3 @@
+MD5 a673526ee965c4791bbfbd70504387da thunderplunger-0.8-tb.xpi 66425
+RMD160 a13eb7c621fd10a6339c5a5f93ffc3ca904575ca thunderplunger-0.8-tb.xpi 66425
+SHA256 ef60976ae80439eb8bb1668ea206a6d1b17642cbadce361bb1c8020030e27afc thunderplunger-0.8-tb.xpi 66425

Deleted: incognito/tags/20080109.1/portage.overlay/x11-plugins/thunderplunger/thunderplunger-0.7.ebuild
===================================================================
--- incognito/trunk/portage.overlay/x11-plugins/thunderplunger/thunderplunger-0.7.ebuild	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/portage.overlay/x11-plugins/thunderplunger/thunderplunger-0.7.ebuild	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,32 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-
-inherit mozextension multilib
-
-DESCRIPTION="Mozilla Thunderbird extension to clean up files"
-HOMEPAGE="http://addons.mozilla.org/en-US/thunderbird/addon/4390"
-SRC_URI="http://addons.mozilla.org/en-US/thunderbird/downloads/file/15324/${P}-tb.xpi"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-RDEPEND=">=mail-client/mozilla-thunderbird-bin-1.5.0.7"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}
-
-src_unpack() {
-	xpi_unpack "${P}-tb.xpi"
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME
-	if has_version '>=mail-client/mozilla-thunderbird-1.5.0.7'; then
-		MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-thunderbird"
-	elif has_version '>=mail-client/mozilla-thunderbird-bin-1.5.0.7'; then
-		MOZILLA_FIVE_HOME="/opt/thunderbird"
-	fi
-
-	xpi_install "${S}"/"${P}-tb"
-}

Copied: incognito/tags/20080109.1/portage.overlay/x11-plugins/thunderplunger/thunderplunger-0.8.ebuild (from rev 13115, incognito/trunk/portage.overlay/x11-plugins/thunderplunger/thunderplunger-0.8.ebuild)
===================================================================
--- incognito/tags/20080109.1/portage.overlay/x11-plugins/thunderplunger/thunderplunger-0.8.ebuild	                        (rev 0)
+++ incognito/tags/20080109.1/portage.overlay/x11-plugins/thunderplunger/thunderplunger-0.8.ebuild	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,32 @@
+# Distributed under the terms of the GNU General Public License v2
+
+inherit mozextension multilib
+
+DESCRIPTION="Mozilla Thunderbird extension to clean up files"
+HOMEPAGE="http://addons.mozilla.org/en-US/thunderbird/addon/4390"
+SRC_URI="http://releases.mozilla.org/pub/mozilla.org/addons/4390/${P}-tb.xpi"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86"
+IUSE=""
+
+RDEPEND=">=mail-client/mozilla-thunderbird-bin-1.5.0.7"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}
+
+src_unpack() {
+	xpi_unpack "${P}-tb.xpi"
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME
+	if has_version '>=mail-client/mozilla-thunderbird-1.5.0.7'; then
+		MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-thunderbird"
+	elif has_version '>=mail-client/mozilla-thunderbird-bin-1.5.0.7'; then
+		MOZILLA_FIVE_HOME="/opt/thunderbird"
+	fi
+
+	xpi_install "${S}"/"${P}-tb"
+}

Deleted: incognito/tags/20080109.1/release-steps.html
===================================================================
--- incognito/trunk/release-steps.html	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/release-steps.html	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,25 +0,0 @@
-<html>
-<head>
-<title>Incognito Release Procedure</title>
-</head>
-
-<body>
-
-<p>
-This document is only of interest to the maintainer. It lists the steps to do when doing a release.
-</p>
-
-<ol>
-<li>Build CDs</li>
-<li>Test (people get grumpy when they download a large file that doesn't work)</li>
-<li>Sign CDs with gpg -ba (detached signature, ASCII armor)</li>
-<li>Copy .iso, .iso.DIGESTS, .iso.asc to files1.cjb.net</li>
-<li>Export readme.html on full CD (/var/tmp/catalyst/tmp/incognito/livecd-stage2-*/usr/share/incognito/readme.html) to incognito.html on www.patdouble.com</li>
-<li>Add release article on www.patdouble.com</li>
-<li>Announce on or-talk at freehaven.net</li>
-</ol>
-
-
-</body>
-
-</html>

Copied: incognito/tags/20080109.1/release-steps.html (from rev 13126, incognito/trunk/release-steps.html)
===================================================================
--- incognito/tags/20080109.1/release-steps.html	                        (rev 0)
+++ incognito/tags/20080109.1/release-steps.html	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,24 @@
+<html>
+<head>
+<title>Incognito Release Procedure</title>
+</head>
+
+<body>
+
+<p>
+This document is only of interest to the maintainer. It lists the steps to do when doing a release.
+</p>
+
+<ol>
+<li>Build CDs</li>
+<li>Test (people get grumpy when they download a large file that doesn't work)</li>
+<li>Sign CDs with gpg -ba (detached signature, ASCII armor)</li>
+<li>Copy .iso, .iso.DIGESTS, .iso.asc to files1.cjb.net</li>
+<li>Export readme.html (/var/tmp/catalyst/tmp/incognito/livecd-stage2-*/usr/share/incognito/readme.html) and trunk/hacking.html to incognito.anonymityanywhere.com</li>
+<li>Add release article on incognito.anonymityanywhere.com</li>
+<li>Announce on or-talk at freehaven.net</li>
+</ol>
+
+</body>
+
+</html>

Deleted: incognito/tags/20080109.1/root_overlay/etc/init.d/external-config-setup
===================================================================
--- incognito/trunk/root_overlay/etc/init.d/external-config-setup	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/root_overlay/etc/init.d/external-config-setup	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,162 +0,0 @@
-#!/sbin/runscript
-
-# Sets up configuration based on media files external from the root
-# fs, i.e. /mnt/cdrom
-
-MEDIAROOT="/mnt/cdrom"
-HOMEPART_EXT3="${MEDIAROOT}/home.ext3.img"
-HOMEPART_TC="${MEDIAROOT}/home.tc"
-
-depend() {
-	need localmount
-	before xdm
-}
-
-start() {
-	# Language
-	for P in $(</proc/cmdline); do echo ${P} | sed 's/=/ /'; done | while read A X; do
-		if [[ "${A}" == "lang" && -n "${X}" ]]; then
-			ebegin "Setting language to ${X}"
-
-			cat > /etc/env.d/02locale <<EOF
-LANG="${X}"
-LC_ALL="${X}"
-EOF
-			/sbin/env-update.sh > /dev/null
-
-			MOZILLA_FIVE_HOME="/opt/firefox"
-			if [[ -w "${MOZILLA_FIVE_HOME}"/defaults/pref/firefox.js ]]; then
-				sed -i "s:general.useragent.locale\", \".*\":general.useragent.locale\", \"${X}\":" \
-				        "${MOZILLA_FIVE_HOME}"/defaults/pref/firefox.js \
-				        "${MOZILLA_FIVE_HOME}"/defaults/pref/firefox-l10n.js 2>/dev/null
-			fi
-			ls /home/gentoo/.mozilla/firefox/*/prefs.js /home/gentoo/.thunderbird/*/prefs.js 2>/dev/null | while read PREFS; do
-				echo "user_pref(\"general.useragent.locale\", \"${X}\");" >> "${PREFS}"
-			done
-
-			KXKBRC="/home/gentoo/.kde3.5/share/config/kxkbrc"
-			if [[ -w "${KXKBRC}" ]]; then
-				sed -i "s:=${X},\?:=:" "${KXKBRC}"
-				sed -i "s:,${X}::" "${KXKBRC}"
-				sed -i "s:LayoutList=:LayoutList=${X},:" "${KXKBRC}"
-			fi
-
-			eend 0
-		fi
-		if [[ "${A}" == "keymap" && -n "${X}" && ! -e "/etc/sysconfig/keyboard" ]]; then
-			# Missing /etc/sysconfig/keyboard implies initramfs script did not set a keymap
-			mkdir -p /etc/sysconfig
-			echo "XKEYBOARD=${X}" > /etc/sysconfig/keyboard
-			sed -i "s/KEYMAP=\"us\"/KEYMAP=\"${X}\"/" /etc/conf.d/keymaps
-		fi
-	done
-	if [[ -e "/etc/sysconfig/keyboard" ]]; then
-		source /etc/sysconfig/keyboard
-		[[ -n "${XKEYBOARD}" ]] && sed -i "s/KEYMAP=\"us\"/KEYMAP=\"${XKEYBOARD}\"/" /etc/conf.d/keymaps
-	fi
-	[[ -f "/etc/env.d/02locale" ]] && source /etc/env.d/02locale
-
-	# User specific config
-	export MEDIAFREE="$(df -k -P "${MEDIAROOT}" | tail -n 1 | awk '{ print $4 }')"
-	einfo "Found ${MEDIAFREE}k free on ${MEDIAROOT}"
-	if [[ -d "${MEDIAROOT}" ]]; then
-		# Remount media rw
-		mount -o rw,remount ${MEDIAROOT} >/dev/null 2>&1
-		if [[ "${MEDIAFREE}" -gt 24576 && ! -f "${HOMEPART_EXT3}" && ! -f "${HOMEPART_TC}" ]]; then
-			# Check if really writeable
-			touch "${MEDIAROOT}/writetest" >/dev/null 2>/dev/null
-			if [[ -f "${MEDIAROOT}/writetest" ]]; then
-				rm "${MEDIAROOT}/writetest"
-				splash_verbose
-				clear
-				/usr/sbin/create-homevol
-				clear
-				splash_silent
-			fi
-		fi
-	fi
-
-	if [[ -w "${HOMEPART_TC}" ]]; then
-		ebegin "Mounting TrueCrypt /home"
-		splash_verbose
-		QUESTION_PASSWORD="Please enter the password for the home volume."
-		QUESTION_ERROR="An error occurred opening the volume, see above, hit ENTER to try again"
-		TITLE="Open Persistent Home Volume"
-		# Ask for truecrypt password, use password from creating (hidden volume preferred) if available
-		TRUECRYPT_PW=""
-		while true; do
-			dialog --stdout --ascii-lines --title "${TITLE}" --backtitle "__INCOGNITO__" --insecure --passwordbox "${QUESTION_PASSWORD}" 0 0 1>/tmp/dialog
-			if [[ $? -ne 0 ]]; then
-				clear
-				rm /tmp/dialog
-				break
-			fi
-			clear
-			TRUECRYPT_PW="$(</tmp/dialog)"
-			rm /tmp/dialog
-			# Attempt to mount the volume
-			truecrypt --keyfile "" --password "${TRUECRYPT_PW}" "${HOMEPART_TC}" /home
-			if [[ $? -eq 0 ]]; then
-				touch /var/state/boot-media-home
-				break
-			fi
-			echo
-			echo "*** ${QUESTION_ERROR} ***"
-			echo
-			read TMP
-		done
-		splash_silent
-		eend 0
-	elif [[ -w "${HOMEPART_EXT3}" ]]; then
-		ebegin "Mounting boot media /home"
-		mount -o rw,remount ${MEDIAROOT} >/dev/null 2>&1
-		mount -o loop -t ext3 "${HOMEPART_EXT3}" /home && touch /var/state/boot-media-home
-		eend $?
-	fi
-	if [[ ! -e /var/state/boot-media-home ]]; then
-		ebegin "Copying user config from boot media to /home/gentoo"
-		mkdir -p /home/gentoo/.kde3.5/share/config
-		[[ -f ${MEDIAROOT}/config/kopeterc ]] && cp ${MEDIAROOT}/config/kopeterc /home/gentoo/.kde3.5/share/config
-		if [[ -d ${MEDIAROOT}/keys/ssh ]]; then
-			cp -a ${MEDIAROOT}/keys/ssh /home/gentoo/.ssh
-			chown -R gentoo:users /home/gentoo/.ssh
-			chmod 700 /home/gentoo/.ssh
-		fi
-		eend 0
-	fi
-
-	# System wide config
-	ebegin "Copying system config from boot media"
-	[[ -d ${MEDIAROOT}/keys/openvpn ]] && cp -a ${MEDIAROOT}/keys/openvpn /etc
-	eend 0
-
-	# Ensure correct user dir permissions
-	if [[ ! -f /var/state/boot-media-home ]]; then
-		ebegin "Fixing permissions on /home"
-		for USERDIR in /home/*; do
-			chown -R ${USERDIR/\/home\//}:users $USERDIR
-			find $USERDIR -type f -print0 | xargs -0 chmod u+rw
-		done
-		eend 0
-	fi
-	chown -R root /root
-
-	# If using 'docache' we are done with the boot media, eject it
-	CD_DEV="$(eject -n | sed 's:.*\(/dev/[A-Za-z0-9]*\).*:\1:')"
-	[[ ! -f /var/state/boot-media-home ]] && grep docache /proc/cmdline >/dev/null && [[ -n "${CD_DEV}" ]] && grep "${CD_DEV}" /proc/mounts >/dev/null && eject
-
-	# The previous line could return a false value which is OK, but should not fail the service
-	true
-
-}
-
-stop() {
-	if [[ -f /var/state/boot-media-home ]]; then
-		ebegin "Unmounting boot media /home"
-		umount /home && rm /var/state/boot-media-home
-		eend $?
-	fi
-}
-
-
-# vim:ts=4

Copied: incognito/tags/20080109.1/root_overlay/etc/init.d/external-config-setup (from rev 13298, incognito/trunk/root_overlay/etc/init.d/external-config-setup)
===================================================================
--- incognito/tags/20080109.1/root_overlay/etc/init.d/external-config-setup	                        (rev 0)
+++ incognito/tags/20080109.1/root_overlay/etc/init.d/external-config-setup	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,175 @@
+#!/sbin/runscript
+
+# Sets up configuration based on media files external from the root
+# fs, i.e. /mnt/cdrom
+
+MEDIAROOT="/mnt/cdrom"
+HOMEPART_EXT3="${MEDIAROOT}/home.ext3.img"
+HOMEPART_TC="${MEDIAROOT}/home.tc"
+
+depend() {
+	need localmount
+	before xdm
+}
+
+start() {
+	# Language
+	for P in $(</proc/cmdline); do echo ${P} | sed 's/=/ /'; done | while read A X; do
+		if [[ "${A}" == "lang" && -n "${X}" ]]; then
+			ebegin "Setting language to ${X}"
+
+			cat > /etc/env.d/02locale <<EOF
+LANG="${X}"
+LC_ALL="${X}"
+EOF
+			/sbin/env-update.sh > /dev/null
+
+			MOZILLA_FIVE_HOME="/opt/firefox"
+			if [[ -w "${MOZILLA_FIVE_HOME}"/defaults/pref/firefox.js ]]; then
+				sed -i "s:general.useragent.locale\", \".*\":general.useragent.locale\", \"${X}\":" \
+				        "${MOZILLA_FIVE_HOME}"/defaults/pref/firefox.js \
+				        "${MOZILLA_FIVE_HOME}"/defaults/pref/firefox-l10n.js 2>/dev/null
+			fi
+			ls /home/gentoo/.mozilla/firefox/*/prefs.js /home/gentoo/.thunderbird/*/prefs.js 2>/dev/null | while read PREFS; do
+				echo "user_pref(\"general.useragent.locale\", \"${X}\");" >> "${PREFS}"
+			done
+
+			KXKBRC="/home/gentoo/.kde3.5/share/config/kxkbrc"
+			if [[ -w "${KXKBRC}" ]]; then
+				sed -i "s:=${X},\?:=:" "${KXKBRC}"
+				sed -i "s:,${X}::" "${KXKBRC}"
+				sed -i "s:LayoutList=:LayoutList=${X},:" "${KXKBRC}"
+			fi
+
+			eend 0
+		fi
+		if [[ "${A}" == "keymap" && -n "${X}" && ! -e "/etc/sysconfig/keyboard" ]]; then
+			# Missing /etc/sysconfig/keyboard implies initramfs script did not set a keymap
+			mkdir -p /etc/sysconfig
+			echo "XKEYBOARD=${X}" > /etc/sysconfig/keyboard
+			sed -i "s/KEYMAP=\"us\"/KEYMAP=\"${X}\"/" /etc/conf.d/keymaps
+		fi
+	done
+	if [[ -e "/etc/sysconfig/keyboard" ]]; then
+		source /etc/sysconfig/keyboard
+		[[ -n "${XKEYBOARD}" ]] && sed -i "s/KEYMAP=\"us\"/KEYMAP=\"${XKEYBOARD}\"/" /etc/conf.d/keymaps
+	fi
+	[[ -f "/etc/env.d/02locale" ]] && source /etc/env.d/02locale
+
+	# User specific config
+	export MEDIAFREE="$(df -k -P "${MEDIAROOT}" | tail -n 1 | awk '{ print $4 }')"
+	einfo "Found ${MEDIAFREE}k free on ${MEDIAROOT}"
+	if [[ -d "${MEDIAROOT}" ]]; then
+		# Remount media rw
+		mount -o rw,remount ${MEDIAROOT} >/dev/null 2>&1
+		if [[ "${MEDIAFREE}" -gt 24576 && ! -f "${HOMEPART_EXT3}" && ! -f "${HOMEPART_TC}" ]]; then
+			# Check if really writeable
+			touch "${MEDIAROOT}/writetest" >/dev/null 2>/dev/null
+			if [[ -f "${MEDIAROOT}/writetest" ]]; then
+				rm "${MEDIAROOT}/writetest"
+				splash_verbose
+				clear
+				/usr/sbin/create-homevol
+				clear
+				splash_silent
+			fi
+		fi
+	fi
+
+	if [[ -w "${HOMEPART_TC}" ]]; then
+		ebegin "Mounting TrueCrypt /home"
+		clear
+		splash_verbose
+		BACKTITLE="__INCOGNITO__"
+		LABEL_PASSWORD="Password"
+		LABEL_OPT_PWD="Optional password"
+		QUESTION_PASSWORD="Please enter the password(s) for the home volume, or choose cancel to boot with default settings and no persistent storage.
+
+To get standard access to a volume, enter the appropriate password in the '${LABEL_PASSWORD}' field and leave the ${LABEL_OPT_PWD} blank. For example, if you do NOT have a hidden volume, you should always simply enter your single password in the '${LABEL_PASSWORD}' field. If you have a hidden volume and want to access it you instead enter the hidden volume password in the '${LABEL_PASSWORD}' field.
+
+If you have a hidden volume but want to access the normal volume safely, enter the normal volume password in the '${LABEL_PASSWORD}' field and the hidden volume password in the '${LABEL_OPT_PWD}' field. If you enter the normal volume password without entering the hidden volume password in this way you risk corrupting the hidden volume and make it inaccessible."
+		QUESTION_ERROR="An error occurred opening the volume, see above, hit Enter/Return to try again"
+		TITLE="Open Persistent Home Volume"
+		# Ask for truecrypt password, use password from creating (hidden volume preferred) if available
+		while true; do
+			dialog --ascii-lines --title "${TITLE}" --backtitle "${BACKTITLE}" --insecure --passwordform "${QUESTION_PASSWORD}" 0 0 0 "${LABEL_PASSWORD}" 1 0 "" 2 0 40 1024 "${LABEL_OPT_PWD}" 4 0 "" 5 0 40 1024 2>/tmp/dialog
+			if [[ $? -ne 0 ]]; then
+				clear
+				rm /tmp/dialog
+				break
+			fi
+			clear
+			TRUECRYPT_PW1="$( tail -n 2 /tmp/dialog | head -n 1 )"
+			TRUECRYPT_PW2="$( tail -n 1 /tmp/dialog )"	
+			rm /tmp/dialog
+			# if we got two passwords, try mounting the normal volume safely, otherwise mount normally
+			if [[ -z ${TRUECRYPT_PW2} ]]; then
+				truecrypt --keyfile "" --password "${TRUECRYPT_PW1}" "${HOMEPART_TC}" /home
+			else
+				truecrypt --protect-hidden --keyfile "" --keyfile "" --password "${TRUECRYPT_PW1}" --password "${TRUECRYPT_PW2}" "${HOMEPART_TC}" /home
+			fi
+		
+			if [[ $? -eq 0 ]]; then
+				touch /var/state/boot-media-home
+				break
+			fi
+			echo
+			echo "*** ${QUESTION_ERROR} ***"
+			echo
+			read TMP
+		done
+		splash_silent
+		eend 0
+	elif [[ -w "${HOMEPART_EXT3}" ]]; then
+		ebegin "Mounting boot media /home"
+		mount -o rw,remount ${MEDIAROOT} >/dev/null 2>&1
+		mount -o loop -t ext3 "${HOMEPART_EXT3}" /home && touch /var/state/boot-media-home
+		eend $?
+	fi
+	if [[ ! -e /var/state/boot-media-home ]]; then
+		ebegin "Copying user config from boot media to /home/gentoo"
+		mkdir -p /home/gentoo/.kde3.5/share/config
+		[[ -f ${MEDIAROOT}/config/kopeterc ]] && cp ${MEDIAROOT}/config/kopeterc /home/gentoo/.kde3.5/share/config
+		if [[ -d ${MEDIAROOT}/keys/ssh ]]; then
+			cp -a ${MEDIAROOT}/keys/ssh /home/gentoo/.ssh
+			chown -R gentoo:users /home/gentoo/.ssh
+			chmod 700 /home/gentoo/.ssh
+		fi
+		eend 0
+	fi
+
+	# System wide config
+	ebegin "Copying system config from boot media"
+	[[ -d ${MEDIAROOT}/keys/openvpn ]] && cp -a ${MEDIAROOT}/keys/openvpn /etc
+	eend 0
+
+	# Ensure correct user dir permissions
+	if [[ ! -f /var/state/boot-media-home ]]; then
+		ebegin "Fixing permissions on /home"
+		for USERDIR in /home/*; do
+			chown -R ${USERDIR/\/home\//}:users $USERDIR
+			find $USERDIR -type f -print0 | xargs -0 chmod u+rw
+		done
+		eend 0
+	fi
+	chown -R root /root
+
+	# If using 'docache' we are done with the boot media, eject it
+	CD_DEV="$(eject -n | sed 's:.*\(/dev/[A-Za-z0-9]*\).*:\1:')"
+	[[ ! -f /var/state/boot-media-home ]] && grep docache /proc/cmdline >/dev/null && [[ -n "${CD_DEV}" ]] && grep "${CD_DEV}" /proc/mounts >/dev/null && eject
+
+	# The previous line could return a false value which is OK, but should not fail the service
+	true
+
+}
+
+stop() {
+	if [[ -f /var/state/boot-media-home ]]; then
+		ebegin "Unmounting boot media /home"
+		umount /home && rm /var/state/boot-media-home
+		eend $?
+	fi
+}
+
+
+# vim:ts=4

Deleted: incognito/tags/20080109.1/root_overlay/etc/locale.gen
===================================================================
--- incognito/trunk/root_overlay/etc/locale.gen	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/root_overlay/etc/locale.gen	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,50 +0,0 @@
-# /etc/locale.gen: list all of the locales you want to have on your system
-#
-# The format of each line:
-# <locale> <charmap>
-#
-# Where <locale> is a locale located in /usr/share/i18n/locales/ and
-# where <charmap> is a charmap located in /usr/share/i18n/charmaps/.
-#
-# All blank lines and lines starting with # are ignored.
-#
-# For the default list of supported combinations, see the file:
-# /usr/share/i18n/SUPPORTED
-#
-# Whenever glibc is emerged, the locales listed here will be automatically
-# rebuilt for you.  After updating this file, you can simply run `locale-gen`
-# yourself instead of re-emerging glibc.
-
-en_AU
-en_AU.utf8
-en_CA
-en_CA.utf8
-en_GB
-en_GB.utf8
-en_US ISO-8859-1
-en_US.UTF-8 UTF-8
-ja_JP.EUC-JP EUC-JP
-ja_JP.UTF-8 UTF-8
-ja_JP EUC-JP
-en_HK ISO-8859-1
-en_PH ISO-8859-1
-de_DE ISO-8859-1
-de_DE at euro ISO-8859-15
-es_MX ISO-8859-1
-fa_IR UTF-8
-fr_FR ISO-8859-1
-fr_FR at euro ISO-8859-15
-it_IT ISO-8859-1
-pt_PT
-pt_PT at euro
-pt_PT.utf8
-zh_CN
-zh_CN.gb18030
-zh_CN.gbk
-zh_CN.utf8
-zh_HK
-zh_HK.utf8
-zh_TW
-zh_TW.euctw
-zh_TW.utf8
-

Copied: incognito/tags/20080109.1/root_overlay/etc/locale.gen (from rev 13126, incognito/trunk/root_overlay/etc/locale.gen)
===================================================================
--- incognito/tags/20080109.1/root_overlay/etc/locale.gen	                        (rev 0)
+++ incognito/tags/20080109.1/root_overlay/etc/locale.gen	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,84 @@
+# /etc/locale.gen: list all of the locales you want to have on your system
+#
+# The format of each line:
+# <locale> <charmap>
+#
+# Where <locale> is a locale located in /usr/share/i18n/locales/ and
+# where <charmap> is a charmap located in /usr/share/i18n/charmaps/.
+#
+# All blank lines and lines starting with # are ignored.
+#
+# For the default list of supported combinations, see the file:
+# /usr/share/i18n/SUPPORTED
+#
+# Whenever glibc is emerged, the locales listed here will be automatically
+# rebuilt for you.  After updating this file, you can simply run `locale-gen`
+# yourself instead of re-emerging glibc.
+
+en_AU.UTF-8 UTF-8
+en_AU ISO-8859-1
+
+en_CA.UTF-8 UTF-8
+en_CA ISO-8859-1
+
+en_GB.UTF-8 UTF-8
+en_GB ISO-8859-1
+
+en_US.UTF-8 UTF-8
+en_US ISO-8859-1
+
+en_HK.UTF-8 UTF-8
+en_HK ISO-8859-1
+
+en_PH.UTF-8 UTF-8
+en_PH ISO-8859-1
+
+en_SG.UTF-8 UTF-8
+en_SG ISO-8859-1
+
+ja_JP.EUC-JP EUC-JP
+ja_JP.UTF-8 UTF-8
+
+de_DE.UTF-8 UTF-8
+de_DE ISO-8859-1
+de_DE at euro ISO-8859-15
+
+es_ES.UTF-8 UTF-8
+es_ES ISO-8859-1
+es_ES at euro ISO-8859-15
+
+es_MX.UTF-8 UTF-8
+es_MX ISO-8859-1
+
+fa_IR UTF-8
+
+fr_CA.UTF-8 UTF-8
+fr_CA ISO-8859-1
+
+fr_FR.UTF-8 UTF-8
+fr_FR ISO-8859-1
+fr_FR at euro ISO-8859-15
+
+it_IT.UTF-8 UTF-8
+it_IT ISO-8859-1
+it_IT at euro ISO-8859-15
+
+pt_PT.UTF-8 UTF-8
+pt_PT ISO-8859-1
+pt_PT at euro ISO-8859-15
+
+zh_CN.GB18030 GB18030
+zh_CN.GBK GBK
+zh_CN.UTF-8 UTF-8
+zh_CN GB2312
+
+zh_HK.UTF-8 UTF-8
+zh_HK BIG5-HKSCS
+
+zh_SG.UTF-8 UTF-8
+zh_SG.GBK GBK
+zh_SG GB2312
+
+zh_TW.EUC-TW EUC-TW
+zh_TW.UTF-8 UTF-8
+zh_TW BIG5

Deleted: incognito/tags/20080109.1/root_overlay/etc/polipo/config
===================================================================
--- incognito/trunk/root_overlay/etc/polipo/config	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/root_overlay/etc/polipo/config	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,22 +0,0 @@
-daemonise=false
-diskCacheRoot=
-disableLocalInterface=true
-proxyAddress=127.0.0.1
-proxyName=localhost
-proxyPort=3128
-serverSlots=2
-serverMaxSlots=8
-cacheIsShared=false
-allowedClients=127.0.0.1
-socksParentProxy=localhost:9050
-socksProxyType=socks5
-disableVia=true
-censoredHeaders=from, accept-language, x-pad, link
-censorReferer=maybe
-forbiddenFile=/etc/polipo/forbidden.d
-allowedPorts=1-65535
-tunnelAllowedPorts=1-65535
-maxConnectionAge=5m
-maxConnectionRequests=120
-chunkHighMark=33554432
-

Copied: incognito/tags/20080109.1/root_overlay/etc/polipo/config (from rev 13115, incognito/trunk/root_overlay/etc/polipo/config)
===================================================================
--- incognito/tags/20080109.1/root_overlay/etc/polipo/config	                        (rev 0)
+++ incognito/tags/20080109.1/root_overlay/etc/polipo/config	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,22 @@
+daemonise=false
+diskCacheRoot=
+disableLocalInterface=true
+proxyAddress=127.0.0.1
+proxyName=localhost
+proxyPort=3128
+serverSlots=2
+serverMaxSlots=8
+cacheIsShared=false
+allowedClients=127.0.0.1
+socksParentProxy=localhost:9050
+socksProxyType=socks5
+disableVia=true
+censoredHeaders=from, accept-language, x-pad
+censorReferer=maybe
+forbiddenFile=/etc/polipo/forbidden.d
+allowedPorts=1-65535
+tunnelAllowedPorts=1-65535
+maxConnectionAge=5m
+maxConnectionRequests=120
+chunkHighMark=33554432
+

Deleted: incognito/tags/20080109.1/root_overlay/etc/socks/socks.conf
===================================================================
--- incognito/trunk/root_overlay/etc/socks/socks.conf	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/root_overlay/etc/socks/socks.conf	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,161 +0,0 @@
-# The configfile is divided into two parts; first misc. settings,
-# then the routes.  Objects in '[]' are optional.
-#
-#
-# recommended order is:
-#	[debug]
-#	[logoutput]
-#	[resolveprotocol]
-#
-#	routes:
-#		from to via
-#		[command]
-#		[extension]
-#		[protocol]
-#		[proxyprotocol]
-
-
-#debug: 1           # uncomment to enable debugging
-
-#logoutput: stdout  # users usually don't want to be bothered with that.
-
-# What protocol should be used for resolving hostnames?  It's important
-# to set this right.
-#resolveprotocol: udp  # default
-#resolveprotocol: tcp  # set this if your socksserver only supports socksv4.
-#resolveprotocol: fake # set this if your clients can't access nameserver,
-		       # neither directly nor proxied.
-
-
-
-#
-# the routes
-#
-
-# specifying routes for accepting remote connections (via bind()) is
-# difficult since we can't know what the "to:" address is
-# until we actually get the connection  Since we support letting
-# the client accept connections both via the proxyserver and
-# "directly" at the same time, we have two options though:
-# a) specify a route for bind (only) first going via the proxyserver.
-#    This will also handle "direct" connections.
-# b) specify a route for bind (only) first going "direct".
-#    This means clients will only be able to accept "direct"
-#    connections.
-
-# we want to accept remote connections via the proxyserver.
-#route {
-#	from: 0.0.0.0/0 to: 0.0.0.0/0 via: 10.1.1.1 port = 1080
-#	command: bind
-#}
-
-# we do not want to accept remote connections via the proxyserver.
-#route {
-#	from: 0.0.0.0/0 to: 0.0.0.0/0 via: direct
-#	command: bind
-#}
-
-
-# if you don't route all local connections via direct, you should
-# at least route nameserver connections via direct connections if you
-# can.  That can make for much better performance, depending on
-# your setup.  Make sure the nameserver line is the first.
-#
-# Assuming your nameserver runs on address 10.1.1.1, you can do it like this:
-#route {
-#	from: 0.0.0.0/0 to: 10.1.1.1/32 port = domain via: direct
-#}
-
-
-# have a route making all connections to loopback addresses be direct.
-#route {
-#	from: 0.0.0.0/0   to: 127.0.0.0/8  via: direct
-#	command: connect udpassociate # everything but bind, bind confuses us.
-#}
-
-# Our net is the 10.0.0.0/8 net, let clients going to local address go
-# direct, not via server.
-#route {
-#	from: 0.0.0.0/0   to: 10.0.0.0/8   via: direct
-#}
-
-# for poor souls trapped behind a msproxy server.
-#route {
-#	from: 0.0.0.0/0   to: 0.0.0.0/0   via: 10.1.1.1 port = 1745
-#	protocol: tcp			 # server supports tcp
-#	proxyprotocol: msproxy_v2        # server runs msproxy_v2
-#}
-
-# clients going anywhere else go via server listening at
-# IP address 10.1.1.1, port 1080.   Note that unless you have
-# specified a direct connection for DNS, or the socksserver is resolvable
-# without network traffic, you can't give a hostname for the socksserver,
-# you must give a IP address.  (the reasons for that are logical enough,
-# you would create a loop otherwise.)
-#route {
-#	from: 0.0.0.0/0   to: 0.0.0.0/0   via: 10.1.1.1 port = 1080
-#	protocol: tcp udp                # server supports tcp and udp.
-#	proxyprotocol: socks_v4 socks_v5 # server supports socks v4 and v5.
-#	method: none #username		 # we are willing to authenticate via
-#					 # method "none", not "username".
-#}
-#
-# this is identical to the above, but it matches hostnames instead.
-# This is if you have clients that are unable to resolve hostnames.
-# It can be important that hostname routes come after address routes.
-#route {
-#	from: 0.0.0.0/0   to: .   via: 10.1.1.1 port = 1080
-#	protocol: tcp udp                # server supports tcp and udp.
-#	proxyprotocol: socks_v4 socks_v5 # server supports socks v4 and v5.
-#	method: none #username		 # we are willing to authenticate via
-#					 # method "none", not "username".
-#}
-
-# identical to above two routes, but using a httpproxy instead.
-#
-
-#route {
-#	from: 0.0.0.0/0   to: 0.0.0.0/0   via: 10.1.1.1 port = 3128
-#	command: connect		 # only thing a httproxy supports.
-#	proxyprotocol: http_v1.0
-#}
-
-#route {
-#	from: 0.0.0.0/0   to: .   via: 10.1.1.1 port = 3128
-#	command: connect		 # only thing a httproxy supports.
-#	proxyprotocol: http_v1.0
-#}
-
-
-
-# 'fake' sends host name to SOCKS server
-resolveprotocol: fake
-
-# Private network
-route {
-	from: 0.0.0.0/0   to: 10.0.0.0/8   via: direct
-}
-# Private network
-route {
-	from: 0.0.0.0/0   to: 172.16.0.0/16   via: direct
-}
-# Private network
-route {
-	from: 0.0.0.0/0   to: 192.168.0.0/16   via: direct
-}
-# Loopback
-route {
-	from: 0.0.0.0/0   to: 127.0.0.0/255.128.0.0   via: direct
-}
-# Onion network
-route {
-	from: 0.0.0.0/0   to: 127.128.0.0/255.192.0.0   via: direct
-}
-
-route {
-	from: 0.0.0.0/0 to: 0.0.0.0/0 via: 127.0.0.1 port = 9050
-	protocol: tcp udp
-	proxyprotocol: socks_v5
-	method: none
-}
-

Copied: incognito/tags/20080109.1/root_overlay/etc/socks/socks.conf (from rev 13148, incognito/trunk/root_overlay/etc/socks/socks.conf)
===================================================================
--- incognito/tags/20080109.1/root_overlay/etc/socks/socks.conf	                        (rev 0)
+++ incognito/tags/20080109.1/root_overlay/etc/socks/socks.conf	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,30 @@
+# 'fake' sends host name to SOCKS server
+resolveprotocol: fake
+
+# Private network
+route {
+	from: 0.0.0.0/0   to: 10.0.0.0/8   via: direct
+}
+# Private network
+route {
+	from: 0.0.0.0/0   to: 172.16.0.0/12   via: direct
+}
+# Private network
+route {
+	from: 0.0.0.0/0   to: 192.168.0.0/16   via: direct
+}
+# Loopback (except .onion virtual address space of 127.192.0.0+) 
+route {
+	from: 0.0.0.0/0   to: 127.0.0.0/9   via: direct
+}
+route {
+	from: 0.0.0.0/0   to: 127.128.0.0/10   via: direct
+}
+
+route {
+	from: 0.0.0.0/0 to: 0.0.0.0/0 via: 127.0.0.1 port = 9050
+	protocol: tcp udp
+	proxyprotocol: socks_v5
+	method: none
+}
+

Deleted: incognito/tags/20080109.1/root_overlay/etc/socks/tsocks.conf
===================================================================
--- incognito/trunk/root_overlay/etc/socks/tsocks.conf	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/root_overlay/etc/socks/tsocks.conf	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,19 +0,0 @@
-# This is the configuration for libtsocks (transparent socks) for use
-# with tor, which is providing a socks server on port 9050 by default.
-#
-# See tsocks.conf(5) and torify(1) manpages.
-
-server = 127.0.0.1
-server_port = 9050
-
-# We specify local as 127.0.0.0 - 127.191.255.255 because the
-# Tor MAPADDRESS virtual IP range is the rest of net 127.
-local = 127.0.0.0/255.128.0.0
-local = 127.128.0.0/255.192.0.0
-
-
-# My local networks
-local = 10.0.0.0/255.0.0.0
-local = 172.16.0.0/255.255.0.0
-local = 192.168.0.0/255.255.0.0
-

Copied: incognito/tags/20080109.1/root_overlay/etc/socks/tsocks.conf (from rev 13148, incognito/trunk/root_overlay/etc/socks/tsocks.conf)
===================================================================
--- incognito/tags/20080109.1/root_overlay/etc/socks/tsocks.conf	                        (rev 0)
+++ incognito/tags/20080109.1/root_overlay/etc/socks/tsocks.conf	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,19 @@
+# This is the configuration for libtsocks (transparent socks) for use
+# with tor, which is providing a socks server on port 9050 by default.
+#
+# See tsocks.conf(5) and torify(1) manpages.
+
+server = 127.0.0.1
+server_port = 9050
+
+# We specify local as 127.0.0.0 - 127.191.255.255 because the
+# Tor MAPADDRESS virtual IP range is the rest of net 127.
+local = 127.0.0.0/255.128.0.0
+local = 127.128.0.0/255.192.0.0
+
+
+# My local networks
+local = 10.0.0.0/255.0.0.0
+local = 172.16.0.0/255.240.0.0
+local = 192.168.0.0/255.255.0.0
+

Deleted: incognito/tags/20080109.1/root_overlay/etc/splash/livecd-2006.1/images/background-1024x768.png
===================================================================
(Binary files differ)

Copied: incognito/tags/20080109.1/root_overlay/etc/splash/livecd-2006.1/images/background-1024x768.png (from rev 13138, incognito/trunk/root_overlay/etc/splash/livecd-2006.1/images/background-1024x768.png)
===================================================================
(Binary files differ)

Deleted: incognito/tags/20080109.1/root_overlay/etc/tor/torrc
===================================================================
--- incognito/trunk/root_overlay/etc/tor/torrc	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/root_overlay/etc/tor/torrc	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,31 +0,0 @@
-User tor
-Group tor
-
-PIDFile /var/lib/tor/tor.pid
-
-ContactInfo Incognito LiveCD <incognito at patdouble.com>
-
-SocksPort 9050
-SocksListenAddress 127.0.0.1
-
-Log notice syslog
-
-DataDirectory   /var/lib/tor/data
-
-ControlPort 9051
-ControlListenAddress 127.0.0.1
-
-TransPort 9040
-TransListenAddress 127.0.0.1
-
-ORPort 9001
-DirPort 9030
-
-ExitPolicy reject *:* # middleman only -- no exits allowed
-
-AvoidDiskWrites 1
-
-CookieAuthentication 1
-CookieAuthFile /var/tor/control_auth_cookie
-CookieAuthFileGroupReadable 1
-

Copied: incognito/tags/20080109.1/root_overlay/etc/tor/torrc (from rev 13148, incognito/trunk/root_overlay/etc/tor/torrc)
===================================================================
--- incognito/tags/20080109.1/root_overlay/etc/tor/torrc	                        (rev 0)
+++ incognito/tags/20080109.1/root_overlay/etc/tor/torrc	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,33 @@
+User tor
+Group tor
+
+PIDFile /var/lib/tor/tor.pid
+
+Log notice syslog
+
+DataDirectory   /var/lib/tor/data
+
+ContactInfo Incognito LiveCD
+
+SocksPort 9050
+SocksListenAddress 127.0.0.1
+
+ControlPort 9051
+ControlListenAddress 127.0.0.1
+
+TransPort 9040
+TransListenAddress 127.0.0.1
+
+ORPort 9001
+DirPort 9030
+
+VirtualAddrNetwork 127.192.0.0/10
+
+ExitPolicy reject *:* # middleman only -- no exits allowed
+
+AvoidDiskWrites 1
+
+CookieAuthentication 1
+CookieAuthFile /var/tor/control_auth_cookie
+CookieAuthFileGroupReadable 1
+

Deleted: incognito/tags/20080109.1/root_overlay/usr/sbin/create-homevol
===================================================================
--- incognito/trunk/root_overlay/usr/sbin/create-homevol	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/root_overlay/usr/sbin/create-homevol	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,132 +0,0 @@
-#!/bin/sh
-
-#
-# Create the home volume
-#
-
-[[ -n "${MEDIAROOT}" ]] || MEDIAROOT="/mnt/cdrom"
-[[ -n "${HOMEPART_EXT3}" ]] || HOMEPART_EXT3="${MEDIAROOT}/home.ext3.img"
-[[ -n "${HOMEPART_TC}" ]] || HOMEPART_TC="${MEDIAROOT}/home.tc"
-[[ -n "${MEDIAFREE}" ]] || exit 1
-
-RANDOM_SOURCE=""
-#RANDOM_SOURCE="--random-source /dev/random"
-TITLE="Create Persistent Home Volume"
-BACKTITLE="__INCOGNITO__"
-QUESTION_HOME_PART="Would you like to create a persistent home volume that will keep your data over __INCOGNITO__ sessions?"
-QUESTION_SIZE="Enter the size in megabytes for the volume."
-QUESTION_ENCRYPTION="Would you like to encrypt the volume using TrueCrypt?"
-QUESTION_PASSWORDS="Please enter the passwords for the normal TrueCrypt volume and the hidden TrueCrypt volume. The passwords must be different. The hidden volume password is the one you will use when booting __INCOGNITO__ from now on. The other password you may give away when under pressure as your real data is not stored there. If you do not want a hidden volume, leave the password empty."
-LABEL_PASSWORD_NORMAL="Normal"
-LABEL_PASSWORD_HIDDEN="Hidden"
-MESSAGE_CREATING_TRUECRYPT_NORMAL="Creating TrueCrypt normal volume..."
-MESSAGE_CREATING_TRUECRYPT_HIDDEN="Creating TrueCrypt hidden volume..."
-
-DIM="0 0"
-
-# Ask for home volume
-dialog --ascii-lines --title "${TITLE}" --backtitle "${BACKTITLE}" --yesno "${QUESTION_HOME_PART}" ${DIM} || exit 0
-
-# Ask for size
-declare -i SIZE
-SIZE=0
-while [[ $(( ${SIZE} * 1024 )) -lt 24576 || $(( ${SIZE} * 1024 )) -gt ${MEDIAFREE} ]]; do
-	# Recommend half of free space
-	SIZE=$(( ${MEDIAFREE} / 2048 ))
-	[[ ${SIZE} -lt 24 ]] && SIZE=24
-	dialog --ascii-lines --title "${TITLE}" --backtitle "${BACKTITLE}" --inputbox "${QUESTION_SIZE} (24-$(( ${MEDIAFREE} / 1024 )))" ${DIM} "${SIZE}" 2>/tmp/dialog
-	[[ $? -eq 0 ]] || exit 0
-	SIZE=$(</tmp/dialog)
-	rm /tmp/dialog
-done
-
-# Ask for encryption desired
-command -v truecrypt >/dev/null && dialog --ascii-lines --title "${TITLE}" --backtitle "${BACKTITLE}"  --yesno "${QUESTION_ENCRYPTION}" ${DIM}
-if [[ $? -eq 0 ]]; then
-
-	# Ask for truecrypt parameters
-	NORMAL_PW=""
-	HIDDEN_PW=""
-	while [[ -z "${NORMAL_PW}" || "${NORMAL_PW}" == "${HIDDEN_PW}" ]]; do
-		dialog --ascii-lines --title "${TITLE}" --backtitle "${BACKTITLE}" --insecure --passwordform "${QUESTION_PASSWORDS}" 0 0 0 "${LABEL_PASSWORD_NORMAL}" 1 0 "" 2 0 40 1024 "${LABEL_PASSWORD_HIDDEN}" 4 0 "" 5 0 40 1024 2>/tmp/dialog
-		if [[ $? -ne 0 ]]; then
-			rm /tmp/dialog
-			exit 1
-		fi
-		NORMAL_PW="$(head -n 1 /tmp/dialog)"
-		HIDDEN_PW="$(tail -n 1 /tmp/dialog)"
-		rm /tmp/dialog
-	done
-
-	clear
-
-	# Unmap all
-	truecrypt -d >/dev/null 2>&1
-
-	# Create the TrueCrypt volume
-	echo
-	echo "*** ${MESSAGE_CREATING_TRUECRYPT_NORMAL}"
-	echo
-	truecrypt --hash RIPEMD-160 --encryption AES --filesystem ext3 --password "${NORMAL_PW}" ${RANDOM_SOURCE} --size ${SIZE}M --type normal --keyfile "" -c "${HOMEPART_TC}"
-	# | dialog --ascii-lines --title "${TITLE}" --backtitle "${BACKTITLE}" --progressbox "${MESSAGE_CREATING_TRUECRYPT_NORMAL}" 30 70
-	[[ -e "${HOMEPART_TC}" ]] || exit 1
-	truecrypt -N 1 --password "${NORMAL_PW}" "${HOMEPART_TC}"
-	if [[ $? -ne 0 ]]; then
-		rm "${HOMEPART_TC}"
-		exit 1
-	fi
-	mkfs.ext3 -q -F -T small /dev/mapper/truecrypt1
-	mkdir /tmp/home
-	mount -t ext3 /dev/mapper/truecrypt1 /tmp/home
-	rm -rf /tmp/home/*
-	cp -a /home/* /tmp/home
-	USED=$(( $(du -sk /tmp/home | awk '{print $1}') / 1024 ))
-	umount /tmp/home
-	rmdir /tmp/home
-	truecrypt -d /dev/mapper/truecrypt1
-
-	if [[ -n "${HIDDEN_PW}" ]]; then
-		echo
-		echo "*** ${MESSAGE_CREATING_TRUECRYPT_HIDDEN}"
-		echo
-		truecrypt --hash RIPEMD-160 --encryption AES --filesystem ext3 --password "${HIDDEN_PW}" ${RANDOM_SOURCE} --size $(( ${SIZE} - ${USED} - 1 ))M --type hidden --keyfile "" -c "${HOMEPART_TC}"
-		#| dialog --ascii-lines --title "${TITLE}" --backtitle "${BACKTITLE}" --progressbox "${MESSAGE_CREATING_TRUECRYPT_HIDDEN}" 30 70
-		truecrypt -N 1 --password "${HIDDEN_PW}" "${HOMEPART_TC}"
-		if [[ $? -ne 0 ]]; then
-			rm "${HOMEPART_TC}"
-			exit 1
-		fi
-		mkfs.ext3 -q -F -T small /dev/mapper/truecrypt1
-		mkdir /tmp/home
-		mount -t ext3 /dev/mapper/truecrypt1 /tmp/home
-		rm -rf /tmp/home/*
-		cp -a /home/* /tmp/home
-		umount /tmp/home
-		rmdir /tmp/home
-		truecrypt -d /dev/mapper/truecrypt1
-	fi
-
-	clear
-
-	exit 0
-else
-	clear
-	# Create ext3 home volume
-	dd if=/dev/zero "of=${HOMEPART_EXT3}" bs=1M count=${SIZE} >/dev/null 2>&1
-	if [[ $? -eq 0 && -w "${HOMEPART_EXT3}" ]]; then
-		mkfs.ext3 -q -F -T small "${HOMEPART_EXT3}"
-		mkdir /tmp/home
-		mount -o loop -t ext3 "${HOMEPART_EXT3}" /tmp/home
-		rm -rf /tmp/home/*
-		cp -a /home/* /tmp/home
-		umount /tmp/home
-		rmdir /tmp/home
-		exit 0
-	else
-		rm -f "${HOMEPART_EXT3}" 2>/dev/null
-		exit 1
-	fi
-
-fi
-
-

Copied: incognito/tags/20080109.1/root_overlay/usr/sbin/create-homevol (from rev 13298, incognito/trunk/root_overlay/usr/sbin/create-homevol)
===================================================================
--- incognito/tags/20080109.1/root_overlay/usr/sbin/create-homevol	                        (rev 0)
+++ incognito/tags/20080109.1/root_overlay/usr/sbin/create-homevol	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,227 @@
+#!/bin/sh
+
+#
+# Create the home volume
+#
+
+[[ -n "${MEDIAROOT}" ]] || MEDIAROOT="/mnt/cdrom"
+[[ -n "${HOMEPART_EXT3}" ]] || HOMEPART_EXT3="${MEDIAROOT}/home.ext3.img"
+[[ -n "${HOMEPART_TC}" ]] || HOMEPART_TC="${MEDIAROOT}/home.tc"
+[[ -n "${MEDIAFREE}" ]] || exit 1
+
+TITLE="Create Persistent Home Volume"
+BACKTITLE="__INCOGNITO__"
+LOCK_FILE="${MEDIAROOT}/LOCK_NO_PERSISTENT"
+MIN_SIZE=$(( $(du -sk /home | awk '{print $1}') / 1024 + 11)) # 10 to 11 MB extra so that it works better
+MAX_SIZE=$(( ${MEDIAFREE} / 1024 ))
+QUESTION_HOME_PART="Would you like to create a persistent home volume that will keep your data over __INCOGNITO__ sessions? This means that application settings and file changes in your home directory will persist through computer shutdowns which is not normally the case with __INCOGNITO__ (normally everything is reseted on a reboot)."
+QUESTION_NO_PERSISTENT="Would you like to disable the persistent home volume? That way this prompt will never appear when starting __INCOGNITO__.
+
+If you choose 'yes' here this can be undone by running the 'Enable persistant home volume' script located on the desktop when logged in."
+QUESTION_SIZE="Enter the size in megabytes for the home volume. ${MIN_SIZE} MB is the smallest we allow, but it is strongly recommended to use more. There will be a recommended value in the input field which work for most users. The recommended value will utilize most space but save a little so that future upgrades of __INCOGNITO__ will fit. If you plan to store other files on the media you should take that into account and decrease the volume size appropriately."
+QUESTION_ENCRYPTION="Would you like to encrypt the home volume using TrueCrypt? This will make your data unreadable for everyone that does not have the password you choose unless they can guess it."
+QUESTION_HIDDEN_VOLUME="Do you want to use a hidden home volume?
+
+A hidden volume offers you plausable deniability which is essential in case you live in a country where you must hand over encryption keys and passwords to the authorities when suspected for a crime (like in the UK). The hidden volume will reside in the free space of the normal volume, and you will have two different passwords; one that grants access to the normal volume and one that grants access to the hidden volume. When the password promt appears (sometime during the __INCOGNITO__ start process) you simply choose which one of these to use. The password for the normal volume can be given away to the authorities when they so demand, and as long as you keep your hidden volume password for yourself they cannot prove of its existence. This is why you get plausible deniability.
+
+If you choose to use a hidden volume you should do all your real work within your hidden volume, which you access with the hidden volume password. Only occasionally should you log in to the normal volume and do some \"normal\", innocent things (i.e. no illegal or otherwise sensitive activites) just so it looks like it is being used, otherwise the authorities might become suspicious when they discover that you have not touched it. But beware! When only entering the normal volume password to access the normal volume, you risk damaging the normal volume. However, the __INCOGNITO__ password prompt supports a safe way to access the normal volume by specifying both passwords. In this mode, changes that otherwise would damage the hidden volume are undone. Be sure to use this mode whenever you want to access the normal volume."
+QUESTION_HIDDEN_SIZE="How much of the normal home volume's capacity would you like the hidden home volume to use? The hidden volume is the one you should use for real work, so try to put as much as possible there. If you choose the maximum value (recommended), around ${MIN_SIZE} MB is left for the normal volume so it will work to some degree, but if you want it to work well (e.g. be able to do web browsing) you should leave even more space for the normal volume. Around 50 MB should be enough for most purposes."
+PASSWORD_RECOMMENDATION="REMEMBER TO USE STRONG PASSWORDS! Blank passwords are not accepted. For some security it is recommended to use at least 10 characters including both upper and lower case letters, numbers and special characters, without any words from any language or other similar systems. It should be as random (and long) as your memory allows."
+PASSWORD_NORMAL_VS_HIDDEN="As you will use a hidden volume, this password (i.e. for the normal volume) should be easy to remember and need not be particularly strong, just enough to fool the authorities. Only the hidden volume's password needs to be strong."
+QUESTION_NORMAL_PASSWORD="Please enter the password for the normal volume.
+
+Use the Up and Down arrow keys to move between input fields. Press Enter/Return to continue when finished, or Escape to exit.
+
+"
+QUESTION_HIDDEN_PASSWORD="Please enter the password for the hidden volume.
+
+Use the Up and Down arrow keys to move between input fields. Press Enter/Return to continue when finished, or Escape to exit.
+
+${PASSWORD_RECOMMENDATION}
+
+This password cannot be the same as the password for the normal volume."
+NORMAL_NO_SPACE="Sorry, but you do not have enough space left on the media. If you store some other files on the media, try remove them, otherwise the only solution is to get yourself a media with higher capacity."
+HIDDEN_NO_SPACE="Sorry, but you do not have enough space left in the normal volume. Your normal volume will still work though."
+LABEL_PASSWORD="Enter your desired password:"
+LABEL_REPEAT="Re-enter your password:"
+MESSAGE_CREATING_TRUECRYPT_NORMAL="Creating TrueCrypt normal volume..."
+MESSAGE_CREATING_TRUECRYPT_HIDDEN="Creating TrueCrypt hidden volume..."
+
+DIM="0 0"
+
+# Check if the lock file is there
+if [[ -e ${LOCK_FILE} ]]; then
+	exit 0
+fi
+
+# Ask for home volume
+dialog --ascii-lines --title "${TITLE}" --backtitle "${BACKTITLE}" --yesno "${QUESTION_HOME_PART}" ${DIM}
+
+# If not, check if the user want to disable it semi-permanently
+if [[ $? -ne 0 ]]; then
+	dialog --ascii-lines --title "${TITLE}" --backtitle "${BACKTITLE}" --defaultno --yesno "${QUESTION_NO_PERSISTENT}" ${DIM}
+	if [[ $? -eq 0 ]]; then
+		touch ${LOCK_FILE}
+	fi
+	exit 0
+fi
+
+# Check if minimum required amount of space is available
+if [[ ${MAX_SIZE} -lt ${MIN_SIZE} ]]; then
+	dialog --ascii-lines --title "${TITLE}" --backtitle "${BACKTITLE}" --msgbox "${NORMAL_NO_SPACE} (Minimum needed: ${MIN_SIZE} MB, currently available: ${MAX_SIZE} MB)" ${DIM}
+	exit 1
+fi
+
+# Ask for size
+declare -i SIZE
+SIZE=0
+while [[ ${SIZE} -lt ${MIN_SIZE} || ${SIZE} -gt ${MAX_SIZE} ]]; do
+	# If there's much space (150+ MB, chosen quite arbitrarily) save 50 MB for updates, otherwise recommend using all available space for the volume
+	if [[ ${MAX_SIZE} -gt 150 ]]; then
+		SIZE=$(( ${MAX_SIZE} - 50 ))
+	else
+		SIZE=${MAX_SIZE}
+	fi
+
+	dialog --ascii-lines --title "${TITLE}" --backtitle "${BACKTITLE}" --inputbox "${QUESTION_SIZE} (Possible values: ${MIN_SIZE} MB to ${MAX_SIZE} MB)" ${DIM} "${SIZE}" 2>/tmp/dialog
+	[[ $? -eq 0 ]] || exit 0
+	SIZE="$( tail -n 1 /tmp/dialog )"
+	rm /tmp/dialog
+done
+
+# Ask for encryption desired
+command -v truecrypt >/dev/null && dialog --ascii-lines --title "${TITLE}" --backtitle "${BACKTITLE}"  --yesno "${QUESTION_ENCRYPTION}" ${DIM}
+if [[ $? -eq 0 ]]; then
+
+	# Ask if a hidden volume should be used
+	dialog --ascii-lines --title "${TITLE}" --backtitle "${BACKTITLE}"  --yesno "${QUESTION_HIDDEN_VOLUME}" ${DIM}
+	if [[ $? -eq 0 ]]; then
+		USE_HIDDEN_VOLUME="yes"
+		PASSWORD_RECOMMENDATION="${PASSWORD_NORMAL_VS_HIDDEN}"
+	else
+		USE_HIDDEN_VOLUME="no"
+		NORMAL_PW_RECOMMENDATION="${ABOUT_PASSWORDS}"
+	fi
+	
+	# Ask for the normal volume password
+	PW1=""
+	PW2=""
+	while [[ -z "${PW1}" || "${PW1}"  != "${PW2}" ]]; do
+		dialog --ascii-lines --title "${TITLE}" --backtitle "${BACKTITLE}" --insecure --passwordform "${QUESTION_NORMAL_PASSWORD}${PASSWORD_RECOMMENDATION}" 0 0 0 "${LABEL_PASSWORD}" 1 0 "" 2 0 40 1024 "${LABEL_REPEAT}" 4 0 "" 5 0 40 1024 2>/tmp/dialog
+		if [[ $? -ne 0 ]]; then
+			shred -u /tmp/dialog
+			exit 1
+		fi
+		PW1="$( tail -n 2 /tmp/dialog | head -n 1 )"
+		PW2="$( tail -n 1 /tmp/dialog )"
+		shred -u /tmp/dialog
+	done
+
+	NORMAL_PW="${PW1}"
+	
+	clear
+
+	# Unmap all
+	truecrypt -d >/dev/null 2>&1
+
+	# Create the TrueCrypt volume
+	echo
+	echo "*** ${MESSAGE_CREATING_TRUECRYPT_NORMAL}"
+	echo
+	truecrypt --hash RIPEMD-160 --encryption AES --filesystem ext3 --password "${NORMAL_PW}" --size ${SIZE}M --type normal --keyfile "" -c "${HOMEPART_TC}"
+	[[ -e "${HOMEPART_TC}" ]] || exit 1
+	truecrypt -N 1 --password "${NORMAL_PW}" "${HOMEPART_TC}"
+	if [[ $? -ne 0 ]]; then
+		rm "${HOMEPART_TC}"
+		exit 1
+	fi
+	mkfs.ext3 -q -F -T small /dev/mapper/truecrypt1
+	mkdir /tmp/home
+	mount -t ext3 /dev/mapper/truecrypt1 /tmp/home
+	rm -rf /tmp/home/*
+	cp -a /home/* /tmp/home
+	umount /tmp/home
+	rmdir /tmp/home
+	truecrypt -d /dev/mapper/truecrypt1
+
+	# Set up hidden volume
+	if [[ ${USE_HIDDEN_VOLUME} == "yes" ]]; then
+
+		# Size considerations for hidden volume. The max value saves some for the normal volume
+		MIN_HIDDEN_SIZE=${MIN_SIZE}
+		MAX_HIDDEN_SIZE=$(( ${SIZE} - ${MIN_SIZE} ))
+		if [[ ${MAX_HIDDEN_SIZE} -lt ${MIN_SIZE} ]]; then
+			dialog --ascii-lines --title "${TITLE}" --backtitle "${BACKTITLE}" --msgbox  "${HIDDEN_NO_SPACE} (Minimum needed: ${MIN_HIDDEN_SIZE} MB, currently available: ${MAX_HIDDEN_SIZE} MB)" ${DIM}
+			exit 0
+		fi
+
+		HIDDEN_SIZE=-1
+		while [[ ${HIDDEN_SIZE} -gt ${MAX_HIDDEN_SIZE} || ${HIDDEN_SIZE} -lt ${MIN_HIDDEN_SIZE} ]]; do
+			# recommend max
+			HIDDEN_SIZE=${MAX_HIDDEN_SIZE}
+
+			dialog --ascii-lines --title "${TITLE}" --backtitle "${BACKTITLE}" --inputbox "${QUESTION_HIDDEN_SIZE} (Possible values: ${MIN_HIDDEN_SIZE} MB to ${MAX_HIDDEN_SIZE} MB)" ${DIM} "${HIDDEN_SIZE}" 2>/tmp/dialog
+			[[ $? -eq 0 ]] || exit 0
+			HIDDEN_SIZE="$( tail -n 1 /tmp/dialog )"
+			rm /tmp/dialog
+	    	done
+
+		# Ask for hidden volume password
+		PW1=""
+		PW2=""
+		while [[ -z "${PW1}" || "${PW1}"  != "${PW2}" || "${PW1}" == "${NORMAL_PW}" ]]; do
+			dialog --ascii-lines --title "${TITLE}" --backtitle "${BACKTITLE}" --insecure --passwordform "${QUESTION_HIDDEN_PASSWORD}" 0 0 0 "${LABEL_PASSWORD}" 1 0 "" 2 0 40 1024 "${LABEL_REPEAT}" 4 0 "" 5 0 40 1024 2>/tmp/dialog
+			if [[ $? -ne 0 ]]; then
+				shred -u /tmp/dialog
+				exit 1
+			fi
+			PW1="$( tail -n 2 /tmp/dialog | head -n 1 )"
+			PW2="$( tail -n 1 /tmp/dialog )"
+			shred -u /tmp/dialog
+		done
+		
+		HIDDEN_PW="${PW1}"
+
+		clear
+
+		echo
+		echo "*** ${MESSAGE_CREATING_TRUECRYPT_HIDDEN}"
+		echo
+		truecrypt --hash RIPEMD-160 --encryption AES --filesystem ext3 --password "${HIDDEN_PW}" --size ${HIDDEN_SIZE}M --type hidden --keyfile "" -c "${HOMEPART_TC}"
+		truecrypt -N 1 --password "${HIDDEN_PW}" "${HOMEPART_TC}"
+		if [[ $? -ne 0 ]]; then
+			rm "${HOMEPART_TC}"
+			exit 1
+		fi
+		mkfs.ext3 -q -F -T small /dev/mapper/truecrypt1
+		mkdir /tmp/home
+		mount -t ext3 /dev/mapper/truecrypt1 /tmp/home
+		rm -rf /tmp/home/*
+		cp -a /home/* /tmp/home
+		umount /tmp/home
+		rmdir /tmp/home
+		truecrypt -d /dev/mapper/truecrypt1
+	fi
+
+	clear
+
+	exit 0
+else
+	clear
+	# Create ext3 home volume
+	dd if=/dev/zero "of=${HOMEPART_EXT3}" bs=1M count=${SIZE} >/dev/null 2>&1
+	if [[ $? -eq 0 && -w "${HOMEPART_EXT3}" ]]; then
+		mkfs.ext3 -q -F -T small "${HOMEPART_EXT3}"
+		mkdir /tmp/home
+		mount -o loop -t ext3 "${HOMEPART_EXT3}" /tmp/home
+		rm -rf /tmp/home/*
+		cp -a /home/* /tmp/home
+		umount /tmp/home
+		rmdir /tmp/home
+		exit 0
+	else
+		rm -f "${HOMEPART_EXT3}" 2>/dev/null
+		exit 1
+	fi
+
+fi

Copied: incognito/tags/20080109.1/root_overlay/usr/sbin/enable-persistent-vol (from rev 13298, incognito/trunk/root_overlay/usr/sbin/enable-persistent-vol)
===================================================================
--- incognito/tags/20080109.1/root_overlay/usr/sbin/enable-persistent-vol	                        (rev 0)
+++ incognito/tags/20080109.1/root_overlay/usr/sbin/enable-persistent-vol	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# FIXME: we should get this from somewhere
+LOCK_FILE=/mnt/cdrom/LOCK_NO_PERSISTENT
+
+sudo rm -f ${LOCK_FILE} 
+
+# Find the dialog command
+DIALOG="$(which Xdialog 2>/dev/null)"
+if [ -z "${DIALOG}" -o -z "${DISPLAY}" ]; then
+	DIALOG="$(which dialog 2>/dev/null)"
+fi
+
+DEFAULT_WIDTH=80            
+DIALOG="${DIALOG} --wrap --cr-wrap --left"          
+
+if [[ -e ${LOCK_FILE} ]]; then
+	${DIALOG} --msgbox "Operation failed." 0 ${DEFAULT_WIDTH}
+	exit 1
+else
+	${DIALOG} --msgbox "The option to create and use persistent home volumes is enabled. You should be prompted next time you start __INCOGNITO__." 0 ${DEFAULT_WIDTH}
+	exit 0
+fi

Deleted: incognito/tags/20080109.1/root_overlay/usr/sbin/replace-versions.pl
===================================================================
--- incognito/trunk/root_overlay/usr/sbin/replace-versions.pl	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/root_overlay/usr/sbin/replace-versions.pl	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,57 +0,0 @@
-#!/usr/bin/perl
-
-#
-# This script will replace version numbers in a file (normally HTML) from a
-# list of packages output by "equery list"
-#
-
-$input = shift(@ARGV);
-$packages = shift(@ARGV);
-
-if (!$input) {
-	print "Usage: $0 <input_file> [packages]\n";
-	exit 1;
-}
-
-# Load packages
-if ($packages)
-{
-	open PKG, $packages;
-	while (<PKG>)
-	{
-		if (m/([0-9A-Za-z\-]+\/[0-9A-Za-z\-]+)-([0-9pr\-.]+)/) {
-			$versions{$1} = $2;
-		}
-	}
-	close PKG;
-}
-else
-{
-	open PKGDIR, "find /var/db/pkg -type d |";
-	while (<PKGDIR>)
-	{
-		chomp($_);
-		local $pkg = $_;
-		$pkg =~ s:/var/db/pkg/::;
-		if ($pkg =~ m/([0-9A-Za-z\-]+\/[0-9A-Za-z\-]+)-([0-9pr\-.]+)/) {
-			$versions{$1} = $2;
-			chomp($desc{$1} = `cat $_/DESCRIPTION`);
-			chomp($homepage{$1} = `cat $_/HOMEPAGE`);
-			$homepage{$1} =~ s/\s+.*//;
-		}
-
-	}
-	close PKGDIR;
-}
-
-
-# Read input and replace tags
-open INPUT, $input;
-while (<INPUT>) {
-	s/<!-- #version\((.*?)\) -->/$versions{$1}/g;
-	s/<!-- #description\((.*?)\) -->/$desc{$1}/g;
-	s/<!-- #homepage\((.*?)\) -->/$homepage{$1}/g;
-	print $_;
-}
-close INPUT;
-

Copied: incognito/tags/20080109.1/root_overlay/usr/sbin/replace-versions.pl (from rev 13127, incognito/trunk/root_overlay/usr/sbin/replace-versions.pl)
===================================================================
--- incognito/tags/20080109.1/root_overlay/usr/sbin/replace-versions.pl	                        (rev 0)
+++ incognito/tags/20080109.1/root_overlay/usr/sbin/replace-versions.pl	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,57 @@
+#!/usr/bin/perl
+
+#
+# This script will replace version numbers in a file (normally HTML) from a
+# list of packages output by "equery list"
+#
+
+$input = shift(@ARGV);
+$packages = shift(@ARGV);
+
+if (!$input) {
+	print "Usage: $0 <input_file> [packages]\n";
+	exit 1;
+}
+
+# Load packages
+if ($packages)
+{
+	open PKG, $packages;
+	while (<PKG>)
+	{
+		if (m/([0-9A-Za-z\-]+\/[0-9A-Za-z\-_]+)-([0-9pr\-.]+)/) {
+			$versions{$1} = $2;
+		}
+	}
+	close PKG;
+}
+else
+{
+	open PKGDIR, "find /var/db/pkg -type d |";
+	while (<PKGDIR>)
+	{
+		chomp($_);
+		local $pkg = $_;
+		$pkg =~ s:/var/db/pkg/::;
+		if ($pkg =~ m/([0-9A-Za-z\-]+\/[0-9A-Za-z\-_]+)-([0-9pr\-.]+)/) {
+			$versions{$1} = $2;
+			chomp($desc{$1} = `cat $_/DESCRIPTION`);
+			chomp($homepage{$1} = `cat $_/HOMEPAGE`);
+			$homepage{$1} =~ s/\s+.*//;
+		}
+
+	}
+	close PKGDIR;
+}
+
+
+# Read input and replace tags
+open INPUT, $input;
+while (<INPUT>) {
+	s/<!-- #version\((.*?)\) -->/$versions{$1}/g;
+	s/<!-- #description\((.*?)\) -->/$desc{$1}/g;
+	s/<!-- #homepage\((.*?)\) -->/$homepage{$1}/g;
+	print $_;
+}
+close INPUT;
+

Copied: incognito/tags/20080109.1/root_overlay/usr/share/applications/enable-persistent-vol.desktop (from rev 13179, incognito/trunk/root_overlay/usr/share/applications/enable-persistent-vol.desktop)
===================================================================
--- incognito/tags/20080109.1/root_overlay/usr/share/applications/enable-persistent-vol.desktop	                        (rev 0)
+++ incognito/tags/20080109.1/root_overlay/usr/share/applications/enable-persistent-vol.desktop	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Comment=Enable the option to create and use persistent home volumes during boot.
+Encoding=UTF-8
+Exec=sudo /usr/sbin/enable-persistent-vol
+GenericName=
+Icon=reload
+MimeType=
+Name=Enable persistant home volume
+Path=
+StartupNotify=true
+Terminal=false
+TerminalOptions=
+Type=Application
+Categories=Utility

Deleted: incognito/tags/20080109.1/root_overlay/usr/share/incognito/readme.html
===================================================================
--- incognito/trunk/root_overlay/usr/share/incognito/readme.html	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/root_overlay/usr/share/incognito/readme.html	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,575 +0,0 @@
-<html>
-<head>
-<title>__INCOGNITO_TITLE__</title>
-</head>
-
-<body>
-
-<h1>Contents</h1>
-<ul>
-<li><a href="#intent">Intent</a></li>
-<li><a href="#download">Download</a></li>
-<li><a href="#contact">Contact</a></li>
-<li><a href="#approach">Approach</a></li>
-<li><a href="#impl">Implementation</a></li>
-<li><a href="#maintenance">Maintenance</a></li>
-<li><a href="#caveats">Caveats</a></li>
-<li><a href="#security">Security</a></li>
-<li><a href="#createusb">Copying to a USB Drive</a></li>
-</ul>
-
-<p>
-<strong>NOTICE</strong>: This CD is provided as-is with no warranty of fitness for a particular purpose, including total anonymity. Anonymity depends not only on the software but also on the user understanding the risks involved and how to overcome those risks.
-</p>
-
-<a name="intent">
-<h1>Intent / Goals</h1>
-<blockquote>What are we trying to do?</blockquote>
-
-<p>
-This CD provides software to use various Internet technologies while keeping the user anonymous. It is based primarily on <a href="https://www.torproject.org">Tor</a> while including supporting applications. The target use case is that of using a public computer, such as in a library, securely. This CD may also be copied to a USB drive to provide persisted user settings. The intended user base are those who would like to perform standard Internet communications such as WWW, mail, IRC, IM, etc, while being confident that their anonymity is not compromised. Power users who want precise control over the application and network configuration may be disappointed.
-</p>
-
-
-<dl>
-
-<dt>Target User Base</dt>
-<dd>
-The target user is one who is using a computer that does not necessarily have full control of said computer and desires to access Internet services. Examples would be a public computer in a library, coffee shop, university or a residence. Also, users not wanting to bother with configuring all applications appropriately (with respect to anonymity) could use __INCOGNITO__ on their home computers. The implementation should provide strong anonymity with no configuration. It should be difficult or impossible, for the user to unknowingly compromise anonymity. Users requiring more precise control over the application and network configuration may be disappointed.
-</dd>
-
-<dt></dt>
-<dd>
-</dd>
-
-<dt>Required Internet Services</dt>
-<dd>
-At minimum the following Internet services should be supported: WWW, E-Mail, IRC.
-</dd>
-
-<dt>Recommended Internet Services</dt>
-<dd>
-The following Internet services are recommended to be supported: Instant Messaging.
-</dd>
-
-<dt>Supported Instant Messaging Protocols</dt>
-<dd>
-The following instant messaging protocols should be supported based on the constraint that the protocol itself does not require information that compromises anonymity: (TODO)
-</dd>
-
-<dt>Discouraged Instant Messaging Protocols</dt>
-<dd>
-The following instant messaging protocols should NOT be supported based on the constraint that the protocol itself requiress information that compromises anonymity: (TODO)
-</dd>
-
-<dt>Maintainable</dt>
-<dd>
-The procedure to update the CD should not be prohibitive to provide timely software updates to address issues related to security or anonymity.
-</dd>
-
-<dt>Media</dt>
-<dd>
-The implementation should be able to run off either CD or a USB bootable drive. The media must be bootable, not run from the host operating system.
-</dd>
-
-<dt>Persisted User Settings on USB Drive</dt>
-<dd>
-User settings should be persisted when using a USB drive. The user should have the option to store these settings encrypted.
-</dd>
-
-</dl>
-
-
-<a name="download">
-<h1>Download</h1>
-
-<p>
-See the <a href="http://www.browseanonymouslyanywhere.com/incognito/index.php?option=com_content&task=view&id=26&Itemid=39">download section</a> on <a href="http://www.browseanonymouslyanywhere.com/incognito">__INCOGNITO__'s main site</a> for download information. Various development files (portage snapshot and stage3 tarball) as well as the current version of __INCOGNITO__ can be found at <a href="http://files1.cjb.net/incognito/">http://files1.cjb.net/incognito/</a>.
-</p>
-
-<p>
-The latest version of this document for the current relesase can be found <a href="http://www.anonymityanywhere.com/incognito/index.php?option=com_content&task=view&id=26&Itemid=39">here</a>. The development version of this document can be found at <a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/usr/share/incognito/readme.html">https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/usr/share/incognito/readme.html</a>, although it should be noted that some information which is added dynamically at build will not be present (has mostly to do with information about which software packages that are installed).
-</p>
-
-<p>
-The build root for the CD is stored in a <a href="http://subversion.tigris.org">Subversion</a> repository. It can be viewed or checked out at <a href="https://tor-svn.freehaven.net/svn/incognito/">https://tor-svn.freehaven.net/svn/incognito/</a>.
-</p>
-
-<a name="contact">
-<h1>Contact</h1>
-
-<p>
-As of november 2007, the maintainace of this distribution has passed from the founder, Pat Double, to anonym, who can be contacted through anonym (at) lavabit (dot) com. Please do not contact Pat for anything relating to the current development of __INCOGNITO__. Feature requests and (especially) bug reports are welcome and should be sent to anonym, but please include "__INCOGNITO__" in the subject line to easy mail sorting. Also, please be considerate of any major technology choices, such as <a href="http://www.gentoo.org/proj/en/releng/catalyst">Catalyst</a> and <a href="http://www.gentoo.org">Gentoo Linux</a>, <a href="http://www.kde.org">KDE</a>, etc. These have been chosen because of the developers' familiarity with them and will likely not change ever. If someone would like to maintain a parallell version with, say, Gnome instead of KDE or similar that would probably work just fine. However, since the whole development process is centered around Gentoo Linux' Catalyst, neither of them are negotiable.
-</p>
-
-<a name="approach">
-<h1>Approach</h1>
-<blockquote>What is needed to reach our goals?</blockquote>
-
-<p>
-</p>
-
-<a name="impl">
-<h1>Implementation</h1>
-<blockquote>How did we implement our approach in order to reach our goals.</blockquote>
-
-<p>
-There are full and tiny versions of the CD. The tiny version is intended to fit on small media (such as a 'business card' CD) and basically provides an anonymous web browser. The full version supports a variety of Internet applications.
-</p>
-
-<h2>Software</h2>
-
-<p>
-The following software is present on both the full and tiny versions. The version of the packages used is included on the CD at /usr/share/packages.txt.
-</p>
-
-<dl>
-
-<dt><a href="http://www.gentoo.org">Gentoo Linux</a> (<a href="http://www.kernel.org">kernel 2.6</a> <!-- #version(sys-kernel/gentoo-sources) -->)</dt>
-<dd>The base operating system, provides hardware detection, infrastructure. Please note that the Gentoo Foundation does not provide or endorse this software distribution.</dd>
-
-<dt><a href="<!-- #homepage(net-misc/tor) -->">Tor</a> <!-- #version(net-misc/tor) --></dt>
-<dd><!-- #description(net-misc/tor) -->. Every attempt is made to use the latest version. This version is patched to allow controllers to access the cookie authentication file. The <a href="https://tor-svn.freehaven.net/svn/incognito/trunk/portage.overlay/net-misc/tor/files/tor-cookieperm.patch">patch</a> is from the 0.2.0.x development branch.</dd>
-
-<dt><a href="<!-- #homepage(net-proxy/polipo) -->">polipo</a> <!-- #version(net-proxy/polipo) --></dt>
-<dd><!-- #description(net-proxy/polipo) --></dd>
-
-<dt><a href="<!-- #homepage(www-client/mozilla-firefox-bin) -->">Firefox</a> <!-- #version(www-client/mozilla-firefox-bin) --></dt>
-<dd><!-- #description(www-client/mozilla-firefox-bin) --></dd>
-
-<dt><a href="<!-- #homepage(x11-plugins/noscript) -->">noscript</a> <!-- #version(x11-plugins/noscript) --></dt>
-<dd><!-- #description(x11-plugins/noscript) --></dd>
-
-<dt><a href="<!-- #homepage(x11-plugins/cookiesafe) -->">CookieSafe</a> <!-- #version(x11-plugins/cookiesafe) --></dt>
-<dd><!-- #description(x11-plugins/cookiesafe) --></dd>
-
-<dt><a href="<!-- #homepage(x11-plugins/refcontrol) -->">refcontrol</a> <!-- #version(x11-plugins/refcontrol) --></dt>
-<dd><!-- #description(x11-plugins/refcontrol) --></dd>
-
-<dt><a href="<!-- #homepage(x11-plugins/adblock_plus) -->">Adblock_Plus</a> <!-- #version(x11-plugins/adblock_plus) --></dt>
-<dd><!-- #description(x11-plugins/adblock_plus) --></dd>
-
-<dt><a href="<!-- #homepage(net-irc/xchat) -->">XChat</a> <!-- #version(net-irc/xchat) --></dt>
-<dd><!-- #description(net-irc/xchat) --></dd>
-
-<dt><a href="<!-- #homepage(x11-wm/fluxbox) -->">Fluxbox</a> <!-- #version(x11-wm/fluxbox) --></dt>
-<dd><!-- #description(x11-wm/fluxbox) --></dd>
-
-<dt><a href="<!-- #homepage(app-crypt/truecrypt) -->">TrueCrypt</a> <!-- #version(app-crypt/truecrypt) --></dt>
-<dd><!-- #description(app-crypt/truecrypt) --></dd>
-
-<dt><a href="<!-- #homepage(net-misc/openssh) -->">ssh, scp</a> <!-- #version(net-misc/openssh) --></dt>
-<dd><!-- #description(net-misc/openssh) --></dd>
-
-<dt><a href="<!-- #homepage(net-analyzer/macchanger) -->">macchanger</a> <!-- #version(net-analyzer/macchanger) --></dt>
-<dd><!-- #description(net-analyzer/macchanger) --></dd>
-
-<dt><a href="<!-- #homepage(www-servers/lighttpd) -->">lighthttpd</a> <!-- #version(www-servers/lighttpd) --> for hidden services</dt>
-<dd><!-- #description(www-servers/lighttpd) --></dd>
-
-<dt><a href="<!-- #homepage(net-proxy/3proxy) -->">3proxy</a> <!-- #version(net-proxy/3proxy) --></dt>
-<dd><!-- #description(net-proxy/3proxy) --></dd>
-
-</dl>
-
-<p>
-The following software is present on only the full version.
-</p>
-
-<dl>
-
-<dt><a href="<!-- #homepage(mail-mta/mixminion) -->">Mixminion</a> <!-- #version(mail-mta/mixminion) --></dt>
-<dd><!-- #description(mail-mta/mixminion) --></dd>
-
-<dt><a href="<!-- #homepage(mail-mta/mixminion-smtp) -->">Mixminion</a> <!-- #version(mail-mta/mixminion-smtp) --></dt>
-<dd><!-- #description(mail-mta/mixminion-smtp) --></dd>
-
-<dt><a href="<!-- #homepage(x11-plugins/firegpg) -->">FireGPG</a> <!-- #version(x11-plugins/firegpg) --></dt>
-<dd><!-- #description(x11-plugins/firegpg) --></dd>
-
-<dt><a href="<!-- #homepage(mail-client/mozilla-thunderbird-bin) -->">Thunderbird</a> <!-- #version(mail-client/mozilla-thunderbird-bin) --></dt>
-<dd><!-- #description(mail-client/mozilla-thunderbird-bin) --></dd>
-
-<dt><a href="<!-- #homepage(x11-plugins/enigmail-bin) -->">Thunderbird OpenPGP (enigmail)</a> <!-- #version(x11-plugins/enigmail-bin) --></dt>
-<dd><!-- #description(x11-plugins/enigmail-bin) --></dd>
-
-<dt><a href="<!-- #homepage(x11-plugins/thunderplunger) -->">Thunder Plunger</a> <!-- #version(x11-plugins/thunderplunger) --></dt>
-<dd><!-- #description(x11-plugins/thunderplunger) --></dd>
-
-<dt><a href="<!-- #homepage(net-misc/trans-proxy-tor) -->">dns-proxy-tor</a> <!-- #version(net-misc/trans-proxy-tor) --></dt>
-<dd>DNS server that uses Tor to resolve addresses.</dd>
-
-<dt><a href="<!-- #homepage(net-dns/pdnsd) -->">pdnsd</a> <!-- #version(net-dns/pdnsd) --></dt>
-<dd><!-- #description(net-dns/pdnsd) -->. Configured to use dns-proxy-tor to do the resolution.</dd>
-
-<dt><a href="http://www.kde.org">KDE</a></dt>
-<dd>K Desktop Environment, a reduced install with parts that could be useful on an anonymity CD.</dd>
-
-<dt><a href="<!-- #homepage(kde-base/kmail) -->">KDE - KMail</a> <!-- #version(kde-base/kmail) --></dt>
-<dd><!-- #description(kde-base/kmail) --></dd>
-
-<dt><a href="<!-- #homepage(kde-base/konqueror) -->">KDE - Konqueror </a> <!-- #version(kde-base/konqueror) --></dt>
-<dd><!-- #description(kde-base/konqueror) --></dd>
-
-<dt><a href="<!-- #homepage(kde-misc/tork) -->">TorK</a> <!-- #version(kde-misc/tork) --></dt>
-<dd><!-- #description(kde-misc/tork) --></dd>
-
-<dt><a href="<!-- #homepage(net-misc/vidalia) -->">Vidalia</a> <!-- #version(net-misc/vidalia) --></dt>
-<dd><!-- #description(net-misc/vidalia) --></dd>
-
-<dt><a href="<!-- #homepage(net-analyzer/ettercap) -->">Ettercap</a> <!-- #version(net-analyzer/ettercap) --></dt>
-<dd><!-- #description(net-analyzer/ettercap) --></dd>
-
-<dt><a href="<!-- #homepage(app-crypt/gnupg) --><">GnuPG</a> <!-- #version(app-crypt/gnupg) --></dt>
-<dd><!-- #description(app-crypt/gnupg) --></dd>
-
-<dt><a href="<!-- #homepage(app-admin/keepassx) --><">KeePassX</a> <!-- #version(app-admin/keepassx) --></dt>
-<dd><!-- #description(app-admin/keepassx) --></dd>
-
-<dt><a href="<!-- #homepage(net-analyzer/thcrut) -->">thcrut</a> <!-- #version(net-analyzer/thcrut) --></dt>
-<dd><!-- #description(net-analyzer/thcrut) --></dd>
-
-<dt><a href="<!-- #homepage(app-misc/screen) -->">screen</a> <!-- #version(app-misc/screen) --></dt>
-<dd><!-- #description(app-misc/screen) --></dd>
-
-<dt><a href="<!-- #homepage(net-wireless/airsnort) -->">airsnort</a> <!-- #version(net-wireless/airsnort) --></dt>
-<dd><!-- #description(net-wireless/airsnort) --></dd>
-
-<dt><a href="<!-- #homepage(www-client/links) -->">links</a> <!-- #version(www-client/links) --></dt>
-<dd><!-- #description(www-client/links) --></dd>
-
-<dt><a href="<!-- #homepage(kde-base/kopete) -->">KDE - Kopete</a> <!-- #version(kde-base/kopete) --></dt>
-<dd><!-- #description(kde-base/kopete) --></dd>
-
-<dt><a href="<!-- #homepage(net-im/kopete-otr) -->">Kopete Off The Record plugin</a> <!-- #version(net-im/kopete-otr) --></dt>
-<dd><!-- #description(net-im/kopete-otr) --></dd>
-
-<dt><a href="<!-- #homepage(kde-base/kontact) -->">KDE - Kontact</a> <!-- #version(kde-base/kontact) --></dt>
-<dd><!-- #description(kde-base/kontact) --></dd>
-
-<dt><a href="<!-- #homepage(kde-base/ksnapshot) -->">KDE - KSnapShot</a> <!-- #version(kde-base/ksnapshot) --></dt>
-<dd><!-- #description(kde-base/ksnapshot) --></dd>
-
-<dt><a href="<!-- #homepage(kde-base/akregator) -->">KDE - Akregator</a> <!-- #version(kde-base/akregator) --></dt>
-<dd><!-- #description(kde-base/akregator) --></dd>
-
-<dt><a href="<!-- #homepage(kde-base/krfb) -->">KDE - krfb</a> <!-- #version(kde-base/krfb) --></dt>
-<dd><!-- #description(kde-base/krfb) --></dd>
-
-<dt><a href="<!-- #homepage(net-p2p/ktorrent) -->">KDE - KTorrent</a> <!-- #version(net-p2p/ktorrent) --></dt>
-<dd><!-- #description(net-p2p/ktorrent) --></dd>
-
-<dt><a href="<!-- #homepage(net-misc/openvpn) -->">OpenVPN</a> <!-- #version(net-misc/openvpn) --></dt>
-<dd><!-- #description(net-misc/openvpn) -->. Can operate over TCP or UDP. Due to the current implementation of Tor only TCP is anonymized. UDP is currently blocked.</dd>
-
-<dt><a href="<!-- #homepage(net-misc/vpnc) -->">vpnc</a> <!-- #version(net-misc/vpnc) --></dt>
-<dd><!-- #description(net-misc/vpnc) --></dd>
-
-<dt><a href="<!-- #homepage(net-misc/netkit-telnetd) -->">telnet</a> <!-- #version(net-misc/netkit-telnetd) --></dt>
-<dd><!-- #description(net-misc/netkit-telnetd) --></dd>
-
-<dt><a href="<!-- #homepage(net-misc/socat) -->">socat</a> <!-- #version(net-misc/socat) --></dt>
-<dd><!-- #description(net-misc/socat) --></dd>
-
-<dt><a href="<!-- #homepage(kde-misc/tcgui) -->">TrueCrypt UI (TCGUI)</a> <!-- #version(kde-misc/tcgui) --></dt>
-<dd><!-- #description(kde-misc/tcgui) --></dd>
-
-</dl>
-</p>
-
-<h2>Internationalization</h2>
-
-<p>
-The full version has the following locales. The tiny CD is English only, sorry but I could not fit the CD under 50MB without removing natural language support. If you'd like to see another locale for the full CD please let me know.
-</p>
-
-<ul>
-<li>de_DE</li>
-<li>en_AU</li>
-<li>en_CA</li>
-<li>en_GB</li>
-<li>en_US</li>
-<li>en_HK</li>
-<li>en_PH</li>
-<li>es_MX</li>
-<li>fa_IR</li>
-<li>fr_FR</li>
-<li>it_IT</li>
-<li>ja_JP</li>
-<li>pt_PT</li>
-<li>zh_CN</li>
-<li>zh_HK</li>
-<li>zh_TW</li>
-</ul>
-
-See <a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/etc/locale.gen">/etc/locale.gen</a> for the selected languages. See <a href="https://tor-svn.freehaven.net/svn/incognito/trunk/fsscript.sh">fsscript.sh</a> for how this configuration is applied.
-
-<h2>Configuration</h2>
-
-<h3>Tor</h3>
-<p>
-Tor is currently configured as a client only. The client listens on SOCKS port 9050, as a transparent proxy on port 9040 and control port 9051 (with cookie authentication). Only connections from localhost are accepted. It can be argued that running a server would increase your anonymity for a number for reasons but we still feel that most users probably would not want this.
-</p>
-
-<ul>
-<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/etc/tor/torrc">/etc/tor/torrc</a></li>
-</ul>
-
-<h3>Mixminion</h3>
-<p>
-Mixminion cannot be configured as a server as these servers need to be very reliable. As a client the default configuration seems to be acceptable. Note that TorK has built-in support for Mixminion. KMail also has been configured to use Mixminion via a sendmail compatible shell script. In this way the signature and encryption features of KMail can be used. Thunderbird is configured to use the Mixminion SMTP server to send email.
-</p>
-
-<ul>
-<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/usr/bin/sendmail-mixminion">/usr/bin/sendmail-mixminion</a></li>
-<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/etc/mixminion/mixminion-smtp.conf">/etc/mixminion/mixminion-smtp.conf</a></li>
-<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/var/lib/kdesession/kmailrc">/var/lib/kdesession/kmailrc</a> (copied to /home/gentoo/.kde3.5/... during build)</li>
-<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/var/lib/thunderbird-config">/var/lib/thunderbird-config</a> (copied to /home/gentoo/.thunderbird during build)</li>
-</ul>
-
-<h3>DNS</h3>
-<p>
-DNS leaks are controlled by using a local caching server. Two software packages are used to effect this. dns-proxy-tor listens for DNS requests and forwards to Tor for the resolution. pdnsd is used to provide caching.  pdnsd is the server configured in /etc/resolv.conf, listening on localhost. It is configured to forward to dns-proxy-tor for the actual resoluton. There is a security concerns that some application could attempt to do its own DNS resolution without consulting /etc/resolv.conf. UDP packets are blocked to prevent leaks. Another solution may be to use the Linux network filter to forward to the local DNS server.
-</p>
-
-<ul>
-<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/etc/resolv.conf">/etc/resolv.conf</a></li>
-<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/etc/conf.d/dns-proxy-tor">/etc/conf.d/dns-proxy-tor</a></li>
-<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/etc/conf.d/pdnsd">/etc/conf.d/pdnsd</a></li>
-<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/etc/conf.d/net">/etc/conf.d/net</a></li>
-</ul>
-
-<h3>HTTP Proxy</h3>
-<p>
-Polipo is used as the HTTP proxy. It contacts Tor via SOCKS5 to make the real connections.
-</p>
-
-<ul>
-<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/etc/polipo/config">/etc/polipo/config</a></li>
-<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/etc/env.d/99proxy">/etc/env.d/99proxy</a></li>
-<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/var/lib/kdesession/kioslaverc">/var/lib/kdesession/kioslaverc</a> (copied to /home/gentoo/.kde3.5/... during build)</li>
-</ul>
-
-<h3>SOCKS libraries</h3>
-<p>
-tsocks and dante are installed. Note that it is unnecessary with the Linux network filter (see below) and the local DNS server to socksify or torify apps. This is done at a lower level. These libraries are here due to dependencies and configured for completeness.
-</p>
-
-<ul>
-<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/etc/socks/">/etc/socks/</a></li>
-<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/etc/env.d/99proxy">/etc/env.d/99proxy</a></li>
-</ul>
-
-<h3>Random MAC Address</h3>
-<p>
-The macchanger program can be used to change the network card MAC addresses to a random value. Gentoo has direct support for macchanger so all we need to do is configure it. The configuration is set to "random-ending" which is equivalent to "macchanger -e", meaning the vendor and media type are not changed. This is done to not draw attention to the changed MAC address in case someone is watching. Using a random MAC address may improve anonymity with respect to the LAN and prevent mapping the user to a specific physical location.
-</p>
-
-</p>
-This functionality is not enabled by default as some DHCP servers may be configured with specific MAC addresses. In the boot menu there is an "Enable/Disable MAC changer" option that can be set before a language is chosen and the system starts booting.
-</p>
-
-<ul>
-<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/etc/conf.d/net">/etc/conf.d/net</a> (used by tiny)</li>
-<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/etc/init.d/macchanger">/etc/init.d/macchanger</a> (used by full)</li>
-</ul>
-
-<h3>Mozilla Firefox</h3>
-<p>
-HTTP and SOCKS proxies are configured. SOCKS is configured to perform name resolution through the proxy. I started Firefox without a config, exited, and then copied the configuration directory to the CD build root. The NoScript extension has been installed.
-</p>
-
-<ul>
-<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/var/lib/firefox-config/">/var/lib/firefox-config/</a> (copied to /home/gentoo/.mozilla during build)</li>
-</ul>
-
-<h3>Bookmarks</h3>
-<p>
-Firefox and Konqueror have preset bookmarks related to anonymity.
-</p>
-
-<ul>
-<li>Firefox: <a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/var/lib/firefox-config/firefox/m7m1jk79.Default%20User/bookmarks.html">bookmarks.html</a></li>
-<li>Konqueror: <a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/var/lib/kdesession/bookmarks.xml">bookmarks.xml</a></li>
-</ul>
-
-<h3>Kopete</h3>
-<p>
-Kopete is configured with contacts to Freenode and OFTC IRC networks accessed via Tor hidden services. The Kopete ircnetworks.xml file is patched with these networks.
-</p>
-
-<ul>
-<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/var/lib/kdesession/kopeterc">kopeterc</a></li>
-<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/fsscript.sh">fsscript.sh</a></li>
-</ul>
-
-<h3>XChat</h3>
-<p>
-XChat is configured to use Tor as a SOCKS5 proxy. It will pass the hostname through SOCKS5 so that the exit node does the DNS resolution.
-</p>
-
-<ul>
-<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/var/lib/xchat-config">xchat-config</a></li>
-<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/fsscript.sh">fsscript.sh</a></li>
-</ul>
-
-<h3>Network Filter</h3>
-<p>
-One of the security issues is we don't know what software will attempt to contact the network without consideration for proxies. This is solved by forwarding all TCP connections that are not targetted to Tor (or localhost) through Tor. Linux has a kernel level network filter that accomplishes this. The CD is configured to pass all TCP traffic through Tor in case an application does not recognize or support HTTP/SOCKS proxies.
-</p>
-
-<ul>
-<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/var/lib/iptables/rules-save">/var/lib/iptables/rules-save</a> (loaded by the standard Gentoo /etc/init.d/iptables service)</li>
-</ul>
-
-
-<h3>Host system RAM</h3>
-<p>
-When shutting down the system RAM is securely wiped. RAM can actually be read after the machine shuts off with the right equipment. The software doing this is smem, part of the <a href="http://www.thc.org/">secure-delete</a> package. This process can take a while. If you are booting from a CD it should eject, and if you are booting from a USB drive you can remove the drive once prompted. In either case you can leave the computer and let it finish on its own.
-</p>
-
-<ul>
-<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/var/patches/secure_halt.patch">/var/patches/secure_halt.patch</a> (applied during build)</li>
-<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/fsscript.sh">fsscript.sh</a></li>
-</ul>
-
-<h3>Passwords</h3>
-<p>
-There are two user's that are intended to be used for logins, 'gentoo' and 'root'. Since this is a CD/USB the passwords are empty. This should not be a security concern because the user will remove the CD/USB when done and there should be no services allowing logins from the network.
-</p>
-
-<ul>
-<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/fsscript.sh">fsscript.sh</a></li>
-</ul>
-
-<h3>Running the CD from RAM</h3>
-<p>
-The tiny version gives you the menu option of running the CD/USB from RAM. During the boot process the entire CD is copied into RAM and run from there. The CD will eject at this time or you may remove the USB drive when the boot progress screen is displayed. The full CD is too large for most computers to run from RAM but if you'd like to then hit [Tab] on the boot option and add " docache" after the boot line.
-</p>
-
-<h3>Running the CD from a Windows session</h3>
-<p>
-__INCOGNITO__ full may be run inside a Windows session in case the computer cannot boot media. <a href="http://fabrice.bellard.free.fr/qemu/">QEMU</a> is used to run the CD in a virtual PC. CTRL-ALT-F can be used to make the virtual machine full screen. Note that this will work for Windows 2000/XP or greater. A security concern that is not covered in this case is a keystroke logger. Keystrokes still run through the host operating system and can be logged, so beware.
-</p>
-
-<h2>Configuration copied from USB drive</h2>
-
-<p>
-Certain configurations are copied from the USB drive on boot. The following table lists the configuration, where it should exist on the USB drive and where it is copied into.
-</p>
-
-<table>
-<tr><th>Software</th><th>USB drive location</th><th>Destination</th></tr>
-<tr><td>OpenVPN</td><td>/keys/openvpn</td><td>/etc/openvpn</td>
-<tr><td colspan="3">The following are only copied if a persistent home cannot be created.</td></tr>
-<tr><td>Kopete</td><td>/config/kopeterc</td><td>/home/gentoo/.kde3.5/share/config</td>
-<tr><td>SSH</td><td>/keys/ssh</td><td>/home/gentoo/.ssh</td>
-</table>
-
-<ul>
-<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/etc/init.d/external-config-setup">/etc/init.d/external-config-setup</a></li>
-</ul>
-
-<a name="persistent">
-
-<h2>Persistent User Settings for a USB drive</h2>
-
-<p>
-When the CD is copied to a USB drive (see <a href="#createusb">here</a>) the user settings may be persisted across sessions. The home volume can be stored as a <a href="http://www.truecrypt.org">TrueCrypt</a> volume or unencrypted. For the Un*x savvy, the unencrypted volume is stored as an ext3 file on the USB drive. The file home.tc (TrueCrypt) or home.ext3.img (unencrypted) on the USB drive stores these settings and can be removed to reset to the CD defaults or copied elsewhere for a backup. You will need to do a clean shutdown (described above) to make sure your settings are saved. When booting from a writable media and there is no home volume you will be prompted to create one, you may choose not to do so.
-</p>
-
-<ul>
-<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/etc/init.d/external-config-setup">/etc/init.d/external-config-setup</a></li>
-<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/usr/sbin/create-homevol">/usr/sbin/create-homevol</a></li>
-</ul>
-
-<h2>Hidden Services</h2>
-
-<p>
-Hidden HTML content may be served if running from an USB drive. Content is limited to static HTML pages. The content is stored in the home directory and so takes advantage of TrueCrypt encryption. The directory structure follows.
-</p>
-
-<dl>
-<dt>/home/hidden/[name]</dt>
-<dd>Base directory for hidden content where [name] can be anything (sane) that you'd like.</dd>
-<dt>/home/hidden/[name]/conf</dt>
-<dd>Configuration directory mostly used for Tor hidden service information. It will include the hostname and private key, keep it safe, i.e. don't copy it over to your buddy's USB drive.</dd>
-<dt>/home/hidden/[name]/conf/port</dt>
-<dd>Optional port for the hidden service. This is what you'd give out to others. If you will have multiple services it is best to specify the port. The default is 80, increasing from there for each additional service.</dd>
-<dt>/home/hidden/[name]/conf/torrc</dt>
-<dd>Optional config to append to /etc/tor/torrc after the hidden service description. An example would be a HiddenServiceNodes directive, etc.</dd>
-<dt>/home/hidden/[name]/www</dt>
-<dd>The HTML content. Use index.html for your default page.</dd>
-</dl>
-
-<p>
-The <a href="<!-- #homepage(www-servers/lighttpd) -->">lighttpd</a> server is used to serve the content. Configuration of the server is done at boot time in the <a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/etc/init.d/hidden-service">/etc/init.d/hidden-service</a> init script.
-</p>
-<p>
-The host name to use for the hidden service can be found in the /home/hidden/[name]/conf/hostname file for that service. This file is created by Tor when configuring the hidden service. The host name will be the same across sessions and machines as it and the private key are stored in the /home/hidden/[name]/conf directory.
-</p>
-<p>
-Changes to /home/hidden (service addition/removal, /home/hidden/[name]/conf change) can be applied using the following command from a terminal. To get a terminal on full, type "Alt-F2", "konsole". On tiny right-click on the desktop and choose "xterm".
-<code>
-su -c /etc/init.d/hidden-service restart
-</code>
-Note that content changes in /home/hidden/[name]/www should take effect immediately without running the above command.
-</p>
-<ul>
-<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/etc/init.d/hidden-service">/etc/init.d/hidden-service</a></li>
-</ul>
-
-<a name="maintenance">
-<h1>Maintenance</h1>
-<blockquote>(How to keep the implementation current for anonymity, security and usefulness.)</blockquote>
-
-<p>
-The Gentoo Catalyst release build tool is used to build the CD. This tool is designed to make the CD easy to maintain. For an update of only Tor it takes a simple version bump and 30 minutes for the tiny CD, two hours for the full version. Human effort is minimal, Catalyst does most of the work. A full update of all software takes several hours to compile, but this is seldom done or needed and again generally requires little human effort. Adding or removing software to/from the CD is also generally trivial.
-</p>
-
-<p>
-The following applications are kept up to date as soon as possible. Others may be updated sooner if a major security problem occurs (Firefox, etc.)
-<p>
-
-<ul>
-<li>Tor</li>
-<li>TorK</li>
-<li>Vidalia</li>
-<li>Polipo</li>
-<li>Mixminion</li>
-</ul>
-
-<p>
-Remaining applications, including the base system, will be updated on a roughly two month schedule. It takes a long time to compile everything from scratch and sometimes there are problems that need to be addressed. Most of the packages are marked stable by Gentoo so there are not many problems.
-</p>
-
-<a name="caveats">
-<h1>Caveats</h1>
-<blockquote>Side effects of the implementation that may be undesirable.</blockquote>
-
-<p>
-UDP is a problem. Tor does not provide anonymity using UDP yet. Outgoing UDP packets are dropped altogether.
-</p>
-
-<p>
-When using a USB drive your user settings are stored on the drive unsecured. If any personal information is stored by the applications you use then you must keep your drive secure from potential threats, for example by using the optional encryption and a strong passphrase.
-</p>
-
-<a name="security">
-<h1>Security</h1>
-<blockquote>Agreements and disagreements with our approach or implementation.</blockquote>
-
-<p>
-(It would be great to have links to peer reviews here.)
-</p>
-
-<a name="createusb">
-<h1>Copying to a USB Drive</h1>
-
-<p>
-The CD may be copied to a USB drive. Why do that? USB drives are easier to carry, harder to break, offer file storage and persistent user settings between sessions. There is a script provided that will copy the CD to a USB drive and make the drive bootable. When booting the user is presented with the option to create a persistent home directory with optional encryption (see <a href="#persistent">here</a> for details). On the desktop after booting the CD there will be an icon for copying to a USB drive (on tiny right click on the desktop and choose "Create USB" from the menu.) See the <a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/usr/sbin/create-usb">/usr/sbin/create-usb</a> script for technical details. Note the script depends on the Gentoo LiveCD structure, it probably won't work when run on another LiveCD setup.
-</p>
-
-</body>
-
-</html>

Copied: incognito/tags/20080109.1/root_overlay/usr/share/incognito/readme.html (from rev 13127, incognito/trunk/root_overlay/usr/share/incognito/readme.html)
===================================================================
--- incognito/tags/20080109.1/root_overlay/usr/share/incognito/readme.html	                        (rev 0)
+++ incognito/tags/20080109.1/root_overlay/usr/share/incognito/readme.html	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,567 @@
+<html>
+<head>
+<title>__INCOGNITO_TITLE__ Documentation</title>
+</head>
+
+<body>
+
+<h1>Contents</h1>
+<ul>
+<li><a href="#intent">Intent</a></li>
+<li><a href="#download">Download</a></li>
+<li><a href="#contact">Contact</a></li>
+<li><a href="#approach">Approach</a></li>
+<li><a href="#impl">Implementation</a></li>
+<li><a href="#maintenance">Maintenance</a></li>
+<li><a href="#caveats">Caveats</a></li>
+<li><a href="#security">Security</a></li>
+<li><a href="#createusb">Copying to a USB Drive</a></li>
+</ul>
+
+<p>
+<strong>NOTICE</strong>: This CD is provided as-is with no warranty of fitness for a particular purpose, including total anonymity. Anonymity depends not only on the software but also on the user understanding the risks involved and how to overcome those risks.
+</p>
+
+<a name="intent">
+<h1>Intent / Goals</h1>
+<blockquote>What are we trying to do?</blockquote>
+
+<p>
+This CD provides software to use various Internet technologies while keeping the user anonymous. It is based primarily on <a href="https://www.torproject.org">Tor</a> while including supporting applications. The target use case is that of using a public computer, such as in a library, securely. This CD may also be copied to a USB drive to provide persisted user settings. The intended user base are those who would like to perform standard Internet communications such as WWW, mail, IRC, IM, etc, while being confident that their anonymity is not compromised. Power users who want precise control over the application and network configuration may be disappointed.
+</p>
+
+
+<dl>
+
+<dt>Target User Base</dt>
+<dd>
+The target user is one who is using a computer that does not necessarily have full control of said computer and desires to access Internet services. Examples would be a public computer in a library, coffee shop, university or a residence. Also, users not wanting to bother with configuring all applications appropriately (with respect to anonymity) could use __INCOGNITO__ on their home computers. The implementation should provide strong anonymity with no configuration. It should be difficult or impossible, for the user to unknowingly compromise anonymity. Users requiring more precise control over the application and network configuration may be disappointed.
+</dd>
+
+<dt></dt>
+<dd>
+</dd>
+
+<dt>Required Internet Services</dt>
+<dd>
+At minimum the following Internet services should be supported: WWW, E-Mail, IRC.
+</dd>
+
+<dt>Recommended Internet Services</dt>
+<dd>
+The following Internet services are recommended to be supported: Instant Messaging.
+</dd>
+
+<dt>Supported Instant Messaging Protocols</dt>
+<dd>
+The following instant messaging protocols should be supported based on the constraint that the protocol itself does not require information that compromises anonymity: (TODO)
+</dd>
+
+<dt>Discouraged Instant Messaging Protocols</dt>
+<dd>
+The following instant messaging protocols should NOT be supported based on the constraint that the protocol itself requiress information that compromises anonymity: (TODO)
+</dd>
+
+<dt>Maintainable</dt>
+<dd>
+The procedure to update the CD should not be prohibitive to provide timely software updates to address issues related to security or anonymity.
+</dd>
+
+<dt>Media</dt>
+<dd>
+The implementation should be able to run off either CD or a USB bootable drive. The media must be bootable, not run from the host operating system.
+</dd>
+
+<dt>Persisted User Settings on USB Drive</dt>
+<dd>
+User settings should be persisted when using a USB drive. The user should have the option to store these settings encrypted.
+</dd>
+
+</dl>
+
+
+<a name="download">
+<h1>Download</h1>
+
+<p>
+See the <a href="http://www.browseanonymouslyanywhere.com/incognito/index.php?option=com_content&task=view&id=26&Itemid=39">download section</a> on <a href="http://www.browseanonymouslyanywhere.com/incognito">__INCOGNITO__'s main site</a> for download information. Various development files (portage snapshot and stage3 tarball) as well as the current version of __INCOGNITO__ can be found at <a href="http://files1.cjb.net/incognito/">http://files1.cjb.net/incognito/</a>.
+</p>
+
+<p>
+The latest version of this document for the current relesase can be found <a href="http://www.anonymityanywhere.com/incognito/index.php?option=com_content&task=view&id=26&Itemid=39">here</a>. The development version of this document can be found at Incognito's subversion repository (specifically <a href="here">https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/usr/share/incognito/readme.html</a>), although it should be noted that some information which is added dynamically at build will not be present (has mostly to do with information about which software packages that are installed).
+</p>
+
+<p>
+The build root for the CD is stored in a <a href="http://subversion.tigris.org">Subversion</a> repository. It can be viewed or checked out at <a href="https://tor-svn.freehaven.net/svn/incognito/">https://tor-svn.freehaven.net/svn/incognito/</a>.
+</p>
+
+<a name="contact">
+<h1>Contact</h1>
+
+<p>
+As of november 2007, the maintainace of this distribution has passed from the founder, Pat Double, to anonym, who can be contacted through anonym (at) lavabit (dot) com. Please do not contact Pat for anything relating to the current development of __INCOGNITO__. Feature requests and (especially) bug reports are welcome and should be sent to anonym, but please include "__INCOGNITO__" in the subject line to easy mail sorting. Also, please be considerate of any major technology choices, such as <a href="http://www.gentoo.org/proj/en/releng/catalyst">Catalyst</a> and <a href="http://www.gentoo.org">Gentoo Linux</a>, <a href="http://www.kde.org">KDE</a>, etc. These have been chosen because of the developers' familiarity with them and will likely not change ever. If someone would like to maintain a parallell version with, say, Gnome instead of KDE or similar that would probably work just fine. However, since the whole development process is centered around Gentoo Linux' Catalyst, neither of them are negotiable.
+</p>
+
+<a name="approach">
+<h1>Approach</h1>
+<blockquote>What is needed to reach our goals?</blockquote>
+
+<p>
+</p>
+
+<a name="impl">
+<h1>Implementation</h1>
+<blockquote>How did we implement our approach in order to reach our goals.</blockquote>
+
+<p>
+There are full and tiny versions of the CD. The tiny version is intended to fit on small media (such as a 'business card' CD) and basically provides an anonymous web browser. The full version supports a variety of Internet applications.
+</p>
+
+<h2>Software</h2>
+
+<p>
+The following software is present on both the full and tiny versions. The version of the packages used is included on the CD at /usr/share/packages.txt.
+</p>
+
+<dl>
+
+<dt><a href="http://www.gentoo.org">Gentoo Linux</a> (<a href="http://www.kernel.org">kernel 2.6</a> <!-- #version(sys-kernel/gentoo-sources) -->)</dt>
+<dd>The base operating system, provides hardware detection, infrastructure. Please note that the Gentoo Foundation does not provide or endorse this software distribution.</dd>
+
+<dt><a href="<!-- #homepage(net-misc/tor) -->">Tor</a> <!-- #version(net-misc/tor) --></dt>
+<dd><!-- #description(net-misc/tor) -->. Our attempt is to always use the latest stable version. This version is patched to allow controllers to access the cookie authentication file. The <a href="https://tor-svn.freehaven.net/svn/incognito/trunk/portage.overlay/net-misc/tor/files/tor-cookieperm.patch">patch</a> is from the 0.2.0.x development branch.</dd>
+
+<dt><a href="<!-- #homepage(net-proxy/polipo) -->">polipo</a> <!-- #version(net-proxy/polipo) --></dt>
+<dd><!-- #description(net-proxy/polipo) --></dd>
+
+<dt><a href="<!-- #homepage(www-client/mozilla-firefox-bin) -->">Firefox</a> <!-- #version(www-client/mozilla-firefox-bin) --></dt>
+<dd><!-- #description(www-client/mozilla-firefox-bin) --></dd>
+
+<dt><a href="<!-- #homepage(x11-plugins/noscript-bin) -->">NoScript</a> <!-- #version(x11-plugins/noscript-bin) --></dt>
+<dd><!-- #description(x11-plugins/noscript-bin) --></dd>
+
+<dt><a href="<!-- #homepage(x11-plugins/cs-lite) -->">CS Lite</a> <!-- #version(x11-plugins/cs-lite) --></dt>
+<dd><!-- #description(x11-plugins/cs-lite) --></dd>
+
+<dt><a href="<!-- #homepage(x11-plugins/firegpg) -->">FireGPG</a> <!-- #version(x11-plugins/firegpg) --></dt>
+<dd><!-- #description(x11-plugins/firegpg) --></dd>
+
+<dt><a href="<!-- #homepage(x11-plugins/refcontrol) -->">refcontrol</a> <!-- #version(x11-plugins/refcontrol) --></dt>
+<dd><!-- #description(x11-plugins/refcontrol) --></dd>
+
+<dt><a href="<!-- #homepage(x11-plugins/adblock_plus) -->">Adblock Plus</a> <!-- #version(x11-plugins/adblock_plus) --></dt>
+<dd><!-- #description(x11-plugins/adblock_plus) --></dd>
+
+<dt><a href="<!-- #homepage(net-irc/xchat) -->">XChat</a> <!-- #version(net-irc/xchat) --></dt>
+<dd><!-- #description(net-irc/xchat) --></dd>
+
+<dt><a href="<!-- #homepage(app-crypt/truecrypt) -->">TrueCrypt</a> <!-- #version(app-crypt/truecrypt) --></dt>
+<dd><!-- #description(app-crypt/truecrypt) --></dd>
+
+<dt><a href="<!-- #homepage(net-misc/openssh) -->">ssh</a> <!-- #version(net-misc/openssh) --></dt>
+<dd><!-- #description(net-misc/openssh) --></dd>
+
+<dt><a href="<!-- #homepage(net-analyzer/macchanger) -->">macchanger</a> <!-- #version(net-analyzer/macchanger) --></dt>
+<dd><!-- #description(net-analyzer/macchanger) --></dd>
+
+<dt><a href="<!-- #homepage(www-servers/lighttpd) -->">lighthttpd</a> <!-- #version(www-servers/lighttpd) --> for hidden services</dt>
+<dd><!-- #description(www-servers/lighttpd) --></dd>
+
+<dt><a href="<!-- #homepage(net-proxy/3proxy) -->">3proxy</a> <!-- #version(net-proxy/3proxy) --></dt>
+<dd><!-- #description(net-proxy/3proxy) --></dd>
+
+<dt><a href="<!-- #homepage(mail-mta/mixminion) -->">Mixminion</a> <!-- #version(mail-mta/mixminion) --></dt>
+<dd><!-- #description(mail-mta/mixminion) --></dd>
+
+<dt><a href="<!-- #homepage(mail-mta/mixminion-smtp) -->">Mixminion SMTP</a> <!-- #version(mail-mta/mixminion-smtp) --></dt>
+<dd><!-- #description(mail-mta/mixminion-smtp) --></dd>
+
+<dt><a href="<!-- #homepage(mail-client/mozilla-thunderbird-bin) -->">Thunderbird</a> <!-- #version(mail-client/mozilla-thunderbird-bin) --></dt>
+<dd><!-- #description(mail-client/mozilla-thunderbird-bin) --></dd>
+
+<dt><a href="<!-- #homepage(x11-plugins/enigmail-bin) -->">Thunderbird OpenPGP (enigmail)</a> <!-- #version(x11-plugins/enigmail-bin) --></dt>
+<dd><!-- #description(x11-plugins/enigmail-bin) --></dd>
+
+<dt><a href="<!-- #homepage(x11-plugins/thunderplunger) -->">Thunder Plunger</a> <!-- #version(x11-plugins/thunderplunger) --></dt>
+<dd><!-- #description(x11-plugins/thunderplunger) --></dd>
+
+<dt><a href="<!-- #homepage(net-misc/trans-proxy-tor) -->">dns-proxy-tor</a> <!-- #version(net-misc/trans-proxy-tor) --></dt>
+<dd>DNS server that uses Tor to resolve addresses.</dd>
+
+<dt><a href="<!-- #homepage(net-dns/pdnsd) -->">pdnsd</a> <!-- #version(net-dns/pdnsd) --></dt>
+<dd><!-- #description(net-dns/pdnsd) -->. Configured to use dns-proxy-tor to do the resolution.</dd>
+
+<dt><a href="<!-- #homepage(net-misc/vidalia) -->">Vidalia</a> <!-- #version(net-misc/vidalia) --></dt>
+<dd><!-- #description(net-misc/vidalia) --></dd>
+
+<dt><a href="<!-- #homepage(app-crypt/gnupg) --><">GnuPG</a> <!-- #version(app-crypt/gnupg) --></dt>
+<dd><!-- #description(app-crypt/gnupg) --></dd>
+
+<dt><a href="<!-- #homepage(app-admin/keepassx) --><">KeePassX</a> <!-- #version(app-admin/keepassx) --></dt>
+<dd><!-- #description(app-admin/keepassx) --></dd>
+
+<dt><a href="<!-- #homepage(net-analyzer/thcrut) -->">thcrut</a> <!-- #version(net-analyzer/thcrut) --></dt>
+<dd><!-- #description(net-analyzer/thcrut) --></dd>
+
+<dt><a href="<!-- #homepage(net-analyzer/nmap) -->">nmap</a> <!-- #version(net-analyzer/nmap) --></dt>
+<dd><!-- #description(net-analyzer/nmap) --></dd>
+
+<dt><a href="<!-- #homepage(net-wireless/airsnort) -->">airsnort</a> <!-- #version(net-wireless/airsnort) --></dt>
+<dd><!-- #description(net-wireless/airsnort) --></dd>
+
+<dt><a href="<!-- #homepage(app-misc/screen) -->">screen</a> <!-- #version(app-misc/screen) --></dt>
+<dd><!-- #description(app-misc/screen) --></dd>
+
+<dt><a href="<!-- #homepage(net-misc/openvpn) -->">OpenVPN</a> <!-- #version(net-misc/openvpn) --></dt>
+<dd><!-- #description(net-misc/openvpn) -->. Can operate over TCP or UDP. Due to the current implementation of Tor only TCP is anonymized. UDP is currently blocked.</dd>
+
+<dt><a href="<!-- #homepage(net-misc/vpnc) -->">vpnc</a> <!-- #version(net-misc/vpnc) --></dt>
+<dd><!-- #description(net-misc/vpnc) --></dd>
+
+<dt><a href="<!-- #homepage(net-misc/netkit-telnetd) -->">telnet</a> <!-- #version(net-misc/netkit-telnetd) --></dt>
+<dd><!-- #description(net-misc/netkit-telnetd) --></dd>
+
+<dt><a href="<!-- #homepage(net-misc/socat) -->">socat</a> <!-- #version(net-misc/socat) --></dt>
+<dd><!-- #description(net-misc/socat) --></dd>
+
+<dt><a href="<!-- #homepage(www-client/links) -->">links</a> <!-- #version(www-client/links) --></dt>
+<dd><!-- #description(www-client/links) --></dd>
+
+<dt><a href="http://www.kde.org">KDE 3.5</a></dt>
+<dd>K Desktop Environment, a reduced install with parts that could be useful on an anonymity CD.</dd>
+
+<dt><a href="<!-- #homepage(kde-base/kmail) -->">KDE - KMail</a> <!-- #version(kde-base/kmail) --></dt>
+<dd><!-- #description(kde-base/kmail) --></dd>
+
+<dt><a href="<!-- #homepage(kde-base/konqueror) -->">KDE - Konqueror </a> <!-- #version(kde-base/konqueror) --></dt>
+<dd><!-- #description(kde-base/konqueror) --></dd>
+
+<dt><a href="<!-- #homepage(kde-misc/tork) -->">TorK</a> <!-- #version(kde-misc/tork) --></dt>
+<dd><!-- #description(kde-misc/tork) --></dd>
+
+<dt><a href="<!-- #homepage(kde-base/kopete) -->">KDE - Kopete</a> <!-- #version(kde-base/kopete) --></dt>
+<dd><!-- #description(kde-base/kopete) --></dd>
+
+<dt><a href="<!-- #homepage(net-im/kopete-otr) -->">Kopete Off The Record plugin</a> <!-- #version(net-im/kopete-otr) --></dt>
+<dd><!-- #description(net-im/kopete-otr) --></dd>
+
+<dt><a href="<!-- #homepage(kde-base/kontact) -->">KDE - Kontact</a> <!-- #version(kde-base/kontact) --></dt>
+<dd><!-- #description(kde-base/kontact) --></dd>
+
+<dt><a href="<!-- #homepage(kde-base/ksnapshot) -->">KDE - KSnapShot</a> <!-- #version(kde-base/ksnapshot) --></dt>
+<dd><!-- #description(kde-base/ksnapshot) --></dd>
+
+<dt><a href="<!-- #homepage(kde-base/akregator) -->">KDE - Akregator</a> <!-- #version(kde-base/akregator) --></dt>
+<dd><!-- #description(kde-base/akregator) --></dd>
+
+<dt><a href="<!-- #homepage(kde-base/krfb) -->">KDE - krfb</a> <!-- #version(kde-base/krfb) --></dt>
+<dd><!-- #description(kde-base/krfb) --></dd>
+
+<dt><a href="<!-- #homepage(net-p2p/ktorrent) -->">KDE - KTorrent</a> <!-- #version(net-p2p/ktorrent) --></dt>
+<dd><!-- #description(net-p2p/ktorrent) --></dd>
+
+<dt><a href="<!-- #homepage(kde-misc/tcgui) -->">TrueCrypt UI (TCGUI)</a> <!-- #version(kde-misc/tcgui) --></dt>
+<dd><!-- #description(kde-misc/tcgui) --></dd>
+
+</dl>
+</p>
+
+<h2>Internationalization</h2>
+
+<p>
+The full version has the following locales. The tiny CD is English only, sorry but I could not fit the CD under 50MB without removing natural language support. If you'd like to see another locale for the full CD please let me know.
+</p>
+
+<ul>
+<li>de_DE (German)</li>
+<li>en_AU (Australian English)</li>
+<li>en_CA (Canadian English)</li>
+<li>en_GB (British English)</li>
+<li>en_HK (Hong Kong English)</li>
+<li>en_PH (Philippine English)</li>
+<li>en_SG (Singapore English)</li>
+<li>en_US (American English)</li>
+<li>es_ES (Spanish)</li>
+<li>es_MX (Mexican Spanish)</li>
+<li>fa_IR (Persian)</li>
+<li>fr_FR (French)</li>
+<li>it_IT (Italian)</li>
+<li>ja_JP (Japanese)</li>
+<li>pt_PT (Portugese)</li>
+<li>zh_CN (Chinese)</li>
+<li>zh_HK (Hong Kong Chinese)</li>
+<li>zh_SG (Singapore Chinese)</li>
+<li>zh_TW (Taiwan Chinese)</li>
+</ul>
+
+See <a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/etc/locale.gen">/etc/locale.gen</a> for the selected languages. See <a href="https://tor-svn.freehaven.net/svn/incognito/trunk/fsscript.sh">fsscript.sh</a> for how this configuration is applied.
+
+<h2>Configuration</h2>
+
+<h3>Tor</h3>
+<p>
+Tor is currently configured as a client only. The client listens on SOCKS port 9050, as a transparent proxy on port 9040 and control port 9051 (with cookie authentication). Only connections from localhost are accepted. It can be argued that running a server would increase your anonymity for a number for reasons but we still feel that most users probably would not want this.
+</p>
+
+<ul>
+<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/etc/tor/torrc">/etc/tor/torrc</a></li>
+</ul>
+
+<h3>Mixminion</h3>
+<p>
+Mixminion cannot be configured as a server as these servers need to be very reliable. As a client the default configuration seems to be acceptable. Note that TorK has built-in support for Mixminion. KMail also has been configured to use Mixminion via a sendmail compatible shell script. In this way the signature and encryption features of KMail can be used. Thunderbird is configured to use the Mixminion SMTP server to send email.
+</p>
+
+<ul>
+<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/usr/bin/sendmail-mixminion">/usr/bin/sendmail-mixminion</a></li>
+<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/etc/mixminion/mixminion-smtp.conf">/etc/mixminion/mixminion-smtp.conf</a></li>
+<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/var/lib/kdesession/kmailrc">/var/lib/kdesession/kmailrc</a> (copied to /home/gentoo/.kde3.5/... during build)</li>
+<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/var/lib/thunderbird-config">/var/lib/thunderbird-config</a> (copied to /home/gentoo/.thunderbird during build)</li>
+</ul>
+
+<h3>DNS</h3>
+<p>
+DNS leaks are controlled by using a local caching server. Two software packages are used to effect this. dns-proxy-tor listens for DNS requests and forwards to Tor for the resolution. pdnsd is used to provide caching.  pdnsd is the server configured in /etc/resolv.conf, listening on localhost. It is configured to forward to dns-proxy-tor for the actual resoluton. There is a security concerns that some application could attempt to do its own DNS resolution without consulting /etc/resolv.conf. UDP packets are blocked to prevent leaks. Another solution may be to use the Linux network filter to forward to the local DNS server.
+</p>
+
+<ul>
+<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/etc/resolv.conf">/etc/resolv.conf</a></li>
+<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/etc/conf.d/dns-proxy-tor">/etc/conf.d/dns-proxy-tor</a></li>
+<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/etc/conf.d/pdnsd">/etc/conf.d/pdnsd</a></li>
+<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/etc/conf.d/net">/etc/conf.d/net</a></li>
+</ul>
+
+<h3>HTTP Proxy</h3>
+<p>
+Polipo is used as the HTTP proxy. It contacts Tor via SOCKS5 to make the real connections.
+</p>
+
+<ul>
+<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/etc/polipo/config">/etc/polipo/config</a></li>
+<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/etc/env.d/99proxy">/etc/env.d/99proxy</a></li>
+<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/var/lib/kdesession/kioslaverc">/var/lib/kdesession/kioslaverc</a> (copied to /home/gentoo/.kde3.5/... during build)</li>
+</ul>
+
+<h3>SOCKS libraries</h3>
+<p>
+tsocks and dante are installed. Note that it is unnecessary with the Linux network filter (see below) and the local DNS server to socksify or torify apps. This is done at a lower level. These libraries are here due to dependencies and configured for completeness.
+</p>
+
+<ul>
+<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/etc/socks/">/etc/socks/</a></li>
+<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/etc/env.d/99proxy">/etc/env.d/99proxy</a></li>
+</ul>
+
+<h3>Random MAC Address</h3>
+<p>
+The macchanger program can be used to change the network card MAC addresses to a random value. Gentoo has direct support for macchanger so all we need to do is configure it. The configuration is set to "random-ending" which is equivalent to "macchanger -e", meaning the vendor and media type are not changed. This is done to not draw attention to the changed MAC address in case someone is watching. Using a random MAC address may improve anonymity with respect to the LAN and prevent mapping the user to a specific physical location.
+</p>
+
+</p>
+This functionality is not enabled by default as some DHCP servers may be configured with specific MAC addresses. In the boot menu there is an "Enable/Disable MAC changer" option that can be set before a language is chosen and the system starts booting.
+</p>
+
+<ul>
+<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/etc/conf.d/net">/etc/conf.d/net</a> (used by tiny)</li>
+<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/etc/init.d/macchanger">/etc/init.d/macchanger</a> (used by full)</li>
+</ul>
+
+<h3>Mozilla Firefox</h3>
+<p>
+HTTP and SOCKS proxies are configured. SOCKS is configured to perform name resolution through the proxy. I started Firefox without a config, exited, and then copied the configuration directory to the CD build root. The NoScript extension has been installed.
+</p>
+
+<ul>
+<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/var/lib/firefox-config/">/var/lib/firefox-config/</a> (copied to /home/gentoo/.mozilla during build)</li>
+</ul>
+
+<h3>Bookmarks</h3>
+<p>
+Firefox and Konqueror have preset bookmarks related to anonymity.
+</p>
+
+<ul>
+<li>Firefox: <a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/var/lib/firefox-config/firefox/m7m1jk79.Default%20User/bookmarks.html">bookmarks.html</a></li>
+<li>Konqueror: <a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/var/lib/kdesession/bookmarks.xml">bookmarks.xml</a></li>
+</ul>
+
+<h3>Kopete</h3>
+<p>
+Kopete is configured with contacts to Freenode and OFTC IRC networks accessed via Tor hidden services. The Kopete ircnetworks.xml file is patched with these networks.
+</p>
+
+<ul>
+<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/var/lib/kdesession/kopeterc">kopeterc</a></li>
+<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/fsscript.sh">fsscript.sh</a></li>
+</ul>
+
+<h3>XChat</h3>
+<p>
+XChat is configured to use Tor as a SOCKS5 proxy. It will pass the hostname through SOCKS5 so that the exit node does the DNS resolution.
+</p>
+
+<ul>
+<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/var/lib/xchat-config">xchat-config</a></li>
+<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/fsscript.sh">fsscript.sh</a></li>
+</ul>
+
+<h3>Network Filter</h3>
+<p>
+One of the security issues is we don't know what software will attempt to contact the network without consideration for proxies. This is solved by forwarding all TCP connections that are not targetted to Tor (or localhost) through Tor. Linux has a kernel level network filter that accomplishes this. The CD is configured to pass all TCP traffic through Tor in case an application does not recognize or support HTTP/SOCKS proxies.
+</p>
+
+<ul>
+<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/var/lib/iptables/rules-save">/var/lib/iptables/rules-save</a> (loaded by the standard Gentoo /etc/init.d/iptables service)</li>
+</ul>
+
+
+<h3>Host system RAM</h3>
+<p>
+When shutting down the system RAM is securely wiped. RAM can actually be read after the machine shuts off with the right equipment. The software doing this is smem, part of the <a href="http://www.thc.org/">secure-delete</a> package. This process can take a while. If you are booting from a CD it should eject, and if you are booting from a USB drive you can remove the drive once prompted. In either case you can leave the computer and let it finish on its own.
+</p>
+
+<ul>
+<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/var/patches/secure_halt.patch">/var/patches/secure_halt.patch</a> (applied during build)</li>
+<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/fsscript.sh">fsscript.sh</a></li>
+</ul>
+
+<h3>Passwords</h3>
+<p>
+There are two user's that are intended to be used for logins, 'gentoo' and 'root'. Since this is a CD/USB the passwords are empty. This should not be a security concern because the user will remove the CD/USB when done and there should be no services allowing logins from the network.
+</p>
+
+<ul>
+<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/fsscript.sh">fsscript.sh</a></li>
+</ul>
+
+<h3>Running the CD from RAM</h3>
+<p>
+The tiny version gives you the menu option of running the CD/USB from RAM. During the boot process the entire CD is copied into RAM and run from there. The CD will eject at this time or you may remove the USB drive when the boot progress screen is displayed. The full CD is too large for most computers to run from RAM but if you'd like to then hit [Tab] on the boot option and add " docache" after the boot line.
+</p>
+
+<h3>Running the CD from a Windows session</h3>
+<p>
+__INCOGNITO__ full may be run inside a Windows session in case the computer cannot boot media. <a href="http://fabrice.bellard.free.fr/qemu/">QEMU</a> is used to run the CD in a virtual PC. CTRL-ALT-F can be used to make the virtual machine full screen. Note that this will work for Windows 2000/XP or greater. A security concern that is not covered in this case is a keystroke logger. Keystrokes still run through the host operating system and can be logged, so beware.
+</p>
+
+<h2>Configuration copied from USB drive</h2>
+
+<p>
+Certain configurations are copied from the USB drive on boot. The following table lists the configuration, where it should exist on the USB drive and where it is copied into.
+</p>
+
+<table>
+<tr><th>Software</th><th>USB drive location</th><th>Destination</th></tr>
+<tr><td>OpenVPN</td><td>/keys/openvpn</td><td>/etc/openvpn</td>
+<tr><td colspan="3">The following are only copied if a persistent home cannot be created.</td></tr>
+<tr><td>Kopete</td><td>/config/kopeterc</td><td>/home/gentoo/.kde3.5/share/config</td>
+<tr><td>SSH</td><td>/keys/ssh</td><td>/home/gentoo/.ssh</td>
+</table>
+
+<ul>
+<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/etc/init.d/external-config-setup">/etc/init.d/external-config-setup</a></li>
+</ul>
+
+<a name="persistent">
+
+<h2>Persistent User Settings for a USB drive</h2>
+
+<p>
+When the CD is copied to a USB drive (see <a href="#createusb">here</a>) the user settings may be persisted across sessions. The home volume can be stored as a <a href="http://www.truecrypt.org">TrueCrypt</a> volume or unencrypted. For the Un*x savvy, the unencrypted volume is stored as an ext3 file on the USB drive. The file home.tc (TrueCrypt) or home.ext3.img (unencrypted) on the USB drive stores these settings and can be removed to reset to the CD defaults or copied elsewhere for a backup. You will need to do a clean shutdown (described above) to make sure your settings are saved. When booting from a writable media and there is no home volume you will be prompted to create one, you may choose not to do so.
+</p>
+
+<ul>
+<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/etc/init.d/external-config-setup">/etc/init.d/external-config-setup</a></li>
+<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/usr/sbin/create-homevol">/usr/sbin/create-homevol</a></li>
+</ul>
+
+<h2>Hidden Services</h2>
+
+<p>
+Hidden HTML content may be served if running from an USB drive. Content is limited to static HTML pages. The content is stored in the home directory and so takes advantage of TrueCrypt encryption. The directory structure follows.
+</p>
+
+<dl>
+<dt>/home/hidden/[name]</dt>
+<dd>Base directory for hidden content where [name] can be anything (sane) that you'd like.</dd>
+<dt>/home/hidden/[name]/conf</dt>
+<dd>Configuration directory mostly used for Tor hidden service information. It will include the hostname and private key, keep it safe, i.e. don't copy it over to your buddy's USB drive.</dd>
+<dt>/home/hidden/[name]/conf/port</dt>
+<dd>Optional port for the hidden service. This is what you'd give out to others. If you will have multiple services it is best to specify the port. The default is 80, increasing from there for each additional service.</dd>
+<dt>/home/hidden/[name]/conf/torrc</dt>
+<dd>Optional config to append to /etc/tor/torrc after the hidden service description. An example would be a HiddenServiceNodes directive, etc.</dd>
+<dt>/home/hidden/[name]/www</dt>
+<dd>The HTML content. Use index.html for your default page.</dd>
+</dl>
+
+<p>
+The <a href="<!-- #homepage(www-servers/lighttpd) -->">lighttpd</a> server is used to serve the content. Configuration of the server is done at boot time in the <a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/etc/init.d/hidden-service">/etc/init.d/hidden-service</a> init script.
+</p>
+<p>
+The host name to use for the hidden service can be found in the /home/hidden/[name]/conf/hostname file for that service. This file is created by Tor when configuring the hidden service. The host name will be the same across sessions and machines as it and the private key are stored in the /home/hidden/[name]/conf directory.
+</p>
+<p>
+Changes to /home/hidden (service addition/removal, /home/hidden/[name]/conf change) can be applied using the following command from a terminal. To get a terminal on full, type "Alt-F2", "konsole". On tiny right-click on the desktop and choose "xterm".
+<code>
+su -c /etc/init.d/hidden-service restart
+</code>
+Note that content changes in /home/hidden/[name]/www should take effect immediately without running the above command.
+</p>
+<ul>
+<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/etc/init.d/hidden-service">/etc/init.d/hidden-service</a></li>
+</ul>
+
+<a name="maintenance">
+<h1>Maintenance</h1>
+<blockquote>(How to keep the implementation current for anonymity, security and usefulness.)</blockquote>
+
+<p>
+The Gentoo Catalyst release build tool is used to build the CD. This tool is designed to make the CD easy to maintain. For an update of only Tor it takes a simple version bump and 30 minutes for the tiny CD, two hours for the full version. Human effort is minimal, Catalyst does most of the work. A full update of all software takes several hours to compile, but this is seldom done or needed and again generally requires little human effort. Adding or removing software to/from the CD is also generally trivial.
+</p>
+
+<p>
+The following applications are kept up to date as soon as possible. Others may be updated sooner if a major security problem occurs (Firefox, etc.)
+<p>
+
+<ul>
+<li>Tor</li>
+<li>TorK</li>
+<li>Vidalia</li>
+<li>Polipo</li>
+<li>Mixminion</li>
+</ul>
+
+<p>
+Remaining applications, including the base system, will be updated on a roughly two month schedule. It takes a long time to compile everything from scratch and sometimes there are problems that need to be addressed. Most of the packages are marked stable by Gentoo so there are not many problems.
+</p>
+
+<a name="caveats">
+<h1>Caveats</h1>
+<blockquote>Side effects of the implementation that may be undesirable.</blockquote>
+
+<p>
+UDP is a problem. Tor does not provide anonymity using UDP yet. Outgoing UDP packets are dropped altogether.
+</p>
+
+<p>
+When using a USB drive your user settings are stored on the drive unsecured. If any personal information is stored by the applications you use then you must keep your drive secure from potential threats, for example by using the optional encryption and a strong passphrase.
+</p>
+
+<a name="security">
+<h1>Security</h1>
+<blockquote>Agreements and disagreements with our approach or implementation.</blockquote>
+
+<p>
+(It would be great to have links to peer reviews here.)
+</p>
+
+<a name="createusb">
+<h1>Copying to a USB Drive</h1>
+
+<p>
+The CD may be copied to a USB drive. Why do that? USB drives are easier to carry, harder to break, offer file storage and persistent user settings between sessions. There is a script provided that will copy the CD to a USB drive and make the drive bootable. When booting the user is presented with the option to create a persistent home directory with optional encryption (see <a href="#persistent">here</a> for details). On the desktop after booting the CD there will be an icon for copying to a USB drive (on tiny right click on the desktop and choose "Create USB" from the menu.) See the <a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/usr/sbin/create-usb">/usr/sbin/create-usb</a> script for technical details. Note the script depends on the Gentoo LiveCD structure, it probably won't work when run on another LiveCD setup.
+</p>
+
+</body>
+
+</html>

Deleted: incognito/tags/20080109.1/root_overlay/var/lib/firefox-config/firefox/m7m1jk79.Default User/localstore.rdf
===================================================================
--- incognito/trunk/root_overlay/var/lib/firefox-config/firefox/m7m1jk79.Default User/localstore.rdf	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/root_overlay/var/lib/firefox-config/firefox/m7m1jk79.Default User/localstore.rdf	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,56 +0,0 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:NC="http://home.netscape.com/NC-rdf#"
-         xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-  <RDF:Description RDF:about="chrome://browser/content/browser.xul#sidebar-title"
-                   value="" />
-  <RDF:Description RDF:about="chrome://browser/content/preferences/connection.xul">
-    <NC:persist RDF:resource="chrome://browser/content/preferences/connection.xul#ConnectionsDialog"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="chrome://browser/content/sanitize.xul#SanitizeDialog"
-                   screenX="80"
-                   screenY="131" />
-  <RDF:Description RDF:about="chrome://mozapps/content/extensions/extensions.xul#viewGroup"
-                   last-selected="extensions" />
-  <RDF:Description RDF:about="chrome://browser/content/browser.xul#sidebar-box"
-                   sidebarcommand=""
-                   width=""
-                   src="" />
-  <RDF:Description RDF:about="chrome://browser/content/browser.xul#main-window"
-                   width="994"
-                   height="705"
-                   sizemode="normal"
-                   screenX="0"
-                   screenY="471" />
-  <RDF:Description RDF:about="chrome://browser/content/preferences/preferences.xul">
-    <NC:persist RDF:resource="chrome://browser/content/preferences/preferences.xul#BrowserPreferences"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="chrome://mozapps/content/extensions/extensions.xul#extensions-view"
-                   selected="true"
-                   last-selected="urn:mozilla:item:{73a6fe31-595d-460b-a920-fcc0f8843232}" />
-  <RDF:Description RDF:about="chrome://browser/content/sanitize.xul">
-    <NC:persist RDF:resource="chrome://browser/content/sanitize.xul#SanitizeDialog"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="chrome://mozapps/content/extensions/extensions.xul#extensionsManager"
-                   width="520"
-                   height="380"
-                   sizemode="normal"
-                   screenX="0"
-                   screenY="796" />
-  <RDF:Description RDF:about="chrome://browser/content/browser.xul">
-    <NC:persist RDF:resource="chrome://browser/content/browser.xul#main-window"/>
-    <NC:persist RDF:resource="chrome://browser/content/browser.xul#sidebar-box"/>
-    <NC:persist RDF:resource="chrome://browser/content/browser.xul#sidebar-title"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="chrome://browser/content/preferences/preferences.xul#BrowserPreferences"
-                   screenX="659"
-                   screenY="352"
-                   lastSelected="paneAdvanced" />
-  <RDF:Description RDF:about="chrome://browser/content/preferences/connection.xul#ConnectionsDialog"
-                   screenX="33"
-                   screenY="20" />
-  <RDF:Description RDF:about="chrome://mozapps/content/extensions/extensions.xul">
-    <NC:persist RDF:resource="chrome://mozapps/content/extensions/extensions.xul#extensionsManager"/>
-    <NC:persist RDF:resource="chrome://mozapps/content/extensions/extensions.xul#extensions-view"/>
-    <NC:persist RDF:resource="chrome://mozapps/content/extensions/extensions.xul#viewGroup"/>
-  </RDF:Description>
-</RDF:RDF>

Copied: incognito/tags/20080109.1/root_overlay/var/lib/firefox-config/firefox/m7m1jk79.Default User/localstore.rdf (from rev 13298, incognito/trunk/root_overlay/var/lib/firefox-config/firefox/m7m1jk79.Default User/localstore.rdf)
===================================================================
--- incognito/tags/20080109.1/root_overlay/var/lib/firefox-config/firefox/m7m1jk79.Default User/localstore.rdf	                        (rev 0)
+++ incognito/tags/20080109.1/root_overlay/var/lib/firefox-config/firefox/m7m1jk79.Default User/localstore.rdf	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+<RDF:RDF xmlns:NC="http://home.netscape.com/NC-rdf#"
+         xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+  <RDF:Description RDF:about="chrome://mozapps/content/extensions/extensions.xul#viewGroup"
+                   last-selected="extensions" />
+  <RDF:Description RDF:about="chrome://browser/content/browser.xul#PersonalToolbar"
+                   collapsed="true" />
+  <RDF:Description RDF:about="chrome://browser/content/sanitize.xul">
+    <NC:persist RDF:resource="chrome://browser/content/sanitize.xul#SanitizeDialog"/>
+  </RDF:Description>
+  <RDF:Description RDF:about="chrome://mozapps/content/extensions/extensions.xul#extensions-view"
+                   selected="true"
+                   last-selected="urn:mozilla:item:{73a6fe31-595d-460b-a920-fcc0f8843232}" />
+  <RDF:Description RDF:about="chrome://browser/content/browser.xul#statusbar-QLS"
+                   hidden="false" />
+  <RDF:Description RDF:about="chrome://browser/content/preferences/connection.xul#ConnectionsDialog"
+                   screenX="33"
+                   screenY="20" />
+  <RDF:Description RDF:about="chrome://browser/content/browser.xul">
+    <NC:persist RDF:resource="chrome://browser/content/browser.xul#main-window"/>
+    <NC:persist RDF:resource="chrome://browser/content/browser.xul#sidebar-box"/>
+    <NC:persist RDF:resource="chrome://browser/content/browser.xul#sidebar-title"/>
+    <NC:persist RDF:resource="chrome://browser/content/browser.xul#statusbar-QLS"/>
+    <NC:persist RDF:resource="chrome://browser/content/browser.xul#nav-bar"/>
+    <NC:persist RDF:resource="chrome://browser/content/browser.xul#PersonalToolbar"/>
+  </RDF:Description>
+  <RDF:Description RDF:about="chrome://browser/content/preferences/preferences.xul">
+    <NC:persist RDF:resource="chrome://browser/content/preferences/preferences.xul#BrowserPreferences"/>
+  </RDF:Description>
+  <RDF:Description RDF:about="chrome://browser/content/browser.xul#sidebar-title"
+                   value="" />
+  <RDF:Description RDF:about="chrome://browser/content/preferences/connection.xul">
+    <NC:persist RDF:resource="chrome://browser/content/preferences/connection.xul#ConnectionsDialog"/>
+  </RDF:Description>
+  <RDF:Description RDF:about="chrome://browser/content/preferences/preferences.xul#BrowserPreferences"
+                   screenX="659"
+                   screenY="352"
+                   lastSelected="paneAdvanced" />
+  <RDF:Description RDF:about="chrome://browser/content/sanitize.xul#SanitizeDialog"
+                   screenX="80"
+                   screenY="131" />
+  <RDF:Description RDF:about="chrome://browser/content/browser.xul#nav-bar"
+                   currentset="back-button,forward-button,reload-button,stop-button,home-button,urlbar-container,search-container,abp-toolbarbutton" />
+  <RDF:Description RDF:about="chrome://browser/content/browser.xul#sidebar-box"
+                   sidebarcommand=""
+                   width=""
+                   src="" />
+  <RDF:Description RDF:about="chrome://mozapps/content/extensions/extensions.xul#extensionsManager"
+                   width="520"
+                   height="380"
+                   sizemode="normal"
+                   screenX="0"
+                   screenY="796" />
+  <RDF:Description RDF:about="chrome://browser/content/browser.xul#main-window"
+                   width="994"
+                   sizemode="normal"
+                   screenY="0"
+                   height="686"
+                   screenX="278" />
+  <RDF:Description RDF:about="chrome://mozapps/content/extensions/extensions.xul">
+    <NC:persist RDF:resource="chrome://mozapps/content/extensions/extensions.xul#extensionsManager"/>
+    <NC:persist RDF:resource="chrome://mozapps/content/extensions/extensions.xul#extensions-view"/>
+    <NC:persist RDF:resource="chrome://mozapps/content/extensions/extensions.xul#viewGroup"/>
+  </RDF:Description>
+</RDF:RDF>

Deleted: incognito/tags/20080109.1/root_overlay/var/lib/firefox-config/firefox/m7m1jk79.Default User/prefs.js
===================================================================
--- incognito/trunk/root_overlay/var/lib/firefox-config/firefox/m7m1jk79.Default User/prefs.js	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/root_overlay/var/lib/firefox-config/firefox/m7m1jk79.Default User/prefs.js	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,81 +0,0 @@
-# Mozilla User Preferences
-
-/* Do not edit this file.
- *
- * If you make changes to this file while the application is running,
- * the changes will be overwritten when the application exits.
- *
- * To make a manual change to preferences, you can visit the URL about:config
- * For more information, see http://www.mozilla.org/unix/customizing.html#prefs
- */
-
-user_pref("app.update.enabled", false);
-user_pref("app.update.autoInstallEnabled", false);
-user_pref("app.update.auto", false);
-user_pref("browser.cache.disk.capacity", 0);
-user_pref("browser.history_expire_days.mirror", 9);
-user_pref("browser.preferences.advanced.selectedTabIndex", 0);
-user_pref("browser.search.update", false);
-user_pref("browser.shell.checkDefaultBrowser", false);
-user_pref("browser.startup.homepage", "http://incognito.anonymityanywhere.com");
-user_pref("browser.startup.page", 0);
-
-/* Update the following two (2) versions when upgrading Firefox */
-user_pref("extensions.lastAppVersion", "2.0.0.11");
-user_pref("browser.startup.homepage_override.mstone", "rv:1.8.1.11");
-
-/* NoScript: prevent update page, notifications and auto-refresh */
-user_pref("noscript.temp", "");
-user_pref("noscript.version", "1.1.7.2");
-user_pref("noscript.notify", false);
-user_pref("noscript.autoReload", false);
-
-/* NoScript: no default white list, block all plugins */
-user_pref("capability.policy.maonoscript.javascript.enabled", "allAccess");
-user_pref("capability.policy.maonoscript.sites", "about:blank about:config about:credits about:neterror about:plugins chrome: resource:");
-user_pref("noscript.filterXExceptions", "");
-user_pref("noscript.forbidBookmarklets", true);
-user_pref("noscript.forbidFlash", true);
-user_pref("noscript.forbidPlugins", true);
-
-/* CookieSafe: reject all cookies per default, clear cookies on shutdown */
-user_pref("network.cookie.cookieBehavior", 2);
-user_pref("cookiesafe.clearCookies", true);
-
-/* AdBlock Plus */
-user_pref("extensions.adblockplus.checkedadblockinstalled", true);
-user_pref("extensions.adblockplus.checkedtoolbar", true);
-user_pref("extensions.adblockplus.showinstatusbar", true);
-user_pref("extensions.adblockplus.showintoolbar", false);
-user_pref("extensions.adblockplus.showsubscriptions", false);
-
-/* RefControl */
-user_pref("refcontrol.actions", "@DEFAULT=@FORGE");
-
-/* FireGPG: disable updates and welcome window */
-user_pref("extensions.firegpg.gpg_path", "gpg");
-user_pref("extensions.firegpg.gpg_version", "0.4.4");
-user_pref("extensions.firegpg.no_updates", true);
-
-/* Firefox: disable extension updates. */
-user_pref("extensions.update.enabled", false);
-user_pref("extensions.update.notifyUser", false);
-user_pref("network.cookie.prefsMigrated", true);
-
-/* Firefox: network performance improvements. */
-user_pref("network.http.keep-alive.timeout", 600);
-user_pref("network.http.max-persistent-connections-per-proxy", 16);
-user_pref("network.http.pipelining", true);
-user_pref("network.http.pipelining.maxrequests", 8);
-user_pref("network.http.proxy.pipelining", true);
-
-/* Firefox: HTTP/SOCKS proxies. */
-user_pref("network.proxy.http", "127.0.0.1");
-user_pref("network.proxy.http_port", 3128);
-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.ssl", "127.0.0.1");
-user_pref("network.proxy.ssl_port", 3128);
-user_pref("network.proxy.type", 1);
-

Copied: incognito/tags/20080109.1/root_overlay/var/lib/firefox-config/firefox/m7m1jk79.Default User/prefs.js (from rev 13298, incognito/trunk/root_overlay/var/lib/firefox-config/firefox/m7m1jk79.Default User/prefs.js)
===================================================================
--- incognito/tags/20080109.1/root_overlay/var/lib/firefox-config/firefox/m7m1jk79.Default User/prefs.js	                        (rev 0)
+++ incognito/tags/20080109.1/root_overlay/var/lib/firefox-config/firefox/m7m1jk79.Default User/prefs.js	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,92 @@
+# Mozilla User Preferences
+
+/* Do not edit this file.
+ *
+ * If you make changes to this file while the application is running,
+ * the changes will be overwritten when the application exits.
+ *
+ * To make a manual change to preferences, you can visit the URL about:config
+ * For more information, see http://www.mozilla.org/unix/customizing.html#prefs
+ */
+
+user_pref("app.update.enabled", false);
+user_pref("app.update.autoInstallEnabled", false);
+user_pref("app.update.auto", false);
+user_pref("browser.cache.disk.capacity", 0);
+user_pref("browser.history_expire_days", 0);
+user_pref("browser.history_expire_days.mirror", 0);
+user_pref("privacy.item.cookies", true);
+user_pref("privacy.sanitize.promptOnSanitize", false);
+user_pref("privacy.sanitize.sanitizeOnShutdown", true);
+user_pref("browser.preferences.advanced.selectedTabIndex", 0);
+user_pref("browser.search.update", false);
+user_pref("browser.shell.checkDefaultBrowser", false);
+user_pref("browser.startup.homepage", "http://incognito.anonymityanywhere.com");
+user_pref("browser.startup.page", 0);
+
+/* Update the following two (2) versions when upgrading Firefox */
+user_pref("extensions.lastAppVersion", "2.0.0.11");
+user_pref("browser.startup.homepage_override.mstone", "rv:1.8.1.11");
+
+/* Firefox: disable extension updates. */
+user_pref("extensions.update.enabled", false);
+user_pref("extensions.update.notifyUser", false);
+user_pref("network.cookie.prefsMigrated", true);
+
+/* Firefox: network performance improvements. */
+user_pref("network.http.keep-alive.timeout", 600);
+user_pref("network.http.max-persistent-connections-per-proxy", 16);
+user_pref("network.http.pipelining", true);
+user_pref("network.http.pipelining.maxrequests", 8);
+user_pref("network.http.proxy.pipelining", true);
+
+/* Firefox: HTTP/SOCKS proxies. */
+user_pref("network.proxy.http", "127.0.0.1");
+user_pref("network.proxy.http_port", 3128);
+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.ssl", "127.0.0.1");
+user_pref("network.proxy.ssl_port", 3128);
+user_pref("network.proxy.type", 1);
+user_pref("network.proxy.no_proxies_on", "localhost, 10.0.0.0/8,  172.16.0.0/12, 192.168.0.0/16,  127.0.0.0/9, 127.128.0.0/10");
+
+/* Firefox: fonts */
+user_pref("font.name.monospace.x-western", "Bitstream Vera Sans Mono");
+user_pref("font.name.sans-serif.x-western", "Bitstream Vera Sans");
+user_pref("font.name.serif.x-western", "Bitstream Vera Serif");
+
+/* NoScript: prevent update page, notifications and auto-refresh */
+user_pref("noscript.temp", "");
+user_pref("noscript.version", "1.3.1");
+user_pref("noscript.notify", false);
+user_pref("noscript.autoReload", false);
+
+/* NoScript: no default white list, block all plugins */
+user_pref("capability.policy.maonoscript.javascript.enabled", "allAccess");
+user_pref("capability.policy.maonoscript.sites", "about:blank about:config about:credits about:neterror about:plugins chrome: resource:");
+user_pref("noscript.filterXExceptions", "");
+user_pref("noscript.forbidBookmarklets", true);
+user_pref("noscript.forbidFlash", true);
+user_pref("noscript.forbidPlugins", true);
+user_pref("noscript.autoReaload", true);
+
+/* CS lite: reject all cookies per default, clear cookies on shutdown */
+user_pref("network.cookie.cookieBehavior", 2);
+user_pref("cookiesafe.globalSettings", 2);
+user_pref("cookiesafe.clearCookies", true);
+user_pref("cookiesafe.autoRefresh", true);
+
+/* AdBlock Plus */
+user_pref("extensions.adblockplus.checkedadblockinstalled", true);
+user_pref("extensions.adblockplus.showinstatusbar", false);
+user_pref("extensions.adblockplus.showintoolbar", true);
+user_pref("extensions.adblockplus.showsubscriptions", false);
+
+/* RefControl -- forge referer as destination domain */
+user_pref("refcontrol.actions", "@DEFAULT=@FORGE");
+
+/* FireGPG: disable updates and welcome window */
+user_pref("extensions.firegpg.gpg_path", "gpg");
+user_pref("extensions.firegpg.gpg_version", "0.4.8");
+user_pref("extensions.firegpg.no_updates", true);

Copied: incognito/tags/20080109.1/root_overlay/var/lib/firefox-config/firefox/m7m1jk79.Default User/searchplugins (from rev 13150, incognito/trunk/root_overlay/var/lib/firefox-config/firefox/m7m1jk79.Default User/searchplugins)

Deleted: incognito/tags/20080109.1/root_overlay/var/lib/iptables/rules-save
===================================================================
--- incognito/trunk/root_overlay/var/lib/iptables/rules-save	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/root_overlay/var/lib/iptables/rules-save	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,52 +0,0 @@
-# Generated by iptables-save v1.3.6 on Thu Dec 21 14:32:27 2006
-*filter
-:INPUT ACCEPT [333351:305303232]
-:FORWARD ACCEPT [0:0]
-:OUTPUT ACCEPT [829:62910]
-
-# Established connections are accepted
-[333804:328742263] -A OUTPUT -m state --state RELATED,ESTABLISHED -j ACCEPT 
-
-# Local networks should not go through Tor
-[0:0] -A OUTPUT -d 192.168.0.0/255.255.0.0 -j ACCEPT 
-[4309:147963] -A OUTPUT -d 10.0.0.0/255.0.0.0 -j ACCEPT 
-[3185:212487] -A OUTPUT -d 172.16.0.0/255.255.0.0 -j ACCEPT 
-[7680:500308] -A OUTPUT -d 127.0.0.0/255.0.0.0 -j ACCEPT 
-
-# Tor is allowed to do anything it wants to
-[587:35220] -A OUTPUT -m owner --uid-owner tor -j ACCEPT 
-
-# Reject remaining TCP traffic, which should have been redirected to Tor (see below)
-[0:0] -A OUTPUT -p tcp -j REJECT --reject-with icmp-port-unreachable 
-
-# Reject all UDP since we cannot anonymize it
-[0:0] -A OUTPUT -p udp -j REJECT --reject-with icmp-port-unreachable 
-
-COMMIT
-
-# Completed on Thu Dec 21 14:32:27 2006
-# Generated by iptables-save v1.3.6 on Thu Dec 21 14:32:27 2006
-*nat
-:PREROUTING ACCEPT [4337577:1351180165]
-:POSTROUTING ACCEPT [13134711:761547407]
-:OUTPUT ACCEPT [13096834:759280116]
-
-# Tor and polipo are allowed to do anything they want to
-[787:47220] -A OUTPUT -m owner --uid-owner tor -j RETURN 
-[787:47220] -A OUTPUT -m owner --uid-owner polipo -j RETURN 
-
-# Local networks should not go through Tor
-[0:0] -A OUTPUT -d 192.168.0.0/255.255.0.0 -j RETURN 
-[4216:131407] -A OUTPUT -d 10.0.0.0/255.0.0.0 -j RETURN 
-[3168:211467] -A OUTPUT -d 172.16.0.0/255.255.0.0 -j RETURN 
-[6710:440633] -A OUTPUT -d 127.0.0.0/255.128.0.0 -j RETURN 
-[0:0] -A OUTPUT -d 127.128.0.0/255.192.0.0 -j RETURN 
-
-# .onion mapped addresses
-[0:0] -A OUTPUT -d 127.192.0.0/255.192.0.0 -p tcp -m tcp -j DNAT --to-destination 127.0.0.1:9040
-
-# Redirect all remaining TCP to Tor
-[547:32820] -A OUTPUT -o ! lo -p tcp -m tcp --tcp-flags FIN,SYN,RST,ACK SYN -j DNAT --to-destination 127.0.0.1:9040 
-
-COMMIT
-# Completed on Thu Dec 21 14:32:27 2006

Copied: incognito/tags/20080109.1/root_overlay/var/lib/iptables/rules-save (from rev 13146, incognito/trunk/root_overlay/var/lib/iptables/rules-save)
===================================================================
--- incognito/tags/20080109.1/root_overlay/var/lib/iptables/rules-save	                        (rev 0)
+++ incognito/tags/20080109.1/root_overlay/var/lib/iptables/rules-save	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,45 @@
+# Generated by iptables-save v1.3.8 on Wed Jan 16 02:17:09 2008
+*filter
+:INPUT ACCEPT [0:0]
+:FORWARD ACCEPT [0:0]
+:OUTPUT ACCEPT [0:0]
+
+# Established connections are accepted
+[0:0] -A OUTPUT -m state --state RELATED,ESTABLISHED -j ACCEPT
+
+# Local networks should not go through Tor
+[0:0] -A OUTPUT -d 192.168.0.0/255.255.0.0 -j ACCEPT
+[0:0] -A OUTPUT -d 10.0.0.0/255.0.0.0 -j ACCEPT
+[0:0] -A OUTPUT -d 172.16.0.0/255.240.0.0 -j ACCEPT
+[0:0] -A OUTPUT -d 127.0.0.0/255.0.0.0 -j ACCEPT
+
+# Tor is allowed to do anything it wants to, everything else is dropped
+[0:0] -A OUTPUT -m owner --uid-owner tor -j ACCEPT
+[0:0] -A OUTPUT -j REJECT --reject-with icmp-port-unreachable
+
+COMMIT
+# Completed on Wed Jan 16 02:17:09 2008
+# Generated by iptables-save v1.3.8 on Wed Jan 16 02:17:09 2008
+*nat
+:PREROUTING ACCEPT [0:0]
+:POSTROUTING ACCEPT [0:0]
+:OUTPUT ACCEPT [0:0]
+
+# Local networks should not go through Tor
+[0:0] -A OUTPUT -d 192.168.0.0/255.255.0.0 -j RETURN
+[0:0] -A OUTPUT -d 10.0.0.0/255.0.0.0 -j RETURN
+[0:0] -A OUTPUT -d 172.16.0.0/255.240.0.0 -j RETURN
+[0:0] -A OUTPUT -d 127.0.0.0/255.128.0.0 -j RETURN
+[0:0] -A OUTPUT -d 127.128.0.0/255.192.0.0 -j RETURN
+
+# Tor is allowed to do anything it wants to
+[0:0] -A OUTPUT -m owner --uid-owner tor -j ACCEPT
+
+# .onion mapped addresses redirection to Tor
+[0:0] -A OUTPUT -d 127.192.0.0/255.192.0.0 -p tcp -m tcp -j DNAT --to-destination 127.0.0.1:9040
+
+# Redirect all remaining TCP traffic to Tor
+[0:0] -A OUTPUT -o ! lo -p tcp -m tcp --tcp-flags FIN,SYN,RST,ACK SYN -j DNAT --to-destination 127.0.0.1:9040
+
+COMMIT
+# Completed on Wed Jan 16 02:17:09 2008

Deleted: incognito/tags/20080109.1/root_overlay/var/lib/kdesession/bookmarks.xml
===================================================================
--- incognito/trunk/root_overlay/var/lib/kdesession/bookmarks.xml	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/root_overlay/var/lib/kdesession/bookmarks.xml	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE xbel>
-<xbel>
- <bookmark icon="favicons/www.torproject.org" href="https://www.torproject.org/" >
-  <title>Tor: anonymity online</title>
-  <info>
-   <metadata owner="http://www.kde.org" />
-  </info>
- </bookmark>
- <bookmark icon="www" href="http://www.patdouble.com" >
-  <title>__INCOGNITO__</title>
-  <info>
-   <metadata owner="http://www.kde.org" />
-  </info>
- </bookmark>
- <bookmark icon="www" href="http://wiki.noreply.org/noreply/TheOnionRouter" >
-  <title>TheOnionRouter - Noreply Wiki</title>
-  <info>
-   <metadata owner="http://www.kde.org" />
-  </info>
- </bookmark>
- <bookmark icon="favicons/anonymityanywhere.com_images_favicon" href="http://www.anonymityanywhere.com/" >
-  <title>anonymityanywhere.com - Home</title>
-  <info>
-   <metadata owner="http://www.kde.org" />
-  </info>
- </bookmark>
- <bookmark icon="favicons/anonymityanywhere.com_images_favicon" href="http://anonymityanywhere.com/index.php?option=com_content&amp;task=view&amp;id=13&amp;Itemid=32" >
-  <title>anonymityanywhere.com - Anonymity Health Check</title>
-  <info>
-   <metadata owner="http://www.kde.org" />
-  </info>
- </bookmark>
-</xbel>

Copied: incognito/tags/20080109.1/root_overlay/var/lib/kdesession/bookmarks.xml (from rev 13148, incognito/trunk/root_overlay/var/lib/kdesession/bookmarks.xml)
===================================================================
--- incognito/tags/20080109.1/root_overlay/var/lib/kdesession/bookmarks.xml	                        (rev 0)
+++ incognito/tags/20080109.1/root_overlay/var/lib/kdesession/bookmarks.xml	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xbel>
+<xbel>
+ <bookmark icon="favicons/www.torproject.org" href="https://www.torproject.org/" >
+  <title>Tor: anonymity online</title>
+  <info>
+   <metadata owner="http://www.kde.org" />
+  </info>
+ </bookmark>
+ <bookmark icon="favicons/incognito.anonymityanywhere.com" href="http://incognito.anonymityanywhere.com/" >
+  <title>__INCOGNITO__ Home</title>
+  <info>
+   <metadata owner="http://www.kde.org" />
+  </info>
+ </bookmark>
+ <bookmark icon="favicons/wiki.noreply.org" href="http://wiki.noreply.org/noreply/TheOnionRouter" >
+  <title>TheOnionRouter - Noreply Wiki</title>
+  <info>
+   <metadata owner="http://www.kde.org" />
+  </info>
+ </bookmark>
+ <bookmark icon="favicons/anonymityanywhere.com_images_favicon" href="http://www.anonymityanywhere.com/" >
+  <title>anonymityanywhere.com - Home</title>
+  <info>
+   <metadata owner="http://www.kde.org" />
+  </info>
+ </bookmark>
+ <bookmark icon="favicons/anonymityanywhere.com_images_favicon" href="http://anonymityanywhere.com/index.php?option=com_content&amp;task=view&amp;id=13&amp;Itemid=32" >
+  <title>anonymityanywhere.com - Anonymity Health Check</title>
+  <info>
+   <metadata owner="http://www.kde.org" />
+  </info>
+ </bookmark>
+</xbel>

Deleted: incognito/tags/20080109.1/root_overlay/var/lib/kdesession/emaildefaults
===================================================================
--- incognito/trunk/root_overlay/var/lib/kdesession/emaildefaults	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/root_overlay/var/lib/kdesession/emaildefaults	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,9 +0,0 @@
-[Defaults]
-Profile=Default
-
-[PROFILE_Default]
-EmailAddress=noreply at dev.null.com
-FullName=Incognito User
-Organization=
-ReplyAddr=
-ServerType=

Copied: incognito/tags/20080109.1/root_overlay/var/lib/kdesession/emaildefaults (from rev 13126, incognito/trunk/root_overlay/var/lib/kdesession/emaildefaults)
===================================================================
--- incognito/tags/20080109.1/root_overlay/var/lib/kdesession/emaildefaults	                        (rev 0)
+++ incognito/tags/20080109.1/root_overlay/var/lib/kdesession/emaildefaults	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,9 @@
+[Defaults]
+Profile=Default
+
+[PROFILE_Default]
+EmailAddress=noreply at dev.null.com
+FullName=Anonymous
+Organization=
+ReplyAddr=
+ServerType=

Deleted: incognito/tags/20080109.1/root_overlay/var/lib/kdesession/emailidentities
===================================================================
--- incognito/trunk/root_overlay/var/lib/kdesession/emailidentities	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/root_overlay/var/lib/kdesession/emailidentities	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,29 +0,0 @@
-[$Version]
-update_info=kmail.upd:3.3-move-identities-to-own-file,kmail.upd:3.3-aegypten-emailidentities-split-sign-encr-keys
-
-[General]
-Default Identity=1065877173
-
-[Identity #0]
-Bcc=
-Dictionary=<default>
-Drafts=drafts
-Email Address=noreply at dev.null.com
-Fcc=sent-mail
-Identity=Default
-Inline Signature=Sent from Incognito Live CD\nhttp://www.patdouble.com/incognito.html
-Name=Incognito User
-Organization=
-PGP Encryption Key=
-PGP Signing Key=
-Preferred Crypto Message Format=auto
-Reply-To Address=
-SMIME Encryption Key=
-SMIME Signing Key=
-Signature Type=inline
-Templates=templates
-Transport=
-VCardFile=
-X-Face=
-X-FaceEnabled=false
-uoid=1065877173

Copied: incognito/tags/20080109.1/root_overlay/var/lib/kdesession/emailidentities (from rev 13126, incognito/trunk/root_overlay/var/lib/kdesession/emailidentities)
===================================================================
--- incognito/tags/20080109.1/root_overlay/var/lib/kdesession/emailidentities	                        (rev 0)
+++ incognito/tags/20080109.1/root_overlay/var/lib/kdesession/emailidentities	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,29 @@
+[$Version]
+update_info=kmail.upd:3.3-move-identities-to-own-file,kmail.upd:3.3-aegypten-emailidentities-split-sign-encr-keys
+
+[General]
+Default Identity=1065877173
+
+[Identity #0]
+Bcc=
+Dictionary=<default>
+Drafts=drafts
+Email Address=noreply at dev.null.com
+Fcc=sent-mail
+Identity=Default
+Inline Signature=
+Name=Anonymous
+Organization=
+PGP Encryption Key=
+PGP Signing Key=
+Preferred Crypto Message Format=auto
+Reply-To Address=
+SMIME Encryption Key=
+SMIME Signing Key=
+Signature Type=disabled
+Templates=templates
+Transport=
+VCardFile=
+X-Face=
+X-FaceEnabled=false
+uoid=1065877173

Deleted: incognito/tags/20080109.1/root_overlay/var/lib/kdesession/kickerrc
===================================================================
--- incognito/trunk/root_overlay/var/lib/kdesession/kickerrc	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/root_overlay/var/lib/kdesession/kickerrc	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,54 +0,0 @@
-[$Version]
-update_info=kickerrc.upd:kde_3_1_sizeChanges,kickerrc.upd:kde_3_4_reverseLayout,kickerrc.upd:kde_3_5_kconfigXTize
-
-[Applet_1]
-ConfigFile=minipager_panelapplet_snponqz9ku6vohoeqdkv_rc
-DesktopFile=minipagerapplet.desktop
-FreeSpace2=0
-WidthForHeightHint=71
-
-[Applet_2]
-ConfigFile=taskbar_panelapplet_xkvdjdnklc8bzvnmlmtg_rc
-DesktopFile=taskbarapplet.desktop
-FreeSpace2=0
-WidthForHeightHint=210
-
-[Applet_3]
-ConfigFile=systemtray_panelappletrc
-DesktopFile=systemtrayapplet.desktop
-FreeSpace2=1
-WidthForHeightHint=108
-
-[Applet_4]
-ConfigFile=clock_panelapplet_fxbdeyp2jxvhipib2djl_rc
-DesktopFile=clockapplet.desktop
-FreeSpace2=1
-WidthForHeightHint=77
-
-[General]
-Applets2=KMenuButton_1,ServiceButton_1,ServiceButton_3,ServiceButton_2,Applet_1,Applet_2,Applet_3,Applet_4
-IExist=true
-UntrustedApplets=
-UntrustedExtensions=
-
-[KMenuButton_1]
-FreeSpace2=0
-
-[ServiceButton_1]
-DesktopFile=/usr/kde/3.5/share/applications/kde/Home.desktop
-FreeSpace2=0
-StorageId=kde-Home.desktop
-
-[ServiceButton_2]
-DesktopFile=/usr/kde/3.5/share/applications/kde/konqbrowser.desktop
-FreeSpace2=0
-StorageId=kde-konqbrowser.desktop
-
-[ServiceButton_3]
-DesktopFile=/usr/share/applications/mozilla-firefox-bin.desktop
-FreeSpace2=0
-StorageId=mozilla-firefox-bin.desktop
-
-[menus]
-MenuEntryFormat=DescriptionAndName
-

Copied: incognito/tags/20080109.1/root_overlay/var/lib/kdesession/kickerrc (from rev 13115, incognito/trunk/root_overlay/var/lib/kdesession/kickerrc)
===================================================================
--- incognito/tags/20080109.1/root_overlay/var/lib/kdesession/kickerrc	                        (rev 0)
+++ incognito/tags/20080109.1/root_overlay/var/lib/kdesession/kickerrc	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,55 @@
+[$Version]
+update_info=kickerrc.upd:kde_3_1_sizeChanges,kickerrc.upd:kde_3_4_reverseLayout,kickerrc.upd:kde_3_5_kconfigXTize
+
+[Applet_1]
+ConfigFile=minipager_panelapplet_snponqz9ku6vohoeqdkv_rc
+DesktopFile=minipagerapplet.desktop
+FreeSpace2=0
+WidthForHeightHint=71
+
+[Applet_2]
+ConfigFile=taskbar_panelapplet_xkvdjdnklc8bzvnmlmtg_rc
+DesktopFile=taskbarapplet.desktop
+FreeSpace2=0
+WidthForHeightHint=210
+
+[Applet_3]
+ConfigFile=systemtray_panelappletrc
+DesktopFile=systemtrayapplet.desktop
+FreeSpace2=1
+WidthForHeightHint=108
+
+[Applet_4]
+ConfigFile=clock_panelapplet_fxbdeyp2jxvhipib2djl_rc
+DesktopFile=clockapplet.desktop
+FreeSpace2=1
+WidthForHeightHint=77
+
+[General]
+Applets2=KMenuButton_1,ServiceButton_1,ServiceButton_3,ServiceButton_2,Applet_1,Applet_2,Applet_3,Applet_4
+IExist=true
+Locked=true
+UntrustedApplets=
+UntrustedExtensions=
+
+[KMenuButton_1]
+FreeSpace2=0
+
+[ServiceButton_1]
+DesktopFile=/usr/kde/3.5/share/applications/kde/Home.desktop
+FreeSpace2=0
+StorageId=kde-Home.desktop
+
+[ServiceButton_2]
+DesktopFile=/usr/kde/3.5/share/applications/kde/konqbrowser.desktop
+FreeSpace2=0
+StorageId=kde-konqbrowser.desktop
+
+[ServiceButton_3]
+DesktopFile=/usr/share/applications/mozilla-firefox-bin.desktop
+FreeSpace2=0
+StorageId=mozilla-firefox-bin.desktop
+
+[menus]
+MenuEntryFormat=DescriptionAndName
+

Deleted: incognito/tags/20080109.1/root_overlay/var/lib/kdesession/kioslaverc
===================================================================
--- incognito/trunk/root_overlay/var/lib/kdesession/kioslaverc	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/root_overlay/var/lib/kdesession/kioslaverc	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,8 +0,0 @@
-AutoResume=true
-PersistentProxyConnection=true
-
-[Proxy Settings]
-NoProxyFor=127.0.0.1,localhost,10.0.0.0,192.168.0.0,172.16.0.0
-ProxyType=1
-httpProxy=http://127.0.0.1:3128
-httpsProxy=http://127.0.0.1:3128

Copied: incognito/tags/20080109.1/root_overlay/var/lib/kdesession/kioslaverc (from rev 13148, incognito/trunk/root_overlay/var/lib/kdesession/kioslaverc)
===================================================================
--- incognito/tags/20080109.1/root_overlay/var/lib/kdesession/kioslaverc	                        (rev 0)
+++ incognito/tags/20080109.1/root_overlay/var/lib/kdesession/kioslaverc	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,8 @@
+AutoResume=true
+PersistentProxyConnection=true
+
+[Proxy Settings]
+NoProxyFor=127.0.0.1,localhost
+ProxyType=1
+httpProxy=http://127.0.0.1:3128
+httpsProxy=http://127.0.0.1:3128

Deleted: incognito/tags/20080109.1/root_overlay/var/lib/kdesession/konquerorrc
===================================================================
--- incognito/trunk/root_overlay/var/lib/kdesession/konquerorrc	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/root_overlay/var/lib/kdesession/konquerorrc	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,29 +0,0 @@
-[$Version]
-update_info=kfmclient_3_2.upd:kfmclient_3_2
-
-[Java/JavaScript Settings]
-EnableJava=false
-EnableJavaScript=false
-EnablePlugins=false
-
-[KonqMainWindow Toolbar Speech Toolbar]
-IconText=IconOnly
-Index=3
-
-[KonqMainWindow Toolbar bookmarkToolBar]
-IconText=IconTextRight
-Index=2
-
-[KonqMainWindow Toolbar extraToolBar]
-Hidden=false
-IconText=IconOnly
-Index=0
-Offset=185
-Position=Bottom
-
-[KonqMainWindow Toolbar locationToolBar]
-IconText=IconOnly
-Index=1
-
-[KonqMainWindow Toolbar mainToolBar]
-Index=0

Copied: incognito/tags/20080109.1/root_overlay/var/lib/kdesession/konquerorrc (from rev 13148, incognito/trunk/root_overlay/var/lib/kdesession/konquerorrc)
===================================================================
--- incognito/tags/20080109.1/root_overlay/var/lib/kdesession/konquerorrc	                        (rev 0)
+++ incognito/tags/20080109.1/root_overlay/var/lib/kdesession/konquerorrc	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,33 @@
+[$Version]
+update_info=kfmclient_3_2.upd:kfmclient_3_2
+
+[Java/JavaScript Settings]
+EnableJava=false
+EnableJavaScript=false
+EnablePlugins=false
+
+[KonqMainWindow Toolbar Speech Toolbar]
+IconText=IconOnly
+Index=3
+
+[KonqMainWindow Toolbar]
+IconText=IconTextRight
+Index=2
+
+[KonqMainWindow Toolbar bookmarkToolBar]
+IconText=IconTextRight
+Index=2
+
+[KonqMainWindow Toolbar extraToolBar]
+Hidden=false
+IconText=IconOnly
+Index=0
+Offset=185
+Position=Bottom
+
+[KonqMainWindow Toolbar locationToolBar]
+IconText=IconOnly
+Index=1
+
+[KonqMainWindow Toolbar mainToolBar]
+Index=0

Deleted: incognito/tags/20080109.1/root_overlay/var/lib/kdesession/ksmserverrc
===================================================================
--- incognito/trunk/root_overlay/var/lib/kdesession/ksmserverrc	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/root_overlay/var/lib/kdesession/ksmserverrc	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,23 +0,0 @@
-[$Version]
-update_info=ksmserver.upd:kde3
-
-[General]
-screenCount=1
-
-[LegacySession: saved at previous logout]
-count=0
-
-[Session: saved at previous logout]
-clientId1=10cfcd7665000116774249400000243640000
-clientId2=10cfcd7665000116774324900000243640016
-count=2
-discardCommand1=rm,$HOME/.kde3.5/share/config/session/kwin_10cfcd7665000116774249400000243640000_1167743318_293752
-discardCommand2=rm,$HOME/.kde3.5/share/config/session/tork_10cfcd7665000116774324900000243640016_1167743318_223267
-program1=kwin
-program2=tork
-restartCommand1=kwin,-session,10cfcd7665000116774249400000243640000_1167743318_293752
-restartCommand2=tork,-session,10cfcd7665000116774324900000243640016_1167743318_223267
-restartStyleHint1=0
-restartStyleHint2=0
-userId1=_USER_
-userId2=_USER_

Copied: incognito/tags/20080109.1/root_overlay/var/lib/kdesession/ksmserverrc (from rev 13170, incognito/trunk/root_overlay/var/lib/kdesession/ksmserverrc)
===================================================================
--- incognito/tags/20080109.1/root_overlay/var/lib/kdesession/ksmserverrc	                        (rev 0)
+++ incognito/tags/20080109.1/root_overlay/var/lib/kdesession/ksmserverrc	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,24 @@
+[$Version]
+update_info=ksmserver.upd:kde3
+
+[General]
+screenCount=1
+excludeApps=knetworkmanager
+
+[LegacySession: saved at previous logout]
+count=0
+
+[Session: saved at previous logout]
+clientId1=10cfcd7665000116774249400000243640000
+clientId2=10cfcd7665000116774324900000243640016
+count=2
+discardCommand1=rm,$HOME/.kde3.5/share/config/session/kwin_10cfcd7665000116774249400000243640000_1167743318_293752
+discardCommand2=rm,$HOME/.kde3.5/share/config/session/tork_10cfcd7665000116774324900000243640016_1167743318_223267
+program1=kwin
+program2=tork
+restartCommand1=kwin,-session,10cfcd7665000116774249400000243640000_1167743318_293752
+restartCommand2=tork,-session,10cfcd7665000116774324900000243640016_1167743318_223267
+restartStyleHint1=0
+restartStyleHint2=0
+userId1=_USER_
+userId2=_USER_

Copied: incognito/tags/20080109.1/root_overlay/var/lib/kdesession/ksynapticsrc (from rev 13125, incognito/trunk/root_overlay/var/lib/kdesession/ksynapticsrc)
===================================================================
--- incognito/tags/20080109.1/root_overlay/var/lib/kdesession/ksynapticsrc	                        (rev 0)
+++ incognito/tags/20080109.1/root_overlay/var/lib/kdesession/ksynapticsrc	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,6 @@
+[General]
+EnableDocking=true
+
+[Scrolling]
+EnableEdgeMotion=false
+EnableHorizontalScrolling=false

Deleted: incognito/tags/20080109.1/root_overlay/var/lib/kdesession/session/tork_10cfcd7665000116774324900000243640016_1167743318_223267
===================================================================
--- incognito/trunk/root_overlay/var/lib/kdesession/session/tork_10cfcd7665000116774324900000243640016_1167743318_223267	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/root_overlay/var/lib/kdesession/session/tork_10cfcd7665000116774324900000243640016_1167743318_223267	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,15 +0,0 @@
-[Number]
-NumberOfWindows=1
-
-[TorK Toolbar style]
-Index=0
-
-[TorK TorToolBar Toolbar style]
-IconText=IconOnly
-Index=1
-
-[WindowProperties1]
-ClassName=tork
-Height 768=628
-ObjectName=TorK
-Width 1024=752

Copied: incognito/tags/20080109.1/root_overlay/var/lib/kdesession/session/tork_10cfcd7665000116774324900000243640016_1167743318_223267 (from rev 13170, incognito/trunk/root_overlay/var/lib/kdesession/session/tork_10cfcd7665000116774324900000243640016_1167743318_223267)
===================================================================
--- incognito/tags/20080109.1/root_overlay/var/lib/kdesession/session/tork_10cfcd7665000116774324900000243640016_1167743318_223267	                        (rev 0)
+++ incognito/tags/20080109.1/root_overlay/var/lib/kdesession/session/tork_10cfcd7665000116774324900000243640016_1167743318_223267	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,15 @@
+[Number]
+NumberOfWindows=1
+
+[TorK Toolbar style]
+Index=0
+
+[TorK TorToolBar Toolbar style]
+IconText=IconOnly
+Index=1
+
+[WindowProperties1]
+ClassName=tork
+Height 768=628
+ObjectName=TorK
+Width 1024=752

Deleted: incognito/tags/20080109.1/root_overlay/var/lib/kdesession/torkrc
===================================================================
--- incognito/trunk/root_overlay/var/lib/kdesession/torkrc	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/root_overlay/var/lib/kdesession/torkrc	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,87 +0,0 @@
-[FirewallsProxies]
-ReachableAddresses=
-
-[LikeBack]
-emailAddress=
-emailAlreadyAsked=false
-
-[MainWindow]
-Height 768=646
-Width 1024=752
-
-[MainWindow Toolbar TorToolBar]
-IconText=IconOnly
-Index=1
-
-[MainWindow Toolbar mainToolBar]
-Index=0
-
-[MyHiddenServices]
-HiddenServices=
-
-[MyServer]
-ContactInfo=noreply at dev.null.com
-ExitPolicy=
-NickName=TorKServer
-
-[Notification Messages]
-LikeBack_starting_information=false
-
-[RunningNormal]
-DataDirectory=/var/lib/tor/
-User=gentoo
-
-[RunningSpecial]
-ClientOnly=true
-
-[ServerPerformance]
-AccountingStart=day
-
-[Servers]
-MapAddress=
-
-[TipOfDay]
-TipLastShown=
-
-[TorKOSD Position]
-Position=1000,700
-Screen=0
-
-[UsedDirectly]
-ApplySettingsToInstance=true
-CurrentEntryNodes=
-CurrentExcludeNodes=
-CurrentExitNodes=
-KDEUsesTor=true
-KonqHttpProxyPort=3128
-KonqHttpsProxyPort=3128
-KonqFtpProxy=http://localhost
-KonqFtpProxyPort=8118
-LogNonTorTraffic=true
-LogTorTraffic=true
-OriginalCookies=false
-OriginalEnableJava=false
-OriginalEnableJavascript=false
-OriginalEnablePlugins=false
-OriginalFtpProxy=
-OriginalHttpProxy=http://127.0.0.1:3128
-OriginalHttpsProxy=http://127.0.0.1:3128
-OriginalProxyType=1
-QuickConfigure=6
-ShowApplySettingsQuestions=false
-ShowDNSLeaks=false
-ShowTorMon=true
-ShowUsageWarnings=false
-SystemProxy=true
-TorLocation=/usr/bin/tor
-TorkProxy=false
-serversHistory=
-
-[UsingTor]
-SOCKSBindAddressMany=
-SOCKSPolicy=
-
-[Usability]
-CookieAuthentication=true
-User=gentoo
-

Copied: incognito/tags/20080109.1/root_overlay/var/lib/kdesession/torkrc (from rev 13144, incognito/trunk/root_overlay/var/lib/kdesession/torkrc)
===================================================================
--- incognito/tags/20080109.1/root_overlay/var/lib/kdesession/torkrc	                        (rev 0)
+++ incognito/tags/20080109.1/root_overlay/var/lib/kdesession/torkrc	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,87 @@
+[FirewallsProxies]
+ReachableAddresses=
+
+[LikeBack]
+emailAddress=
+emailAlreadyAsked=false
+
+[MainWindow]
+Height 768=646
+Width 1024=752
+
+[MainWindow Toolbar TorToolBar]
+IconText=IconOnly
+Index=1
+
+[MainWindow Toolbar mainToolBar]
+Index=0
+
+[MyHiddenServices]
+HiddenServices=
+
+[MyServer]
+ContactInfo=noreply at dev.null.com
+ExitPolicy=
+NickName=TorKServer
+
+[Notification Messages]
+LikeBack_starting_information=false
+
+[RunningNormal]
+DataDirectory=/var/lib/tor/
+User=gentoo
+
+[RunningSpecial]
+ClientOnly=true
+
+[ServerPerformance]
+AccountingStart=day
+
+[Servers]
+MapAddress=
+
+[TipOfDay]
+TipLastShown=
+
+[TorKOSD Position]
+Position=1000,700
+Screen=0
+
+[UsedDirectly]
+ApplySettingsToInstance=true
+CurrentEntryNodes=
+CurrentExcludeNodes=
+CurrentExitNodes=
+KDEUsesTor=true
+KonqHttpProxyPort=3128
+KonqHttpsProxyPort=3128
+KonqFtpProxy=http://localhost
+KonqFtpProxyPort=8118
+LogNonTorTraffic=true
+LogTorTraffic=true
+OriginalCookies=false
+OriginalEnableJava=false
+OriginalEnableJavascript=false
+OriginalEnablePlugins=false
+OriginalFtpProxy=
+OriginalHttpProxy=http://127.0.0.1:3128
+OriginalHttpsProxy=http://127.0.0.1:3128
+OriginalProxyType=1
+QuickConfigure=6
+ShowApplySettingsQuestions=false
+ShowDNSLeaks=false
+ShowTorMon=false
+ShowUsageWarnings=false
+SystemProxy=true
+TorLocation=/usr/bin/tor
+TorkProxy=false
+serversHistory=
+
+[UsingTor]
+SOCKSBindAddressMany=
+SOCKSPolicy=
+
+[Usability]
+CookieAuthentication=true
+User=gentoo
+

Deleted: incognito/tags/20080109.1/root_overlay/var/lib/thunderbird-config/qmuzmhh7.default/prefs.js
===================================================================
--- incognito/trunk/root_overlay/var/lib/thunderbird-config/qmuzmhh7.default/prefs.js	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/root_overlay/var/lib/thunderbird-config/qmuzmhh7.default/prefs.js	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,109 +0,0 @@
-# Mozilla User Preferences
-
-/* Do not edit this file.
- *
- * If you make changes to this file while the application is running,
- * the changes will be overwritten when the application exits.
- *
- * To make a manual change to preferences, you can visit the URL about:config
- * For more information, see http://www.mozilla.org/unix/customizing.html#prefs
- */
-
-user_pref("app.update.auto", false);
-user_pref("app.update.lastUpdateTime.addon-background-update-timer", 1182197646);
-user_pref("app.update.lastUpdateTime.background-update-timer", 1182197642);
-user_pref("app.update.lastUpdateTime.blocklist-background-update-timer", 1182197646);
-user_pref("extensions.lastAppVersion", "2.0.0.6");
-user_pref("extensions.update.enabled", false);
-user_pref("ldap_2.servers.default.filename", "default.mab");
-user_pref("ldap_2.servers.default.replication.lastChangeNumber", 0);
-user_pref("ldap_2.servers.default.uri", "moz-abldapdirectory://default.mab");
-user_pref("ldap_2.servers.history.replication.lastChangeNumber", 0);
-user_pref("ldap_2.servers.pab.replication.lastChangeNumber", 0);
-user_pref("mail.account.account1.server", "server1");
-user_pref("mail.account.account2.identities", "id1");
-user_pref("mail.account.account2.server", "server2");
-user_pref("mail.accountmanager.accounts", "account1,account2");
-user_pref("mail.accountmanager.defaultaccount", "account2");
-user_pref("mail.accountmanager.localfoldersserver", "server1");
-user_pref("mail.attachment.store.version", 1);
-user_pref("mail.folder.views.version", 1);
-user_pref("mail.identity.id1.compose_html", false);
-user_pref("mail.identity.id1.doBcc", false);
-user_pref("mail.identity.id1.doBccList", "");
-user_pref("mail.identity.id1.draft_folder", "mailbox://nobody@Local%20Folders/Drafts");
-user_pref("mail.identity.id1.drafts_folder_picker_mode", "0");
-user_pref("mail.identity.id1.fcc", false);
-user_pref("mail.identity.id1.fcc_folder", "mailbox://nobody@Local%20Folders/Sent");
-user_pref("mail.identity.id1.fcc_folder_picker_mode", "0");
-user_pref("mail.identity.id1.fullName", "Incognito Live CD User");
-user_pref("mail.identity.id1.smtpServer", "smtp1");
-user_pref("mail.identity.id1.stationery_folder", "mailbox://nobody@Local%20Folders/Templates");
-user_pref("mail.identity.id1.tmpl_folder_picker_mode", "0");
-user_pref("mail.identity.id1.useremail", "noreply at dev.null.com");
-user_pref("mail.identity.id1.valid", true);
-user_pref("mail.preferences.advanced.selectedTabIndex", 3);
-user_pref("mail.preferences.compose.selectedTabIndex", 0);
-user_pref("mail.preferences.display.selectedTabIndex", 0);
-user_pref("mail.root.none", "/home/gentoo/.thunderbird/qmuzmhh7.default/Mail");
-user_pref("mail.root.none-rel", "[ProfD]Mail");
-user_pref("mail.root.pop3", "/home/gentoo/.thunderbird/qmuzmhh7.default/Mail");
-user_pref("mail.root.pop3-rel", "[ProfD]Mail");
-user_pref("mail.server.server1.ageLimit", 30);
-user_pref("mail.server.server1.daysToKeepBodies", 30);
-user_pref("mail.server.server1.daysToKeepHdrs", 30);
-user_pref("mail.server.server1.directory", "/home/gentoo/.thunderbird/qmuzmhh7.default/Mail/Local Folders");
-user_pref("mail.server.server1.directory-rel", "[ProfD]Mail/Local Folders");
-user_pref("mail.server.server1.hostname", "Local Folders");
-user_pref("mail.server.server1.name", "Local Folders");
-user_pref("mail.server.server1.numHdrsToKeep", 30);
-user_pref("mail.server.server1.type", "none");
-user_pref("mail.server.server1.userName", "nobody");
-user_pref("mail.server.server2.ageLimit", 30);
-user_pref("mail.server.server2.check_new_mail", false);
-user_pref("mail.server.server2.daysToKeepBodies", 30);
-user_pref("mail.server.server2.daysToKeepHdrs", 30);
-user_pref("mail.server.server2.defer_get_new_mail", true);
-user_pref("mail.server.server2.deferred_to_account", "account1");
-user_pref("mail.server.server2.directory", "/home/gentoo/.thunderbird/qmuzmhh7.default/Mail/localhost");
-user_pref("mail.server.server2.directory-rel", "[ProfD]Mail/localhost");
-user_pref("mail.server.server2.hostname", "localhost");
-user_pref("mail.server.server2.name", "noreply at dev.null.com");
-user_pref("mail.server.server2.numHdrsToKeep", 30);
-user_pref("mail.server.server2.type", "pop3");
-user_pref("mail.server.server2.userName", "incognito");
-user_pref("mail.shell.checkDefaultClient", false);
-user_pref("mail.smtp.defaultserver", "smtp1");
-user_pref("mail.smtpserver.smtp1.auth_method", 0);
-user_pref("mail.smtpserver.smtp1.description", "Mixminion SMTP");
-user_pref("mail.smtpserver.smtp1.hostname", "localhost");
-user_pref("mail.smtpserver.smtp1.port", 8026);
-user_pref("mail.smtpserver.smtp1.try_ssl", 0);
-user_pref("mail.smtpserver.smtp1.username", "");
-user_pref("mail.smtpservers", "smtp1");
-user_pref("mail.spam.version", 1);
-user_pref("mail.startup.enabledMailCheckOnce", true);
-user_pref("mailnews.headers.extraExpandedHeaders", "x-enigmail-version content-transfer-encoding openpgp x-mimeole x-bugzilla-reason x-php-bug list-post");
-user_pref("mailnews.quotingPrefs.version", 1);
-user_pref("mailnews.start_page.enabled", false);
-user_pref("mailnews.start_page_override.mstone", "1.8.1.6");
-user_pref("mailnews.tags.$label1.color", "#FF0000");
-user_pref("mailnews.tags.$label1.tag", "Important");
-user_pref("mailnews.tags.$label2.color", "#FF9900");
-user_pref("mailnews.tags.$label2.tag", "Work");
-user_pref("mailnews.tags.$label3.color", "#009900");
-user_pref("mailnews.tags.$label3.tag", "Personal");
-user_pref("mailnews.tags.$label4.color", "#3333FF");
-user_pref("mailnews.tags.$label4.tag", "To Do");
-user_pref("mailnews.tags.$label5.color", "#993399");
-user_pref("mailnews.tags.$label5.tag", "Later");
-user_pref("mailnews.tags.version", 2);
-user_pref("mailnews.ui.threadpane.version", 5);
-user_pref("network.proxy.http", "127.0.0.1");
-user_pref("network.proxy.http_port", 3128);
-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.ssl", "127.0.0.1");
-user_pref("network.proxy.ssl_port", 3128);
-user_pref("network.proxy.type", 1);

Copied: incognito/tags/20080109.1/root_overlay/var/lib/thunderbird-config/qmuzmhh7.default/prefs.js (from rev 13115, incognito/trunk/root_overlay/var/lib/thunderbird-config/qmuzmhh7.default/prefs.js)
===================================================================
--- incognito/tags/20080109.1/root_overlay/var/lib/thunderbird-config/qmuzmhh7.default/prefs.js	                        (rev 0)
+++ incognito/tags/20080109.1/root_overlay/var/lib/thunderbird-config/qmuzmhh7.default/prefs.js	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,112 @@
+# Mozilla User Preferences
+
+/* Do not edit this file.
+ *
+ * If you make changes to this file while the application is running,
+ * the changes will be overwritten when the application exits.
+ *
+ * To make a manual change to preferences, you can visit the URL about:config
+ * For more information, see http://www.mozilla.org/unix/customizing.html#prefs
+ */
+
+user_pref("app.update.auto", false);
+user_pref("app.update.lastUpdateTime.addon-background-update-timer", 1182197646);
+user_pref("app.update.lastUpdateTime.background-update-timer", 1182197642);
+user_pref("app.update.lastUpdateTime.blocklist-background-update-timer", 1182197646);
+user_pref("extensions.lastAppVersion", "2.0.0.9");
+user_pref("extensions.update.enabled", false);
+user_pref("ldap_2.servers.default.filename", "default.mab");
+user_pref("ldap_2.servers.default.replication.lastChangeNumber", 0);
+user_pref("ldap_2.servers.default.uri", "moz-abldapdirectory://default.mab");
+user_pref("ldap_2.servers.history.replication.lastChangeNumber", 0);
+user_pref("ldap_2.servers.pab.replication.lastChangeNumber", 0);
+user_pref("mail.account.account1.server", "server1");
+user_pref("mail.account.account2.identities", "id1");
+user_pref("mail.account.account2.server", "server2");
+user_pref("mail.accountmanager.accounts", "account1,account2");
+user_pref("mail.accountmanager.defaultaccount", "account2");
+user_pref("mail.accountmanager.localfoldersserver", "server1");
+user_pref("mail.attachment.store.version", 1);
+user_pref("mail.folder.views.version", 1);
+user_pref("mail.identity.id1.compose_html", false);
+user_pref("mail.identity.id1.doBcc", false);
+user_pref("mail.identity.id1.doBccList", "");
+user_pref("mail.identity.id1.draft_folder", "mailbox://nobody@Local%20Folders/Drafts");
+user_pref("mail.identity.id1.drafts_folder_picker_mode", "0");
+user_pref("mail.identity.id1.fcc", false);
+user_pref("mail.identity.id1.fcc_folder", "mailbox://nobody@Local%20Folders/Sent");
+user_pref("mail.identity.id1.fcc_folder_picker_mode", "0");
+user_pref("mail.identity.id1.fullName", "Anonymous");
+user_pref("mail.identity.id1.smtpServer", "smtp1");
+user_pref("mail.identity.id1.stationery_folder", "mailbox://nobody@Local%20Folders/Templates");
+user_pref("mail.identity.id1.tmpl_folder_picker_mode", "0");
+user_pref("mail.identity.id1.useremail", "noreply at dev.null.com");
+user_pref("mail.identity.id1.valid", true);
+user_pref("mail.preferences.advanced.selectedTabIndex", 3);
+user_pref("mail.preferences.compose.selectedTabIndex", 0);
+user_pref("mail.preferences.display.selectedTabIndex", 0);
+user_pref("mail.root.none", "/home/gentoo/.thunderbird/qmuzmhh7.default/Mail");
+user_pref("mail.root.none-rel", "[ProfD]Mail");
+user_pref("mail.root.pop3", "/home/gentoo/.thunderbird/qmuzmhh7.default/Mail");
+user_pref("mail.root.pop3-rel", "[ProfD]Mail");
+user_pref("mail.server.server1.ageLimit", 30);
+user_pref("mail.server.server1.daysToKeepBodies", 30);
+user_pref("mail.server.server1.daysToKeepHdrs", 30);
+user_pref("mail.server.server1.directory", "/home/gentoo/.thunderbird/qmuzmhh7.default/Mail/Local Folders");
+user_pref("mail.server.server1.directory-rel", "[ProfD]Mail/Local Folders");
+user_pref("mail.server.server1.hostname", "Local Folders");
+user_pref("mail.server.server1.name", "Local Folders");
+user_pref("mail.server.server1.numHdrsToKeep", 30);
+user_pref("mail.server.server1.type", "none");
+user_pref("mail.server.server1.userName", "nobody");
+user_pref("mail.server.server2.ageLimit", 30);
+user_pref("mail.server.server2.check_new_mail", false);
+user_pref("mail.server.server2.daysToKeepBodies", 30);
+user_pref("mail.server.server2.daysToKeepHdrs", 30);
+user_pref("mail.server.server2.defer_get_new_mail", true);
+user_pref("mail.server.server2.deferred_to_account", "account1");
+user_pref("mail.server.server2.directory", "/home/gentoo/.thunderbird/qmuzmhh7.default/Mail/localhost");
+user_pref("mail.server.server2.directory-rel", "[ProfD]Mail/localhost");
+user_pref("mail.server.server2.hostname", "localhost");
+user_pref("mail.server.server2.name", "noreply at dev.null.com");
+user_pref("mail.server.server2.numHdrsToKeep", 30);
+user_pref("mail.server.server2.type", "pop3");
+user_pref("mail.server.server2.userName", "incognito");
+user_pref("mail.shell.checkDefaultClient", false);
+user_pref("mail.smtp.defaultserver", "smtp1");
+user_pref("mail.smtpserver.smtp1.auth_method", 0);
+user_pref("mail.smtpserver.smtp1.description", "Mixminion SMTP");
+user_pref("mail.smtpserver.smtp1.hostname", "localhost");
+user_pref("mail.smtpserver.smtp1.port", 8026);
+user_pref("mail.smtpserver.smtp1.try_ssl", 0);
+user_pref("mail.smtpserver.smtp1.username", "");
+user_pref("mail.smtpservers", "smtp1");
+user_pref("mail.spam.version", 1);
+user_pref("mail.startup.enabledMailCheckOnce", true);
+user_pref("mailnews.headers.extraExpandedHeaders", "x-enigmail-version content-transfer-encoding openpgp x-mimeole x-bugzilla-reason x-php-bug list-post");
+user_pref("mailnews.quotingPrefs.version", 1);
+user_pref("mailnews.start_page.enabled", false);
+user_pref("mailnews.start_page_override.mstone", "1.8.1.9");
+user_pref("mailnews.tags.$label1.color", "#FF0000");
+user_pref("mailnews.tags.$label1.tag", "Important");
+user_pref("mailnews.tags.$label2.color", "#FF9900");
+user_pref("mailnews.tags.$label2.tag", "Work");
+user_pref("mailnews.tags.$label3.color", "#009900");
+user_pref("mailnews.tags.$label3.tag", "Personal");
+user_pref("mailnews.tags.$label4.color", "#3333FF");
+user_pref("mailnews.tags.$label4.tag", "To Do");
+user_pref("mailnews.tags.$label5.color", "#993399");
+user_pref("mailnews.tags.$label5.tag", "Later");
+user_pref("mailnews.tags.version", 2);
+user_pref("mailnews.ui.threadpane.version", 5);
+user_pref("network.proxy.http", "127.0.0.1");
+user_pref("network.proxy.http_port", 3128);
+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.ssl", "127.0.0.1");
+user_pref("network.proxy.ssl_port", 3128);
+user_pref("network.proxy.type", 1);
+user_pref("network.protocol-handler.app.ftp", "konqueror");
+user_pref("network.protocol-handler.app.http", "firefox");
+user_pref("network.protocol-handler.app.https", "firefox");

Copied: incognito/tags/20080109.1/root_overlay/var/lib/vidalia-config (from rev 13115, incognito/trunk/root_overlay/var/lib/vidalia-config)

Deleted: incognito/tags/20080109.1/root_overlay/var/patches/secure_halt.patch
===================================================================
--- incognito/trunk/root_overlay/var/patches/secure_halt.patch	2008-01-12 12:31:16 UTC (rev 13114)
+++ incognito/tags/20080109.1/root_overlay/var/patches/secure_halt.patch	2008-01-26 16:31:02 UTC (rev 13299)
@@ -1,68 +0,0 @@
-diff -ru etc/conf.d/rc etc/conf.d/rc
---- etc/conf.d/rc	2007-06-11 10:40:47.000000000 -0500
-+++ etc/conf.d/rc	2007-06-11 10:27:06.000000000 -0500
-@@ -140,6 +140,19 @@
- 
- RC_SWAP_ERASE="no"
- 
-+# RC_MEM_ERASE controls erasing of memory at shutdown.
-+# Useful for all those paranoid peeps to nuke their memory.
-+# Requires smem from app-misc/secure-delete.
-+
-+RC_MEM_ERASE="yes"
-+
-+# Arguments for the app-misc/secure-delete package. Used when nuking
-+# swap and/or memory. See man sswap or smem for values. Default is
-+# most secure. This only applies when RC_SWAP_ERASE or RC_MEM_ERASE
-+# are "yes".
-+
-+RC_SECURE_DELETE_ARGS=""
-+
- # RC_DMESG_LEVEL sets the level at which logging of messages is done to the
- # console.  See dmesg(8) for more info.
- 
-diff -ru etc/init.d/halt.sh etc/init.d/halt.sh
---- etc/init.d/halt.sh	2007-06-11 10:40:41.000000000 -0500
-+++ etc/init.d/halt.sh	2007-06-11 11:20:37.000000000 -0500
-@@ -39,8 +39,13 @@
- 	if [[ ${RC_SWAP_ERASE} == "yes" ]] ; then
- 		for s in $(echo "${swap_list}" | awk '$2 == "partition" {print $1}') ; do
- 			ebegin $"Erasing swap space" ${s}
--			ssize=$(awk '$4 == "'${s##*/}'" {print $3}' /proc/partitions 2> /dev/null)
--			dd if=/dev/zero of=${s} bs=1024 count=${ssize} 2> /dev/null
-+			if [[ -x /usr/bin/sswap ]] ; then
-+				splash_verbose
-+				/usr/bin/sswap ${RC_SECURE_DELETE_ARGS} ${s}
-+			else
-+				ssize=$(awk '$4 == "'${s##*/}'" {print $3}' /proc/partitions 2> /dev/null)
-+				dd if=/dev/zero of=${s} bs=1024 count=${ssize} 2> /dev/null
-+			fi
- 			eend $?
- 			ebegin $"Creating swap space" ${s}
- 			mkswap ${s} > /dev/null
-@@ -195,6 +200,25 @@
- 	fi
- fi
- eend ${mount_worked}
-+
-+if [[ ${RC_MEM_ERASE} == "yes" && -x /usr/bin/smem ]] ; then
-+	CDROM_DEVICE="$(eject -n | sed 's:.*\(/dev/[A-Za-z0-9]*\).*:\1:')"
-+	CDROM_UNMOUNTED=0
-+	if [[ -n "${CDROM_DEVICE}" ]] && grep "${CDROM_DEVICE}" /proc/mounts >/dev/null; then
-+		CDROM_UNMOUNTED=1 
-+		# Following will try to put halt into disk cache for calling later
-+		cat /sbin/halt >/dev/null
-+		( sleep 2s && eject -m & )
-+	fi
-+	splash_verbose
-+	clear
-+	einfo "You may remove the media now and leave, machine will shutdown when complete" ; ebegin "Erasing memory"
-+	/usr/bin/smem ${RC_SECURE_DELETE_ARGS} >/dev/null
-+	eend $?
-+	# If we've unmounted the cd forcibly we'll need to halt immediately
-+	[[ ${CDROM_UNMOUNTED} -eq 1 ]] && /sbin/halt -fndp
-+fi
-+
- if [[ ${mount_worked} -eq 1 ]]; then
- 	ups_kill_power
- 	/sbin/sulogin -t 10 /dev/console

Copied: incognito/tags/20080109.1/root_overlay/var/patches/secure_halt.patch (from rev 13115, incognito/trunk/root_overlay/var/patches/secure_halt.patch)
===================================================================
--- incognito/tags/20080109.1/root_overlay/var/patches/secure_halt.patch	                        (rev 0)
+++ incognito/tags/20080109.1/root_overlay/var/patches/secure_halt.patch	2008-01-26 16:31:02 UTC (rev 13299)
@@ -0,0 +1,51 @@
+--- etc/init.d/halt.sh.orig	2008-01-11 07:21:49.000000000 +0100
++++ etc/init.d/halt.sh	2008-01-11 08:13:49.000000000 +0100
+@@ -35,6 +35,18 @@
+ 	ebegin $"Deactivating swap"
+ 	swapoff -a
+ 	eend $?
++
++	# secure deletion of swap	
++	for s in $(echo "${swap_list}" | awk '$2 == "partition" {print $1}') ; do
++		ebegin $"Erasing swap space" ${s}
++		splash_verbose
++		/usr/bin/sswap ${s}
++		eend $?
++
++		ebegin $"Creating swap space" ${s}
++		mkswap ${s} > /dev/null
++		eend $?
++	done
+ fi
+ 
+ # Write a reboot record to /var/log/wtmp before unmounting
+@@ -184,6 +196,29 @@
+ 	fi
+ fi
+ eend ${mount_worked}
++
++# try to eject CD
++CDROM_DEVICE="$(eject -n | sed 's:.*\(/dev/[A-Za-z0-9]*\).*:\1:')"
++CDROM_UNMOUNTED=0
++if [[ -n "${CDROM_DEVICE}" ]] && grep "${CDROM_DEVICE}" /proc/mounts >/dev/null; then
++	CDROM_UNMOUNTED=1
++	# Following will try to put halt into disk cache for calling later
++	cat /sbin/halt >/dev/null
++	( sleep 2s && eject -m & )
++fi
++
++# secure deletion of system memory
++splash_verbose
++clear
++einfo "You may remove the CD now and leave. The machine will shutdown when complete with securely ereasing the memory which otherwise could leave traces. If this is of no worry, the machine can safely be turned off manually now."
++einfo " "
++ebegin "Erasing memory"
++/usr/bin/smem >/dev/null
++eend $?
++
++# If we've unmounted the cd forcibly we'll need to halt immediately
++[[ ${CDROM_UNMOUNTED} -eq 1 ]] && /sbin/halt -fndp
++
+ if [[ ${mount_worked} -eq 1 ]]; then
+ 	ups_kill_power
+ 	sulogin -t 10 /dev/console

