1 files changed, 78 insertions, 63 deletions

diff --git a/chinese/irssi/files/patch-irssi.conf b/chinese/irssi/files/patch-irssi.conf
index a0d303845f7b..aa8c245876da 100644
--- a/chinese/irssi/files/patch-irssi.conf
+++ b/chinese/irssi/files/patch-irssi.conf
@@ -1,104 +1,119 @@
---- irssi.conf.orig	2013-06-26 05:50:43.000000000 +0800
-+++ irssi.conf	2014-06-01 12:03:12.986452178 +0800
-@@ -1,93 +1,14 @@
+--- irssi.conf.orig	2014-10-11 16:42:36.000000000 +0800
++++ irssi.conf	2014-10-16 14:23:58.950709874 +0800
+@@ -1,108 +1,14 @@
  servers = (
--  { address = "eu.irc6.net"; chatnet = "IRCnet"; port = "6667"; },
--  { address = "open.ircnet.net"; chatnet = "IRCnet"; port = "6667"; },
--  { address = "chat.freenode.net"; chatnet = "Freenode"; port = "6667"; },
--  { address = "irc.efnet.org"; chatnet = "EFNet"; port = "6667"; },
--  { address = "irc.undernet.org"; chatnet = "Undernet"; port = "6667"; },
--  { address = "irc.dal.net"; chatnet = "DALnet"; port = "6667"; }, 
--  { address = "irc.quakenet.org"; chatnet = "QuakeNet"; port = "6667"; },
--  { address = "irc.oftc.net"; chatnet = "OFTC"; port = "6667"; },
+-  { address = "irc.dal.net";       chatnet = "DALnet";    port = "6667"; },
+-  { address = "irc.efnet.org";     chatnet = "EFNet";     port = "6667"; },
+-  { address = "irc.esper.net";     chatnet = "EsperNet";  port = "6667"; },
+-  { address = "chat.freenode.net"; chatnet = "Freenode";  port = "6667"; },
 -  { address = "irc.gamesurge.net"; chatnet = "GameSurge"; port = "6667"; },
--  { address = "irc.webchat.org"; chatnet = "WebChat"; port = "6667"; },
--  { address = "irc.rizon.net"; chatnet = "Rizon"; port = "6667"; },
--  { address = "irc.link-net.org"; chatnet = "LinkNet"; port = "6667"; },
--  { address = "silc.silcnet.org"; chatnet = "SILC"; port = "706"; }
+-  { address = "eu.irc6.net";       chatnet = "IRCnet";    port = "6667"; },
+-  { address = "open.ircnet.net";   chatnet = "IRCnet";    port = "6667"; },
+-  { address = "irc.ircsource.net"; chatnet = "IRCSource"; port = "6667"; },
+-  { address = "irc.netfuze.net";   chatnet = "NetFuze";   port = "6667"; },
+-  { address = "irc.oftc.net";      chatnet = "OFTC";      port = "6667"; },
+-  { address = "irc.quakenet.org";  chatnet = "QuakeNet";  port = "6667"; },
+-  { address = "irc.rizon.net";     chatnet = "Rizon";     port = "6667"; },
+-  { address = "silc.silcnet.org";  chatnet = "SILC";      port = "706";  },
+-  { address = "irc.undernet.org";  chatnet = "Undernet";  port = "6667"; }
 +  { address = "chat.ap.freenode.net"; chatnet = "BSDChat"; port = "6667"; },
 +  { address = "chat.us.freenode.net"; chatnet = "BSDChat"; port = "6667"; }
  );
  
  chatnets = {
--  IRCnet = {
--    type = "IRC";
+-  DALnet = {
+-    type      = "IRC";
 -    max_kicks = "4";
--    max_msgs = "5";
--    max_whois = "4";
--    max_query_chans = "5";
--  };
+-    max_msgs  = "20";
+-    max_whois = "30";
+-  }; 
 -  EFNet = {
--    type = "IRC";
--    max_kicks = "4";
--    max_msgs = "3";
+-    type      = "IRC";
+-    max_kicks = "1";
+-    max_msgs  = "4";
+-    max_whois = "1";
+-  };
+-  EsperNet = {
+-    type      = "IRC";
+-    max_kicks = "1";
+-    max_msgs  = "4";
 -    max_whois = "1";
 -  };
 -  Freenode = {
--    type = "IRC";
+-    type      = "IRC";
 -    max_kicks = "1";
--    max_msgs = "4";
+-    max_msgs  = "4";
 -    max_whois = "1";
 -  };
--  Undernet = {
--    type = "IRC";
+-  GameSurge = {
+-    type      = "IRC";
 -    max_kicks = "1";
--    max_msgs = "3";
--    max_whois = "30";
+-    max_msgs  = "1";
+-    max_whois = "1";
 -  };
--  DALnet = {
--    type = "IRC";
--    max_kicks = "4";
--    max_msgs = "3";
--    max_whois = "30";
--  }; 
--  QuakeNet = {
--    type = "IRC";
+-  IRCnet = {
+-    type      = "IRC";
 -    max_kicks = "1";
--    max_msgs = "3";
--    max_whois = "30";
+-    max_msgs  = "1";
+-    max_whois = "1";
 -  };
--  OFTC = {   
--    type = "IRC";
+-  IRCSource = {
+-    type      = "IRC";
 -    max_kicks = "1";
--    max_msgs = "3";
--    max_whois = "30";
+-    max_msgs  = "4";
+-    max_whois = "1";
 -  };
--  GameSurge = {
--    type = "IRC";
+-  NetFuze = {
+-    type      = "IRC";
 -    max_kicks = "1";
--    max_msgs = "3";
--    max_whois = "30";
+-    max_msgs  = "1";
+-    max_whois = "1";
 -  };
--  WebChat = {
--    type = "IRC";
+-  OFTC = {   
+-    type      = "IRC";
 -    max_kicks = "1";
--    max_msgs = "3";
--    max_whois = "30";
+-    max_msgs  = "1";
+-    max_whois = "1";
+-  };
+-  QuakeNet = {
+-    type      = "IRC";
+-    max_kicks = "1";
+-    max_msgs  = "1";
+-    max_whois = "1";
 -  };
 -  Rizon = {
--    type = "IRC";
+-    type      = "IRC";
 -    max_kicks = "1";
--    max_msgs = "3";
--    max_whois = "30";
+-    max_msgs  = "1";
+-    max_whois = "1";
+-  };
+-  SILC = {
+-    type = "SILC";
 -  };
--  LinkNet = {
--    type = "IRC";
+-  Undernet = {
+-    type      = "IRC";
 -    max_kicks = "1";
--    max_msgs = "3";
--    max_whois = "30";
+-    max_msgs  = "1";
+-    max_whois = "1";
 -  };
--  SILC = { type = "SILC"; };
 +  BSDChat = { type = "IRC"; max_kicks = 4; max_modes = 6; max_msgs = 3; };
  };
  
  channels = (
--  { name = "#irssi"; chatnet = "ircnet"; autojoin = "No"; },
--  { name = "silc"; chatnet = "silc"; autojoin = "No"; }
+-  { name = "#lobby";     chatnet = "EsperNet";  autojoin = "No"; },
+-  { name = "#freenode";  chatnet = "Freenode";  autojoin = "No"; },
+-  { name = "#irssi";     chatnet = "Freenode";  autojoin = "No"; },
+-  { name = "#gamesurge"; chatnet = "GameSurge"; autojoin = "No"; },
+-  { name = "#irssi";     chatnet = "IRCNet";    autojoin = "No"; },
+-  { name = "#ircsource"; chatnet = "IRCSource"; autojoin = "No"; },
+-  { name = "#netfuze";   chatnet = "NetFuze";   autojoin = "No"; },
+-  { name = "#oftc";      chatnet = "OFTC";      autojoin = "No"; },
+-  { name = "silc";       chatnet = "SILC";      autojoin = "No"; }
 +  { name = "#bsdchat"; chatnet = "BSDChat"; autojoin = "No"; }
  );
  
  aliases = {
-@@ -251,3 +172,14 @@ statusbar = {
+@@ -357,3 +263,14 @@ statusbar = {
      };
    };
  };