[or-cvs] r11787: Merge from /incognito/trunk r11786. (in incognito/branches/polipo: . arch/x86 arch/x86/overlay portage.config portage.overlay portage.overlay/dev-perl/Net-Server-Mail portage.overlay/mail-mta/mixminion portage.overlay/mail-mta/mixminion/files portage.overlay/mail-mta/mixminion-smtp portage.overlay/mail-mta/mixminion-smtp/files portage.overlay/net-misc/trans-proxy-tor portage.overlay/net-misc/trans-proxy-tor/files portage.overlay/net-www/mplayerplug-in-bin portage.overlay/sys-boot portage.overlay/sys-boot/syslinux portage.overlay/sys-boot/syslinux/files portage.overlay/x11-plugins portage.overlay/x11-plugins/cookiesafe portage.overlay/x11-plugins/enigmail-bin portage.overlay/x11-plugins/firefox-quick-locale-switcher portage.overlay/x11-plugins/firegpg portage.overlay/x11-plugins/firegpg/files portage.overlay/x11-plugins/thunderplunger root_overlay/usr/sbin root_overlay/usr/share/incognito root_overlay/var/lib/firefox-config/firefox/m7m1jk79.Default User root_overlay/var/lib/kdesession)

double at seul.org double at seul.org
Mon Oct 8 13:13:47 UTC 2007


Author: double
Date: 2007-10-08 09:13:46 -0400 (Mon, 08 Oct 2007)
New Revision: 11787

Added:
   incognito/branches/polipo/arch/x86/isolinux-3.52-cdtar.tar.bz2
   incognito/branches/polipo/create-macchanger.sh
   incognito/branches/polipo/create-runbat.sh
   incognito/branches/polipo/hacking.html
   incognito/branches/polipo/portage.overlay/net-misc/trans-proxy-tor/files/digest-trans-proxy-tor-0.1.0
   incognito/branches/polipo/portage.overlay/sys-boot/
   incognito/branches/polipo/portage.overlay/sys-boot/syslinux/
   incognito/branches/polipo/portage.overlay/sys-boot/syslinux/Manifest
   incognito/branches/polipo/portage.overlay/sys-boot/syslinux/files/
   incognito/branches/polipo/portage.overlay/sys-boot/syslinux/files/digest-syslinux-3.52
   incognito/branches/polipo/portage.overlay/sys-boot/syslinux/syslinux-3.52.ebuild
   incognito/branches/polipo/portage.overlay/x11-plugins/firegpg/
   incognito/branches/polipo/portage.overlay/x11-plugins/firegpg/Manifest
   incognito/branches/polipo/portage.overlay/x11-plugins/firegpg/files/
   incognito/branches/polipo/portage.overlay/x11-plugins/firegpg/files/digest-firegpg-0.4.3
   incognito/branches/polipo/portage.overlay/x11-plugins/firegpg/firegpg-0.4.3.ebuild
Removed:
   incognito/branches/polipo/arch/x86/isolinux-3.36-cdtar.tar.bz2
   incognito/branches/polipo/portage.overlay/sys-boot/syslinux/
   incognito/branches/polipo/portage.overlay/sys-boot/syslinux/Manifest
   incognito/branches/polipo/portage.overlay/sys-boot/syslinux/files/
   incognito/branches/polipo/portage.overlay/sys-boot/syslinux/files/digest-syslinux-3.52
   incognito/branches/polipo/portage.overlay/sys-boot/syslinux/syslinux-3.52.ebuild
   incognito/branches/polipo/portage.overlay/x11-plugins/firegpg/Manifest
   incognito/branches/polipo/portage.overlay/x11-plugins/firegpg/files/
   incognito/branches/polipo/portage.overlay/x11-plugins/firegpg/files/digest-firegpg-0.4.3
   incognito/branches/polipo/portage.overlay/x11-plugins/firegpg/firegpg-0.4.3.ebuild
Modified:
   incognito/branches/polipo/AUTHORS
   incognito/branches/polipo/ChangeLog
   incognito/branches/polipo/TODO
   incognito/branches/polipo/arch/x86/livecd-stage1.spec
   incognito/branches/polipo/arch/x86/livecd-stage2-tiny.spec
   incognito/branches/polipo/arch/x86/livecd-stage2.spec
   incognito/branches/polipo/arch/x86/overlay/run.bat
   incognito/branches/polipo/building.html
   incognito/branches/polipo/livecd-stage2.sh
   incognito/branches/polipo/portage.config/package.keywords
   incognito/branches/polipo/portage.config/package.mask
   incognito/branches/polipo/portage.overlay/dev-perl/Net-Server-Mail/Manifest
   incognito/branches/polipo/portage.overlay/dev-perl/Net-Server-Mail/Net-Server-Mail-0.16.ebuild
   incognito/branches/polipo/portage.overlay/mail-mta/mixminion-smtp/Manifest
   incognito/branches/polipo/portage.overlay/mail-mta/mixminion-smtp/files/mixminion-smtp.initd
   incognito/branches/polipo/portage.overlay/mail-mta/mixminion-smtp/mixminion-smtp-0.1.ebuild
   incognito/branches/polipo/portage.overlay/mail-mta/mixminion/Manifest
   incognito/branches/polipo/portage.overlay/mail-mta/mixminion/files/mixminion.initd
   incognito/branches/polipo/portage.overlay/mail-mta/mixminion/mixminion-0.0.8_alpha3.ebuild
   incognito/branches/polipo/portage.overlay/net-misc/trans-proxy-tor/Manifest
   incognito/branches/polipo/portage.overlay/net-misc/trans-proxy-tor/files/dns-proxy-tor.init.d
   incognito/branches/polipo/portage.overlay/net-misc/trans-proxy-tor/files/trans-proxy-tor.init.d
   incognito/branches/polipo/portage.overlay/net-misc/trans-proxy-tor/trans-proxy-tor-0.1.0.ebuild
   incognito/branches/polipo/portage.overlay/net-www/mplayerplug-in-bin/Manifest
   incognito/branches/polipo/portage.overlay/net-www/mplayerplug-in-bin/mplayerplug-in-bin-3.45.ebuild
   incognito/branches/polipo/portage.overlay/x11-plugins/cookiesafe/Manifest
   incognito/branches/polipo/portage.overlay/x11-plugins/cookiesafe/cookiesafe-2.0.6.ebuild
   incognito/branches/polipo/portage.overlay/x11-plugins/enigmail-bin/Manifest
   incognito/branches/polipo/portage.overlay/x11-plugins/enigmail-bin/enigmail-bin-0.95.2.ebuild
   incognito/branches/polipo/portage.overlay/x11-plugins/firefox-quick-locale-switcher/Manifest
   incognito/branches/polipo/portage.overlay/x11-plugins/firefox-quick-locale-switcher/firefox-quick-locale-switcher-1.6.3.1.ebuild
   incognito/branches/polipo/portage.overlay/x11-plugins/thunderplunger/Manifest
   incognito/branches/polipo/portage.overlay/x11-plugins/thunderplunger/thunderplunger-0.7.ebuild
   incognito/branches/polipo/release-steps.html
   incognito/branches/polipo/root_overlay/usr/sbin/create-usb
   incognito/branches/polipo/root_overlay/usr/share/incognito/readme.html
   incognito/branches/polipo/root_overlay/var/lib/firefox-config/firefox/m7m1jk79.Default User/bookmarks.html
   incognito/branches/polipo/root_overlay/var/lib/firefox-config/firefox/m7m1jk79.Default User/prefs.js
   incognito/branches/polipo/root_overlay/var/lib/kdesession/bookmarks.xml
Log:
Merge from /incognito/trunk r11786.


Modified: incognito/branches/polipo/AUTHORS
===================================================================
--- incognito/branches/polipo/AUTHORS	2007-10-08 08:28:51 UTC (rev 11786)
+++ incognito/branches/polipo/AUTHORS	2007-10-08 13:13:46 UTC (rev 11787)
@@ -1,9 +1,12 @@
 
-Pat Double <pat at patdouble.com> : Main author
+Pat Double <pat at patdouble.com>
+	Main author
+	Finger print: C31F D009 E379 DF75 BC7F 5378 EC06 3529 C54B AD26
 
-Contributions by:
+anonym <anonym at lavabit.com>
+	Contributor
+	Finger print: A43A 06A5 C52F 59C2 7ABB  B56F A7C1 2CC1 D0E6 4958
 
-anonym		mplayer plugin ebuild, firmware fix, testing, suggestions
 
-Thanks to those unmentioned for testing and suggestions.
+Thanks to others for testing and suggestions.
 

Modified: incognito/branches/polipo/ChangeLog
===================================================================
--- incognito/branches/polipo/ChangeLog	2007-10-08 08:28:51 UTC (rev 11786)
+++ incognito/branches/polipo/ChangeLog	2007-10-08 13:13:46 UTC (rev 11787)
@@ -1,5 +1,7 @@
-
 	- Replace squid/privoxy with polipo
+	- Added FireGPG 0.4.3 Firefox extension (http://firegpg.tuxfamily.org)
+	- 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:

Modified: incognito/branches/polipo/TODO
===================================================================
--- incognito/branches/polipo/TODO	2007-10-08 08:28:51 UTC (rev 11786)
+++ incognito/branches/polipo/TODO	2007-10-08 13:13:46 UTC (rev 11787)
@@ -42,8 +42,6 @@
 
 - Add torbutton, disabling tor enable/disable in toolbar and status bar
 
-- FireGPG (http://firegpg.tuxfamily.org) when out of beta
-
 - 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.
 
@@ -58,8 +56,8 @@
 - 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.
 
-- Run from USB in virtualized PC for computers that cannot reboot (CD has this functionality)
-Public computers may prevent rebooting or booting from removable media. Include QEMU for Windows in root and batch file that will start Incognito in virtual environment. Only works for Windows 2000/XP+ host. vvfat can be used for the disk but boot sector will not be available. QEMU can specify linux kernel and initrd directly, but then we don't get the menu choices, in which case we need the batch file to do so.
+- 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
 
 - Allow Tor to be bypassed
@@ -68,4 +66,6 @@
 - 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.
 
+- AdBlock Plus for Firefox, polipo
+Add AdBlock Plus for Firefox. On build, download and convert AdBlock Plus easylist block lists for polipo /etc/polipo/forbidden.d. Get all languages since we support multiple languages.
 

Deleted: incognito/branches/polipo/arch/x86/isolinux-3.36-cdtar.tar.bz2
===================================================================
(Binary files differ)

Copied: incognito/branches/polipo/arch/x86/isolinux-3.52-cdtar.tar.bz2 (from rev 11786, incognito/trunk/arch/x86/isolinux-3.52-cdtar.tar.bz2)
===================================================================
(Binary files differ)

Modified: incognito/branches/polipo/arch/x86/livecd-stage1.spec
===================================================================
--- incognito/branches/polipo/arch/x86/livecd-stage1.spec	2007-10-08 08:28:51 UTC (rev 11786)
+++ incognito/branches/polipo/arch/x86/livecd-stage1.spec	2007-10-08 13:13:46 UTC (rev 11787)
@@ -120,6 +120,7 @@
 	x11-plugins/noscript
 	x11-plugins/firefox-quick-locale-switcher
 	x11-plugins/cookiesafe
+	x11-plugins/firegpg
 	net-irc/xchat
 	mail-client/mozilla-thunderbird-bin
 	x11-plugins/enigmail-bin

Modified: incognito/branches/polipo/arch/x86/livecd-stage2-tiny.spec
===================================================================
--- incognito/branches/polipo/arch/x86/livecd-stage2-tiny.spec	2007-10-08 08:28:51 UTC (rev 11786)
+++ incognito/branches/polipo/arch/x86/livecd-stage2-tiny.spec	2007-10-08 13:13:46 UTC (rev 11787)
@@ -9,7 +9,7 @@
 portage_confdir: /usr/src/incognito/portage.config
 
 livecd/fstype: squashfs
-livecd/cdtar: /usr/src/incognito/arch/x86/isolinux-3.36-cdtar.tar.bz2
+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
@@ -201,8 +201,14 @@
 	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

Modified: incognito/branches/polipo/arch/x86/livecd-stage2.spec
===================================================================
--- incognito/branches/polipo/arch/x86/livecd-stage2.spec	2007-10-08 08:28:51 UTC (rev 11786)
+++ incognito/branches/polipo/arch/x86/livecd-stage2.spec	2007-10-08 13:13:46 UTC (rev 11787)
@@ -9,7 +9,7 @@
 portage_confdir: /usr/src/incognito/portage.config
 
 livecd/fstype: squashfs
-livecd/cdtar: /usr/src/incognito/arch/x86/isolinux-3.36-cdtar.tar.bz2
+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
@@ -199,7 +199,11 @@
 	dev-util/pkgconfig
 	app-doc/xorg-docs
 	dev-lang/nasm
-	# sys-apps/portage dev-python/python-fchksum dev-lang/python
+	# Following four for subversion based packages
+	dev-libs/apr
+	dev-libs/apr-util
+	net-misc/neon
+	dev-util/subversion
 
 livecd/empty:
 	/etc/bootsplash/gentoo

Modified: incognito/branches/polipo/arch/x86/overlay/run.bat
===================================================================
--- incognito/branches/polipo/arch/x86/overlay/run.bat	2007-10-08 08:28:51 UTC (rev 11786)
+++ incognito/branches/polipo/arch/x86/overlay/run.bat	2007-10-08 13:13:46 UTC (rev 11787)
@@ -1,10 +1,39 @@
 @echo off
-echo .
-echo Running Incognito CD/USB in a virtual PC.
-echo .
-echo Type CTRL-ALT-F to toggle fullscreen mode.
-echo .
+echo.
+echo Running __INCOGNITO__ in a virtual PC.
+echo.
+echo This mode is only recommended when it is impossible to restart the computer and
+echo boot __INCOGNITO__ directly from the CD/USB. When running through a virtual PC,
+echo any software keyloggers and similar types of surveillance installed under
+echo Microsoft Windows will work and might compromise your anonymity. Booting 
+echo directly from the CD/USB medium will protect you from any such malicious
+echo software, although you are just as vulnerable against hardware surveillance.
+echo.
+echo Press CTRL-ALT-F to toggle fullscreen mode.
+echo.
+echo !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+echo !!                                                                           !!
+echo !! BEWARE! While running from within Microsoft Windows any changes made      !!
+echo !! to the user home (e.g. new settings, new files) will not be persistent    !!
+echo !! between boots, even if running from USB! In other words, any changes made !!
+echo !! during this session will be lost when shutting down. Note, however, that  !!
+echo !! when running from USB, changes made to the user home in the past will     !!                                                       !!
+echo !! still be available.                                                       !!
+echo !!                                                                           !!
+echo !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 set DRIVE=%CD:~0,1%
-start /B %DRIVE%:\qemu\qemu.exe -m 256M -localtime -usb -L %DRIVE%://qemu -cdrom //./%DRIVE%: -boot d
 
+rem Default boot parameters, just in case
+set KERNEL=gentoo
+set INITRD=gentoo.igz
+set KERNEL_ARGS=root=/dev/ram0 init=/linuxrc looptype=squashfs loop=/image.squashfs cdroot vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on quiet dokeymap
+
+rem MENU
+
+rem Find the correct SYSLINUX directory
+set SYSLINUX=syslinux
+if exist %DRIVE%:\isolinux set SYSLINUX=isolinux
+
+rem Start QEMU
+start /B %DRIVE%:\qemu\qemu.exe -m 256M -localtime -usb -L %DRIVE%://qemu -hda fat:%DRIVE%:\ -kernel %DRIVE%:\%SYSLINUX%\%KERNEL% -initrd %DRIVE%:\%SYSLINUX%\%INITRD% -append "%KERNEL_ARGS%"

Modified: incognito/branches/polipo/building.html
===================================================================
--- incognito/branches/polipo/building.html	2007-10-08 08:28:51 UTC (rev 11786)
+++ incognito/branches/polipo/building.html	2007-10-08 13:13:46 UTC (rev 11787)
@@ -85,4 +85,5 @@
 </ol>
 
 </body>
+</html>
 

Copied: incognito/branches/polipo/create-macchanger.sh (from rev 11786, incognito/trunk/create-macchanger.sh)
===================================================================
--- incognito/branches/polipo/create-macchanger.sh	                        (rev 0)
+++ incognito/branches/polipo/create-macchanger.sh	2007-10-08 13:13:46 UTC (rev 11787)
@@ -0,0 +1,57 @@
+#!/bin/bash
+
+USAGE="Usage: $0 <macchanger_cfg> <isolinux.cfg>"
+
+MACCHANGER="$1"
+ISOLINUX="$2"
+
+if [[ ! $# -eq 2 ]]; then
+    echo "error: Incorrect number of arguments."
+    echo
+    echo ${USAGE}
+    exit 1
+fi
+
+if [[ -e "${MACCHANGER}" ]] && [[ ! -w "${MACCHANGER}" ]]; then
+    echo "error: ${MACCHANGER} not writable."
+    echo
+    echo ${USAGE}
+    exit 1
+fi
+
+if [[ ! -r "${ISOLINUX}" ]]; then
+    echo "error: ${ISOLINUX} not readable."
+    echo
+    echo ${USAGE}
+    exit 1
+fi
+
+# create new cfg with macchanger enabled for all entries
+sed 's/append.*/& macchanger/' ${ISOLINUX} > ${MACCHANGER}
+
+
+HELP="If you are using a computer that can be traced to you (e.g. your laptop)\non an untrusted network (e.g. public wireless network) you might want to\nhave this option enabled to further increase your anonymity by making\nyour network cards' MAC addresses randomised.\n"
+
+# add "Enable MAC changer" entry to original cfg
+cat >>${ISOLINUX} <<EOF
+
+label domacchange
+  menu label Enable MAC changer
+  text help
+$( echo -en ${HELP} )
+  endtext
+  kernel vesamenu.c32
+  append macchang.cfg
+EOF
+
+# add "Disable MAC changer" entry to original cfg
+cat >>${MACCHANGER} <<EOF
+
+label nomacchange
+  menu label Disable MAC changer
+  text help
+$( echo -en ${HELP} )
+  endtext
+  kernel vesamenu.c32
+  append ~
+EOF

Copied: incognito/branches/polipo/create-runbat.sh (from rev 11786, incognito/trunk/create-runbat.sh)
===================================================================
--- incognito/branches/polipo/create-runbat.sh	                        (rev 0)
+++ incognito/branches/polipo/create-runbat.sh	2007-10-08 13:13:46 UTC (rev 11787)
@@ -0,0 +1,88 @@
+#!/bin/sh
+
+# Verify arguments
+BAT="$1"
+ISOLINUX="$2"
+if [[ -z "${BAT}" ]] || [[ ! -r "${BAT}" ]] || [[ -z "${ISOLINUX}" ]] || [[ ! -r "${ISOLINUX}" ]]; then
+	echo "Usage: $0 <bat_file> <isolinux.cfg>"
+	exit 1
+fi
+
+grep "rem MENU" "${BAT}" >/dev/null || exit 0
+
+declare -a BOOT_TITLE BOOT_KERNEL BOOT_INITRD BOOT_ARGS
+declare -i BOOT_COUNT
+
+BOOT_COUNT=0
+eval $( cat "${ISOLINUX}" | while read -r L; do
+
+	if echo $L | grep "^\\s*menu label " >/dev/null; then
+		echo BOOT_TITLE[$BOOT_COUNT]=\"${L/menu label /}\"
+	elif echo $L | grep "^\\s*kernel " >/dev/null; then
+		echo BOOT_KERNEL[$BOOT_COUNT]=\"${L/kernel /}\"
+	elif echo $L | grep "^\\s*append " >/dev/null; then
+		echo BOOT_INITRD[$BOOT_COUNT]=\"$( echo $L | tr -s [:space:] '\n' | grep initrd | cut -c 8- )\"
+		L="$(echo $L | sed 's/initrd=[^\s]*//')"
+		echo BOOT_ARGS[$BOOT_COUNT]=\"${L/append /}\"
+	elif echo $L | grep "^\\s*label " >/dev/null; then
+		BOOT_COUNT=$(( $BOOT_COUNT+1 ))
+		echo BOOT_COUNT=$BOOT_COUNT
+		BOOT_LIST="${BOOT_LIST} $BOOT_COUNT"
+		echo BOOT_LIST=\"${BOOT_LIST}\"
+	fi
+
+done )
+
+# No kernels in the config, don't do anything
+[[ $BOOT_COUNT -eq 0 ]] && exit 0
+
+# Create temporary
+FILE="$(mktemp -t incognitoXXXXXXXX)"
+if [[ $? -ne 0 ]]; then
+	echo "Could not create temporary file, $? from mktemp" >2
+	exit 1
+fi
+
+cat "${BAT}" | while read -r FL; do
+
+if echo "${FL}" | grep "rem MENU" >/dev/null; then
+
+(
+
+echo -en ":menu\r\n"
+echo -en "echo.\r\n"
+
+for BOOT_INDEX in ${BOOT_LIST}; do
+echo -en "echo $(( $BOOT_INDEX )). ${BOOT_TITLE[$BOOT_INDEX]}\r\n"
+done
+
+echo -en "set /p BOOT_OPT= Boot Option:\r\n"
+
+for BOOT_INDEX in $BOOT_LIST; do
+echo -en "if \"%BOOT_OPT%\" == \"$(( $BOOT_INDEX ))\" goto bootopt$(( $BOOT_INDEX ))\r\n"
+done
+
+echo -en "goto menu\r\n"
+
+for BOOT_INDEX in $BOOT_LIST; do
+echo -en ":bootopt$(( $BOOT_INDEX ))\r\n"
+echo -en "set KERNEL=${BOOT_KERNEL[$BOOT_INDEX]}\r\n"
+echo -en "set INITRD=${BOOT_INITRD[$BOOT_INDEX]}\r\n"
+echo -en "set KERNEL_ARGS=${BOOT_ARGS[$BOOT_INDEX]}\r\n"
+echo -en "goto qemu\r\n"
+done
+
+echo -en ":qemu\r\n"
+
+) >> "${FILE}"
+
+else
+
+echo "${FL}" >> "${FILE}"
+
+fi
+
+done
+
+mv "${FILE}" "${BAT}"
+

Copied: incognito/branches/polipo/hacking.html (from rev 11786, incognito/trunk/hacking.html)
===================================================================
--- incognito/branches/polipo/hacking.html	                        (rev 0)
+++ incognito/branches/polipo/hacking.html	2007-10-08 13:13:46 UTC (rev 11787)
@@ -0,0 +1,77 @@
+<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 <a href="mailto:pat at patdouble.com">pat at patdouble.com</a>. 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" to create the patch. If you are very active and seem to know what you are doing we may give you an SVN account, but don't ask right away.
+</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>
+

Modified: incognito/branches/polipo/livecd-stage2.sh
===================================================================
--- incognito/branches/polipo/livecd-stage2.sh	2007-10-08 08:28:51 UTC (rev 11786)
+++ incognito/branches/polipo/livecd-stage2.sh	2007-10-08 13:13:46 UTC (rev 11787)
@@ -85,6 +85,9 @@
 	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"
@@ -99,8 +102,15 @@
 	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}
+
 # Build it
 NICECMD=""
 [[ -x "/usr/bin/ionice" ]] && NICECMD="/usr/bin/ionice -c 3"

Modified: incognito/branches/polipo/portage.config/package.keywords
===================================================================
--- incognito/branches/polipo/portage.config/package.keywords	2007-10-08 08:28:51 UTC (rev 11786)
+++ incognito/branches/polipo/portage.config/package.keywords	2007-10-08 13:13:46 UTC (rev 11787)
@@ -42,6 +42,7 @@
 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 ~*
@@ -52,6 +53,7 @@
 net-im/pidgin ~*
 x11-plugins/pidgin-otr ~*
 dev-util/subversion ~*
+sys-boot/syslinux ~*
 
 # NetworkManager
 net-misc/networkmanager ~*

Modified: incognito/branches/polipo/portage.config/package.mask
===================================================================
--- incognito/branches/polipo/portage.config/package.mask	2007-10-08 08:28:51 UTC (rev 11786)
+++ incognito/branches/polipo/portage.config/package.mask	2007-10-08 13:13:46 UTC (rev 11787)
@@ -9,3 +9,8 @@
 # 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

Modified: incognito/branches/polipo/portage.overlay/dev-perl/Net-Server-Mail/Manifest
===================================================================
--- incognito/branches/polipo/portage.overlay/dev-perl/Net-Server-Mail/Manifest	2007-10-08 08:28:51 UTC (rev 11786)
+++ incognito/branches/polipo/portage.overlay/dev-perl/Net-Server-Mail/Manifest	2007-10-08 13:13:46 UTC (rev 11787)
@@ -1,8 +1,8 @@
 DIST Net-Server-Mail-0.16.tar.gz 15813 RMD160 4950d706256e56c57c8445d9e046372c7dbdef8f SHA1 78a56df9db7f34d8ca70a1396ea994dd3cfa16d0 SHA256 58fce332fd1820c253c05c672df6cbf0d30043beabe7a1e322f9e9f663b261e7
-EBUILD Net-Server-Mail-0.16.ebuild 379 RMD160 0972b64c9f8093c562297322573d129bc25e8a5d SHA1 7eda258498d3ab9e4703fddec853cfe92bf6e608 SHA256 25a10694a3b170436c3501f56a0bb5a13a53489cebf3f8a66078f9b8686bfff3
-MD5 07905670b3850fd6bb96c33a71f479bf Net-Server-Mail-0.16.ebuild 379
-RMD160 0972b64c9f8093c562297322573d129bc25e8a5d Net-Server-Mail-0.16.ebuild 379
-SHA256 25a10694a3b170436c3501f56a0bb5a13a53489cebf3f8a66078f9b8686bfff3 Net-Server-Mail-0.16.ebuild 379
+EBUILD Net-Server-Mail-0.16.ebuild 328 RMD160 0b69a642f85603059aecbc59d243d78a788f35a1 SHA1 dac329c4955f995ec3196a4a14d9947a01ffc25b SHA256 2ae349fdf8bb5775251076d99759bad638d8601ddbc260764a535032bedc18a7
+MD5 1dcd146d7f2f5588572d1bf792cbd566 Net-Server-Mail-0.16.ebuild 328
+RMD160 0b69a642f85603059aecbc59d243d78a788f35a1 Net-Server-Mail-0.16.ebuild 328
+SHA256 2ae349fdf8bb5775251076d99759bad638d8601ddbc260764a535032bedc18a7 Net-Server-Mail-0.16.ebuild 328
 MD5 d020f121728e669fa02f951ff0df6ec2 files/digest-Net-Server-Mail-0.16 259
 RMD160 34ad49e38a59a4ff3c95ce970cd11e63e040b679 files/digest-Net-Server-Mail-0.16 259
 SHA256 0556aa2cb40564700819252fe5a0a96a13ee32636cc2b139133043e2ce270d06 files/digest-Net-Server-Mail-0.16 259

Modified: incognito/branches/polipo/portage.overlay/dev-perl/Net-Server-Mail/Net-Server-Mail-0.16.ebuild
===================================================================
--- incognito/branches/polipo/portage.overlay/dev-perl/Net-Server-Mail/Net-Server-Mail-0.16.ebuild	2007-10-08 08:28:51 UTC (rev 11786)
+++ incognito/branches/polipo/portage.overlay/dev-perl/Net-Server-Mail/Net-Server-Mail-0.16.ebuild	2007-10-08 13:13:46 UTC (rev 11787)
@@ -1,6 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header$
 
 inherit perl-module
 

Modified: incognito/branches/polipo/portage.overlay/mail-mta/mixminion/Manifest
===================================================================
--- incognito/branches/polipo/portage.overlay/mail-mta/mixminion/Manifest	2007-10-08 08:28:51 UTC (rev 11786)
+++ incognito/branches/polipo/portage.overlay/mail-mta/mixminion/Manifest	2007-10-08 13:13:46 UTC (rev 11787)
@@ -2,15 +2,15 @@
 MD5 75675c48fae9b088491446adf00abfad files/0.0.8_alpha3-mixminiond.conf.patch 900
 RMD160 6b945e9a241e257967a26ba84c3e55f7c5d740b8 files/0.0.8_alpha3-mixminiond.conf.patch 900
 SHA256 2d2ea30a1d36e8be838951cfcf0880d0c10d8866a3f6338bd951e50824e463b5 files/0.0.8_alpha3-mixminiond.conf.patch 900
-AUX mixminion.initd 1021 RMD160 beb1305a4c0f4d38986ccb870ad23bb47bf254ef SHA1 884b382d97bb68c7ad7d5602636fbc48ee8ffd98 SHA256 89a11ea195831ccffd1d63546e3c4ca5dfbae4922eb182177bdbc30eb9cb3e2d
-MD5 7adc82dcdb30cdb2662a9a697298ae51 files/mixminion.initd 1021
-RMD160 beb1305a4c0f4d38986ccb870ad23bb47bf254ef files/mixminion.initd 1021
-SHA256 89a11ea195831ccffd1d63546e3c4ca5dfbae4922eb182177bdbc30eb9cb3e2d files/mixminion.initd 1021
+AUX mixminion.initd 970 RMD160 11d8757315e3a0ea351175e7328cb63899b7e301 SHA1 30ac8dc04915670039776213fcb76030a77594ef SHA256 8f08ccb75cb36703405ae237cfa2b2c482f268ec284bbc43497b4f22462efcda
+MD5 4c3e29e1618869a12578210f622fb04d files/mixminion.initd 970
+RMD160 11d8757315e3a0ea351175e7328cb63899b7e301 files/mixminion.initd 970
+SHA256 8f08ccb75cb36703405ae237cfa2b2c482f268ec284bbc43497b4f22462efcda files/mixminion.initd 970
 DIST Mixminion-0.0.8alpha3.tar.gz 483281 RMD160 d321c45f86a363f29f92d3130e38b1608be27459 SHA1 543235e96ccde34e2db20fe79aad32412db3ccac SHA256 9336fe24d75bbc1eadd759fc228074b1b376e6d718aa62b527d52c32bd44018a
-EBUILD mixminion-0.0.8_alpha3.ebuild 1285 RMD160 a99521220c01dc98c1a9c5cfc117710290602f77 SHA1 65c9ae3d3ce8b38b185458d86f4d105a3ecab35b SHA256 393cd1e605747b7d75ee6dcdc85abe178fad71b88e4783534e58b9d2ccd68d16
-MD5 76d076072c53f5c94724a7aa045fc34e mixminion-0.0.8_alpha3.ebuild 1285
-RMD160 a99521220c01dc98c1a9c5cfc117710290602f77 mixminion-0.0.8_alpha3.ebuild 1285
-SHA256 393cd1e605747b7d75ee6dcdc85abe178fad71b88e4783534e58b9d2ccd68d16 mixminion-0.0.8_alpha3.ebuild 1285
+EBUILD mixminion-0.0.8_alpha3.ebuild 1232 RMD160 ea3b06cf99f6adb0e81b9bbcb1045bb6fbe23a00 SHA1 74593419a98f97559930821813cd812e71db001c SHA256 7bb3af4038ba9eb03e813d662d9230744f00a110fd0b83ebbbc5400462bbc018
+MD5 196adf5958f85eacf1d4b967b657f453 mixminion-0.0.8_alpha3.ebuild 1232
+RMD160 ea3b06cf99f6adb0e81b9bbcb1045bb6fbe23a00 mixminion-0.0.8_alpha3.ebuild 1232
+SHA256 7bb3af4038ba9eb03e813d662d9230744f00a110fd0b83ebbbc5400462bbc018 mixminion-0.0.8_alpha3.ebuild 1232
 MD5 b55794d9bdfce909b67d067a978fa39d files/digest-mixminion-0.0.8_alpha3 265
 RMD160 32bb4686536f39bd38e57b2fe67139eb83fc729f files/digest-mixminion-0.0.8_alpha3 265
 SHA256 1d5071c582cd5ab653b08fc142ddd06893c4ae800ee6064231cb96e7cbbbca98 files/digest-mixminion-0.0.8_alpha3 265

Modified: incognito/branches/polipo/portage.overlay/mail-mta/mixminion/files/mixminion.initd
===================================================================
--- incognito/branches/polipo/portage.overlay/mail-mta/mixminion/files/mixminion.initd	2007-10-08 08:28:51 UTC (rev 11786)
+++ incognito/branches/polipo/portage.overlay/mail-mta/mixminion/files/mixminion.initd	2007-10-08 13:13:46 UTC (rev 11787)
@@ -1,7 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header$
 
 depend() {
         need net

Modified: incognito/branches/polipo/portage.overlay/mail-mta/mixminion/mixminion-0.0.8_alpha3.ebuild
===================================================================
--- incognito/branches/polipo/portage.overlay/mail-mta/mixminion/mixminion-0.0.8_alpha3.ebuild	2007-10-08 08:28:51 UTC (rev 11786)
+++ incognito/branches/polipo/portage.overlay/mail-mta/mixminion/mixminion-0.0.8_alpha3.ebuild	2007-10-08 13:13:46 UTC (rev 11787)
@@ -1,6 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
 inherit eutils
 

Modified: incognito/branches/polipo/portage.overlay/mail-mta/mixminion-smtp/Manifest
===================================================================
--- incognito/branches/polipo/portage.overlay/mail-mta/mixminion-smtp/Manifest	2007-10-08 08:28:51 UTC (rev 11786)
+++ incognito/branches/polipo/portage.overlay/mail-mta/mixminion-smtp/Manifest	2007-10-08 13:13:46 UTC (rev 11787)
@@ -2,15 +2,15 @@
 MD5 93e2f991af875c7c5df49ecfcb7be6fe files/mixminion-smtp.conf.patch 402
 RMD160 053a343fc870b460ff95ada41184dfa3aad20b5d files/mixminion-smtp.conf.patch 402
 SHA256 f6c67e6c28406903f1db11f6f61d5d2c920780c7a7206f3a5b3f198e2af011db files/mixminion-smtp.conf.patch 402
-AUX mixminion-smtp.initd 1054 RMD160 b8e107203c6f5d2a0abfd6b602242a39b3edae0a SHA1 a9c1cd344c092abdfd2d5d200860db04671c3981 SHA256 5c3bffc82f716ebcc2237156e96795160c926ea2e07c4b6cfeb2701440ce984f
-MD5 a2e6998478ef4790f6018e2b74e51cba files/mixminion-smtp.initd 1054
-RMD160 b8e107203c6f5d2a0abfd6b602242a39b3edae0a files/mixminion-smtp.initd 1054
-SHA256 5c3bffc82f716ebcc2237156e96795160c926ea2e07c4b6cfeb2701440ce984f files/mixminion-smtp.initd 1054
+AUX mixminion-smtp.initd 1003 RMD160 013ba841b1dc4e4c0f24f8fe2dee862a0c9eec3d SHA1 7be84e34a6667fd01477a61b2371aecbb99bb526 SHA256 18ec195ad14dbc5ced9b450dad58326175db85f94247b175c070d762a4705552
+MD5 1cf409facc83039b169a050c703debd0 files/mixminion-smtp.initd 1003
+RMD160 013ba841b1dc4e4c0f24f8fe2dee862a0c9eec3d files/mixminion-smtp.initd 1003
+SHA256 18ec195ad14dbc5ced9b450dad58326175db85f94247b175c070d762a4705552 files/mixminion-smtp.initd 1003
 DIST mixminion-smtp-0.1.tar.gz 14214 RMD160 53157ff74fbc1608c67dd5821bc0651c830b02a3 SHA1 2b64a4e8fe1a62b8bffb8bbdeaf30290de987cb1 SHA256 155fbd66e96ea5c58b913dc19c4838d9370bad33bd6feb8615f160eca6576d82
-EBUILD mixminion-smtp-0.1.ebuild 903 RMD160 6d3c2e4a71aaab6fcd4e040611f00989e92145af SHA1 2501b96c46b335963f8a16e403bc4ba7b194e292 SHA256 17efaafeee3f4f6f4b0a806541bbae2ba9bd6948a5de4a51b04613ae08da45fd
-MD5 0c5759dd0b14c87a38db5639e2d9d22b mixminion-smtp-0.1.ebuild 903
-RMD160 6d3c2e4a71aaab6fcd4e040611f00989e92145af mixminion-smtp-0.1.ebuild 903
-SHA256 17efaafeee3f4f6f4b0a806541bbae2ba9bd6948a5de4a51b04613ae08da45fd mixminion-smtp-0.1.ebuild 903
+EBUILD mixminion-smtp-0.1.ebuild 850 RMD160 043cbc2065c93aba319640866b681c941f8dabbf SHA1 1be4d0cdcc8cd38a2395d5c00fb7b6a8d4193716 SHA256 e61a4f74438debf8d4920750c9730e1a1fe48185a08349e1b0716733e92e34f0
+MD5 3310a9182147a79ba624520b99d48572 mixminion-smtp-0.1.ebuild 850
+RMD160 043cbc2065c93aba319640866b681c941f8dabbf mixminion-smtp-0.1.ebuild 850
+SHA256 e61a4f74438debf8d4920750c9730e1a1fe48185a08349e1b0716733e92e34f0 mixminion-smtp-0.1.ebuild 850
 MD5 e19225b07981d2379688c87fa2f937e9 files/digest-mixminion-smtp-0.1 253
 RMD160 54f1b2ebbe964967128178bd039851dd5fb007f8 files/digest-mixminion-smtp-0.1 253
 SHA256 66f4cbec1c37d22bd8ab8481f0b843de16ad72561ed4e19b6c86a49c329027f0 files/digest-mixminion-smtp-0.1 253

Modified: incognito/branches/polipo/portage.overlay/mail-mta/mixminion-smtp/files/mixminion-smtp.initd
===================================================================
--- incognito/branches/polipo/portage.overlay/mail-mta/mixminion-smtp/files/mixminion-smtp.initd	2007-10-08 08:28:51 UTC (rev 11786)
+++ incognito/branches/polipo/portage.overlay/mail-mta/mixminion-smtp/files/mixminion-smtp.initd	2007-10-08 13:13:46 UTC (rev 11787)
@@ -1,7 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header$
 
 depend() {
         need net

Modified: incognito/branches/polipo/portage.overlay/mail-mta/mixminion-smtp/mixminion-smtp-0.1.ebuild
===================================================================
--- incognito/branches/polipo/portage.overlay/mail-mta/mixminion-smtp/mixminion-smtp-0.1.ebuild	2007-10-08 08:28:51 UTC (rev 11786)
+++ incognito/branches/polipo/portage.overlay/mail-mta/mixminion-smtp/mixminion-smtp-0.1.ebuild	2007-10-08 13:13:46 UTC (rev 11787)
@@ -1,6 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
 inherit eutils
 

Modified: incognito/branches/polipo/portage.overlay/net-misc/trans-proxy-tor/Manifest
===================================================================
--- incognito/branches/polipo/portage.overlay/net-misc/trans-proxy-tor/Manifest	2007-10-08 08:28:51 UTC (rev 11786)
+++ incognito/branches/polipo/portage.overlay/net-misc/trans-proxy-tor/Manifest	2007-10-08 13:13:46 UTC (rev 11787)
@@ -2,10 +2,10 @@
 MD5 7553187fdad3affd225e8b8f01769cee files/dns-proxy-tor.conf.d 639
 RMD160 04a3f1288432ce7b50cf3d0325dca3d84f80b5d2 files/dns-proxy-tor.conf.d 639
 SHA256 cfbf84898494470a20d2f7f5bffed1aeab5822917080132aefd8a52b1951092d files/dns-proxy-tor.conf.d 639
-AUX dns-proxy-tor.init.d 808 RMD160 effd72523d884a5ef599f7b5953fce41e2dbb61b SHA1 03fc536a0aa9a5c98b4b3655ef025694d8161461 SHA256 f9f2e9090894d8dba18a5911b8821dee49ae4cc56176968723c8caf024d3dd16
-MD5 f061f19b6ed8e6b0920e3241e3bd9b23 files/dns-proxy-tor.init.d 808
-RMD160 effd72523d884a5ef599f7b5953fce41e2dbb61b files/dns-proxy-tor.init.d 808
-SHA256 f9f2e9090894d8dba18a5911b8821dee49ae4cc56176968723c8caf024d3dd16 files/dns-proxy-tor.init.d 808
+AUX dns-proxy-tor.init.d 768 RMD160 1ca9ec11fee6df2c894d980cce2966dd4241aa07 SHA1 63c08c5bfa7c51b609cb47569be4c8ad546c3703 SHA256 6498ea1b4777f89af6b434989e5f90d6490f80a5fb134fed2244798a330c582b
+MD5 c64138cf75e886ae49d89b3403dfc92e files/dns-proxy-tor.init.d 768
+RMD160 1ca9ec11fee6df2c894d980cce2966dd4241aa07 files/dns-proxy-tor.init.d 768
+SHA256 6498ea1b4777f89af6b434989e5f90d6490f80a5fb134fed2244798a330c582b files/dns-proxy-tor.init.d 768
 AUX dns-proxy-tor.logrotate.d 83 RMD160 9d95c6ccfec711eff518bbd0ae499bd5ee098fe5 SHA1 ea0a72c3a1d24cf7de98f23de5a5cad9f0e0dc60 SHA256 193cc59a5c7d2bbd88e6a7572f9d9c4298e933c5ccda62702956642989267d3f
 MD5 67a49d1569e7aab230441c85fb69a621 files/dns-proxy-tor.logrotate.d 83
 RMD160 9d95c6ccfec711eff518bbd0ae499bd5ee098fe5 files/dns-proxy-tor.logrotate.d 83
@@ -14,19 +14,19 @@
 MD5 edca66960596cd5862cdc4324c27e1f3 files/trans-proxy-tor.conf.d 295
 RMD160 02ca46a264be9e23c5128a56f8f9b6f6eb176874 files/trans-proxy-tor.conf.d 295
 SHA256 b9b89d1ec77a51c1cf747d08bc5adc570a2ea986be9671b3b3b8e46a281b2de8 files/trans-proxy-tor.conf.d 295
-AUX trans-proxy-tor.init.d 713 RMD160 b29cc7fa822d71711adc8ba6d62ac62d08b8edfc SHA1 fad70a2ff4ae8c310082d82572b9bb164f983c36 SHA256 8348424125e0ad8c7dc86f48b20b9f1cddd2e826a2304635d4c5500b37e5f946
-MD5 23e5c2da21f8031aa6c05884ba4b15b2 files/trans-proxy-tor.init.d 713
-RMD160 b29cc7fa822d71711adc8ba6d62ac62d08b8edfc files/trans-proxy-tor.init.d 713
-SHA256 8348424125e0ad8c7dc86f48b20b9f1cddd2e826a2304635d4c5500b37e5f946 files/trans-proxy-tor.init.d 713
+AUX trans-proxy-tor.init.d 673 RMD160 1077334a0b69001199038bf6b909e1e9f0c1f1c5 SHA1 c9dde569249b354e5e2d1eec4e7c1b334bacce04 SHA256 d4b57413557f027653f18c0f22e828e1d3765c83659db8c089ceec0e679c3d4e
+MD5 c617d98449b82bff67ecf7fdc0a572e5 files/trans-proxy-tor.init.d 673
+RMD160 1077334a0b69001199038bf6b909e1e9f0c1f1c5 files/trans-proxy-tor.init.d 673
+SHA256 d4b57413557f027653f18c0f22e828e1d3765c83659db8c089ceec0e679c3d4e files/trans-proxy-tor.init.d 673
 AUX trans-proxy-tor.logrotate.d 85 RMD160 ce19433bc54d9ff5655e33b4b44a369bab494f50 SHA1 ce208f66df46bcd5b025b109c396f3782b88a774 SHA256 6de9caac788e8e2fe317c8d59caf44c71f8c04e040880aa9b611f6606cec375c
 MD5 e463e7f2d9141da8373822ee4fe7a809 files/trans-proxy-tor.logrotate.d 85
 RMD160 ce19433bc54d9ff5655e33b4b44a369bab494f50 files/trans-proxy-tor.logrotate.d 85
 SHA256 6de9caac788e8e2fe317c8d59caf44c71f8c04e040880aa9b611f6606cec375c files/trans-proxy-tor.logrotate.d 85
 DIST trans-proxy-tor-0.1.0.tar.gz 25752 RMD160 70253c34188cfd6b955eac05b999c9a1c63cdbc9 SHA1 ff0c90ec2db2616633060594bc96cdaeb0391cb9 SHA256 876b6ff00cc2b60e432ffd19aae09e0fcf509ae11977b1ac73894052e9946717
-EBUILD trans-proxy-tor-0.1.0.ebuild 1251 RMD160 2c97bb15df3ca40595520861324ea9726d9ebd4c SHA1 370f44d8fc8b483488b9f6262fe81952a53773f2 SHA256 9cc75aefc9becd6bebeed54a0f5b7fb630ecb2d60e5cc9f5efd92b0b46120ca5
-MD5 e73aa4bf6df8afa375f56d2c1cf37e1f trans-proxy-tor-0.1.0.ebuild 1251
-RMD160 2c97bb15df3ca40595520861324ea9726d9ebd4c trans-proxy-tor-0.1.0.ebuild 1251
-SHA256 9cc75aefc9becd6bebeed54a0f5b7fb630ecb2d60e5cc9f5efd92b0b46120ca5 trans-proxy-tor-0.1.0.ebuild 1251
-MD5 7dd19410e476b51f6130c8c4a86de886 files/digest-trans-proxy-tor-0.1.0 190
-RMD160 41bfd68e947414ceadc5ac443f64c304a953f74a files/digest-trans-proxy-tor-0.1.0 190
-SHA256 45778f1bd863d29b928e161a207ae549d5c7d01478cf8a590172990d837b14e6 files/digest-trans-proxy-tor-0.1.0 190
+EBUILD trans-proxy-tor-0.1.0.ebuild 1198 RMD160 25316047d8b811981cd93cf77e62997cd70f9f87 SHA1 80c46f34f1cea2eb24c6ca43b627311d7d12d90d SHA256 039e8e18e4ef4244b01a77ac0591950b2076995330c5698e6dac26dcbb5fca6a
+MD5 73b8be4e3798fd9f5420702dafe99018 trans-proxy-tor-0.1.0.ebuild 1198
+RMD160 25316047d8b811981cd93cf77e62997cd70f9f87 trans-proxy-tor-0.1.0.ebuild 1198
+SHA256 039e8e18e4ef4244b01a77ac0591950b2076995330c5698e6dac26dcbb5fca6a trans-proxy-tor-0.1.0.ebuild 1198
+MD5 36d5c9d67e961abe068918fe5af9ebdc files/digest-trans-proxy-tor-0.1.0 262
+RMD160 bbf95bca10d495216fbf7d0679254798dff77940 files/digest-trans-proxy-tor-0.1.0 262
+SHA256 0a7d3dd3af5f26063448545aed6df5a26194654cb1a57cbdda79fe31ce6a348d files/digest-trans-proxy-tor-0.1.0 262

Copied: incognito/branches/polipo/portage.overlay/net-misc/trans-proxy-tor/files/digest-trans-proxy-tor-0.1.0 (from rev 11786, incognito/trunk/portage.overlay/net-misc/trans-proxy-tor/files/digest-trans-proxy-tor-0.1.0)
===================================================================
--- incognito/branches/polipo/portage.overlay/net-misc/trans-proxy-tor/files/digest-trans-proxy-tor-0.1.0	                        (rev 0)
+++ incognito/branches/polipo/portage.overlay/net-misc/trans-proxy-tor/files/digest-trans-proxy-tor-0.1.0	2007-10-08 13:13:46 UTC (rev 11787)
@@ -0,0 +1,3 @@
+MD5 8466ce417405a60394c22bdc2b837d43 trans-proxy-tor-0.1.0.tar.gz 25752
+RMD160 70253c34188cfd6b955eac05b999c9a1c63cdbc9 trans-proxy-tor-0.1.0.tar.gz 25752
+SHA256 876b6ff00cc2b60e432ffd19aae09e0fcf509ae11977b1ac73894052e9946717 trans-proxy-tor-0.1.0.tar.gz 25752

Modified: incognito/branches/polipo/portage.overlay/net-misc/trans-proxy-tor/files/dns-proxy-tor.init.d
===================================================================
--- incognito/branches/polipo/portage.overlay/net-misc/trans-proxy-tor/files/dns-proxy-tor.init.d	2007-10-08 08:28:51 UTC (rev 11786)
+++ incognito/branches/polipo/portage.overlay/net-misc/trans-proxy-tor/files/dns-proxy-tor.init.d	2007-10-08 13:13:46 UTC (rev 11787)
@@ -1,5 +1,4 @@
 #!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {

Modified: incognito/branches/polipo/portage.overlay/net-misc/trans-proxy-tor/files/trans-proxy-tor.init.d
===================================================================
--- incognito/branches/polipo/portage.overlay/net-misc/trans-proxy-tor/files/trans-proxy-tor.init.d	2007-10-08 08:28:51 UTC (rev 11786)
+++ incognito/branches/polipo/portage.overlay/net-misc/trans-proxy-tor/files/trans-proxy-tor.init.d	2007-10-08 13:13:46 UTC (rev 11787)
@@ -1,5 +1,4 @@
 #!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {

Modified: incognito/branches/polipo/portage.overlay/net-misc/trans-proxy-tor/trans-proxy-tor-0.1.0.ebuild
===================================================================
--- incognito/branches/polipo/portage.overlay/net-misc/trans-proxy-tor/trans-proxy-tor-0.1.0.ebuild	2007-10-08 08:28:51 UTC (rev 11786)
+++ incognito/branches/polipo/portage.overlay/net-misc/trans-proxy-tor/trans-proxy-tor-0.1.0.ebuild	2007-10-08 13:13:46 UTC (rev 11787)
@@ -1,6 +1,4 @@
-# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
 DESCRIPTION="A transparent proxy for Tor"
 HOMEPAGE="http://p56soo2ibjkx23xo.onion"

Modified: incognito/branches/polipo/portage.overlay/net-www/mplayerplug-in-bin/Manifest
===================================================================
--- incognito/branches/polipo/portage.overlay/net-www/mplayerplug-in-bin/Manifest	2007-10-08 08:28:51 UTC (rev 11786)
+++ incognito/branches/polipo/portage.overlay/net-www/mplayerplug-in-bin/Manifest	2007-10-08 13:13:46 UTC (rev 11787)
@@ -1,8 +1,8 @@
 DIST mplayerplug-in-3.45-i686-1amg.tgz 979258 RMD160 45d85a420a3250b1b91ee779b1e497795509c0f7 SHA1 967c9aec4ba3e120f321a486eab19197c40256bf SHA256 ba9efd96b02ce4019dea7b83d594e846f23ce15e21ccb0405d05d7173bf23e65
-EBUILD mplayerplug-in-bin-3.45.ebuild 1627 RMD160 54e130c449bb2619e24bbd45454bd06c769d2c76 SHA1 029494839b4a134415ccaf6748fe692300b7ffe0 SHA256 a57a9b62046110c4427ba2071e573cecf86c68f202121e6cc3d0a102ef41fc79
-MD5 c850e7b1c85edbd5952bb71277236023 mplayerplug-in-bin-3.45.ebuild 1627
-RMD160 54e130c449bb2619e24bbd45454bd06c769d2c76 mplayerplug-in-bin-3.45.ebuild 1627
-SHA256 a57a9b62046110c4427ba2071e573cecf86c68f202121e6cc3d0a102ef41fc79 mplayerplug-in-bin-3.45.ebuild 1627
+EBUILD mplayerplug-in-bin-3.45.ebuild 1574 RMD160 ab534e772a98843ed0448c5eefd01232bb8158c6 SHA1 195737f05a3196596bc140cf238bf1c6a318e988 SHA256 8c9e5ed758b24173d853d244867e3c580b840aeae2ccd2eca98a4640b49fbb72
+MD5 62971cbb2572a299625497d41ec4cbc4 mplayerplug-in-bin-3.45.ebuild 1574
+RMD160 ab534e772a98843ed0448c5eefd01232bb8158c6 mplayerplug-in-bin-3.45.ebuild 1574
+SHA256 8c9e5ed758b24173d853d244867e3c580b840aeae2ccd2eca98a4640b49fbb72 mplayerplug-in-bin-3.45.ebuild 1574
 MD5 0edc1773e30d60a0f79cd49a27b88047 files/digest-mplayerplug-in-bin-3.45 280
 RMD160 b23dea76b82342cf9afb6265a1d6f04b70b83f37 files/digest-mplayerplug-in-bin-3.45 280
 SHA256 68622ae74fdeb2ae4c705187f9728b85d7f841ad7fecf989dc684bf7444cf4b1 files/digest-mplayerplug-in-bin-3.45 280

Modified: incognito/branches/polipo/portage.overlay/net-www/mplayerplug-in-bin/mplayerplug-in-bin-3.45.ebuild
===================================================================
--- incognito/branches/polipo/portage.overlay/net-www/mplayerplug-in-bin/mplayerplug-in-bin-3.45.ebuild	2007-10-08 08:28:51 UTC (rev 11786)
+++ incognito/branches/polipo/portage.overlay/net-www/mplayerplug-in-bin/mplayerplug-in-bin-3.45.ebuild	2007-10-08 13:13:46 UTC (rev 11787)
@@ -1,6 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
 inherit eutils multilib
 

Copied: incognito/branches/polipo/portage.overlay/sys-boot (from rev 11786, incognito/trunk/portage.overlay/sys-boot)

Copied: incognito/branches/polipo/portage.overlay/sys-boot/syslinux (from rev 11786, incognito/trunk/portage.overlay/sys-boot/syslinux)

Deleted: incognito/branches/polipo/portage.overlay/sys-boot/syslinux/Manifest
===================================================================
--- incognito/trunk/portage.overlay/sys-boot/syslinux/Manifest	2007-10-08 08:28:51 UTC (rev 11786)
+++ incognito/branches/polipo/portage.overlay/sys-boot/syslinux/Manifest	2007-10-08 13:13:46 UTC (rev 11787)
@@ -1,8 +0,0 @@
-DIST syslinux-3.52.tar.bz2 1691659 RMD160 5501211b59a0c290dd660b018d00c534362286f1 SHA1 c2a6fb9e225d079c87b70568a683245313c842d1 SHA256 f691835ca1419c90747f852f2000daba89a09457173819bd2a550660c4435722
-EBUILD syslinux-3.52.ebuild 906 RMD160 e96d16672ffd67d6848f67afe885802d18378d2b SHA1 ef2244f65f33e8f1f656c5bf28c4876ae678d403 SHA256 713271f52a9af6182732e7f2b31c7cefa8798506674d71f7fd1b71ad71b72312
-MD5 c61d640b33c1fc15aeda0d7cfc88572d syslinux-3.52.ebuild 906
-RMD160 e96d16672ffd67d6848f67afe885802d18378d2b syslinux-3.52.ebuild 906
-SHA256 713271f52a9af6182732e7f2b31c7cefa8798506674d71f7fd1b71ad71b72312 syslinux-3.52.ebuild 906
-MD5 0eec0036ec5c37f5b1eb9760325242c1 files/digest-syslinux-3.52 247
-RMD160 19f9e932dc216ba04109927490bb5eac2f2ad770 files/digest-syslinux-3.52 247
-SHA256 c52bc3d67684dbfd91f7351db01e8f11dc81fa6d7141c2b447ebbc9a7e72a133 files/digest-syslinux-3.52 247

Copied: incognito/branches/polipo/portage.overlay/sys-boot/syslinux/Manifest (from rev 11786, incognito/trunk/portage.overlay/sys-boot/syslinux/Manifest)
===================================================================
--- incognito/branches/polipo/portage.overlay/sys-boot/syslinux/Manifest	                        (rev 0)
+++ incognito/branches/polipo/portage.overlay/sys-boot/syslinux/Manifest	2007-10-08 13:13:46 UTC (rev 11787)
@@ -0,0 +1,8 @@
+DIST syslinux-3.52.tar.bz2 1691659 RMD160 5501211b59a0c290dd660b018d00c534362286f1 SHA1 c2a6fb9e225d079c87b70568a683245313c842d1 SHA256 f691835ca1419c90747f852f2000daba89a09457173819bd2a550660c4435722
+EBUILD syslinux-3.52.ebuild 906 RMD160 e96d16672ffd67d6848f67afe885802d18378d2b SHA1 ef2244f65f33e8f1f656c5bf28c4876ae678d403 SHA256 713271f52a9af6182732e7f2b31c7cefa8798506674d71f7fd1b71ad71b72312
+MD5 c61d640b33c1fc15aeda0d7cfc88572d syslinux-3.52.ebuild 906
+RMD160 e96d16672ffd67d6848f67afe885802d18378d2b syslinux-3.52.ebuild 906
+SHA256 713271f52a9af6182732e7f2b31c7cefa8798506674d71f7fd1b71ad71b72312 syslinux-3.52.ebuild 906
+MD5 0eec0036ec5c37f5b1eb9760325242c1 files/digest-syslinux-3.52 247
+RMD160 19f9e932dc216ba04109927490bb5eac2f2ad770 files/digest-syslinux-3.52 247
+SHA256 c52bc3d67684dbfd91f7351db01e8f11dc81fa6d7141c2b447ebbc9a7e72a133 files/digest-syslinux-3.52 247

Copied: incognito/branches/polipo/portage.overlay/sys-boot/syslinux/files (from rev 11786, incognito/trunk/portage.overlay/sys-boot/syslinux/files)

Deleted: incognito/branches/polipo/portage.overlay/sys-boot/syslinux/files/digest-syslinux-3.52
===================================================================
--- incognito/trunk/portage.overlay/sys-boot/syslinux/files/digest-syslinux-3.52	2007-10-08 08:28:51 UTC (rev 11786)
+++ incognito/branches/polipo/portage.overlay/sys-boot/syslinux/files/digest-syslinux-3.52	2007-10-08 13:13:46 UTC (rev 11787)
@@ -1,3 +0,0 @@
-MD5 e66e2b3fd7a17977086f65588b324607 syslinux-3.52.tar.bz2 1691659
-RMD160 5501211b59a0c290dd660b018d00c534362286f1 syslinux-3.52.tar.bz2 1691659
-SHA256 f691835ca1419c90747f852f2000daba89a09457173819bd2a550660c4435722 syslinux-3.52.tar.bz2 1691659

Copied: incognito/branches/polipo/portage.overlay/sys-boot/syslinux/files/digest-syslinux-3.52 (from rev 11786, incognito/trunk/portage.overlay/sys-boot/syslinux/files/digest-syslinux-3.52)
===================================================================
--- incognito/branches/polipo/portage.overlay/sys-boot/syslinux/files/digest-syslinux-3.52	                        (rev 0)
+++ incognito/branches/polipo/portage.overlay/sys-boot/syslinux/files/digest-syslinux-3.52	2007-10-08 13:13:46 UTC (rev 11787)
@@ -0,0 +1,3 @@
+MD5 e66e2b3fd7a17977086f65588b324607 syslinux-3.52.tar.bz2 1691659
+RMD160 5501211b59a0c290dd660b018d00c534362286f1 syslinux-3.52.tar.bz2 1691659
+SHA256 f691835ca1419c90747f852f2000daba89a09457173819bd2a550660c4435722 syslinux-3.52.tar.bz2 1691659

Deleted: incognito/branches/polipo/portage.overlay/sys-boot/syslinux/syslinux-3.52.ebuild
===================================================================
--- incognito/trunk/portage.overlay/sys-boot/syslinux/syslinux-3.52.ebuild	2007-10-08 08:28:51 UTC (rev 11786)
+++ incognito/branches/polipo/portage.overlay/sys-boot/syslinux/syslinux-3.52.ebuild	2007-10-08 13:13:46 UTC (rev 11787)
@@ -1,37 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-DESCRIPTION="SysLinux, IsoLinux and PXELinux bootloader"
-HOMEPAGE="http://syslinux.zytor.com/"
-SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="sys-fs/mtools"
-DEPEND="${RDEPEND}
-	dev-lang/nasm"
-
-# This ebuild is a departure from the old way of rebuilding everything in syslinux
-# This departure is necessary since hpa doesn't support the rebuilding of anything other
-# than the installers.
-
-# removed all the unpack/patching stuff since we aren't rebuilding the core stuff anymore
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	rm -f gethostip #137081
-}
-
-src_compile() {
-	emake installer || die
-}
-
-src_install() {
-	emake INSTALLROOT="${D}" install || die
-	dodoc README* NEWS TODO *.doc memdisk/memdisk.doc
-}

Copied: incognito/branches/polipo/portage.overlay/sys-boot/syslinux/syslinux-3.52.ebuild (from rev 11786, incognito/trunk/portage.overlay/sys-boot/syslinux/syslinux-3.52.ebuild)
===================================================================
--- incognito/branches/polipo/portage.overlay/sys-boot/syslinux/syslinux-3.52.ebuild	                        (rev 0)
+++ incognito/branches/polipo/portage.overlay/sys-boot/syslinux/syslinux-3.52.ebuild	2007-10-08 13:13:46 UTC (rev 11787)
@@ -0,0 +1,37 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+DESCRIPTION="SysLinux, IsoLinux and PXELinux bootloader"
+HOMEPAGE="http://syslinux.zytor.com/"
+SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="sys-fs/mtools"
+DEPEND="${RDEPEND}
+	dev-lang/nasm"
+
+# This ebuild is a departure from the old way of rebuilding everything in syslinux
+# This departure is necessary since hpa doesn't support the rebuilding of anything other
+# than the installers.
+
+# removed all the unpack/patching stuff since we aren't rebuilding the core stuff anymore
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	rm -f gethostip #137081
+}
+
+src_compile() {
+	emake installer || die
+}
+
+src_install() {
+	emake INSTALLROOT="${D}" install || die
+	dodoc README* NEWS TODO *.doc memdisk/memdisk.doc
+}

Modified: incognito/branches/polipo/portage.overlay/x11-plugins/cookiesafe/Manifest
===================================================================
--- incognito/branches/polipo/portage.overlay/x11-plugins/cookiesafe/Manifest	2007-10-08 08:28:51 UTC (rev 11786)
+++ incognito/branches/polipo/portage.overlay/x11-plugins/cookiesafe/Manifest	2007-10-08 13:13:46 UTC (rev 11787)
@@ -1,8 +1,8 @@
 DIST cookiesafe-2.0.6-fx+fl+mz+ns+zm.xpi 196491 RMD160 96fabf29379fab9e1dce5211427f1530f2c05af1 SHA1 8b637b48dca66995d46cb80fb414775c23fc2378 SHA256 42bec2e93d99927c7c093ed5693ede4e3b1dc80af767acb5f7df8d853f342d9a
-EBUILD cookiesafe-2.0.6.ebuild 976 RMD160 0f6bdc4bafbc5076e8256173d9951deba9a26000 SHA1 89c492c1df0be487524b8aa7fb58c21a32af246b SHA256 b65f9538280ce6d58ebcd26f772b641c9d7ed1dc26e93604c05026b50085975c
-MD5 0e76a80a2641948b60151f5159c22a6f cookiesafe-2.0.6.ebuild 976
-RMD160 0f6bdc4bafbc5076e8256173d9951deba9a26000 cookiesafe-2.0.6.ebuild 976
-SHA256 b65f9538280ce6d58ebcd26f772b641c9d7ed1dc26e93604c05026b50085975c cookiesafe-2.0.6.ebuild 976
+EBUILD cookiesafe-2.0.6.ebuild 925 RMD160 458502d3f05780d43f89d3ff7da6ecc05e85b850 SHA1 55b51033ea145c9be8481c21debf29296631239e SHA256 67519d94e8c49251f1298bc5e0dcf1c71bf349fddb155475640210b99796cc2d
+MD5 b5a6f14a1a7154c5ec0b6a3ee850ed86 cookiesafe-2.0.6.ebuild 925
+RMD160 458502d3f05780d43f89d3ff7da6ecc05e85b850 cookiesafe-2.0.6.ebuild 925
+SHA256 67519d94e8c49251f1298bc5e0dcf1c71bf349fddb155475640210b99796cc2d cookiesafe-2.0.6.ebuild 925
 MD5 6336e6d794bd657c0ace9b95978591e8 files/digest-cookiesafe-2.0.6 286
 RMD160 388978bb42b69dc845db83bfe0fcee7c594070fb files/digest-cookiesafe-2.0.6 286
 SHA256 6b3f649f9b5cd3c9526ec3ebacfd6ba13126e707cccd429612250c0b4d21153f files/digest-cookiesafe-2.0.6 286

Modified: incognito/branches/polipo/portage.overlay/x11-plugins/cookiesafe/cookiesafe-2.0.6.ebuild
===================================================================
--- incognito/branches/polipo/portage.overlay/x11-plugins/cookiesafe/cookiesafe-2.0.6.ebuild	2007-10-08 08:28:51 UTC (rev 11786)
+++ incognito/branches/polipo/portage.overlay/x11-plugins/cookiesafe/cookiesafe-2.0.6.ebuild	2007-10-08 13:13:46 UTC (rev 11787)
@@ -1,6 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header$
 
 inherit mozextension multilib
 

Modified: incognito/branches/polipo/portage.overlay/x11-plugins/enigmail-bin/Manifest
===================================================================
--- incognito/branches/polipo/portage.overlay/x11-plugins/enigmail-bin/Manifest	2007-10-08 08:28:51 UTC (rev 11786)
+++ incognito/branches/polipo/portage.overlay/x11-plugins/enigmail-bin/Manifest	2007-10-08 13:13:46 UTC (rev 11787)
@@ -1,9 +1,9 @@
 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 1022 RMD160 113b887fa81138b9e2e3b7e0e972a40d8e0b6ca3 SHA1 367c9e314d192a71bf15217ee0f05c40eb1a8bd4 SHA256 564a0dd58713f71f79fb19d552cdb1c23fa84ae33c4800048ee6661ff3c0679c
-MD5 c1b60ddadb5d5384ca01c797fa3666e1 enigmail-bin-0.95.2.ebuild 1022
-RMD160 113b887fa81138b9e2e3b7e0e972a40d8e0b6ca3 enigmail-bin-0.95.2.ebuild 1022
-SHA256 564a0dd58713f71f79fb19d552cdb1c23fa84ae33c4800048ee6661ff3c0679c enigmail-bin-0.95.2.ebuild 1022
+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

Modified: incognito/branches/polipo/portage.overlay/x11-plugins/enigmail-bin/enigmail-bin-0.95.2.ebuild
===================================================================
--- incognito/branches/polipo/portage.overlay/x11-plugins/enigmail-bin/enigmail-bin-0.95.2.ebuild	2007-10-08 08:28:51 UTC (rev 11786)
+++ incognito/branches/polipo/portage.overlay/x11-plugins/enigmail-bin/enigmail-bin-0.95.2.ebuild	2007-10-08 13:13:46 UTC (rev 11787)
@@ -1,6 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation 
 # Distributed under the terms of the GNU General Public License v2 
-# $Header: $ 
 
 inherit multilib mozextension 
 	 

Modified: incognito/branches/polipo/portage.overlay/x11-plugins/firefox-quick-locale-switcher/Manifest
===================================================================
--- incognito/branches/polipo/portage.overlay/x11-plugins/firefox-quick-locale-switcher/Manifest	2007-10-08 08:28:51 UTC (rev 11786)
+++ incognito/branches/polipo/portage.overlay/x11-plugins/firefox-quick-locale-switcher/Manifest	2007-10-08 13:13:46 UTC (rev 11787)
@@ -1,8 +1,8 @@
 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 1153 RMD160 1c909dc163ee8f40926028876561fb4839d8f116 SHA1 7bfb66eeb425d4f87af9f98d8bf41cc51fbe328f SHA256 cb178619f57514990f29cf5919e264ea344422db59dd3912439014eeeba727ba
-MD5 78687a730bdd864370bdb726c9a3e533 firefox-quick-locale-switcher-1.6.3.1.ebuild 1153
-RMD160 1c909dc163ee8f40926028876561fb4839d8f116 firefox-quick-locale-switcher-1.6.3.1.ebuild 1153
-SHA256 cb178619f57514990f29cf5919e264ea344422db59dd3912439014eeeba727ba firefox-quick-locale-switcher-1.6.3.1.ebuild 1153
+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

Modified: incognito/branches/polipo/portage.overlay/x11-plugins/firefox-quick-locale-switcher/firefox-quick-locale-switcher-1.6.3.1.ebuild
===================================================================
--- incognito/branches/polipo/portage.overlay/x11-plugins/firefox-quick-locale-switcher/firefox-quick-locale-switcher-1.6.3.1.ebuild	2007-10-08 08:28:51 UTC (rev 11786)
+++ incognito/branches/polipo/portage.overlay/x11-plugins/firefox-quick-locale-switcher/firefox-quick-locale-switcher-1.6.3.1.ebuild	2007-10-08 13:13:46 UTC (rev 11787)
@@ -1,6 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header$
 
 inherit mozextension multilib
 

Copied: incognito/branches/polipo/portage.overlay/x11-plugins/firegpg (from rev 11786, incognito/trunk/portage.overlay/x11-plugins/firegpg)

Deleted: incognito/branches/polipo/portage.overlay/x11-plugins/firegpg/Manifest
===================================================================
--- incognito/trunk/portage.overlay/x11-plugins/firegpg/Manifest	2007-10-08 08:28:51 UTC (rev 11786)
+++ incognito/branches/polipo/portage.overlay/x11-plugins/firegpg/Manifest	2007-10-08 13:13:46 UTC (rev 11787)
@@ -1,7 +0,0 @@
-EBUILD firegpg-0.4.3.ebuild 1282 RMD160 5eea4a181426e7adc467bd4d6edfd6f654404122 SHA1 576bbbd471aaf7b1f6fcc331a8f4b0f2cac40c4b SHA256 783a85d6e3085ee02c3292ea776f0f4d15f9104e415e3ea4ae8587ae68cc7219
-MD5 86f123ab053398b13b91ffc32e3ea604 firegpg-0.4.3.ebuild 1282
-RMD160 5eea4a181426e7adc467bd4d6edfd6f654404122 firegpg-0.4.3.ebuild 1282
-SHA256 783a85d6e3085ee02c3292ea776f0f4d15f9104e415e3ea4ae8587ae68cc7219 firegpg-0.4.3.ebuild 1282
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-firegpg-0.4.3 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-firegpg-0.4.3 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-firegpg-0.4.3 0

Copied: incognito/branches/polipo/portage.overlay/x11-plugins/firegpg/Manifest (from rev 11786, incognito/trunk/portage.overlay/x11-plugins/firegpg/Manifest)
===================================================================
--- incognito/branches/polipo/portage.overlay/x11-plugins/firegpg/Manifest	                        (rev 0)
+++ incognito/branches/polipo/portage.overlay/x11-plugins/firegpg/Manifest	2007-10-08 13:13:46 UTC (rev 11787)
@@ -0,0 +1,7 @@
+EBUILD firegpg-0.4.3.ebuild 1282 RMD160 5eea4a181426e7adc467bd4d6edfd6f654404122 SHA1 576bbbd471aaf7b1f6fcc331a8f4b0f2cac40c4b SHA256 783a85d6e3085ee02c3292ea776f0f4d15f9104e415e3ea4ae8587ae68cc7219
+MD5 86f123ab053398b13b91ffc32e3ea604 firegpg-0.4.3.ebuild 1282
+RMD160 5eea4a181426e7adc467bd4d6edfd6f654404122 firegpg-0.4.3.ebuild 1282
+SHA256 783a85d6e3085ee02c3292ea776f0f4d15f9104e415e3ea4ae8587ae68cc7219 firegpg-0.4.3.ebuild 1282
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-firegpg-0.4.3 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-firegpg-0.4.3 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-firegpg-0.4.3 0

Copied: incognito/branches/polipo/portage.overlay/x11-plugins/firegpg/files (from rev 11786, incognito/trunk/portage.overlay/x11-plugins/firegpg/files)

Deleted: incognito/branches/polipo/portage.overlay/x11-plugins/firegpg/files/digest-firegpg-0.4.3
===================================================================

Copied: incognito/branches/polipo/portage.overlay/x11-plugins/firegpg/files/digest-firegpg-0.4.3 (from rev 11786, incognito/trunk/portage.overlay/x11-plugins/firegpg/files/digest-firegpg-0.4.3)
===================================================================

Deleted: incognito/branches/polipo/portage.overlay/x11-plugins/firegpg/firegpg-0.4.3.ebuild
===================================================================
--- incognito/trunk/portage.overlay/x11-plugins/firegpg/firegpg-0.4.3.ebuild	2007-10-08 08:28:51 UTC (rev 11786)
+++ incognito/branches/polipo/portage.overlay/x11-plugins/firegpg/firegpg-0.4.3.ebuild	2007-10-08 13:13:46 UTC (rev 11787)
@@ -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 279"
-
-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/branches/polipo/portage.overlay/x11-plugins/firegpg/firegpg-0.4.3.ebuild (from rev 11786, incognito/trunk/portage.overlay/x11-plugins/firegpg/firegpg-0.4.3.ebuild)
===================================================================
--- incognito/branches/polipo/portage.overlay/x11-plugins/firegpg/firegpg-0.4.3.ebuild	                        (rev 0)
+++ incognito/branches/polipo/portage.overlay/x11-plugins/firegpg/firegpg-0.4.3.ebuild	2007-10-08 13:13:46 UTC (rev 11787)
@@ -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/"
+# 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 279"
+
+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"
+}

Modified: incognito/branches/polipo/portage.overlay/x11-plugins/thunderplunger/Manifest
===================================================================
--- incognito/branches/polipo/portage.overlay/x11-plugins/thunderplunger/Manifest	2007-10-08 08:28:51 UTC (rev 11786)
+++ incognito/branches/polipo/portage.overlay/x11-plugins/thunderplunger/Manifest	2007-10-08 13:13:46 UTC (rev 11787)
@@ -1,8 +1,8 @@
 DIST thunderplunger-0.7-tb.xpi 51426 RMD160 cdbbb2cb709d02b77fc14f7a811331d2a09c4474 SHA1 c9a0a6bdc8013b8c0149e41468f3975c1169855c SHA256 7c9d9daec73bc463e6492c7d14d1016451dd1615d29201d359270902597e8a9c
-EBUILD thunderplunger-0.7.ebuild 868 RMD160 b34243383d09288138f9de882f7b18b26b94dac6 SHA1 081969c08c20c163c1f8723053147310f7b086a2 SHA256 948b6e7e083f083852fe8eec940baacac4877a8c0ce8be6e0f4d483213d3a712
-MD5 36aa24a34f1b71f848c1c9264277d434 thunderplunger-0.7.ebuild 868
-RMD160 b34243383d09288138f9de882f7b18b26b94dac6 thunderplunger-0.7.ebuild 868
-SHA256 948b6e7e083f083852fe8eec940baacac4877a8c0ce8be6e0f4d483213d3a712 thunderplunger-0.7.ebuild 868
+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

Modified: incognito/branches/polipo/portage.overlay/x11-plugins/thunderplunger/thunderplunger-0.7.ebuild
===================================================================
--- incognito/branches/polipo/portage.overlay/x11-plugins/thunderplunger/thunderplunger-0.7.ebuild	2007-10-08 08:28:51 UTC (rev 11786)
+++ incognito/branches/polipo/portage.overlay/x11-plugins/thunderplunger/thunderplunger-0.7.ebuild	2007-10-08 13:13:46 UTC (rev 11787)
@@ -1,6 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header$
 
 inherit mozextension multilib
 

Modified: incognito/branches/polipo/release-steps.html
===================================================================
--- incognito/branches/polipo/release-steps.html	2007-10-08 08:28:51 UTC (rev 11786)
+++ incognito/branches/polipo/release-steps.html	2007-10-08 13:13:46 UTC (rev 11787)
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>Incognito CD Release Procedure</title>
+<title>Incognito Release Procedure</title>
 </head>
 
 <body>
@@ -13,8 +13,8 @@
 <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 with timestamp removed</li>
-<li>Export readme.html on full CD (/var/tmp/catalyst/tmp/incognito/livecd-stage2-*/usr/share/incognito/readme.html) to incognito.html in hidden service dir and www.patdouble.com</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>

Modified: incognito/branches/polipo/root_overlay/usr/sbin/create-usb
===================================================================
--- incognito/branches/polipo/root_overlay/usr/sbin/create-usb	2007-10-08 08:28:51 UTC (rev 11786)
+++ incognito/branches/polipo/root_overlay/usr/sbin/create-usb	2007-10-08 13:13:46 UTC (rev 11787)
@@ -123,7 +123,7 @@
 # Required files
 IMAGE="image.squashfs"
 REQUIRED_FILES="isolinux/isolinux.cfg isolinux/vesamenu.c32 isolinux/splash.png isolinux/gentoo isolinux/gentoo.igz ${IMAGE}"
-EXCLUDE="System.map-gentoo|isolinux.bin|boot.cat|kernels.msg|qemu"
+EXCLUDE="System.map-gentoo|isolinux.bin|boot.cat|kernels.msg"
 COPY_FILES=$( find ${MEDIAROOT} ! -type d | egrep -v "$EXCLUDE" | sed "s|${MEDIAROOT}/||g" )
 DIRS=$( find ${MEDIAROOT} -type d | egrep -v "$EXCLUDE" | sed "s|${MEDIAROOT}||g" | sed "s|isolinux|syslinux|g" )
 

Modified: incognito/branches/polipo/root_overlay/usr/share/incognito/readme.html
===================================================================
--- incognito/branches/polipo/root_overlay/usr/share/incognito/readme.html	2007-10-08 08:28:51 UTC (rev 11786)
+++ incognito/branches/polipo/root_overlay/usr/share/incognito/readme.html	2007-10-08 13:13:46 UTC (rev 11787)
@@ -142,6 +142,9 @@
 <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(net-irc/xchat) -->">XChat</a> <!-- #version(net-irc/xchat) --></dt>
 <dd><!-- #description(net-irc/xchat) --></dd>
 
@@ -171,6 +174,9 @@
 <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>
 

Modified: incognito/branches/polipo/root_overlay/var/lib/firefox-config/firefox/m7m1jk79.Default User/bookmarks.html
===================================================================
--- incognito/branches/polipo/root_overlay/var/lib/firefox-config/firefox/m7m1jk79.Default User/bookmarks.html	2007-10-08 08:28:51 UTC (rev 11786)
+++ incognito/branches/polipo/root_overlay/var/lib/firefox-config/firefox/m7m1jk79.Default User/bookmarks.html	2007-10-08 13:13:46 UTC (rev 11787)
@@ -21,12 +21,11 @@
         <DT><A HREF="http://en-US.www.mozilla.com/en-US/firefox/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">About Us</A>
     </DL><p>
     <DT><A HREF="http://tor.eff.org/" ADD_DATE="1179421077" LAST_VISIT="1179421601" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd4v9sP17/xsHN/1A3Tf8lGSD/YxM9/2sVRP80DB7/Ty44bv///wD///8A////AP///wAwAAUwSERJ/+jx8v/Xx9P/YDVS/7y+zP9BKEH/LiUs/2ceRf91JFT/Ngke/yYACVj///8A////AP///wD///8ANwAJHFNNUv/h6+z/9PD0/31Zev+GeJL/Rj5X/zAjK/9zL1f/ezFd/y0NGv8mAA42////AP///wD///8A////AFUAAAMVAAqge4GF//v8/P/x7/L/hHCN/1NVbf87KDP/g0Fq/14pSP9PLz3/AAAABP///wD///8A////AP///wD///8AOQAcCQcACpWcoqX/+/39/7PJ0v9oeYn/Ry89/5BVff8+IC//IAANKP///wD///8A////AP///wD///8A////AP///wBGABcLCgAHmXFucv/G4eb/SUhS/109UP9WOkf/WEJIhf///wD///8A////AP///wD///8A////AP///wD///8A////AFUAKgYZAAiGRkNJ/0IyO/9XQkj/KQAIHzMAAAX///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AMwANFFxMU/9WQEr/PgAMKf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AD4AFyFWUln/OW5Y/wCobmQAqnEJ////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCZAGYFQpF3hQteOv8AiVGpGb2BbP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AAD//wMAjF2oB35N8gClYpcAuHEk////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AANOEHQCvdn8ArGipALJshwC4ezb///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wAA/78IANmXNgDFgyMAv4AM////AP///wD///8A//8AAPAPAADgBwAA4AcAAOAHAADgBwAA8AcAAPgPAAD8HwAA/j8AAP5/AAD+fwAA/38AAP//AAD//wAA//8AAA==" LAST_CHARSET="ISO-8859-1" ID="rdf:#$J6xLp1">Tor: anonymity online</A>
-    <DT><A HREF="http://www.patdouble.com" ADD_DATE="1179421170" LAST_CHARSET="ISO-8859-1" ID="rdf:#$K6xLp1">__INCOGNITO_TITLE__</A>
+    <DT><A HREF="http://www.patdouble.com" ADD_DATE="1179421170" LAST_CHARSET="ISO-8859-1" ID="rdf:#$K6xLp1">__INCOGNITO__</A>
     <DT><A HREF="http://wiki.noreply.org/noreply/TheOnionRouter" ADD_DATE="1179421176" LAST_CHARSET="UTF-8" ID="rdf:#$L6xLp1">TheOnionRouter - Noreply Wiki</A>
     <DT><A HREF="http://6sxoyfb3h2nvok2d.onion/tor/" ADD_DATE="1179421241" LAST_VISIT="1179421480" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd4v9sP17/xsHN/1A3Tf8lGSD/YxM9/2sVRP80DB7/Ty44bv///wD///8A////AP///wAwAAUwSERJ/+jx8v/Xx9P/YDVS/7y+zP9BKEH/LiUs/2ceRf91JFT/Ngke/yYACVj///8A////AP///wD///8ANwAJHFNNUv/h6+z/9PD0/31Zev+GeJL/Rj5X/zAjK/9zL1f/ezFd/y0NGv8mAA42////AP///wD///8A////AFUAAAMVAAqge4GF//v8/P/x7/L/hHCN/1NVbf87KDP/g0Fq/14pSP9PLz3/AAAABP///wD///8A////AP///wD///8AOQAcCQcACpWcoqX/+/39/7PJ0v9oeYn/Ry89/5BVff8+IC//IAANKP///wD///8A////AP///wD///8A////AP///wBGABcLCgAHmXFucv/G4eb/SUhS/109UP9WOkf/WEJIhf///wD///8A////AP///wD///8A////AP///wD///8A////AFUAKgYZAAiGRkNJ/0IyO/9XQkj/KQAIHzMAAAX///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AMwANFFxMU/9WQEr/PgAMKf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AD4AFyFWUln/OW5Y/wCobmQAqnEJ////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCZAGYFQpF3hQteOv8AiVGpGb2BbP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AAD//wMAjF2oB35N8gClYpcAuHEk////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AANOEHQCvdn8ArGipALJshwC4ezb///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wAA/78IANmXNgDFgyMAv4AM////AP///wD///8A//8AAPAPAADgBwAA4AcAAOAHAADgBwAA8AcAAPgPAAD8HwAA/j8AAP5/AAD+fwAA/38AAP//AAD//wAA//8AAA==" LAST_CHARSET="UTF-8" ID="rdf:#$M6xLp1">Tor Hidden Wiki</A>
     <DT><A HREF="http://www.anonymityanywhere.com/" ADD_DATE="1179421773" LAST_CHARSET="ISO-8859-1" ID="rdf:#$O6xLp1">anonymityanywhere.com - Home</A>
 <DD>Anonymity Anywhere - A LiveCD That Allows You To Browse the Internet Anonymously Anywhere
     <DT><A HREF="http://anonymityanywhere.com/index.php?option=com_content&task=view&id=13&Itemid=32" ADD_DATE="1179421800" LAST_CHARSET="ISO-8859-1" ID="rdf:#$P6xLp1">anonymityanywhere.com - Anonymity Health Check</A>
 <DD>Anonymity Anywhere - A LiveCD That Allows You To Browse the Internet Anonymously Anywhere
-    <DT><A HREF="http://www.rocklinux.org/wiki/ROCKate" ADD_DATE="1179422102" LAST_CHARSET="UTF-8" ID="rdf:#$Q6xLp1">ROCKate - RockWiki</A>
 </DL><p>

Modified: incognito/branches/polipo/root_overlay/var/lib/firefox-config/firefox/m7m1jk79.Default User/prefs.js
===================================================================
--- incognito/branches/polipo/root_overlay/var/lib/firefox-config/firefox/m7m1jk79.Default User/prefs.js	2007-10-08 08:28:51 UTC (rev 11786)
+++ incognito/branches/polipo/root_overlay/var/lib/firefox-config/firefox/m7m1jk79.Default User/prefs.js	2007-10-08 13:13:46 UTC (rev 11787)
@@ -41,6 +41,11 @@
 user_pref("network.cookie.cookieBehavior", 2);
 user_pref("cookiesafe.clearCookies", true);
 
+/* FireGPG: disable updates and welcome window */
+user_pref("extensions.firegpg.gpg_path", "gpg");
+user_pref("extensions.firegpg.gpg_version", "0.4.3");
+user_pref("extensions.firegpg.no_updates", true);
+
 user_pref("browser.startup.page", 0);
 user_pref("extensions.update.enabled", false);
 user_pref("extensions.update.notifyUser", false);

Modified: incognito/branches/polipo/root_overlay/var/lib/kdesession/bookmarks.xml
===================================================================
--- incognito/branches/polipo/root_overlay/var/lib/kdesession/bookmarks.xml	2007-10-08 08:28:51 UTC (rev 11786)
+++ incognito/branches/polipo/root_overlay/var/lib/kdesession/bookmarks.xml	2007-10-08 13:13:46 UTC (rev 11787)
@@ -8,7 +8,7 @@
   </info>
  </bookmark>
  <bookmark icon="www" href="http://www.patdouble.com" >
-  <title>__INCOGNITO_TITLE__</title>
+  <title>__INCOGNITO__</title>
   <info>
    <metadata owner="http://www.kde.org" />
   </info>
@@ -31,10 +31,4 @@
    <metadata owner="http://www.kde.org" />
   </info>
  </bookmark>
- <bookmark icon="www" href="http://www.rocklinux.org/wiki/ROCKate" >
-  <title>ROCKate - RockWiki</title>
-  <info>
-   <metadata owner="http://www.kde.org" />
-  </info>
- </bookmark>
 </xbel>



More information about the tor-commits mailing list