[setup] branch master, updated. release_2.871-8-ge993e24

[setup] branch master, updated. release_2.871-8-ge993e24

[gratz]

https://sourceware.org/git/gitweb.cgi?p=cygwin-setup.git;h=e993e2449417ab6f1c559b3fedc239bdb1e0a485

commit e993e2449417ab6f1c559b3fedc239bdb1e0a485
Author: Achim Gratz <Stromeko@Stromeko.DE>
Date:   Sun Jul 26 20:28:10 2015 +0200

    iniparse.yy: Fix a copy-and-paste bug
    
    	* iniparse.yy (singleitem): Fix a copy-and-paste bug, use
    	SHA512Line for SHA512 standalone checksums (unused in setup.ini).


Diff:
---
 ChangeLog   |    5 +++++
 iniparse.yy |    4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5fc1c86..4471acb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-07-26  Achim Gratz  <Stromeko@NexGo.DE>
+
+	* iniparse.yy (singleitem): Fix a copy-and-paste bug, use
+	SHA512Line for SHA512 standalone checksums (unused in setup.ini).
+
 2015-07-01  Achim Gratz  <Stromeko@NexGo.DE>
 
 	* ini.cc: Construct setup_ext_list from array until we can use
diff --git a/iniparse.yy b/iniparse.yy
index 0cd1c64..442135d 100644
--- a/iniparse.yy
+++ b/iniparse.yy
@@ -108,8 +108,8 @@ singleitem /* non-empty */
  | DIRECTORY STRING NL		{ /* TODO */ }
  | STANDARDSVERSION STRING NL	{ /* TODO */ }
  | MD5LINE MD5 NL	{ iniBuilder->buildInstallMD5 ((unsigned char *)$2); }
- | MD5LINE SHA512 NL	{ iniBuilder->buildInstallSHA512 ((unsigned char *)$2); }
- | MD5LINE SHA512B64URL NL	{ iniBuilder->buildInstallSHA512 ((unsigned char *)$2); }
+ | SHA512LINE SHA512 NL		{ iniBuilder->buildInstallSHA512 ((unsigned char *)$2); }
+ | SHA512LINE SHA512B64URL NL	{ iniBuilder->buildInstallSHA512 ((unsigned char *)$2); }
  | SOURCEPACKAGE source NL
  | CATEGORY categories NL
  | INSTALL STRING { iniBuilder->buildPackageInstall ($2); } installmeta NL