[or-cvs] r16230: Removed the Kopete instant messenger. Pidgin should be enoug (in incognito/trunk: . arch/x86 portage.config root_overlay/etc/init.d root_overlay/usr/share/incognito root_overlay/var/lib/kdesession)

anonym at seul.org anonym at seul.org
Sun Jul 27 14:33:03 UTC 2008 

Author: anonym
Date: 2008-07-27 10:33:03 -0400 (Sun, 27 Jul 2008)
New Revision: 16230

Removed:
   incognito/trunk/root_overlay/var/lib/kdesession/kopeterc
Modified:
   incognito/trunk/arch/x86/livecd-stage1.spec
   incognito/trunk/fsscript.sh
   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/share/incognito/docs.html
Log:
Removed the Kopete instant messenger. Pidgin should be enough.


Modified: incognito/trunk/arch/x86/livecd-stage1.spec
===================================================================
--- incognito/trunk/arch/x86/livecd-stage1.spec	2008-07-27 14:24:09 UTC (rev 16229)
+++ incognito/trunk/arch/x86/livecd-stage1.spec	2008-07-27 14:33:03 UTC (rev 16230)
@@ -145,7 +145,6 @@
 	kde-base/konqueror
 	kde-base/konqueror-akregator
 	kde-base/konsole
-	kde-base/kopete
 	kde-base/kpager
 	kde-base/kpdf
 	kde-base/kpf
@@ -196,7 +195,6 @@
 	net-dialup/penggy
 	net-dns/bind-tools
 	net-dns/pdnsd
-	net-im/kopete-otr
 	net-im/pidgin
 	net-irc/xchat
 	net-misc/dhcp

Modified: incognito/trunk/fsscript.sh
===================================================================
--- incognito/trunk/fsscript.sh	2008-07-27 14:24:09 UTC (rev 16229)
+++ incognito/trunk/fsscript.sh	2008-07-27 14:33:03 UTC (rev 16230)
@@ -198,38 +198,6 @@
 passwd -d "root"
 chown -R root:root /root
 
-# Add Tor hidden IRC proxies to Kopete IRC networks
-echo "Add Tor hidden IRC proxies to Kopete"
-if [[ -f "/usr/kde/3.5/share/apps/kopete/ircnetworks.xml" ]]; then
-	head -n 2 /usr/kde/3.5/share/apps/kopete/ircnetworks.xml > /tmp/ircnetworks.xml
-	cat >> /tmp/ircnetworks.xml <<EOF
-	<network>
-		<name>Freenode (via Tor Hidden Service)</name>
-		<description></description>
-		<servers>
-			<server>
-				<host>mejokbp2brhw4omd.onion</host>
-				<port>6667</port>
-				<useSSL>false</useSSL>
-			</server>
-		</servers>
-	</network>
-	<network>
-		<name>OFTC (via Tor Hidden Service)</name>
-		<description></description>
-		<servers>
-			<server>
-				<host>37lnq2veifl4kar7.onion</host>
-				<port>6667</port>
-				<useSSL>false</useSSL>
-			</server>
-		</servers>
-	</network>
-EOF
-	tail -n $(( $(wc -l /usr/kde/3.5/share/apps/kopete/ircnetworks.xml | awk '{print $1}') - 2  )) /usr/kde/3.5/share/apps/kopete/ircnetworks.xml >> /tmp/ircnetworks.xml
-	mv /tmp/ircnetworks.xml /usr/kde/3.5/share/apps/kopete/ircnetworks.xml
-fi
-
 # Allow these applications to start without root password
 echo "Setting up sudoers"
 cat >>/etc/sudoers <<EOF

Modified: incognito/trunk/portage.config/package.keywords
===================================================================
--- incognito/trunk/portage.config/package.keywords	2008-07-27 14:24:09 UTC (rev 16229)
+++ incognito/trunk/portage.config/package.keywords	2008-07-27 14:33:03 UTC (rev 16230)
@@ -4,7 +4,6 @@
 kde-misc/tork ~*
 mail-client/mozilla-thunderbird-bin ~*
 mail-mta/mixminion ~*
-net-im/kopete-otr ~*
 net-im/pidgin ~*
 net-libs/libotr ~*
 net-misc/tor ~*

Modified: incognito/trunk/portage.config/package.use
===================================================================
--- incognito/trunk/portage.config/package.use	2008-07-27 14:24:09 UTC (rev 16229)
+++ incognito/trunk/portage.config/package.use	2008-07-27 14:33:03 UTC (rev 16230)
@@ -11,7 +11,6 @@
 net-irc/xchat tcl
 
 net-im/pidgin -gadu groupwise meanwhile msn ncurses qq zephyr
-kde-base/kopete gadu
  
 # 'build' causes some required files to be removed
 dev-lang/perl -build

Modified: incognito/trunk/root_overlay/etc/init.d/external-config-setup
===================================================================
--- incognito/trunk/root_overlay/etc/init.d/external-config-setup	2008-07-27 14:24:09 UTC (rev 16229)
+++ incognito/trunk/root_overlay/etc/init.d/external-config-setup	2008-07-27 14:33:03 UTC (rev 16230)
@@ -49,7 +49,6 @@
 	if [[ ! -e /var/state/boot-media-home ]]; then
 		ebegin "Copying user config from boot media to /home/__INCOGNITO_USER__"
 		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
@@ -88,6 +87,7 @@
 stop() {
 	if [[ -f /var/state/boot-media-home ]]; then
 		ebegin "Unmounting boot media /home"
+		sync
 		umount /home && rm /var/state/boot-media-home
 		truecrypt -t -d
 		eend $?

Modified: incognito/trunk/root_overlay/usr/share/incognito/docs.html
===================================================================
--- incognito/trunk/root_overlay/usr/share/incognito/docs.html	2008-07-27 14:24:09 UTC (rev 16229)
+++ incognito/trunk/root_overlay/usr/share/incognito/docs.html	2008-07-27 14:33:03 UTC (rev 16230)
@@ -236,12 +236,6 @@
 <dt><a href="<!-- #homepage(kde-misc/tork) -->">TorK</a> <!-- #version(kde-misc/tork) --></dt>
 <dd><!-- #description(kde-misc/tork) --></dd>
 
-<dt><a href="<!-- #homepage(kde-base/kopete) -->">KDE - Kopete</a> <!-- #version(kde-base/kopete) --></dt>
-<dd><!-- #description(kde-base/kopete) --></dd>
-
-<dt><a href="<!-- #homepage(net-im/kopete-otr) -->">Kopete Off The Record plugin</a> <!-- #version(net-im/kopete-otr) --></dt>
-<dd><!-- #description(net-im/kopete-otr) --></dd>
-
 <dt><a href="<!-- #homepage(kde-base/kontact) -->">KDE - Kontact</a> <!-- #version(kde-base/kontact) --></dt>
 <dd><!-- #description(kde-base/kontact) --></dd>
 
@@ -373,16 +367,6 @@
 <li>Konqueror: <a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/var/lib/kdesession/bookmarks.xml">bookmarks.xml</a></li>
 </ul>
 
-<h4>Kopete</h4>
-<p>
-Kopete is configured with contacts to Freenode and OFTC IRC networks accessed via Tor hidden services. The Kopete ircnetworks.xml file is patched with these networks.
-</p>
-
-<ul>
-<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/root_overlay/var/lib/kdesession/kopeterc">kopeterc</a></li>
-<li><a href="https://tor-svn.freehaven.net/svn/incognito/trunk/fsscript.sh">fsscript.sh</a></li>
-</ul>
-
 <h4>XChat</h4>
 <p>
 XChat is configured to use the Tor software as a SOCKS5 proxy. It will pass the hostname through SOCKS5 so that the exit node does the DNS resolution.
@@ -442,7 +426,6 @@
 <tr><th>Software</th><th>USB drive location</th><th>Destination</th></tr>
 <tr><td>OpenVPN</td><td>/keys/openvpn</td><td>/etc/openvpn</td>
 <tr><td colspan="3">The following are only copied if a persistent home cannot be created.</td></tr>
-<tr><td>Kopete</td><td>/config/kopeterc</td><td>/home/__INCOGNITO_USER__/.kde/share/config</td>
 <tr><td>SSH</td><td>/keys/ssh</td><td>/home/__INCOGNITO_USER__/.ssh</td>
 </table>
 

Deleted: incognito/trunk/root_overlay/var/lib/kdesession/kopeterc
===================================================================
--- incognito/trunk/root_overlay/var/lib/kdesession/kopeterc	2008-07-27 14:24:09 UTC (rev 16229)
+++ incognito/trunk/root_overlay/var/lib/kdesession/kopeterc	2008-07-27 14:33:03 UTC (rev 16230)
@@ -1,49 +0,0 @@
-[Account_IRCProtocol_37lnq2veifl4kar7.onion]
-AccountId=37lnq2veifl4kar7.onion
-AutoShowServerWindow=false
-Codec=106
-Color=255,255,0
-ConnectCommands=
-CustomCtcp=
-ErrorMessages=1
-ExcludeConnect=false
-InformationReplies=1
-NetworkName=OFTC (via Tor Hidden Service)
-NickName=none
-PasswordIsWrong=false
-PreferSSL=false
-Protocol=IRCProtocol
-RealName=
-RememberPassword=true
-ServerMessages=2
-ServerNotices=2
-UserName=
-altNick=
-defaultPart=Kopete 0.12.4 : http://kopete.kde.org
-defaultQuit=Kopete 0.12.4 : http://kopete.kde.org
-
-[Account_IRCProtocol_mejokbp2brhw4omd.onion]
-AccountId=mejokbp2brhw4omd.onion
-AutoShowServerWindow=false
-Codec=106
-Color=0,0,255
-ConnectCommands=
-CustomCtcp=
-ErrorMessages=1
-ExcludeConnect=false
-InformationReplies=1
-NetworkName=Freenode (via Tor Hidden Service)
-NickName=none
-PasswordIsWrong=false
-PreferSSL=false
-Priority=1
-Protocol=IRCProtocol
-RealName=
-RememberPassword=true
-ServerMessages=2
-ServerNotices=2
-UserName=
-altNick=
-defaultPart=Kopete 0.12.4 : http://kopete.kde.org
-defaultQuit=Kopete 0.12.4 : http://kopete.kde.org
-

More information about the tor-commits mailing list