philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

Merge branch 'master.upstream' into staging.upstream

Browse source
This commit is contained in:
William A. Kennington III 2015-08-20 10:32:29 -07:00
parent d911cc8d63 4ec87513b6
commit 2138f789bc
25 changed files with 273 additions and 164 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
nixos/modules/programs/ssh.nix
View file

@ -115,9 +115,6 @@ in
ForwardX11 ${if cfg.forwardX11 then "yes" else "no"}
# Allow DSA keys for now. (These were deprecated in OpenSSH 7.0.)
PubkeyAcceptedKeyTypes +ssh-dss
${cfg.extraConfig}
'';

3
nixos/modules/services/networking/ssh/sshd.nix
View file

@ -413,9 +413,6 @@ in
${flip concatMapStrings cfg.hostKeys (k: ''
HostKey ${k.path}
'')}
# Allow DSA keys for now. (These were deprecated in OpenSSH 7.0.)
PubkeyAcceptedKeyTypes +ssh-dss
'';
assertions = [{ assertion = if cfg.forwardX11 then cfgc.setXAuthLocation else true;

3
nixos/tests/lightdm.nix
View file

@ -22,7 +22,6 @@ import ./make-test.nix ({ pkgs, ...} : {
$machine->waitForText(qr/${user.description}/);
$machine->screenshot("lightdm");
$machine->sendChars("${user.password}\n");
$machine->waitForText(qr/^\d{2}(?::\d{2}){2} (?:AM|PM)$/m);
$machine->screenshot("session");
$machine->waitForWindow("^IceWM ");
'';
})

7
pkgs/applications/editors/emacs-24/default.nix
View file

@ -50,7 +50,9 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional (stdenv.isDarwin && withX) cairo;
configureFlags =
if withX
if stdenv.isDarwin
then [ "--with-ns" "--disable-ns-self-contained" ]
else if withX
then [ "--with-x-toolkit=${toolkit}" "--with-xft" ]
else [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no"
"--with-gif=no" "--with-tiff=no" ];
@ -61,6 +63,9 @@ stdenv.mkDerivation rec {
postInstall = ''
mkdir -p $out/share/emacs/site-lisp/
cp ${./site-start.el} $out/share/emacs/site-lisp/site-start.el
'' + stdenv.lib.optionalString stdenv.isDarwin ''
mkdir -p $out/Applications
mv nextstep/Emacs.app $out/Applications
'';
doCheck = true;

12
pkgs/applications/graphics/meshlab/default.nix
View file

@ -1,22 +1,18 @@
{stdenv, fetchurl, qt4, bzip2, lib3ds, levmar, muparser, unzip}:
stdenv.mkDerivation rec {
name = "meshlab-1.3.2";
name = "meshlab-1.3.3";
src = fetchurl {
url = "mirror://sourceforge/meshlab/meshlab/MeshLab%20v1.3.2/MeshLabSrc_AllInc_v132.tgz";
sha256 = "d57f0a99a55421aac54a66e2475d48f00f7b1752f9587cd69cf9b5b9c1a519b1";
url = "mirror://sourceforge/meshlab/meshlab/MeshLab%20v1.3.3/MeshLabSrc_AllInc_v133.tgz";
sha256 = "03wqaibfbfag2w1zi1a5z6h546r9d7pg2sjl5pwg24w7yp8rr0n9";
};
# I don't know why I need this; without this, the rpath set at the beginning of the
# buildPhase gets removed from the 'meshlab' binary
dontPatchELF = true;
# Patches are from the Arch Linux package
patchPhase = ''
patch -Np0 -i "${./qt-4.8.patch}"
patch -Np1 -i "${./gcc-4.7.patch}"
'';
patches = [ ./include-unistd.diff ];
buildPhase = ''
mkdir -p "$out/include"

38
pkgs/applications/graphics/meshlab/gcc-4.7.patch
View file

@ -1,38 +0,0 @@
diff --git a/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h b/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h
index 2351b2a..90c6d76 100644
--- a/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h
+++ b/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h
@@ -40,7 +40,7 @@ public:
//! Reset histogram data.
void Clear() {
- this->::Clear();
+ Histogram<ScalarType>::Clear();
CV.clear();
}
/*
diff --git a/vcglib/wrap/gl/trimesh.h b/vcglib/wrap/gl/trimesh.h
index 5d40404..ab9d0aa 100644
--- a/vcglib/wrap/gl/trimesh.h
+++ b/vcglib/wrap/gl/trimesh.h
@@ -1003,7 +1003,7 @@ void Crease(MESH_TYPE &m, typename MESH_TYPE::scalar_type angleRad)
}
}
- m.vert.math::Swap(newvert);
+ m.vert.math.Swap(newvert);
m.vn=m.vert.size();
}
diff --git a/vcglib/wrap/ply/plystuff.h b/vcglib/wrap/ply/plystuff.h
index 3e41e63..4af9508 100644
--- a/vcglib/wrap/ply/plystuff.h
+++ b/vcglib/wrap/ply/plystuff.h
@@ -75,6 +75,7 @@ using namespace vcg;
#define pb_close _close
#define DIR_SEP "\\"
#else
+#include <unistd.h>
#define pb_mkdir(n) mkdir(n,0755)
#define pb_access access
#define pb_stat stat

13
pkgs/applications/graphics/meshlab/include-unistd.diff Normal file
View file

@ -0,0 +1,13 @@
*** old/vcglib/wrap/ply/plystuff.h 2013-02-09 00:00:04.110705851 -0500
--- new/vcglib/wrap/ply/plystuff.h 2013-02-09 15:20:53.482205183 -0500
***************
*** 75,80 ****
--- 75,81 ----
#define pb_close _close
#define DIR_SEP "\\"
#else
+ #include <unistd.h>
#define pb_mkdir(n) mkdir(n,0755)
#define pb_access access
#define pb_stat stat

54
pkgs/applications/graphics/meshlab/qt-4.8.patch
View file

@ -1,54 +0,0 @@
diff -Nur meshlab.orig/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp
--- meshlab.orig/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp 2011-01-25 18:51:28.000000000 +1100
+++ meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp 2012-01-07 11:47:12.836800072 +1100
@@ -7,6 +7,12 @@
#include "SyntopiaCore/Logging/Logging.h"
#include "SyntopiaCore/Misc/MiniParser.h"
+#ifdef Q_WS_MAC
+#include <OpenGL/glu.h>
+#else
+#include <GL/glu.h>
+#endif
+
using namespace SyntopiaCore::Math;
using namespace SyntopiaCore::Misc;
diff -Nur meshlab.orig/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h
--- meshlab.orig/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h 2011-01-25 18:51:28.000000000 +1100
+++ meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h 2012-01-07 11:45:26.795586149 +1100
@@ -3,6 +3,12 @@
#include "SyntopiaCore/Math/Vector3.h"
#include "Object3D.h"
+#ifdef Q_WS_MAC
+#include <OpenGL/glu.h>
+#else
+#include <GL/glu.h>
+#endif
+
namespace SyntopiaCore {
namespace GLEngine {
diff -Nur meshlab.orig/src/external/structuresynth/structuresynth.pro meshlab/src/external/structuresynth/structuresynth.pro
--- meshlab.orig/src/external/structuresynth/structuresynth.pro 2011-01-25 18:49:34.000000000 +1100
+++ meshlab/src/external/structuresynth/structuresynth.pro 2012-01-07 11:51:46.695981995 +1100
@@ -113,6 +113,7 @@
ssynth/StructureSynth/Model/Rendering/TemplateRenderer.cpp
CONFIG+=opengl
QT+=xml opengl script
+unix:LIBS += -lGLU
macx:DESTDIR = ../lib/macx
win32-g++:DESTDIR = ../lib/win32-gcc
win32-msvc2005:DESTDIR = ../lib/win32-msvc2005
diff -Nur meshlab.orig/src/meshlab/meshlab.pro meshlab/src/meshlab/meshlab.pro
--- meshlab.orig/src/meshlab/meshlab.pro 2011-02-15 20:39:47.000000000 +1100
+++ meshlab/src/meshlab/meshlab.pro 2012-01-07 11:57:18.055586086 +1100
@@ -85,6 +85,7 @@
QT += xmlpatterns
QT += network
QT += script
+unix:LIBS += -lGLU
# the following line is needed to avoid mismatch between

2
pkgs/applications/networking/browsers/chromium/default.nix
View file

@ -42,7 +42,7 @@ let
desktopItem = makeDesktopItem {
name = "chromium";
exec = "chromium %U";
icon = "${chromium.browser}/share/icons/hicolor/48x48/apps/chromium.png";
icon = "chromium";
comment = "An open source web browser from Google";
desktopName = "Chromium";
genericName = "Web browser";

2
pkgs/applications/version-management/rcs/default.nix
View file

@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
doCheck = true;
NIX_CFLAGS_COMPILE = if stdenv.isDarwin then "-std=gnu99" else null;
meta = {
homepage = http://www.gnu.org/software/rcs/;
description = "Revision control system";

4
pkgs/desktops/gnome-3/3.16/apps/gnome-calendar/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
, intltool, evolution_data_server, sqlite, libxml2, libsoup
, glib }:
, glib, hicolor_icon_theme }:
stdenv.mkDerivation rec {
name = "gnome-calendar-${gnome3.version}.2";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [
pkgconfig gtk3 wrapGAppsHook intltool evolution_data_server
sqlite libxml2 libsoup glib
sqlite libxml2 libsoup glib hicolor_icon_theme
];
meta = with stdenv.lib; {

20
pkgs/development/libraries/pcl/default.nix
View file

@ -1,23 +1,25 @@
{ stdenv, fetchurl, cmake, qhull, flann, boost, vtk, eigen, pkgconfig, qt4, libusb1 }:
{ stdenv, fetchzip, cmake, qhull, flann, boost, vtk, eigen, pkgconfig, qt4
, libusb1, libpcap, libXt
}:
stdenv.mkDerivation {
name = "pcl-1.6.0";
stdenv.mkDerivation rec {
name = "pcl-1.7.2";
buildInputs = [ cmake qhull flann boost vtk eigen pkgconfig qt4 libusb1 ];
src = fetchurl {
url = mirror://sourceforge/pointclouds/PCL-1.6.0-Source.tar.bz2;
sha256 = "0ip3djcjgynlr9vac6jlcw6kxhg2lm8fc0aqk747a6l0rqvllf1x";
src = fetchzip {
name = name + "-src";
url = "https://github.com/PointCloudLibrary/pcl/archive/${name}.tar.gz";
sha256 = "0sm19p6wcls2d9l0vi5fgwqp7l372nh3g7bdin42w31zr8dmz8h8";
};
enableParallelBuilding = true;
buildInputs = [ cmake qhull flann boost vtk eigen pkgconfig qt4 libusb1 libpcap libXt ];
meta = {
homepage = http://pointclouds.org/;
description = "Open project for 2D/3D image and point cloud processing";
license = stdenv.lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
broken = true;
};
}

4
pkgs/development/ocaml-modules/ocurl/default.nix
View file

@ -1,9 +1,9 @@
{ stdenv, ocaml, findlib, fetchurl, curl, ncurses }:
stdenv.mkDerivation rec {
name = "ocurl-0.7.2";
name = "ocurl-0.7.5";
src = fetchurl {
url = "https://forge.ocamlcore.org/frs/download.php/1463/${name}.tar.gz";
url = "https://forge.ocamlcore.org/frs/download.php/1463/${name}.tar.bz2";
sha256 = "0yn7f3g5wva8nqxh76adpq9rihggc405jkqysfghzwnf3yymyqrr";
};

4
pkgs/development/tools/misc/gtkdialog/default.nix
View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, gtk, pkgconfig}:
{stdenv, fetchurl, gtk, pkgconfig, hicolor_icon_theme }:
stdenv.mkDerivation {
name = "gtkdialog-0.8.3";
@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "ff89d2d7f1e6488e5df5f895716ac1d4198c2467a2a5dc1f51ab408a2faec38e";
};
buildInputs = [ gtk pkgconfig ];
buildInputs = [ gtk pkgconfig hicolor_icon_theme ];
meta = {
homepage = http://gtkdialog.googlecode.com/;

9
pkgs/servers/search/elasticsearch/default.nix
View file

@ -3,11 +3,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
name = "elasticsearch-1.4.5";
name = "elasticsearch-1.5.2";
src = fetchurl {
url = "https://download.elasticsearch.org/elasticsearch/elasticsearch/${name}.tar.gz";
sha256 = "1qjnffbxa1fz5f3sqahhgf45b4r1xa5lkjy9xj135g0w8jgala6w";
url = "https://download.elastic.co/elasticsearch/elasticsearch/${name}.tar.gz";
sha256 = "054s0k0y0g1x6wzbd6gmvrp5n89fqwqssbyhay0gmhvs6sbpibpg";
};
patches = [ ./es-home.patch ];
@ -36,7 +36,8 @@ stdenv.mkDerivation rec {
meta = {
description = "Open Source, Distributed, RESTful Search Engine";
license = stdenv.lib.licenses.asl20;
license = licenses.asl20;
platforms = platforms.unix;
maintainers = [ maintainers.offline ];
};
}

16
pkgs/servers/search/elasticsearch/es-home.patch
View file

@ -1,8 +1,7 @@
diff --git a/bin/elasticsearch b/bin/elasticsearch
index c7c9263..0fcecf6 100755
--- a/bin/elasticsearch
+++ b/bin/elasticsearch
@@ -76,7 +76,10 @@ while [ -h "$SCRIPT" ] ; do
diff -rupN a/bin/elasticsearch b/bin/elasticsearch
--- a/bin/elasticsearch 2015-08-05 17:52:05.740819671 +0200
+++ b/bin/elasticsearch 2015-08-05 17:22:34.664657364 +0200
@@ -83,7 +83,10 @@ while [ -h "$SCRIPT" ] ; do
done
# determine elasticsearch home
@ -14,10 +13,9 @@ index c7c9263..0fcecf6 100755
# make ELASTICSEARCH_HOME absolute
ES_HOME=`cd "$ES_HOME"; pwd`
diff --git a/bin/plugin b/bin/plugin
index a8c796a..daf7b99 100755
--- a/bin/plugin
+++ b/bin/plugin
diff -rupN a/bin/plugin b/bin/plugin
--- a/bin/plugin 2015-08-05 17:57:07.903088815 +0200
+++ b/bin/plugin 2015-08-05 17:57:38.979808139 +0200
@@ -16,7 +16,10 @@ while [ -h "$SCRIPT" ] ; do
done

32
pkgs/servers/search/elasticsearch/plugins.nix
View file

@ -24,10 +24,10 @@ in {
elasticsearch_river_jdbc = esPlugin rec {
name = "elasticsearch-river-jdbc-${version}";
pluginName = "elasticsearch-river-jdbc";
version = "1.3.0.4";
version = "1.5.0.5";
src = fetchurl {
url = "http://xbib.org/repository/org/xbib/elasticsearch/plugin/elasticsearch-river-jdbc/${version}/${name}-plugin.zip";
sha256 = "0272l6cr032iccwwa803shzfjg3505jc48d9qdazrwxjmnlkkzqk";
sha256 = "1p75l3vcnb90ar4j3dci2xf8dqnqyy31kc1r075fa2xqlsxgigcp";
};
meta = {
homepage = "https://github.com/jprante/elasticsearch-river-jdbc";
@ -53,11 +53,11 @@ in {
elasticsearch_http_basic = stdenv.mkDerivation rec {
name = "elasticsearch-http-basic-${version}";
version = "1.3.2";
version = "1.5.0";
src = fetchurl {
url = "https://github.com/Asquera/elasticsearch-http-basic/releases/download/${version}/${name}.jar";
sha256 = "1qq8z0233mzz699zbzjwmx7ghn8k0djgyc5ixr8i5xchfrsrymn2";
url = "https://github.com/Asquera/elasticsearch-http-basic/releases/download/v${version}/${name}.jar";
sha256 = "0fif6sbn2ich39lrgm039y9d5bxkylx9pvly04wss8rdhspvdskb";
};
phases = ["installPhase"];
@ -75,11 +75,11 @@ in {
name = pname + "-" + version;
pname = "elasticsearch-river-twitter";
pluginName = "elasticsearch/" + pname + "/" + version;
version = "2.3.0";
version = "2.5.0";
src = fetchurl {
url = "http://download.elasticsearch.org/elasticsearch/${pname}/${name}.zip";
sha256 = "1lxxh1r61r15mzqyl0li37kcnn3vvpklnbfyys0kd6a1l82f0qvj";
sha256 = "0851yrmyrpp6whyxk34ykcj7b28f90w0nvkrhvl49dwqgr5s4mn4";
};
meta = {
@ -94,10 +94,10 @@ in {
elasticsearch_kopf = esPlugin rec {
name = "elasticsearch-kopf-${version}";
pluginName = "elasticsearch-kopf";
version = "1.4.7";
version = "1.5.7";
src = fetchurl {
url = "https://github.com/lmenezes/elasticsearch-kopf/archive/v${version}.zip";
sha256 = "17r9mmfjnraswij1glmglljga4i4mfiraivxmai6giwmm2grwlz3";
sha256 = "0mq6jmjb4ldi03m431kzr7ly0bf7mdim7s5dx4wplb85gyhscns1";
};
meta = {
homepage = https://github.com/lmenezes/elasticsearch-kopf;
@ -106,4 +106,18 @@ in {
};
};
search_guard = esPlugin rec {
name = "elastic-search-guard-${version}";
pluginName = "search-guard";
version = "0.5";
src = fetchurl {
url = "https://github.com/floragunncom/search-guard/releases/download/v${version}/${pluginName}-${version}.zip";
sha256 = "1zima4jmq1rrcqxhlrp2xian80vp244d2splby015n5cgqrp39fl";
};
meta = {
homepage = https://github.com/floragunncom/search-guard;
description = "Plugin to fetch data from JDBC sources for indexing into Elasticsearch";
license = licenses.asl20;
};
};
}

4
pkgs/tools/X11/xvkbd/default.nix
View file

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
name = "xvkbd-${version}";
version = "3.5";
version = "3.6";
src = fetchurl {
url = "http://homepage3.nifty.com/tsato/xvkbd/xvkbd-${version}.tar.gz";
sha256 = "1vlg5gl1bflx80prvwg6glw0g4fvbi6k3cy0pya0h7cz6nxbs6c8";
sha256 = "1bjvv93xmmjjk6ir95shwrk6aaiqiprwk12npyahfsik4cf58y16";
};
buildInputs = [ imake libXt libXaw libXtst xextproto libXi Xaw3d libXpm gccmakedep ];

39
pkgs/tools/filesystems/fatresize/default.nix Normal file
View file

@ -0,0 +1,39 @@
{ stdenv, fetchurl, parted, substituteAll, utillinux }:
stdenv.mkDerivation rec {
version = "1.0.2";
name = "fatresize-${version}";
src = fetchurl {
url = "mirror://sourceforge/fatresize/fatresize-${version}.tar.bz2";
sha256 = "04wp48jpdvq4nn0dgbw5za07g842rnxlh9mig4mslz70zqs0izjm";
};
buildInputs = [ parted utillinux ];
# This patch helps this unmantained piece of software to be built against recent parted
# It basically modifies the detection scheme for parted version (the current one has no micro version defined)
# The second change is to include a header for a moved function since 1.6+ to current 3.1+ parted
# The third change is to modify the call to PED_ASSERT that is no longer defined with 2 params
patches = [ ./fatresize_parted_nix.patch ];
preConfigure = ''
echo "Replacing calls to ped_free with free ..."
substituteInPlace ./fatresize.c --replace ped_free free
'';
# Filesystem resize functions were reintroduced in parted 3.1 due to no other available free alternatives
# but in a sepparate library -> libparted-fs-resize --- that's why the added LDFLAG
makeFlags = ''
LDFLAGS=-lparted-fs-resize
'';
propagatedBuildInputs = [ parted utillinux ];
meta = {
description = "The FAT16/FAT32 non-destructive resizer";
homepage = http://sourceforge.net/projects/fatresize;
platform = stdenv.lib.platforms.linux;
};
}

74
pkgs/tools/filesystems/fatresize/fatresize_parted_nix.patch Normal file
View file

@ -0,0 +1,74 @@
diff --git a/aclocal.m4 b/aclocal.m4
index 18e8176..2e75592 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -88,8 +88,15 @@ int main ()
if ( !(version = ped_get_version ()) )
exit(1);
if (sscanf(version, "%d.%d.%d", &major, &minor, &micro) != 3) {
- printf("%s, bad version string\n", version);
- exit(1);
+ if (sscanf(version, "%d.%d", &major, &minor) != 2)
+ {
+ printf("%s, bad version string\n", version);
+ exit(1);
+ }
+ else
+ {
+ micro = 0;
+ }
}
if ((major > $parted_config_major_version) ||
diff --git a/configure b/configure
index ed31457..e5f1705 100755
--- a/configure
+++ b/configure
@@ -4793,8 +4793,15 @@ int main ()
if ( !(version = ped_get_version ()) )
exit(1);
if (sscanf(version, "%d.%d.%d", &major, &minor, &micro) != 3) {
- printf("%s, bad version string\n", version);
- exit(1);
+ if (sscanf(version, "%d.%d", &major, &minor) != 2)
+ {
+ printf("%s, bad version string\n", version);
+ exit(1);
+ }
+ else
+ {
+ micro = 0;
+ }
}
if ((major > $parted_config_major_version) ||
diff --git a/fatresize.c b/fatresize.c
index 424d5d2..e439102 100644
--- a/fatresize.c
+++ b/fatresize.c
@@ -30,6 +30,7 @@
#include <inttypes.h>
#include <parted/parted.h>
#include <parted/debug.h>
+#include <parted/filesys.h>
#include <parted/unit.h>
#include "config.h"
@@ -217,7 +218,7 @@ fatresize_handler(PedException *ex)
static int
snap(PedSector* sector, PedSector new_sector, PedGeometry* range)
{
- PED_ASSERT(ped_geometry_test_sector_inside (range, *sector), return 0);
+ PED_ASSERT(ped_geometry_test_sector_inside (range, *sector));
if (!ped_geometry_test_sector_inside(range, new_sector))
return 0;
@@ -281,7 +282,7 @@ snap_to_boundaries (PedGeometry* new_geom, PedGeometry* old_geom,
end_part->geom.end, end_part->geom.start - 1, -1);
}
- PED_ASSERT (start <= end, return);
+ PED_ASSERT (start <= end);
ped_geometry_set (new_geom, start, end - start + 1);
}

16
pkgs/tools/misc/logstash/default.nix
View file

@ -1,31 +1,27 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
version = "1.4.2";
version = "1.5.3";
name = "logstash-${version}";
src = fetchurl {
url = "https://download.elasticsearch.org/logstash/logstash/logstash-${version}.tar.gz";
sha256 = "0sc0bwyf96fzs5h3d7ii65v9vvpfbm7w67vk1im9djnlz0d1ggnm";
sha256 = "1an476k4q2shdxvhcx4fzbrcpk6isjrrvzlb6ivxfqg5fih3cg7b";
};
dontBuild = true;
dontPatchELF = true;
dontStrip = true;
dontBuild = true;
dontPatchELF = true;
dontStrip = true;
dontPatchShebangs = true;
installPhase = ''
mkdir -p $out/bin
mkdir -p $out/vendor
mkdir -p $out/lib
mkdir -p $out/locales
mkdir -p $out/patterns
cp -a bin $out
cp -a vendor $out
cp -a lib $out
cp -a locales $out
cp -a patterns $out
patchShebangs $out/bin
cp Gemfile* $out
'';
meta = {

6
pkgs/tools/networking/openssh/default.nix
View file

@ -17,11 +17,11 @@ let
in
with stdenv.lib;
stdenv.mkDerivation rec {
name = "openssh-7.0p1";
name = "openssh-6.9p1";
src = fetchurl {
url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz";
sha256 = "1rc52jyc5v5b8j9kvasrnz9vnj9b0i7fw4nqac8wix0r794k4ngx";
sha256 = "1zkci5nbpb4frmzj2vr3kv9j47x2h72kvybcpr0d8mzk73sls1vf";
};
prePatch = optionalString hpnSupport
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s"
'';
patches = [ ./locale_archive.patch ];
patches = [ ./locale_archive.patch ./openssh-6.9p1-security-7.0.patch];
buildInputs = [ zlib openssl libedit pkgconfig pam ]
++ optional withKerberos [ kerberos ];

65
pkgs/tools/networking/openssh/openssh-6.9p1-security-7.0.patch Normal file
View file

@ -0,0 +1,65 @@
http://pkgs.fedoraproject.org/cgit/openssh.git/commit/openssh-6.9p1-security-7.0.patch?h=f22&id=4776fad91e7e1f626f33e8c240d0ccecd663554d
diff --git a/sshpty.c b/sshpty.c
index 7bb7641..15da8c6 100644
--- a/sshpty.c
+++ b/sshpty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshpty.c,v 1.29 2014/09/03 18:55:07 djm Exp $ */
+/* $OpenBSD: sshpty.c,v 1.30 2015/07/30 23:09:15 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -197,7 +197,7 @@ pty_setowner(struct passwd *pw, const char *tty)
/* Determine the group to make the owner of the tty. */
grp = getgrnam("tty");
gid = (grp != NULL) ? grp->gr_gid : pw->pw_gid;
- mode = (grp != NULL) ? 0622 : 0600;
+ mode = (grp != NULL) ? 0620 : 0600;
/*
* Change owner and mode of the tty as required.
diff --git a/monitor.c b/monitor.c
index b410965..f1b873d 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1084,9 +1084,7 @@ extern KbdintDevice sshpam_device;
int
mm_answer_pam_init_ctx(int sock, Buffer *m)
{
-
debug3("%s", __func__);
- authctxt->user = buffer_get_string(m, NULL);
sshpam_ctxt = (sshpam_device.init_ctx)(authctxt);
sshpam_authok = NULL;
buffer_clear(m);
@@ -1166,14 +1166,16 @@ mm_answer_pam_respond(int sock, Buffer *m)
int
mm_answer_pam_free_ctx(int sock, Buffer *m)
{
+ int r = sshpam_authok != NULL && sshpam_authok == sshpam_ctxt;
debug3("%s", __func__);
(sshpam_device.free_ctx)(sshpam_ctxt);
+ sshpam_ctxt = sshpam_authok = NULL;
buffer_clear(m);
mm_request_send(sock, MONITOR_ANS_PAM_FREE_CTX, m);
auth_method = "keyboard-interactive";
auth_submethod = "pam";
- return (sshpam_authok == sshpam_ctxt);
+ return r;
}
#endif
diff --git a/monitor_wrap.c b/monitor_wrap.c
index e6217b3..eac421b 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -614,7 +614,6 @@ mm_sshpam_init_ctx(Authctxt *authctxt)
debug3("%s", __func__);
buffer_init(&m);
- buffer_put_cstring(&m, authctxt->user);
mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PAM_INIT_CTX, &m);
debug3("%s: waiting for MONITOR_ANS_PAM_INIT_CTX", __func__);
mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_PAM_INIT_CTX, &m);

4
pkgs/tools/package-management/packagekit/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, intltool, glib, pkgconfig, polkit, python3, sqlite }:
{ stdenv, fetchurl, intltool, glib, pkgconfig, polkit, python, sqlite }:
let version = "1.0.7"; in
stdenv.mkDerivation {
@ -9,7 +9,7 @@ stdenv.mkDerivation {
url = "https://www.freedesktop.org/software/PackageKit/releases/PackageKit-${version}.tar.xz";
};
buildInputs = [ glib polkit python3 ];
buildInputs = [ glib polkit python ];
propagatedBuildInputs = [ sqlite ];
nativeBuildInputs = [ intltool pkgconfig ];

3
pkgs/top-level/all-packages.nix
View file

@ -1521,6 +1521,8 @@ let
lp_solve = callPackage ../applications/science/math/lp_solve { };
lprof = callPackage ../tools/graphics/lprof { };
fatresize = callPackage ../tools/filesystems/fatresize {};
fdk_aac = callPackage ../development/libraries/fdk-aac { };
@ -7808,6 +7810,7 @@ let
pcl = callPackage ../development/libraries/pcl {
vtk = vtkWithQt4;
inherit (xorg) libXt;
};
pcre = callPackage ../development/libraries/pcre {