alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

tpm-tools: fix build by applying debians patch

Browse source
This commit is contained in:
Pascal Wittmann 2016-03-24 22:19:35 +01:00
parent 119c287c71
commit 71d3b34bd7
2 changed files with 32 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
pkgs/tools/security/tpm-tools/03-fix-bool-error-parseStringWithValues.patch Normal file
View file

@ -0,0 +1,30 @@
Title: Fix boolean comparison error (and FTBFS with gcc-5)
Date: 2015-06-28
Author: Pierre Chifflier <pollux@debian.org>
Bug-Debian: http://bugs.debian.org/778147
Index: tpm-tools/src/tpm_mgmt/tpm_nvcommon.c
===================================================================
--- tpm-tools.orig/src/tpm_mgmt/tpm_nvcommon.c
+++ tpm-tools/src/tpm_mgmt/tpm_nvcommon.c
@@ -140,8 +140,8 @@ int parseStringWithValues(const char *aA
aArg);
return -1;
}
- if (!aArg[offset+numbytes] == '|' &&
- !aArg[offset+numbytes] == 0) {
+ if (!(aArg[offset+numbytes] == '|' ||
+ aArg[offset+numbytes] == 0)) {
logError(_("Illegal character following "
"hexadecimal number in %s\n"),
aArg + offset);
@@ -164,8 +164,8 @@ int parseStringWithValues(const char *aA
return -1;
}
- if (!aArg[offset+numbytes] == '|' &&
- !aArg[offset+numbytes] == 0) {
+ if (!(aArg[offset+numbytes] == '|' ||
+ aArg[offset+numbytes] == 0)) {
logError(_("Illegal character following decimal "
"number in %s\n"),
aArg + offset);

2
pkgs/tools/security/tpm-tools/default.nix
View file

@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
buildInputs = [ trousers openssl opencryptoki ];
patches = [ ./03-fix-bool-error-parseStringWithValues.patch ];
meta = with stdenv.lib; {
description = "Management tools for TPM hardware";
longDescription = ''