GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-31 00:44:19 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into v5_0

Browse Source 
Conflicts (resolved):
	NEWS.md
	sgminer.c
	util.c
This commit is contained in:
Noel Maersk 2014-06-27 18:21:11 +03:00
commit 0677b9564e
5 changed files with 6180 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6166
ChangeLog
View File

File diff suppressed because it is too large Load Diff

7
NEWS.md
View File

@ -18,6 +18,13 @@
* Extranonce support for stratum (by _bitbandi_).
## Version 4.2.2 - 27th June 2014
* Fixes for a few stratum-related security vulnerabilities (reported by
_Mick Ayzenberg_ of DejaVu Security).
* Found blocks calculation fix (by _troky_).
## Version 4.2.1 - 22nd May 2014
* Fixed MSVS building, tested with MSVC++ 2010 and 2013 (by _troky_).

2
configure.ac
View File

@ -2,7 +2,7 @@
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
m4_define([v_maj], [4])
m4_define([v_min], [2])
m4_define([v_mic], [1])
m4_define([v_mic], [2])
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
m4_define([v_ver], [v_maj.v_min.v_mic])
m4_define([lt_rev], m4_eval(v_maj + v_min))

9
tools/update_changelog.sh Executable file
View File

@ -0,0 +1,9 @@
#!/bin/sh
FILE="$(dirname "$0")/../ChangeLog"
UPDATECMD="git log --oneline --decorate"
echo "Updated on `date`." > $FILE
echo "If working with git, use \`$UDATECMD\` for latest change log." >> $FILE
echo "------------------------------------------------------------------------" >> $FILE
$UPDATECMD >> $FILE

6
winbuild/dist/include/config.h vendored
View File

@ -68,11 +68,11 @@
#endif
#define VERSION "v4.2.1"
#define VERSION "v4.2.2"
#define PACKAGE_NAME "sgminer"
#define PACKAGE_TARNAME "sgminer"
#define PACKAGE_VERSION "4.2.1"
#define PACKAGE_STRING "sgminer 4.2.1"
#define PACKAGE_VERSION "4.2.2"
#define PACKAGE_STRING "sgminer 4.2.2"
#define PACKAGE "sgminer"
#define SGMINER_PREFIX ""