From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 85496 invoked by alias); 26 Jul 2015 18:29:47 -0000 Mailing-List: contact cygwin-apps-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cygwin-apps-cvs-owner@sourceware.org Received: (qmail 85471 invoked by uid 10076); 26 Jul 2015 18:29:46 -0000 Date: Sun, 26 Jul 2015 18:29:00 -0000 Message-ID: <20150726182946.85441.qmail@sourceware.org> From: gratz@sourceware.org To: cygwin-apps-cvs@sourceware.org Subject: [setup] branch master, updated. release_2.871-8-ge993e24 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 740db89981d031e7d72f98ab6174691f1bcee014 X-Git-Newrev: e993e2449417ab6f1c559b3fedc239bdb1e0a485 X-SW-Source: 2015-q3/txt/msg00001.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=cygwin-setup.git;h=e993e2449417ab6f1c559b3fedc239bdb1e0a485 commit e993e2449417ab6f1c559b3fedc239bdb1e0a485 Author: Achim Gratz 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 + + * iniparse.yy (singleitem): Fix a copy-and-paste bug, use + SHA512Line for SHA512 standalone checksums (unused in setup.ini). + 2015-07-01 Achim Gratz * 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