cryptogera/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-02-15 18:08:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0.4.x' into 0.5.x

Browse Source 
Conflicts:
	contrib/Bitcoin.app/Contents/Info.plist
	doc/README
	doc/README_windows.txt
	share/setup.nsi
	src/serialize.h
This commit is contained in:
Luke Dashjr 2012-08-27 19:10:41 +00:00
commit d31e24aeaa
6 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bitcoin-qt.pro
View File

@ -1,6 +1,6 @@
TEMPLATE = app
TARGET =
VERSION = 0.5.6
VERSION = 0.5.7
INCLUDEPATH += src src/json src/qt
DEFINES += QT_GUI BOOST_THREAD_USE_LIB
CONFIG += no_include_pwd

2
doc/README
View File

@ -1,4 +1,4 @@
Bitcoin 0.5.6 BETA
Bitcoin 0.5.7 BETA
Copyright (c) 2009-2012 Bitcoin Developers
Distributed under the MIT/X11 software license, see the accompanying

2
doc/README_windows.txt
View File

@ -1,4 +1,4 @@
Bitcoin 0.5.6 BETA
Bitcoin 0.5.7 BETA
Copyright (c) 2009-2012 Bitcoin Developers
Distributed under the MIT/X11 software license, see the accompanying

6
share/setup.nsi
View File

@ -5,7 +5,7 @@ SetCompressor /SOLID lzma
# General Symbol Definitions
!define REGKEY "SOFTWARE\$(^Name)"
!define VERSION 0.5.6
!define VERSION 0.5.7
!define COMPANY "Bitcoin project"
!define URL http://www.bitcoin.org/
@ -45,13 +45,13 @@ Var StartMenuGroup
!insertmacro MUI_LANGUAGE English
# Installer attributes
OutFile bitcoin-0.5.6-win32-setup.exe
OutFile bitcoin-0.5.7-win32-setup.exe
InstallDir $PROGRAMFILES\Bitcoin
CRCCheck on
XPStyle on
BrandingText " "
ShowInstDetails show
VIProductVersion 0.5.6.0
VIProductVersion 0.5.7.0
VIAddVersionKey ProductName Bitcoin
VIAddVersionKey ProductVersion "${VERSION}"
VIAddVersionKey CompanyName "${COMPANY}"

22
src/main.cpp
View File

@ -1994,6 +1994,28 @@ bool CAlert::ProcessAlert()
if (!IsInEffect())
return false;
// alert.nID=max is reserved for if the alert key is
// compromised. It must have a pre-defined message,
// must never expire, must apply to all versions,
// and must cancel all previous
// alerts or it will be ignored (so an attacker can't
// send an "everything is OK, don't panic" version that
// cannot be overridden):
int maxInt = std::numeric_limits<int>::max();
if (nID == maxInt)
{
if (!(
nExpiration == maxInt &&
nCancel == (maxInt-1) &&
nMinVer == 0 &&
nMaxVer == maxInt &&
setSubVer.empty() &&
nPriority == maxInt &&
strStatusBar == "URGENT: Alert key compromised, upgrade required"
))
return false;
}
CRITICAL_BLOCK(cs_mapAlerts)
{
// Cancel previous alerts

2
src/serialize.h
View File

@ -60,7 +60,7 @@ class CDataStream;
class CAutoFile;
static const unsigned int MAX_SIZE = 0x02000000;
static const int VERSION = 50603;
static const int VERSION = 50700;
static const char* pszSubVer = "";
static const bool VERSION_IS_BETA = true;