Merge pull request #2411 from TheBlueMatt/master

(finally) Remove IRC Seed support now that lfnet is down.
TrezarCoin · Mar 29, 2013 · ea83336 · ea83336
2 parents 8455310 + 6a1d6e0
commit ea83336
Show file tree

Hide file tree

Showing 17 changed files with 38 additions and 462 deletions.
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro
@@ -159,7 +159,6 @@ HEADERS += src/qt/bitcoingui.h \
     src/walletdb.h \
     src/script.h \
     src/init.h \
-    src/irc.h \
     src/bloom.h \
     src/mruset.h \
     src/checkqueue.h \
@@ -233,7 +232,6 @@ SOURCES += src/qt/bitcoin.cpp \
     src/main.cpp \
     src/init.cpp \
     src/net.cpp \
-    src/irc.cpp \
     src/bloom.cpp \
     src/checkpoints.cpp \
     src/addrman.cpp \

diff --git a/contrib/debian/bin/bitcoind b/contrib/debian/bin/bitcoind
diff --git a/contrib/debian/bitcoind.install b/contrib/debian/bitcoind.install
@@ -1,2 +1 @@
-debian/bin/bitcoind usr/bin
-src/bitcoind usr/lib/bitcoin
+src/bitcoind usr/bin
diff --git a/contrib/debian/changelog b/contrib/debian/changelog
@@ -1,3 +1,39 @@
+bitcoin (0.8.1-natty2) natty; urgency=low
+
+  * Remove dumb broken launcher script
+
+ -- Matt Corallo <[email protected]>  Sun, 24 Mar 2013 20:01:00 -0400
+
+bitcoin (0.8.1-natty1) natty; urgency=low
+
+  * New upstream release.
+
+ -- Matt Corallo <[email protected]>  Tue, 19 Mar 2013 13:03:00 -0400
+
+bitcoin (0.8.0-natty1) natty; urgency=low
+
+  * New upstream release.
+
+ -- Matt Corallo <[email protected]>  Sat, 23 Feb 2013 16:01:00 -0500
+
+bitcoin (0.7.2-natty1) natty; urgency=low
+
+  * New upstream release.
+
+ -- Matt Corallo <[email protected]>  Sat, 15 Dec 2012 10:59:00 -0400
+
+bitcoin (0.7.1-natty1) natty; urgency=low
+
+  * New upstream release.
+
+ -- Matt Corallo <[email protected]>  Wed, 24 Oct 2012 15:06:00 -0400
+
+bitcoin (0.7.0-natty1) natty; urgency=low
+
+  * New upstream release.
+
+ -- Matt Corallo <[email protected]>  Mon, 17 Sep 2012 13:45:00 +0200
+
 bitcoin (0.6.3-natty1) natty; urgency=low
 
   * New upstream release.

diff --git a/contrib/debian/control b/contrib/debian/control
@@ -33,8 +33,6 @@ Description: peer-to-peer network based digital currency - daemon
  transact directly with each other, with the help of a P2P network to
  check for double-spending.
  .
- By default connects to an IRC network to discover other peers.
- .
  Full transaction history is stored locally at each client.  This
  requires 2+ GB of space, slowly growing.
  .
@@ -51,8 +49,6 @@ Description: peer-to-peer network based digital currency - Qt GUI
  transact directly with each other, with the help of a P2P network to
  check for double-spending.
  .
- By default connects to an IRC network to discover other peers.
- .
  Full transaction history is stored locally at each client.  This
  requires 2+ GB of space, slowly growing.
  .

diff --git a/contrib/debian/examples/bitcoin.conf b/contrib/debian/examples/bitcoin.conf
@@ -18,10 +18,6 @@
 #connect=69.164.218.197
 #connect=10.0.0.1:8333
 
-# Do not use Internet Relay Chat (irc.lfnet.org #bitcoin channel) to
-# find other peers.
-#noirc=1
-
 # Maximum number of inbound+outbound connections.
 #maxconnections=
 

diff --git a/contrib/debian/manpages/bitcoin.conf.5 b/contrib/debian/manpages/bitcoin.conf.5
@@ -24,9 +24,6 @@ Use as many *addnode=* settings as you like to connect to specific peers.
 \fBconnect=\fR\fI'10.0.0.1:8333'\fR
 Use as many *connect=* settings as you like to connect ONLY to specific peers.
 .TP
-\fBnoirc=\fR[\fI'1'\fR|\fI'0'\fR]
-Use or Do not use Internet Relay Chat (irc.lfnet.org #bitcoin channel) to find other peers.
-.TP
 \fRmaxconnections=\fR\fI'value'\fR
 Maximum number of inbound+outbound connections.
 .SH JSON-RPC OPTIONS

diff --git a/doc/coding.txt b/doc/coding.txt
@@ -65,9 +65,6 @@ StartNode : Starts other threads.
 ThreadGetMyExternalIP : Determines outside-the-firewall IP address,
 sends addr message to connected peers when it determines it. 
 
-ThreadIRCSeed : Joins IRC bootstrapping channel, watching for new
-peers and advertising this node's IP address. 
-
 ThreadSocketHandler : Sends/Receives data from peers on port 8333.
 
 ThreadMessageHandler : Higher-level message handling (sending and

diff --git a/src/init.cpp b/src/init.cpp
@@ -262,7 +262,6 @@ std::string HelpMessage()
         "  -externalip=<ip>       " + _("Specify your own public address") + "\n" +
         "  -onlynet=<net>         " + _("Only connect to nodes in network <net> (IPv4, IPv6 or Tor)") + "\n" +
         "  -discover              " + _("Discover own IP address (default: 1 when listening and no -externalip)") + "\n" +
-        "  -irc                   " + _("Find peers using internet relay chat (default: 0)") + "\n" +
         "  -checkpoints           " + _("Only accept block chain matching built-in checkpoints (default: 1)") + "\n" +
         "  -listen                " + _("Accept connections from outside (default: 1 if no -proxy or -connect)") + "\n" +
         "  -bind=<addr>           " + _("Bind to given address and always listen on it. Use [host]:port notation for IPv6") + "\n" +
@@ -453,9 +452,6 @@ bool AppInit2()
     // ********************************************************* Step 2: parameter interactions
 
     fTestNet = GetBoolArg("-testnet");
-    if (fTestNet) {
-        SoftSetBoolArg("-irc", true);
-    }
 
     if (mapArgs.count("-bind")) {
         // when specifying an explicit binding address, you want to listen on it