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

Merge staging into closure-size

Browse Source 
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
This commit is contained in:
Vladimír Čunát
2015-11-20 14:32:58 +01:00
parent bdbbfa0d42 b809f886c0
commit 333d69a5f0
1278 changed files with 105731 additions and 30012 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/security/chkrootkit/default.nix
+1 -1
View File
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
name = "chkrootkit-0.50";
src = fetchurl {
url = ftp://ftp.pangeia.com.br/pub/seg/pac/chkrootkit.tar.gz;
url = ftp://ftp.pangeia.com.br/pub/seg/pac/chkrootkit-0.50.tar.gz;
sha256 = "1ivclp7ixndacjmf7xgj8lfa6h7ihx44mzzsapqdvf0c5f9gqj4m";
};
pkgs/tools/security/eid-mw/default.nix
+4 -3
View File
@@ -1,12 +1,12 @@
{ stdenv, fetchFromGitHub, autoreconfHook, gtk2, nssTools, pcsclite
, pkgconfig }:
let version = "4.1.6"; in
let version = "4.1.8"; in
stdenv.mkDerivation {
name = "eid-mw-${version}";
src = fetchFromGitHub {
sha256 = "006s7093wqmk36mrlakjv89bqddyh599rvmgv0zgsp15vf9160zi";
sha256 = "1nmw4c2gvbpkrgjxyd2g0lbh85lb2czbgqplqrv69fr6azaddyyk";
rev = "v${version}";
repo = "eid-mw";
owner = "Fedict";
@@ -29,10 +29,11 @@ stdenv.mkDerivation {
--replace "modutil" "${nssTools}/bin/modutil"
# Only provides a useless "about-eid-mw.desktop" that segfaults anyway:
rm -rf $out/share/applications $out/bin/about-eid-mw
rm -r $out/share/applications $out/bin/about-eid-mw
'';
meta = with stdenv.lib; {
inherit version;
description = "Belgian electronic identity card (eID) middleware";
homepage = http://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/;
license = licenses.lgpl3;
pkgs/tools/security/gencfsm/default.nix
+34
View File
@@ -0,0 +1,34 @@
{ stdenv, fetchurl, autoconf, automake, intltool, libtool, pkgconfig, encfs
, glib , gnome3, gtk3, libgnome_keyring, vala, wrapGAppsHook, xorg }:
stdenv.mkDerivation rec {
version = "1.8.15";
name = "gnome-encfs-manager-${version}";
src = fetchurl {
url = "https://launchpad.net/gencfsm/trunk/1.8/+download/gnome-encfs-manager_${version}.tar.gz";
sha256 = "1iryli6fgw6a45abkrjacfac7dwjhbrhw652rqf0s183373db0mx";
};
buildInputs = [ autoconf automake intltool libtool pkgconfig vala glib encfs
gtk3 libgnome_keyring gnome3.libgee_1 xorg.libSM xorg.libICE
wrapGAppsHook ];
patches = [ ./makefile-mkdir.patch ];
preConfigure = ''
./autogen.sh
'';
configureFlags = [ "--disable-appindicator" ];
preFixup = ''gappsWrapperArgs+=(--prefix PATH : ${encfs}/bin)'';
meta = with stdenv.lib; {
homepage = http://www.libertyzero.com/GEncfsM/;
description = "EncFS manager and mounter with GNOME3 integration";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.spacefrogg ];
};
}
pkgs/tools/security/gencfsm/makefile-mkdir.patch
+14
View File
@@ -0,0 +1,14 @@
--- a/dist/Makefile.am
+++ b/dist/Makefile.am
@@ -10,9 +10,9 @@ install-data-hook:
chmod 0755 $(shell find $(dist) -type d)
chmod 0644 $(shell find $(dist) -type f)
chmod 0755 $(shell find "scripts" -type f)
- test -z "$(DESTDIR)$(datadir)/dbus-1/services/" || /bin/mkdir -p "$(DESTDIR)$(datadir)/dbus-1/services/"
+ test -z "$(DESTDIR)$(datadir)/dbus-1/services/" || $(MKDIR_P) "$(DESTDIR)$(datadir)/dbus-1/services/"
cp "extra/com.libertyzero.gnome-encfs-manager.service" "$(DESTDIR)$(datadir)/dbus-1/services/"
- test -z "$(gencfsmdir)" || /bin/mkdir -p "$(gencfsmdir)"
+ test -z "$(gencfsmdir)" || $(MKDIR_P) "$(gencfsmdir)"
cp --parent -rf $(dist) "$(gencfsmdir)"
cp --parent -rf $(icons) $(DESTDIR)$(datadir)
pkgs/tools/security/gnupg/21.nix
+2 -2
View File
@@ -13,11 +13,11 @@ with stdenv.lib;
assert x11Support -> pinentry != null;
stdenv.mkDerivation rec {
name = "gnupg-2.1.8";
name = "gnupg-2.1.9";
src = fetchurl {
url = "mirror://gnupg/gnupg/${name}.tar.bz2";
sha256 = "18w14xp0ynzzwpklyplkzbrncds1hly4k2gjx115swch8qgd1f53";
sha256 = "1dpp555glln6fldk72ad7lkrn8h3cr2bg714z5kfn2qrawx67dqw";
};
postPatch = stdenv.lib.optionalString stdenv.isLinux ''
pkgs/tools/security/gpgstats/default.nix
+30
View File
@@ -0,0 +1,30 @@
{ stdenv, fetchurl, ncurses, gpgme }:
stdenv.mkDerivation rec {
name = "gpgstats-${version}";
version = "0.5";
src = fetchurl {
url = "http://www.vanheusden.com/gpgstats/${name}.tgz";
sha256 = "1n3njqhjwgfllcxs0xmk89dzgirrpfpfzkj71kqyvq97gc1wbcxy";
};
buildInputs = [ ncurses gpgme ];
installPhase = ''
mkdir -p $out/bin
cp gpgstats $out/bin
'';
meta = with stdenv.lib; {
description = "Calculates statistics on the keys in your gpg key-ring";
longDescription = ''
GPGstats calculates statistics on the keys in your key-ring.
'';
homepage = http://www.vanheusden.com/gpgstats/;
license = licenses.gpl2;
maintainers = with maintainers; [ davidak ];
platforms = with platforms; unix;
};
}
pkgs/tools/security/john/default.nix
+42 -17
View File
@@ -1,29 +1,54 @@
{ stdenv, fetchgit, openssl, nss, nspr, kerberos, gmp, zlib, libpcap, re2 }:
{ stdenv, fetchurl, openssl, nss, nspr, kerberos, gmp, zlib, libpcap, re2
, writeText
}:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "JohnTheRipper-${version}";
version = "8a3e3c1d";
buildInputs = [ openssl nss nspr kerberos gmp zlib libpcap re2 ];
NIX_CFLAGS_COMPILE = "-DJOHN_SYSTEMWIDE=1";
preConfigure = ''cd src'';
installPhase = ''
ensureDir $out/share/john/
ensureDir $out/bin
cp -R ../run/* $out/share/john
ln -s $out/share/john/john $out/bin/john
'';
src = fetchgit {
url = https://github.com/magnumripper/JohnTheRipper.git;
rev = "93f061bc41652c94ae049b52572aac709d18aa4c";
sha256 = "1rnfi09830n34jcqaxmsam54p4zsq9a49ic2ljh44lahcipympvy";
name = "john-${version}";
version = "1.8.0-jumbo-1";
src = fetchurl {
url = "http://www.openwall.com/john/j/${name}.tar.xz";
sha256 = "08q92sfdvkz47rx6qjn7qv57cmlpy7i7rgddapq5384mb413vjds";
};
postPatch = ''
sed -ri -e '
s!^(#define\s+CFG_[A-Z]+_NAME\s+).*/!\1"'"$out"'/etc/john/!
/^#define\s+JOHN_SYSTEMWIDE/s!/usr!'"$out"'!
' src/params.h
sed -ri -e '/^\.include/ {
s!\$JOHN!'"$out"'/etc/john!
s!^(\.include\s*)<([^./]+\.conf)>!\1"'"$out"'/etc/john/\2"!
}' run/*.conf
'';
preConfigure = "cd src";
configureFlags = [ "--disable-native-macro" ];
buildInputs = [ openssl nss nspr kerberos gmp zlib libpcap re2 ];
enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = [ "-DJOHN_SYSTEMWIDE=1" ];
installPhase = ''
mkdir -p "$out/etc/john" "$out/share/john" "$out/share/doc/john"
find ../run -mindepth 1 -maxdepth 1 -type f -executable \
-exec "${stdenv.shell}" "${writeText "john-binary-install.sh" ''
filename="$(basename "$1")"
install -vD "$1" "$out/bin/''${filename%.*}"
''}" {} \;
cp -vt "$out/etc/john" ../run/*.conf
cp -vt "$out/share/john" ../run/*.chr ../run/password.lst
cp -vrt "$out/share/doc/john" ../doc/*
'';
meta = {
description = "John the Ripper password cracker";
license = licenses.gpl2;
homepage = https://github.com/magnumripper/JohnTheRipper/;
maintainers = with maintainers; [offline];
maintainers = with maintainers; [ offline ];
platforms = with platforms; unix;
};
}
pkgs/tools/security/knockknock/default.nix
+1
View File
@@ -14,6 +14,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ pycrypto ];
patchPhase = ''
sed -i '/build\//d' setup.py
substituteInPlace setup.py --replace "/etc" "$out/etc"
substituteInPlace knockknock.py --replace 'existsInPath("hping3")' '"${hping}/bin/hping3"'
'';
pkgs/tools/security/mkpasswd/default.nix
+7 -16
View File
@@ -1,30 +1,21 @@
{ stdenv, fetchFromGitHub }:
{ stdenv, whois, perl }:
stdenv.mkDerivation rec {
name = "mkpasswd-${version}";
stdenv.mkDerivation {
name = "mkpasswd-${whois.version}";
version = "5.1.1";
src = whois.src;
src = fetchFromGitHub {
owner = "rfc1036";
repo = "whois";
rev = "v${version}";
sha256 = "026x8byx8pcpkdxca64368p0nlspk4phw18jg4p04di6cg6nc1m5";
};
preConfigure = ''
substituteInPlace Makefile --replace "prefix = /usr" "prefix = $out"
'';
buildInputs = [ perl ];
preConfigure = whois.preConfigure;
buildPhase = "make mkpasswd";
installPhase = "make install-mkpasswd";
meta = with stdenv.lib; {
homepage = http://packages.qa.debian.org/w/whois.html;
description = "Overfeatured front-end to crypt, from the Debian whois package";
license = licenses.gpl2;
maintainers = [ maintainers.cstrahan ];
maintainers = with maintainers; [ cstrahan fpletz ];
platforms = platforms.linux;
};
}
pkgs/tools/security/nasty/default.nix
+32
View File
@@ -0,0 +1,32 @@
{ stdenv, fetchurl, gpgme }:
stdenv.mkDerivation rec {
name = "nasty-${version}";
version = "0.6";
src = fetchurl {
url = "http://www.vanheusden.com/nasty/${name}.tgz";
sha256 = "1dznlxr728k1pgy1kwmlm7ivyl3j3rlvkmq34qpwbwbj8rnja1vn";
};
buildInputs = [ gpgme ];
installPhase = ''
mkdir -p $out/bin
cp nasty $out/bin
'';
meta = with stdenv.lib; {
description = "Recover the passphrase of your PGP or GPG-key";
longDescription = ''
Nasty is a program that helps you to recover the passphrase of your PGP or GPG-key
in case you forget or lost it. It is mostly a proof-of-concept: with a different implementation
this program could be at least 100x faster.
'';
homepage = http://www.vanheusden.com/nasty/;
license = licenses.gpl2;
maintainers = with maintainers; [ davidak ];
platforms = with platforms; unix;
};
}
pkgs/tools/security/pcsclite/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, udev, dbus_libs, perl }:
{ stdenv, fetchurl, pkgconfig, udev, dbus_libs, perl, python2 }:
stdenv.mkDerivation rec {
name = "pcsclite-1.8.14";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
"--enable-confdir=/etc"
];
nativeBuildInputs = [ pkgconfig perl ];
nativeBuildInputs = [ pkgconfig perl python2 ];
buildInputs = [ udev dbus_libs ];
meta = with stdenv.lib; {
pkgs/tools/security/pcsctools/default.nix
+24 -10
View File
@@ -1,22 +1,36 @@
{ stdenv, fetchurl, pkgconfig, udev, dbus_libs, perl, pcsclite }:
{ stdenv, lib, fetchurl, makeWrapper, pkgconfig, udev, dbus_libs, pcsclite
, wget, coreutils
, perl, pcscperl, Glib, Gtk2, Pango
}:
stdenv.mkDerivation rec {
name = "pcsc-tools-1.4.23";
let deps = lib.makeSearchPath "bin" [ wget coreutils ];
in stdenv.mkDerivation rec {
name = "pcsc-tools-1.4.25";
src = fetchurl {
url = "http://ludovic.rousseau.free.fr/softwares/pcsc-tools/pcsc-tools-1.4.23.tar.gz";
sha256 = "1qjgvvvwhykmzn4js9s3rjnp9pbjc3sz4lb4d7i9kvr3xsv7pjk9";
url = "http://ludovic.rousseau.free.fr/softwares/pcsc-tools/${name}.tar.gz";
sha256 = "0iqcy28pb963ds4pjrpi37577vm6nkgf3i0b3rr978jy9qi1bix9";
};
buildInputs = [ udev dbus_libs perl pcsclite ];
preBuild = ''
makeFlags=DESTDIR=$out
makeFlags = [ "DESTDIR=$(out)" ];
nativeBuildInputs = [ makeWrapper pkgconfig ];
postInstall = ''
wrapProgram $out/bin/scriptor \
--set PERL5LIB "${lib.makePerlPath [ pcscperl ]}"
wrapProgram $out/bin/gscriptor \
--set PERL5LIB "${lib.makePerlPath [ pcscperl Glib Gtk2 Pango ]}"
wrapProgram $out/bin/ATR_analysis \
--set PERL5LIB "${lib.makePerlPath [ pcscperl ]}"
wrapProgram $out/bin/pcsc_scan \
--set PATH "$out/bin:${deps}"
'';
nativeBuildInputs = [ pkgconfig ];
meta = with stdenv.lib; {
meta = with lib; {
description = "Tools used to test a PC/SC driver, card or reader";
homepage = http://ludovic.rousseau.free.fr/softwares/pcsc-tools/;
license = licenses.gpl2Plus;
pkgs/tools/security/ssdeep/default.nix
+3 -1
View File
@@ -9,9 +9,11 @@ stdenv.mkDerivation rec {
sha256 = "1igqy0j7jrklb8fdlrm6ald4cyl1fda5ipfl8crzyl6bax2ajk3f";
};
buildInputs = stdenv.lib.optional (!stdenv.isDarwin) [ patchelf ];
# For some reason (probably a build system bug), the binary isn't
# properly linked to $out/lib to find libfuzzy.so
postFixup = ''
postFixup = stdenv.lib.optionalString (!stdenv.isDarwin) ''
rp=$(patchelf --print-rpath $out/bin/ssdeep)
patchelf --set-rpath $rp:$out/lib $out/bin/ssdeep
'';
pkgs/tools/security/sslscan/default.nix
+27
View File
@@ -0,0 +1,27 @@
{ stdenv, fetchurl, openssl }:
stdenv.mkDerivation rec {
name = "sslscan-${version}";
version = "1.11.0";
src = fetchurl {
url = "https://github.com/rbsec/sslscan/archive/${version}-rbsec.tar.gz";
sha256 = "19d6vpcihfqs35hni4vigcpqabbnd3sndr5wyvfsladgp40vz3b9";
};
buildInputs = [ openssl ];
installFlags = [
"BINPATH=$(out)/bin"
"MANPATH=$(out)/share/man"
];
meta = with stdenv.lib; {
description = "Tests SSL/TLS services and discover supported cipher suites";
homepage = https://github.com/rbsec/sslscan;
license = licenses.gpl3;
maintainers = with maintainers; [ fpletz globin ];
platforms = platforms.all;
};
}
pkgs/tools/security/tor/torbrowser.nix
+6 -10
View File
@@ -2,9 +2,6 @@
, xorg, alsaLib, dbus, dbus_glib, glib, gtk, atk, pango, freetype, fontconfig
, gdk_pixbuf, cairo, zlib}:
let
bits = if stdenv.system == "x86_64-linux" then "64"
else "32";
# isolated tor environment
torEnv = buildEnv {
name = "tor-env";
@@ -15,18 +12,17 @@ let
];
};
ldLibraryPath = if bits == "64" then torEnv+"/lib:"+torEnv+"/lib64"
else torEnv+"/lib";
ldLibraryPath = ''${torEnv}/lib${stdenv.lib.optionalString stdenv.is64bit ":${torEnv}/lib64"}'';
in stdenv.mkDerivation rec {
name = "tor-browser-${version}";
version = "4.5.3";
version = "5.0.4";
src = fetchurl {
url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${bits}-${version}_en-US.tar.xz";
sha256 = if bits == "64" then
"24c517d2aeb15ba5eeda1eb87f483ed4fb0c22b07a95ca26af9f692e0d4d9b7c" else
"154d659583048e91870c40921561f0519babf6d3c9ac439f6fb74ed66824463f";
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
"03vn1wkkpgr6wzd6iiyqs7zv7yxl9q99j755n8l2579bd10w1xcn" else
"1yc13cykr4fafz6r8hnjccl0s33sk297c779cknbdbhj3z3yn163";
};
patchPhase = ''
pkgs/tools/security/yara/default.nix
+64
View File
@@ -0,0 +1,64 @@
{ stdenv, fetchurl, fetchFromGitHub, autoconf, automake, libtool, pcre
, withCrypto ? true, openssl
, enableMagic ? true, file
, enableCuckoo ? true, jansson
}:
stdenv.mkDerivation rec {
version = "3.4.0";
name = "yara-${version}";
src = fetchFromGitHub {
owner = "plusvic";
repo = "yara";
rev = "v${version}";
sha256 = "1rv1xixbjqx1vkcij8r01rq08ncqgy6nn98xvkrpixwvi4fy956s";
};
# FIXME: this is probably not the right way to make it work
# make[2]: *** No rule to make target 'libyara/.libs/libyara.a', needed by 'yara'. Stop.
dynamic_library_extension = ""
+ stdenv.lib.optionalString stdenv.isLinux "so"
+ stdenv.lib.optionalString stdenv.isDarwin "dylib"
;
prePatch = ''
cat >staticlibrary.patch <<EOF
--- a/Makefile.am 2015-11-01 11:39:12.000000000 +0100
+++ b/Makefile.am 2015-11-01 11:45:32.000000000 +0100
@@ -12 +12 @@
-yara_LDADD = libyara/.libs/libyara.a
+yara_LDADD = libyara/.libs/libyara.${dynamic_library_extension}
@@ -15 +15 @@
-yarac_LDADD = libyara/.libs/libyara.a
+yarac_LDADD = libyara/.libs/libyara.${dynamic_library_extension}
EOF
'';
patches = [
(fetchurl {
url = "https://github.com/plusvic/yara/pull/261.diff";
sha256 = "1fkxnk84ryvrjq7p225xvw9pn5gm2bjia2jz38fclwbsaxdi6p3b";
})
"staticlibrary.patch"
];
buildInputs = [ autoconf automake libtool pcre]
++ stdenv.lib.optionals withCrypto [ openssl ]
++ stdenv.lib.optionals enableMagic [ file ]
++ stdenv.lib.optionals enableCuckoo [ jansson ]
;
preConfigure = "./bootstrap.sh";
configureFlags = ""
+ stdenv.lib.optionalString withCrypto "--with-crypto "
+ stdenv.lib.optionalString enableMagic "--enable-magic "
+ stdenv.lib.optionalString enableCuckoo "--enable-cuckoo "
;
meta = with stdenv.lib; {
description = "The pattern matching swiss knife for malware researchers";
homepage = http://plusvic.github.io/yara/;
license = licenses.asl20;
platforms = stdenv.lib.platforms.all;
};
}