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

Merge branch 'master' into closure-size

Browse Source 
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
This commit is contained in:
Vladimír Čunát
2016-04-01 10:06:01 +02:00
parent c643ccaa8c a26357eefe
commit ab15a62c68
1108 changed files with 76254 additions and 11297 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/ecryptfs/default.nix
+10 -8
View File
@@ -3,20 +3,22 @@
stdenv.mkDerivation rec {
name = "ecryptfs-${version}";
version = "108";
version = "110";
src = fetchurl {
url = "http://launchpad.net/ecryptfs/trunk/${version}/+download/ecryptfs-utils_${version}.orig.tar.gz";
sha256 = "1pfpzc907m4qi5h2rxmkqq072c6g22pik2rilj4bl4qishd8p0sj";
sha256 = "1x03m9s409fmzjcnsa9f9ghzkpxcnj9irj05rx7jlwm5cach0lqs";
};
#TODO: replace wrapperDir below with from <nixos> config.security.wrapperDir;
# TODO: replace wrapperDir below with from <nixos> config.security.wrapperDir;
wrapperDir = "/var/setuid-wrappers";
postPatch = ''
FILES="$(grep -r '/bin/sh' src/utils -l; find src -name \*.c)"
for file in $FILES; do
substituteInPlace "$file" \
--replace /sbin/mount.ecryptfs_private /var/setuid-wrappers/mount.ecryptfs_private \
--replace /sbin/umount.ecryptfs_private /var/setuid-wrappers/umount.ecryptfs_private \
--replace /sbin/mount.ecryptfs_private ${wrapperDir}/mount.ecryptfs_private \
--replace /sbin/umount.ecryptfs_private ${wrapperDir}/umount.ecryptfs_private \
--replace /sbin/mount.ecryptfs $out/sbin/mount.ecryptfs \
--replace /sbin/umount.ecryptfs $out/sbin/umount.ecryptfs \
--replace /usr/bin/ecryptfs-rewrite-file $out/bin/ecryptfs-rewrite-file \
@@ -26,7 +28,7 @@ stdenv.mkDerivation rec {
--replace /sbin/dmsetup ${lvm2}/sbin/dmsetup \
--replace /bin/mount ${utillinux}/bin/mount \
--replace /bin/umount ${utillinux}/bin/umount \
--replace /sbin/unix_chkpwd /var/setuid-wrappers/unix_chkpwd \
--replace /sbin/unix_chkpwd ${wrapperDir}/unix_chkpwd \
--replace /bin/bash ${bash}/bin/bash
done
'';
@@ -50,8 +52,8 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Enterprise-class stacked cryptographic filesystem";
license = licenses.gpl2Plus;
license = licenses.gpl2Plus;
maintainers = [ maintainers.obadz ];
platforms = platforms.linux;
platforms = platforms.linux;
};
}
pkgs/tools/security/fail2ban/default.nix
+8 -9
View File
@@ -1,19 +1,18 @@
{ stdenv, fetchzip, python, pythonPackages, unzip, gamin }:
{ stdenv, fetchFromGitHub, python, pythonPackages, gamin }:
let version = "0.9.3"; in
let version = "0.9.4"; in
pythonPackages.buildPythonApplication {
name = "fail2ban-${version}";
namePrefix = "";
src = fetchzip {
name = "fail2ban-${version}-src";
url = "https://github.com/fail2ban/fail2ban/archive/${version}.tar.gz";
sha256 = "1pwgr56i6l6wh2ap8b5vknxgsscfzjqy2nmd1c3vzdii5kf72j0f";
src = fetchFromGitHub {
owner = "fail2ban";
repo = "fail2ban";
rev = version;
sha256 = "1m8gqj35kwrn30rqwd488sgakaisz22xa5v9llvz6gwf4f7ps0a9";
};
buildInputs = [ unzip ];
propagatedBuildInputs = [ python.modules.sqlite3 gamin ]
++ (stdenv.lib.optional stdenv.isLinux pythonPackages.systemd);
@@ -48,7 +47,7 @@ pythonPackages.buildPythonApplication {
homepage = http://www.fail2ban.org/;
description = "A program that scans log files for repeated failing login attempts and bans IP addresses";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ eelco lovek323 ];
maintainers = with maintainers; [ eelco lovek323 fpletz ];
platforms = platforms.linux ++ platforms.darwin;
};
}
pkgs/tools/security/gnupg/1compat.nix
+2 -2
View File
@@ -6,12 +6,12 @@ stdenv.mkDerivation {
builder = writeScript "gnupg1compat-builder" ''
# First symlink all top-level dirs
${coreutils}/bin/mkdir -p $out
${coreutils}/bin/ln -s ${gnupg}/* $out
${coreutils}/bin/ln -s "${gnupg}/"* $out
# Replace bin with directory and symlink it contents
${coreutils}/bin/rm $out/bin
${coreutils}/bin/mkdir -p $out/bin
${coreutils}/bin/ln -s ${gnupg}/bin/* $out/bin
${coreutils}/bin/ln -s "${gnupg}/bin/"* $out/bin
# Add gpg->gpg2 and gpgv->gpgv2 symlinks
${coreutils}/bin/ln -s gpg2 $out/bin/gpg
pkgs/tools/security/gnupg/21.nix
+9 -10
View File
@@ -1,5 +1,5 @@
{ fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba, libiconv, npth
, autoreconfHook, gettext, texinfo, pcsclite
, gettext, texinfo, pcsclite
# Each of the dependencies below are optional.
# Gnupg can be built without them at the cost of reduced functionality.
@@ -20,25 +20,24 @@ stdenv.mkDerivation rec {
sha256 = "06mn2viiwsyq991arh5i5fhr9jyxq2bi0jkdj7ndfisxihngpc5p";
};
buildInputs = [
pkgconfig libgcrypt libassuan libksba libiconv npth gettext texinfo
readline libusb gnutls adns openldap zlib bzip2
];
postPatch = stdenv.lib.optionalString stdenv.isLinux ''
sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c
''; #" fix Emacs syntax highlighting :-(
postConfigure = "substituteAllInPlace tools/gpgkey2ssh.c";
buildInputs = [
pkgconfig libgcrypt libassuan libksba libiconv npth
autoreconfHook gettext texinfo
readline libusb gnutls adns openldap zlib bzip2
];
configureFlags = optional x11Support "--with-pinentry-pgm=${pinentry}/bin/pinentry";
postConfigure = "substituteAllInPlace tools/gpgkey2ssh.c";
meta = with stdenv.lib; {
homepage = http://gnupg.org;
description = "a complete and free implementation of the OpenPGP standard";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ wkennington ];
maintainers = with maintainers; [ wkennington simons ];
platforms = platforms.all;
};
}
pkgs/tools/security/gpgstats/default.nix
+3
View File
@@ -16,6 +16,9 @@ stdenv.mkDerivation rec {
cp gpgstats $out/bin
'';
NIX_CFLAGS_COMPILE = stdenv.lib.optionals (!stdenv.is64bit)
[ "-D_FILE_OFFSET_BITS=64" "-DLARGEFILE_SOURCE=1" ];
meta = with stdenv.lib; {
description = "Calculates statistics on the keys in your gpg key-ring";
longDescription = ''
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/lastpass-cli/default.nix
+2 -2
View File
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "lastpass-cli-${version}";
version = "0.7.0";
version = "0.9.0";
src = fetchFromGitHub {
owner = "lastpass";
repo = "lastpass-cli";
rev = "v${version}";
sha256 = "18dn4sx173666w6aaqhwcya5x2z3q0fmhg8h76lgdmx8adrhzdzc";
sha256 = "1iaz36bcyss2kahhlm92l7yh26rxvs12wnkkh1289yarl5wi0yld";
};
buildInputs = [
pkgs/tools/security/minisign/default.nix
+2 -1
View File
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "029g8ian72fy07k73nf451dw1yggav6crjjc2x6kv4nfpq3pl9pj";
};
buildInputs = [ cmake libsodium ];
nativeBuildInputs = [ cmake ];
buildInputs = [ libsodium ];
meta = with stdenv.lib; {
description = "A simple tool for signing files and verifying signatures";
pkgs/tools/security/sshuttle/default.nix
+2 -2
View File
@@ -3,10 +3,10 @@
pythonPackages.buildPythonApplication rec {
name = "sshuttle-${version}";
version = "0.76";
version = "0.77.2";
src = fetchurl {
sha256 = "1q0hr0vhdvv23cw5dqndsmf61283mvs6b14662ci00xj6zp5v48b";
sha256 = "1fwlhr5r9pl3pns65nn4mxf5ivypmd2a12gv3vpyznfy5f097k10";
url = "https://pypi.python.org/packages/source/s/sshuttle/${name}.tar.gz";
};
pkgs/tools/security/tor/torbrowser.nix
+3 -3
View File
@@ -16,13 +16,13 @@ let
in stdenv.mkDerivation rec {
name = "tor-browser-${version}";
version = "5.5.2";
version = "5.5.4";
src = fetchurl {
url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${if stdenv.is64bit then "64" else "32"}-${version}_en-US.tar.xz";
sha256 = if stdenv.is64bit then
"1zb5fssy9c37cb0ab083f2jifw47wnck32nc6zpijmqm059yccxc" else
"1gjc6prx3n769nj4gzhfjrb2qpw3ypvsb3pp0a130db1ssgnzqqr";
"0sjx2r7z7s3x1ygs9xak1phng13jcf4d5pcfyfrfsrd8kb1yn8xa" else
"0w9wk9hk57hyhhx7l4sr2x64ki9882fr6py2can1slr7kbb4mhpb";
};
desktopItem = makeDesktopItem {
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 = ''