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

Merge remote-tracking branch 'upstream/master' into hardened-stdenv

Browse Source
This commit is contained in:
Robin Gloster
2016-05-02 22:58:02 +00:00
parent 0fdde5efd0 94520a25ad
commit c92bca56f8
867 changed files with 75282 additions and 27025 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/security/afl/default.nix
+2 -2
View File
@@ -9,11 +9,11 @@ let
in
stdenv.mkDerivation rec {
name = "afl-${version}";
version = "1.94b";
version = "2.10b";
src = fetchurl {
url = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz";
sha256 = "1c36yz3ajd66m3c5aiai3wf59pzxivn80cvlib3dw45d4zqiymqp";
sha256 = "1qxz3szsdr3ciz496mjb5v2k8p90nilgnlbwwv9csk828qb2jhc1";
};
# Note: libcgroup isn't needed for building, just for the afl-cgroup
pkgs/tools/security/eid-mw/default.nix
+2 -2
View File
@@ -3,10 +3,10 @@
stdenv.mkDerivation rec {
name = "eid-mw-${version}";
version = "4.1.14";
version = "4.1.16";
src = fetchFromGitHub {
sha256 = "1gj08dylcwdfjmdci1ja853n9xqkhgxy0x8m30bks81qwbnd12lp";
sha256 = "14b17aa45l0pyqd87c17mgfmpgq1qmybnl6hq9mc29rxw6jdb1ka";
rev = "v${version}";
repo = "eid-mw";
owner = "Fedict";
pkgs/tools/security/meo/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchhg, openssl, pcre, qt4, boost, pkcs11helper }:
{ stdenv, fetchhg, openssl, pcre-cpp, qt4, boost, pkcs11helper }:
stdenv.mkDerivation {
name = "meo-20121113";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
buildFlags = "QMAKE=qmake";
buildInputs = [ openssl pcre qt4 boost pkcs11helper ];
buildInputs = [ openssl pcre-cpp qt4 boost pkcs11helper ];
preConfigure = ''
sed -i s,-mt$,, meo-gui/meo-gui.pro
pkgs/tools/security/qdigidoc/certs.patch
+3309
View File
File diff suppressed because one or more lines are too long
pkgs/tools/security/qdigidoc/default.nix
+40
View File
@@ -0,0 +1,40 @@
{ stdenv, fetchurl, cmake, ccid, qttools, qttranslations, pkgconfig, pcsclite
, hicolor_icon_theme, libdigidocpp, opensc, shared_mime_info, openldap
, gettext, desktop_file_utils, makeWrapper }:
stdenv.mkDerivation rec {
version = "3.12.0.1442";
name = "qdigidoc-${version}";
src = fetchurl {
url = "https://installer.id.ee/media/ubuntu/pool/main/q/qdigidoc/qdigidoc_3.12.0.1442.orig.tar.xz";
sha256 = "1a7nsi28q57ic99hrb6x83qlvpqvzvk6acbfl6ncny2j4yaxa4jl";
};
patches = [ ./certs.patch ];
unpackPhase = ''
mkdir src
tar xf $src -C src
cd src
'';
postInstall = ''
wrapProgram $out/bin/qdigidocclient \
--prefix LD_LIBRARY_PATH : ${opensc}/lib/pkcs11/
'';
buildInputs = [ cmake ccid qttools pkgconfig pcsclite qttranslations
hicolor_icon_theme libdigidocpp opensc shared_mime_info
openldap gettext desktop_file_utils makeWrapper
];
meta = with stdenv.lib; {
description = "Qt based UI application for verifying and signing digital signatures";
homepage = "http://www.id.ee/";
license = licenses.lgpl2;
platforms = platforms.linux;
maintainers = [ maintainers.jagajaga ];
};
}
pkgs/tools/security/qesteidutil/default.nix
+31
View File
@@ -0,0 +1,31 @@
{ stdenv, fetchurl, cmake, ccid, qttools, qttranslations, pkgconfig, pcsclite
, hicolor_icon_theme }:
stdenv.mkDerivation rec {
version = "3.12.2.1206";
name = "qesteidutil-${version}";
src = fetchurl {
url = "https://installer.id.ee/media/ubuntu/pool/main/q/qesteidutil/qesteidutil_3.12.2.1206.orig.tar.xz";
sha256 = "1v1i0jlycjjdg6wi4cpm1il5v1zn8dfj82mrfvsjy6j9rfzinkda";
};
unpackPhase = ''
mkdir src
tar xf $src -C src
cd src
'';
buildInputs = [ cmake ccid qttools pkgconfig pcsclite qttranslations
hicolor_icon_theme
];
meta = with stdenv.lib; {
description = "UI application for managing smart card PIN/PUK codes and certificates";
homepage = "http://www.id.ee/";
license = licenses.lgpl2;
platforms = platforms.linux;
maintainers = [ maintainers.jagajaga ];
};
}
pkgs/tools/security/sshuttle/default.nix
+1 -1
View File
@@ -7,7 +7,7 @@ pythonPackages.buildPythonApplication rec {
src = fetchurl {
sha256 = "18hrwi2gyri1n2rq0nghvv7hfhbhh5h67am89524vc1yyx40vn3b";
url = "https://pypi.python.org/packages/source/s/sshuttle/${name}.tar.gz";
url = "mirror://pypi/s/sshuttle/${name}.tar.gz";
};
patches = [ ./sudo.patch ];
pkgs/tools/security/tor/default.nix
+15 -15
View File
@@ -25,25 +25,25 @@ stdenv.mkDerivation rec {
doCheck = true;
meta = {
homepage = http://www.torproject.org/;
meta = with stdenv.lib; {
homepage = https://www.torproject.org/;
repositories.git = https://git.torproject.org/git/tor;
description = "Anonymous network router to improve privacy on the Internet";
description = "Anonymizing overlay network";
longDescription=''
Tor protects you by bouncing your communications around a distributed
network of relays run by volunteers all around the world: it prevents
somebody watching your Internet connection from learning what sites you
visit, and it prevents the sites you visit from learning your physical
location. Tor works with many of your existing applications, including
web browsers, instant messaging clients, remote login, and other
applications based on the TCP protocol.
longDescription = ''
Tor helps improve your privacy by bouncing your communications around a
network of relays run by volunteers all around the world: it makes it
harder for somebody watching your Internet connection to learn what sites
you visit, and makes it harder for the sites you visit to track you. Tor
works with many of your existing applications, including web browsers,
instant messaging clients, remote login, and other applications based on
the TCP protocol.
'';
license="mBSD";
license = licenses.bsd3;
maintainers = with stdenv.lib.maintainers;
[ phreedom doublec thoughtpolice ];
platforms = stdenv.lib.platforms.unix;
maintainers = with maintainers;
[ phreedom doublec thoughtpolice joachifm ];
platforms = platforms.unix;
};
}
pkgs/tools/security/tor/tor-arm.nix
+19 -16
View File
@@ -1,19 +1,21 @@
{ stdenv, fetchurl, python, setuptools, lsof, nettools, makeWrapper
, pythonPackages, ncurses }:
{ stdenv, fetchurl, makeWrapper
, pythonPackages, ncurses, lsof, nettools
}:
stdenv.mkDerivation rec {
name = "tor-arm-${version}";
name = "tor-arm-${version}";
version = "1.4.5.0";
src = fetchurl {
url = "https://www.atagar.com/arm/resources/static/arm-${version}.tar.bz2";
url = "https://www.atagar.com/arm/resources/static/arm-${version}.tar.bz2";
sha256 = "1yi87gdglkvi1a23hv5c3k7mc18g0rw7b05lfcw81qyxhlapf3pw";
};
buildInputs =
[ python pythonPackages.curses setuptools lsof nettools makeWrapper ];
nativeBuildInputs = [ makeWrapper pythonPackages.python ];
patchPhase = ''
outputs = [ "out" "man" ];
postPatch = ''
substituteInPlace ./setup.py --replace "/usr/bin" "$out/bin"
substituteInPlace ./src/util/connections.py \
--replace "lsof -wnPi" "${lsof}/bin/lsof"
@@ -22,28 +24,29 @@ stdenv.mkDerivation rec {
--replace "lsof -wnPi" "${lsof}/bin/lsof"
substituteInPlace ./arm --replace '"$0" = /usr/bin/arm' 'true'
substituteInPlace ./arm --replace "python" "${python}/bin/python"
substituteInPlace ./arm --replace "python" "${pythonPackages.python}/bin/python"
for i in ./install ./arm ./src/gui/controller.py ./src/cli/wizard.py ./src/resources/torrcOverride/override.h ./src/resources/torrcOverride/override.py ./src/resources/arm.1 ./setup.py; do
substituteInPlace $i --replace "/usr/share" "$out/share"
done
# fixes man page installation
substituteInPlace ./setup.py --replace "src/resoureces" "src/resources"
'';
installPhase = ''
mkdir -p $out/share/arm $out/bin $out/libexec
python setup.py install --prefix=$out
python setup.py install --prefix=$out --docPath $out/share/doc/arm
cp -R src/TorCtl $out/libexec
for i in $(cd $out/bin && ls); do
wrapProgram $out/bin/$i \
--prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pythonPackages.curses}):$out/libexec:$PYTHONPATH" \
--set TERMINFO "${ncurses.out}/share/terminfo" \
--set TERM "xterm"
done
wrapProgram $out/bin/arm \
--prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pythonPackages.curses}):$out/libexec:$PYTHONPATH" \
--set TERMINFO "${ncurses.out}/share/terminfo" \
--set TERM "xterm"
'';
meta = {
description = "Anonymizing relay monitor for Tor";
description = "A terminal status monitor for Tor relays";
homepage = "https://www.atagar.com/arm/";
license = stdenv.lib.licenses.gpl3;
platforms = stdenv.lib.platforms.unix;
pkgs/tools/security/tor/torbrowser.nix
+24 -28
View File
@@ -1,28 +1,24 @@
{ stdenv, fetchurl, buildEnv, makeDesktopItem
, xorg, alsaLib, dbus, dbus_glib, glib, gtk, atk, pango, freetype, fontconfig
, gdk_pixbuf, cairo, zlib}:
{ stdenv, fetchurl, makeDesktopItem
, libXrender, libX11, libXext, libXt, alsaLib, dbus, dbus_glib, glib, gtk
, atk, pango, freetype, fontconfig, gdk_pixbuf, cairo, zlib
}:
let
# isolated tor environment
torEnv = buildEnv {
name = "tor-env";
paths = [
stdenv.cc.cc zlib glib alsaLib dbus dbus_glib gtk atk pango freetype
fontconfig gdk_pixbuf cairo xorg.libXrender xorg.libX11 xorg.libXext
xorg.libXt
];
};
libPath = stdenv.lib.makeLibraryPath [
stdenv.cc.cc zlib glib alsaLib dbus dbus_glib gtk atk pango freetype
fontconfig gdk_pixbuf cairo libXrender libX11 libXext libXt
];
in
ldLibraryPath = ''${torEnv}/lib${stdenv.lib.optionalString stdenv.is64bit ":${torEnv}/lib64"}'';
in stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
name = "tor-browser-${version}";
version = "5.5.4";
version = "5.5.5";
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
"0sjx2r7z7s3x1ygs9xak1phng13jcf4d5pcfyfrfsrd8kb1yn8xa" else
"0w9wk9hk57hyhhx7l4sr2x64ki9882fr6py2can1slr7kbb4mhpb";
"0k6v41j880fb4zdxk1v13kmizdaz5rwvi5lskdbdi68iml4p53gj" else
"04mqjmnxwa75yi8gmdwadkzrzikgxn08bkvr50zdm7id9fj4nkza";
};
desktopItem = makeDesktopItem {
@@ -38,16 +34,16 @@ in stdenv.mkDerivation rec {
patchPhase = ''
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" Browser/firefox
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" Browser/TorBrowser/Tor/tor
sed -e "s,./TorBrowser,$out/share/tor-browser/Browser/TorBrowser,g" -i Browser/TorBrowser/Data/Tor/torrc-defaults
'';
doCheck = true;
checkPhase = ''
# Just do a simple test if all libraries get loaded by running help on
# firefox and tor
echo "Checking firefox..."
LD_LIBRARY_PATH=${ldLibraryPath} Browser/firefox --help 1> /dev/null
LD_LIBRARY_PATH=${libPath} Browser/firefox --help 1> /dev/null
echo "Checking tor..."
LD_LIBRARY_PATH=${torEnv}/lib:Browser/TorBrowser/Tor Browser/TorBrowser/Tor/tor --help 1> /dev/null
LD_LIBRARY_PATH=${libPath}:Browser/TorBrowser/Tor Browser/TorBrowser/Tor/tor --help 1> /dev/null
'';
installPhase = ''
@@ -56,15 +52,17 @@ in stdenv.mkDerivation rec {
cp -R * $out/share/tor-browser
cat > "$out/bin/tor-browser" << EOF
#!${stdenv.shell}
#! ${stdenv.shell}
unset SESSION_MANAGER
export HOME="\$HOME/.torbrowser4"
if [ ! -d \$HOME ]; then
mkdir -p \$HOME && cp -R $out/share/tor-browser/Browser/TorBrowser/Data \$HOME/ && chmod -R +w \$HOME
echo "pref(\"extensions.torlauncher.tordatadir_path\", \"\$HOME/Data/Tor/\");" >> \
~/Data/Browser/profile.default/preferences/extension-overrides.js
fi
export LD_LIBRARY_PATH=${ldLibraryPath}:$out/share/tor-browser/Browser/TorBrowser/Tor
$out/share/tor-browser/Browser/firefox -no-remote -profile ~/Data/Browser/profile.default "$@"
export FONTCONFIG_PATH=\$HOME/Data/fontconfig
export LD_LIBRARY_PATH=${libPath}:$out/share/tor-browser/Browser/TorBrowser/Tor
exec $out/share/tor-browser/Browser/firefox --class "Tor Browser" -no-remote -profile ~/Data/Browser/profile.default "\$@"
EOF
chmod +x $out/bin/tor-browser
@@ -75,12 +73,10 @@ in stdenv.mkDerivation rec {
cp Browser/browser/icons/mozicon128.png $out/share/pixmaps/torbrowser.png
'';
buildInputs = [ stdenv ];
meta = with stdenv.lib; {
description = "Tor Browser Bundle";
homepage = https://www.torproject.org/;
platforms = platforms.linux;
maintainers = with maintainers; [ offline matejc doublec thoughtpolice ];
maintainers = with maintainers; [ offline matejc doublec thoughtpolice joachifm ];
};
}
pkgs/tools/security/torbutton/default.nix
-34
View File
@@ -1,34 +0,0 @@
{ stdenv, fetchgit, zip }:
stdenv.mkDerivation rec {
name = "torbutton-${version}.xpi";
version = "1.6.1";
src = fetchgit {
url = https://git.torproject.org/torbutton.git;
rev = "refs/tags/${version}";
sha256 = "0ypzrl8nhckrgh45rcwsjds1jnzz3w5nr09b926a4h3a5njammlv";
};
buildInputs = [ zip ];
buildPhase = ''
mkdir pkg
./makexpi.sh
'';
installPhase = "cat pkg/*.xpi > $out";
meta = with stdenv.lib; {
homepage = https://www.torproject.org/torbutton/;
description = "Part of the Tor Browser Bundle";
longDescription = ''
The component in Tor Browser Bundle that takes care of application-level
security and privacy concerns in Firefox. To keep you safe, Torbutton
disables many types of active content.
'';
license = licenses.mit;
maintainers = [ maintainers.phreedom ];
platforms = platforms.linux;
};
}