[or-cvs] r16203: Just a few refinements, minor tweaks and rewordings here and (in incognito/trunk: . portage.config root_overlay/etc/init.d root_overlay/usr/sbin root_overlay/var/lib/kdesession)

anonym at seul.org anonym at seul.org
Fri Jul 25 14:15:53 UTC 2008 

Author: anonym
Date: 2008-07-25 10:15:53 -0400 (Fri, 25 Jul 2008)
New Revision: 16203

Modified:
   incognito/trunk/building.html
   incognito/trunk/hacking.html
   incognito/trunk/portage.config/package.keywords
   incognito/trunk/portage.config/package.use
   incognito/trunk/root_overlay/etc/init.d/external-config-setup
   incognito/trunk/root_overlay/usr/sbin/create-homevol
   incognito/trunk/root_overlay/var/lib/kdesession/ksmserverrc
Log:
Just a few refinements, minor tweaks and rewordings here and there.


Modified: incognito/trunk/building.html
===================================================================
--- incognito/trunk/building.html	2008-07-25 14:12:07 UTC (rev 16202)
+++ incognito/trunk/building.html	2008-07-25 14:15:53 UTC (rev 16203)
@@ -14,14 +14,14 @@
 <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>
 <li>Good understanding of catalyst, portage, Gentoo and Linux systems in general</li>
-<li>The Incognito sources of you choice (get a branch, tagged release or trunk from <a href="https://tor-svn.freehaven.net/svn/incognito/">here</a>), placed in <code>/usr/src/incognito</code> (this is currently assumed by the build-scripts and spec-files, unfortunately).</li>
+<li>The Incognito sources of your choice (get a branch, tagged release or trunk from <a href="https://tor-svn.freehaven.net/svn/incognito/">here</a>).</li>
 </ul>
 </p>
 
-<p>Here are the instructions. Note that the following probably will not work as a step-to-step guide really. It's more a set of pointers. It's assumed that you know what you're doing, especially in terms of how portage and catalyst works. If you don't, you might very well fail at some point even if you followed the preceeding steps to the letter.</p>
-
 <p>Unfortunaley, due to the dynamic and time dependent nature of portage some sources (at least in the old releases) might not be available at the URIs specified in the ebuilds if they're outdated. Therefore, if some ebuild fails stating that the sources could not be located, you'll have to locate them manually and put them in <code>/usr/portage/distfiles</code>. Unless you have configured wget to use Tor in the catalyst build environment the same applies for the package <code>trans-proxy-tor</code> as it's only available from a Tor hidden service.</p> 
 
+<p>Here are the instructions. Note that all commands should be run as the super user (i.e. root). Note that the following probably will not work as a step-to-step guide really. It's more a set of pointers. It's assumed that you know what you're doing, especially in terms of how portage and catalyst works. If you don't, you might very well fail at some point even if you followed the preceeding steps to the letter.</p>
+
 <ol>
 
 <li><p>First of all you'll need a portage snapshot. This can be done either by using one of the snapshots used for building the official Incognito releases, or by generating your own one that might be more up to date. Usually, if you're using the trunk sources (i.e. the development version) you should generate your own snapshot. Note that generating your own snapshot most likely will require alot more modifications and ebuild hacking to get working. If you're trying to build any of the tagged versions (i.e. any past Incognito release) you might want to get the snapshot for that release (if it's available) since you then avoid the above mentioned trouble.</p>

Modified: incognito/trunk/hacking.html
===================================================================
--- incognito/trunk/hacking.html	2008-07-25 14:12:07 UTC (rev 16202)
+++ incognito/trunk/hacking.html	2008-07-25 14:15:53 UTC (rev 16203)
@@ -6,21 +6,20 @@
 
 <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. Patches present your changes better and if the file(s) are you changing have changed since you updated, there is a better chance the changes 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'll probably get an SVN account if you want to.
-</p>
+<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. Patches present your changes better and if your changes affect files that have been altered by the developers since you updated, there is a better chance the changes can be applied. Checkout <a href="https://tor-svn.freehaven.net/svn/incognito/trunk">https://tor-svn.freehaven.net/svn/incognito/trunk</a> with Subversion, 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'll probably get an Subversion account if you want to be a frequent contributor or join the team.</p>
 
 <h2>Pre-reqs</h2>
 
 <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>Linux - the base operating system</li>
+<li>Portage - the Gentoo Linux package management system</li>
+<li>Catalyst - the Gentoo Linux 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.
+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, VMWare or Virtual PC to test it.
 </p>
 
 <h2>TODO list</h2>

Modified: incognito/trunk/portage.config/package.keywords
===================================================================
--- incognito/trunk/portage.config/package.keywords	2008-07-25 14:12:07 UTC (rev 16202)
+++ incognito/trunk/portage.config/package.keywords	2008-07-25 14:15:53 UTC (rev 16203)
@@ -1,6 +1,7 @@
 # Tor and important applications we want latest version of
-#app-crypt/truecrypt ~*
-<kde-misc/tork-9999 ~*
+app-crypt/truecrypt ~*
+kde-misc/kvkbd ~*
+kde-misc/tork ~*
 mail-client/mozilla-thunderbird-bin ~*
 mail-mta/mixminion ~*
 net-im/kopete-otr ~*
@@ -11,13 +12,14 @@
 net-misc/vidalia ~*
 net-proxy/polipo ~*
 net-proxy/tsocks ~*
-www-client/mozilla-firefox-bin ~*
+<www-client/mozilla-firefox-bin-3 ~*
 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 ~*
+x11-plugins/torbutton-bin ~*
 
 # NetworkManager
 dev-libs/libnl ~*
@@ -72,8 +74,8 @@
 kde-misc/ksynaptics ~*
 net-misc/socat ~*
 net-proxy/dante ~*
-sys-boot/syslinux ~*
+=sys-boot/syslinux-3.70 ~*
 sys-devel/prelink ~*
-=sys-kernel/genkernel-3.4.10_pre10 ~*
+<sys-kernel/genkernel-9999 ~*
 x11-libs/libsynaptics ~*
 x11-misc/xdialog ~*

Modified: incognito/trunk/portage.config/package.use
===================================================================
--- incognito/trunk/portage.config/package.use	2008-07-25 14:12:07 UTC (rev 16202)
+++ incognito/trunk/portage.config/package.use	2008-07-25 14:15:53 UTC (rev 16203)
@@ -6,6 +6,8 @@
 net-misc/networkmanager -gnome
 kde-misc/knetworkmanager cisco dialup openvpn pptp
 www-servers/lighttpd minimal
+app-crypt/truecrypt X
+x11-libs/wxGTK X
 
 net-im/pidgin -gadu groupwise meanwhile msn ncurses qq zephyr
 kde-base/kopete gadu
@@ -21,3 +23,4 @@
 
 # apply log rotation patch for tor 0.1.2.x series
 net-misc/tor logrotate
+

Modified: incognito/trunk/root_overlay/etc/init.d/external-config-setup
===================================================================
--- incognito/trunk/root_overlay/etc/init.d/external-config-setup	2008-07-25 14:12:07 UTC (rev 16202)
+++ incognito/trunk/root_overlay/etc/init.d/external-config-setup	2008-07-25 14:15:53 UTC (rev 16203)
@@ -34,7 +34,7 @@
 
 	if [[ -w "${HOMEPART_TC}" ]]; then
 		ebegin "Mounting TrueCrypt /home"
-		#clear
+		clear
 		splash_verbose
 		/usr/sbin/mount-homevol TC ${HOMEPART_TC}
 		TMP=$?
@@ -48,8 +48,8 @@
 
 	if [[ ! -e /var/state/boot-media-home ]]; then
 		ebegin "Copying user config from boot media to /home/__INCOGNITO_USER__"
-		mkdir -p /home/__INCOGNITO_USER__/.kde3.5/share/config
-		[[ -f ${MEDIAROOT}/config/kopeterc ]] && cp ${MEDIAROOT}/config/kopeterc /home/__INCOGNITO_USER__/.kde3.5/share/config
+		mkdir -p /home/__INCOGNITO_USER__/.kde/share/config
+		[[ -f ${MEDIAROOT}/config/kopeterc ]] && cp ${MEDIAROOT}/config/kopeterc /home/__INCOGNITO_USER__/.kde/share/config
 		if [[ -d ${MEDIAROOT}/keys/ssh ]]; then
 			cp -a ${MEDIAROOT}/keys/ssh /home/__INCOGNITO_USER__/.ssh
 			chown -R __INCOGNITO_USER__:users /home/__INCOGNITO_USER__/.ssh
@@ -89,6 +89,7 @@
 	if [[ -f /var/state/boot-media-home ]]; then
 		ebegin "Unmounting boot media /home"
 		umount /home && rm /var/state/boot-media-home
+		truecrypt -t -d
 		eend $?
 	fi
 }

Modified: incognito/trunk/root_overlay/usr/sbin/create-homevol
===================================================================
--- incognito/trunk/root_overlay/usr/sbin/create-homevol	2008-07-25 14:12:07 UTC (rev 16202)
+++ incognito/trunk/root_overlay/usr/sbin/create-homevol	2008-07-25 14:15:53 UTC (rev 16203)
@@ -14,30 +14,30 @@
 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="Use the UP and DOWN arrowkeys, and TAB to navigate between different fields and buttons in this guide.
+QUESTION_HOME_PART="Use the UP and DOWN arrowkeys, and TAB to navigate between different fields and buttons in this guide. You may press ESC/Escape at any time to exit this guide.
 
 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 previous prompt? That way the start sequence will never get interrupted when booting __INCOGNITO__.
+QUESTION_DISABLE_PERSISTENT="Would you like to disable the previous prompt? That way the start sequence will not get interrupted when booting __INCOGNITO__ like it was this time.
 
-If you choose 'yes' here this can be undone by removing the file $(basename ${LOCK_FILE}), located on the USB drive."
+If you choose 'yes' here this can be undone by running \"Enable persistant home volume\" located on the desktop and in the K-menu once the graphical user interface has started."
 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_ENCRYPTION="Would you like to encrypt the home volume using TrueCrypt? This is strongly recommended as it will make your data unreadable for everyone that does not have the password you choose unless they can guess it. The only inconvenience added for this is that you will be prompted for the password at each start up."
 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.
+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 during the __INCOGNITO__ start sequence 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 claim that this is the only password you have they cannot prove of the hidden volume's 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."
+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. Leaving 50 MB should be enough for most purposes."
+PASSWORD_RECOMMENDATION="REMEMBER TO USE STRONG PASSWORDS! Blank passwords are not accepted. To be safe it is recommended to use at least 12 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.
+Use the Up and Down arrow keys to move between input fields. Press ENTER/RETURN to continue when finished.
 
 "
 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.
+Use the Up and Down arrow keys to move between input fields. Press ENTER/RETURN to continue when finished.
 
 ${PASSWORD_RECOMMENDATION}
 
@@ -60,9 +60,9 @@
 # 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 not, check if the user want to disable it permanently
 if [[ $? -ne 0 ]]; then
-	dialog --ascii-lines --title "${TITLE}" --backtitle "${BACKTITLE}" --defaultno --yesno "${QUESTION_NO_PERSISTENT}" ${DIM}
+	dialog --ascii-lines --title "${TITLE}" --backtitle "${BACKTITLE}" --defaultno --yesno "${QUESTION_DISABLE_PERSISTENT}" ${DIM}
 	if [[ $? -eq 0 ]]; then
 		touch ${LOCK_FILE}
 	fi

Modified: incognito/trunk/root_overlay/var/lib/kdesession/ksmserverrc
===================================================================
--- incognito/trunk/root_overlay/var/lib/kdesession/ksmserverrc	2008-07-25 14:12:07 UTC (rev 16202)
+++ incognito/trunk/root_overlay/var/lib/kdesession/ksmserverrc	2008-07-25 14:15:53 UTC (rev 16203)
@@ -12,8 +12,8 @@
 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
+discardCommand1=rm,$HOME/.kde/share/config/session/kwin_10cfcd7665000116774249400000243640000_1167743318_293752
+discardCommand2=rm,$HOME/.kde/share/config/session/tork_10cfcd7665000116774324900000243640016_1167743318_223267
 program1=kwin
 program2=tork
 restartCommand1=kwin,-session,10cfcd7665000116774249400000243640000_1167743318_293752

More information about the tor-commits mailing list