Author: nextgens
Date: 2007-07-19 21:15:50 +0000 (Thu, 19 Jul 2007)
New Revision: 14195

Removed:
   trunk/apps/new_installer/res/unix/bin/install_opennet.sh
   trunk/apps/new_installer/res/windows/bin/install_opennet.cmd
Modified:
   trunk/apps/new_installer/ProcessPanel.Spec.xml
   trunk/apps/new_installer/install.xml
   trunk/apps/new_installer/langpacks/fra.xml
Log:
new_installer: revert 14189 - see 
http://archives.freenetproject.org/message/20070719.205828.1e8fd0bf.en.html for 
details

Modified: trunk/apps/new_installer/ProcessPanel.Spec.xml
===================================================================
--- trunk/apps/new_installer/ProcessPanel.Spec.xml      2007-07-19 21:10:49 UTC 
(rev 14194)
+++ trunk/apps/new_installer/ProcessPanel.Spec.xml      2007-07-19 21:15:50 UTC 
(rev 14195)
@@ -26,19 +26,6 @@
                <executefile name="$INSTALL_PATH\bin\install_updater.cmd"/>
        </job>
 
-       <job name="Setting Opennet up">
-               <os family="unix"/>
-               <executefile name="$INSTALL_PATH/bin/install_opennet.sh"/>
-       </job>
-       <job name="Setting the Opennet up">
-               <os family="mac"/>
-               <executefile name="$INSTALL_PATH/bin/install_opennet.sh"/>
-       </job>
-       <job name="Setting the Opennet up">
-               <os family="windows"/>
-               <executefile name="$INSTALL_PATH\bin\install_opennet.cmd"/>
-       </job>
-
        <job name="Setting MDNS up">
                <os family="unix"/>
                <executefile name="$INSTALL_PATH/bin/install_mdns.sh"/>

Modified: trunk/apps/new_installer/install.xml
===================================================================
--- trunk/apps/new_installer/install.xml        2007-07-19 21:10:49 UTC (rev 
14194)
+++ trunk/apps/new_installer/install.xml        2007-07-19 21:15:50 UTC (rev 
14195)
@@ -151,7 +151,6 @@
                        <parsable 
targetfile="$INSTALL_PATH\bin\install_frost.cmd"/>
                        <parsable 
targetfile="$INSTALL_PATH\bin\install_jsite.cmd"/>
                        <parsable 
targetfile="$INSTALL_PATH\bin\install_plugins.cmd"/>
-                       <parsable 
targetfile="$INSTALL_PATH\bin\install_opennet.cmd"/>
                        <parsable 
targetfile="$INSTALL_PATH\bin\install_thaw.cmd"/>
                        <parsable 
targetfile="$INSTALL_PATH\bin\install_updater.cmd"/>
                        <parsable 
targetfile="$INSTALL_PATH\bin\install_wrapper.cmd"/>
@@ -183,7 +182,6 @@
                        <parsable 
targetfile="$INSTALL_PATH/bin/install_jSite.sh"/>
                        <parsable 
targetfile="$INSTALL_PATH/bin/install_librarian.sh"/>
                        <parsable 
targetfile="$INSTALL_PATH/bin/install_mdns.sh"/>
-                       <parsable 
targetfile="$INSTALL_PATH/bin/install_opennet.sh"/>
                        <parsable 
targetfile="$INSTALL_PATH/bin/install_stun.sh"/>
                        <parsable 
targetfile="$INSTALL_PATH/bin/install_upnp.sh"/>
                        <parsable 
targetfile="$INSTALL_PATH/bin/install_thaw.sh"/>
@@ -220,7 +218,6 @@
                        <parsable 
targetfile="$INSTALL_PATH/bin/install_jSite.sh"/>
                        <parsable 
targetfile="$INSTALL_PATH/bin/install_librarian.sh"/>
                        <parsable 
targetfile="$INSTALL_PATH/bin/install_mdns.sh"/>
-                       <parsable 
targetfile="$INSTALL_PATH/bin/install_opennet.sh"/>
                        <parsable 
targetfile="$INSTALL_PATH/bin/install_stun.sh"/>
                        <parsable 
targetfile="$INSTALL_PATH/bin/install_upnp.sh"/>
                        <parsable 
targetfile="$INSTALL_PATH/bin/install_thaw.sh"/>
@@ -231,11 +228,6 @@
                        <parsable 
targetfile="$INSTALL_PATH/bin/install_startup_hook-mac.sh"/>
                        <parsable targetfile="$INSTALL_PATH/bin/cleanup.sh"/>
                </pack>
-
-               <pack name="Opennet" id="opennet" required="no">
-                       <description>Allow the node to establish new 
connections to strangers automaticaly (useful only if you don't know anyone 
using freenet). Enabling this feature presents a SECURITY RISK.</description>
-                       <singlefile src="res/license/LICENSE.Freenet" 
target="$INSTALL_PATH/opennet"/>
-               </pack>
                
                <pack name="UninstallStuff" id="uninstall" required="no" 
os="windows">
                        <description>Create uninstallation hooks in the 
registry</description>

Modified: trunk/apps/new_installer/langpacks/fra.xml
===================================================================
--- trunk/apps/new_installer/langpacks/fra.xml  2007-07-19 21:10:49 UTC (rev 
14194)
+++ trunk/apps/new_installer/langpacks/fra.xml  2007-07-19 21:15:50 UTC (rev 
14195)
@@ -78,7 +78,6 @@
     <str id="unix.description" txt="Un pack contenant des scripts."/>
     <str id="uninstall.description" txt="Un pack permettant de configurer 
l'outil de d�sinstallation."/>
     <str id="autoupdater.description" txt="Un pack permettant au noeud de se 
tenir � jour automatiquement via freenet. Il est conseill� de l'installer."/>
-    <str id="opennet.description" txt="Un pack configurant le noeud pour qu'il 
trouve automatiquement des amis � qui se connecter (utile si vous ne connaissez 
personne qui utilise freenet) Attention: activer ce pack pr�sente des risques 
de SECURITE."/>
     <str id="stun.description" txt="Un pack permettant d'installer le plugin 
STUN pour freenet. STUN est le protocole permettant � freenet de d�couvrir 
dynamiquement quel est votre type de connexion internet. Ce protocole utilise 
un serveur tiers pour officier, ce qui peut etre consid�r� comme un risque de 
s�curit�. Nous recommandons de l'installer car il permet d'am�liorer la 
connectivit� des noeuds utilisant des adresses ip dynamiques (la plupart des 
noeuds)."/>
     <str id="upnp.description" txt="Un pack permettant d'activer le support 
UP&P pour freenet. Universal Plug aNd Play est le protocole permettant � 
freenet de d�couvrir dynamiquement quel est votre adresse IP et d'�tablir un 
port-forwarding. Ce protocole ne doit pas �tre utilis� si vous de faites pas 
confiance au r�seau auquel vous �tes connect�. Nous recommandons tout de m�me 
de l'installer car il permet d'am�liorer la connectivit� des noeuds."/>
     <str id="mdns.description" txt="Un pack permettant d'installer le plugin 
MDNSDiscovery pour freenet. MDNS est le protocole connu sous les noms 
ZeroConf/Bonjour/Rendez-Vous permettant � freenet de d�couvrir dynamiquement 
les autres noeuds pr�sents sur le r�seau local. Ce protocole permet aussi aux 
clients compatibles de s'auto-configurer."/>

Deleted: trunk/apps/new_installer/res/unix/bin/install_opennet.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_opennet.sh    2007-07-19 
21:10:49 UTC (rev 14194)
+++ trunk/apps/new_installer/res/unix/bin/install_opennet.sh    2007-07-19 
21:15:50 UTC (rev 14195)
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-INSTALL_PATH="${INSTALL_PATH:-$PWD}"
-
-cd "$INSTALL_PATH"
-
-if test -e opennet
-then
-       # Register opennet
-       echo "Enabling Opennet"
-       echo "node.opennet.enabled=true" >> freenet.ini
-
-       # Cleanup
-       rm -f opennet
-fi

Deleted: trunk/apps/new_installer/res/windows/bin/install_opennet.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/install_opennet.cmd        
2007-07-19 21:10:49 UTC (rev 14194)
+++ trunk/apps/new_installer/res/windows/bin/install_opennet.cmd        
2007-07-19 21:15:50 UTC (rev 14195)
@@ -1,10 +0,0 @@
[EMAIL PROTECTED] PATH=%SYSTEMROOT%\System32\;%PATH%
[EMAIL PROTECTED] INSTALL_PATH=$INSTALL_PATH
[EMAIL PROTECTED] JAVA_HOME=$JAVA_HOME
[EMAIL PROTECTED] /D %INSTALL_PATH%
-
[EMAIL PROTECTED] not exist opennet goto noopennet
[EMAIL PROTECTED] Enabling Opennet
[EMAIL PROTECTED] node.opennet.enabled=true >> freenet.ini
[EMAIL PROTECTED] /F opennet > NUL
-:noopennet

_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs

Reply via email to