tree checksum vpatch file split hunks

all signers: mircea_popescu trinque asciilifeform ben_vulpes mod6

antecedents: asciilifeform_ver_now_5_4_and_irc_is_gone_and_now_must_give_ip asciilifeform_add_verifyall_option

press order:

genesisasciilifeform ben_vulpes mircea_popescu mod6 trinque
bitcoin-asciilifeform.1asciilifeform ben_vulpes mod6
rm_rf_upnpasciilifeform ben_vulpes mod6
bitcoin-asciilifeform.3-turdmeister-alert-snipasciilifeform ben_vulpes mod6
asciilifeform_orphanage_thermonukeasciilifeform ben_vulpes mod6
bitcoin-asciilifeform.2-https_snipsnipasciilifeform ben_vulpes mod6
bitcoin-v0_5_3_1-static_makefile_v002.8asciilifeform ben_vulpes mod6
bitcoin-asciilifeform.4-goodbye-win32asciilifeform ben_vulpes mod6
bitcoin-v0_5_3_1-rev_bump.7asciilifeform ben_vulpes mod6
asciilifeform_tx-orphanage_amputationasciilifeform ben_vulpes mod6
asciilifeform_dnsseed_snipsnipasciilifeform ben_vulpes mod6
asciilifeform_zap_hardcoded_seedsasciilifeform ben_vulpes mod6
asciilifeform_zap_showmyip_crudasciilifeform ben_vulpes mod6
asciilifeform_dns_thermonyukyoolar_kleansingasciilifeform ben_vulpes mod6
asciilifeform_ver_now_5_4_and_irc_is_gone_and_now_must_give_ipasciilifeform ben_vulpes mod6
asciilifeform-kills-integer-retardationasciilifeform ben_vulpes mod6
asciilifeform_and_now_we_have_block_dumper_correctedasciilifeform ben_vulpes mod6
mod6_fix_dumpblock_paramsasciilifeform ben_vulpes mod6
asciilifeform_and_now_we_have_eatblockasciilifeform ben_vulpes mod6
asciilifeform_lets_lose_testnetasciilifeform ben_vulpes mod6
asciilifeform_add_verifyall_optionasciilifeform ben_vulpes mod6
programmable-versionstringben_vulpes mod6

patch:

- FF7009F672BF400A42D1D7AFB6E58AAF1C29D9C219FAD51C5F17000243A485E92BBB250D3F4BBEC3F0717D00FAD620C294D537832671F20C0979FB3F1383779B
+ 29FBB8792C3462CED61B4A0284360122F72C4FEF7FB5FB84E5399967AB6474CD83CCF3A60EB3C425E183B1B95FB9CA71FC23BB791316D762034559DF293F8BB0
bitcoin/src/init.cpp
(175 . 6)(175 . 8)
5 " -debug \t\t " + _("Output extra debugging information\n") +
6 " -caneat \t\t " + _("Permit the use of 'eatblock'\n") +
7 " -verifyall \t\t " + _("Forbid the skipping of ECDSA signature verification between checkpoints.\n") +
8 " -setverstring \t\t " + _("Set a custom version string.\n") +
9 " -setvernum \t\t " + _("Set a custom version number.\n") +
10 " -logtimestamps \t " + _("Prepend debug output with timestamp\n") +
11 " -printtoconsole \t " + _("Send trace/debug info to console instead of debug.log file\n") +
12 " -rpcuser=<user> \t " + _("Username for JSON-RPC connections\n") +
(199 . 6)(201 . 16)
14 fCanEat = GetBoolArg("-caneat");
15 fVerifyAll = GetBoolArg("-verifyall");
16
17 if (mapArgs.count("-setverstring"))
18 {
19 CLIENT_NAME = mapArgs["-setverstring"];
20 }
21
22 if (mapArgs.count("-setvernum"))
23 {
24 VERSION = atoi(mapArgs["-setvernum"]);
25 }
26
27 if (fDaemon)
28 fServer = true;
29 else
-
+ 9B88B8F60D9A0AE98F9DD148DBA06E132B6B1FC199719EACB3270FE6CE2AF889422EEE62C2CB08C3B93F22069AEA880C657E771C4E4B4157A69C321550C8FC73
bitcoin/src/knobs.h
(0 . 0)(1 . 7)
34 #ifndef KNOBS_H
35 #define KNOBS_H
36
37 #define DEFAULT_CLIENT_NAME "therealbitcoin.org"
38 #define DEFAULT_CLIENT_VERSION 99999 /* 50400 */
39
40 #endif
- 92038390413F77B55E19439738E87C21BD5B2313DC6EDAD78BCC8BF722DDE82623A31A56A87B0182E75E6824FC709DC216FB9CB159B49A16E212E3A5DED93F58
+ AEEFFE8C603D726AAE829C01F057CA0EFDAE8A84820A57E41D8282DE988A74494F139842228BCC158FC8EC484F076C7B2187C4D6D14E7C998FA698570948992E
bitcoin/src/main.cpp
(17 . 6)(17 . 8)
45 // Global state
46 //
47
48 int VERSION = DEFAULT_CLIENT_VERSION;
49
50 CCriticalSection cs_setpwalletRegistered;
51 set<CWallet*> setpwalletRegistered;
52
- 929157D5E139336F38E98555F14FC125C4217C23EBA941086B648147E39FCEC9ECAB632567FC3295E58826FEDF6239D5CC0CD028F4E78FD56AE868B795D2DE02
+ 09AC104678A444430D3EF0BDF6DBD07D875666493B2D938AC6AA7FB67ABE840F2254F517055F4B5F90D0E86C83EE3DADE77A58F1C37B7AB7B4C13598A5559ADC
bitcoin/src/makefile.unix
(81 . 6)(81 . 7)
57 init.h \
58 key.h \
59 keystore.h \
60 knobs.h \
61 main.h \
62 net.h \
63 noui.h \
- D18800DFC6ABC874CF8F8F3FDF9BBFA000B6611760C571EF64089894B3AC92303C8891AFF55D66648D6B8C0033BFAB31E40AA6562A0BC75E2A9C0950175A733B
+ BB842420BCC67752EDF8E658524B135F499C5F8676557A6C12F47F204303E34BD73BEABDF6E9146BA452947C4E5CD298529969FAB90F16942F6BF0C1229F7043
bitcoin/src/net.h
(360 . 7)(360 . 7)
68 CAddress addrMe = (fUseProxy || !addrLocalHost.IsRoutable() ? CAddress("0.0.0.0") : addrLocalHost);
69 RAND_bytes((unsigned char*)&nLocalHostNonce, sizeof(nLocalHostNonce));
70 PushMessage("version", VERSION, nLocalServices, nTime, addrYou, addrMe,
71 nLocalHostNonce, std::string(pszSubVer), nBestHeight);
72 nLocalHostNonce, FormatSubVersion(CLIENT_NAME, VERSION), nBestHeight);
73 }
74
75
- BC602BFBC512259FBB6C01F2C1633FF142966BF0752612E9A488CEE8A95DA7921B98ABE646E2F7002243F1981939372E0B53948646398E40525ED442C377F449
+ EF93153B01FDF024A0AB2CE0F992EA9AF50D3423BAA147C395BBA4CC90575BDA0D832C0313428BBBC837C99D549C4BA787B94FAD5B871870397A410BA59EA0E9
bitcoin/src/serialize.h
(24 . 6)(24 . 9)
80
81 #include <sys/mman.h>
82 #include <limits.h>
83
84 #include "knobs.h"
85
86 /* This comes from limits.h if it's not defined there set a sane default */
87 #ifndef PAGESIZE
88 #include <unistd.h>
(41 . 9)(44 . 7)
90 class CAutoFile;
91 static const unsigned int MAX_SIZE = 0x02000000;
92
93 static const int VERSION = 50400;
94 static const char* pszSubVer = "";
95 static const bool VERSION_IS_BETA = true;
96 extern int VERSION;
97
98 // Used to bypass the rule against non-const reference to temporary
99 // where it makes sense with wrappers such as CFlatData or CTxDB
- 3DCFE5F29728DCD34A6DFE23E9CD17E5F4A332A8D2E7444355106C8C63436CF54892424DF2018756C2E109463FD87728FC668A5A03914A4AA3F30BB90403B433
+ 72641FCB9BCE1F705246CF52F08B3ECE4B8DF65E07CA10A32DB860D4A120532A911FC62549960CCFDFC020FD1A5EF8BAF0FCF181B861E0903C65B044899FC008
bitcoin/src/util.cpp
(2 . 6)(2 . 7)
104 // Copyright (c) 2009-2012 The Bitcoin developers
105 // Distributed under the MIT/X11 software license, see the accompanying
106 // file license.txt or http://www.opensource.org/licenses/mit-license.php.
107 #include "knobs.h"
108 #include "headers.h"
109 #include "strlcpy.h"
110 #include <boost/program_options/detail/config_file.hpp>
(32 . 7)(33 . 7)
112 bool fNoListen = false;
113 bool fLogTimestamps = false;
114
115
116 std::string CLIENT_NAME(DEFAULT_CLIENT_NAME);
117
118
119 // Workaround for "multiple definition of `_tls_used'"
(889 . 14)(890 . 18)
121
122 string FormatFullVersion()
123 {
124 string s = FormatVersion(VERSION) + pszSubVer;
125 if (VERSION_IS_BETA) {
126 s += "-";
127 s += _("beta");
128 }
129 string s = FormatVersion(VERSION);
130 return s;
131 }
132
133 std::string FormatSubVersion(const std::string& name, int nClientVersion)
134 {
135 std::ostringstream ss;
136 ss << "/";
137 ss << name << ":" << FormatVersion(nClientVersion);
138 ss << "/";
139 return ss.str();
140 }
141
142
143
- 44BD62E864ED9400105AEEA2E2EF6499F971577FD28B9C8DC52EF72DCDB4D4928168037CD7D7FCA718E5D5A2D4D7C19C65F5B45C87D814D6E24C0D014B307477
+ D7E407108638C11F75B5BED04DC455AC78A96DEBC0776CD0E71871001C5886FD1472AE060E7A2334FCF3E323B7AD0A1B4FB68757392CC45A1B09721EB67415D1
bitcoin/src/util.h
(121 . 6)(121 . 7)
148 extern std::string strMiscWarning;
149 extern bool fNoListen;
150 extern bool fLogTimestamps;
151 extern std::string CLIENT_NAME;
152
153 void RandAddSeed();
154 void RandAddSeedPerfmon();
(161 . 6)(162 . 7)
156 int64 GetAdjustedTime();
157 void AddTimeData(unsigned int ip, int64 nTime);
158 std::string FormatFullVersion();
159 std::string FormatSubVersion(const std::string& name, int nClientVersion);
160
161
162