public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/staging'

Browse Source
This commit is contained in:
Domen Kožar
2016-03-27 13:19:04 +01:00
parent d88ae1045d dae3a7b721
commit b07e7bfc7b
106 changed files with 1065 additions and 3988 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/security/crackxls/default.nix
-6
View File
@@ -13,12 +13,6 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig autoconf automake openssl libgsf gmp ];
patchPhase = ''
substituteInPlace Makefile.in \
--replace '-march=native' "" \
--replace '-mtune=native' ""
'';
installPhase =
''
mkdir -p $out/bin
pkgs/tools/security/haka/default.nix
+2
View File
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
sha1 = "87625ed32841cc0b3aa92aa49397ce71ce434bc2";
};
NIX_CFLAGS_COMPILE = "-Wno-error";
preConfigure = ''
sed -i 's,/etc,'$out'/etc,' src/haka/haka.c
sed -i 's,/etc,'$out'/etc,' src/haka/CMakeLists.txt
pkgs/tools/security/tpm-tools/03-fix-bool-error-parseStringWithValues.patch
+30
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);
pkgs/tools/security/tpm-tools/default.nix
+2
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 = ''