Merge remote-tracking branch 'origin/staging'

6 files changed, 57 insertions, 11 deletions

diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/tools/networking/atftp/default.nix
index eda7f716876..5fff72a3b07 100644
--- a/pkgs/tools/networking/atftp/default.nix
+++ b/pkgs/tools/networking/atftp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, readline, tcp_wrappers, pcre, makeWrapper }:
+{ lib, stdenv, fetchurl, readline, tcp_wrappers, pcre, makeWrapper, gcc }:
 assert stdenv.isLinux;
 assert stdenv.cc.isGNU;
 let
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
     url = "mirror://debian/pool/main/a/atftp/atftp_${version}.dfsg.orig.tar.gz";
     sha256 = "0nd5dl14d6z5abgcbxcn41rfn3syza6s57bbgh4aq3r9cxdmz08q";
   };
-  buildInputs = [ readline tcp_wrappers pcre makeWrapper ];
+  buildInputs = [ readline tcp_wrappers pcre makeWrapper gcc ];
   patches = [ debianPatch ];
   postInstall = ''
     wrapProgram $out/sbin/atftpd --prefix LD_LIBRARY_PATH : ${stdenv.cc.cc}/lib${if stdenv.system == "x86_64-linux" then "64" else ""}
diff --git a/pkgs/tools/networking/cadaver/default.nix b/pkgs/tools/networking/cadaver/default.nix
index a6752606da6..6bc96a5b8c7 100644
--- a/pkgs/tools/networking/cadaver/default.nix
+++ b/pkgs/tools/networking/cadaver/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl }:
+{ stdenv, fetchurl, fetchpatch, openssl }:
 
 stdenv.mkDerivation rec {
   name = "cadaver-0.23.3";
@@ -8,11 +8,20 @@ stdenv.mkDerivation rec {
     sha256 = "1jizq69ifrjbjvz5y79wh1ny94gsdby4gdxwjad4bfih6a5fck7x";
   };
 
-  buildInputs = [openssl];
-  configureFlags = ["--with-ssl"];
+  patches = [
+    (fetchpatch {
+      url = https://projects.archlinux.org/svntogit/community.git/plain/trunk/disable-sslv2.patch?h=packages/cadaver;
+      name = "disable-sslv2.patch";
+      sha256 = "1qx65hv584wdarks51yhd3y38g54affkphm5wz27xiz4nhmbssrr";
+    })
+  ];
+
+  configureFlags = "--with-ssl";
+
+  buildInputs = [ openssl ];
 
   meta = with stdenv.lib; {
-    description = "A command-line WebDAV client for Unix";
+    description = "A command-line WebDAV client";
     homepage    = http://www.webdav.org/cadaver;
     maintainers = with maintainers; [ ianwookim ];
     license     = licenses.gpl2;
diff --git a/pkgs/tools/networking/curl/7.15.nix b/pkgs/tools/networking/curl/7.15.nix
index 356c9b4f32d..56046d5423d 100644
--- a/pkgs/tools/networking/curl/7.15.nix
+++ b/pkgs/tools/networking/curl/7.15.nix
@@ -74,5 +74,6 @@ stdenv.mkDerivation rec {
     homepage = "http://curl.haxx.se/";
     description = "A command line tool for transferring files with URL syntax";
     platforms = with stdenv.lib.platforms; allBut darwin;
+    broken = true;
   };
 }
diff --git a/pkgs/tools/networking/eggdrop/b34a33255f56bbd2317c26da12d702796d67ed50.patch b/pkgs/tools/networking/eggdrop/b34a33255f56bbd2317c26da12d702796d67ed50.patch
new file mode 100644
index 00000000000..03277838e88
--- /dev/null
+++ b/pkgs/tools/networking/eggdrop/b34a33255f56bbd2317c26da12d702796d67ed50.patch
@@ -0,0 +1,36 @@
+From b34a33255f56bbd2317c26da12d702796d67ed50 Mon Sep 17 00:00:00 2001
+From: Geo Van Osterom <george.vo@alum.rpi.edu>
+Date: Thu, 22 Oct 2015 00:12:42 -0400
+Subject: [PATCH] Fix gcc 5 compile errors
+
+---
+ src/net.c     | 2 +-
+ src/tclhash.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/net.c b/src/net.c
+index a1937de..c369fda 100644
+--- a/src/net.c
++++ b/src/net.c
+@@ -560,7 +560,7 @@ int open_address_listen(sockname_t *addr)
+ /* Returns a socket number for a listening socket that will accept any
+  * connection -- port # is returned in port
+  */
+-inline int open_listen(int *port)
++extern inline int open_listen(int *port)
+ {
+   int sock;
+   sockname_t name;
+diff --git a/src/tclhash.c b/src/tclhash.c
+index 9729acb..22c3d05 100644
+--- a/src/tclhash.c
++++ b/src/tclhash.c
+@@ -113,7 +113,7 @@ static inline void tcl_bind_list_delete(tcl_bind_list_t *tl)
+   nfree(tl);
+ }
+
+-inline void garbage_collect_tclhash(void)
++extern inline void garbage_collect_tclhash(void)
+ {
+   tcl_bind_list_t *tl, *tl_next, *tl_prev;
+   tcl_bind_mask_t *tm, *tm_next, *tm_prev;
diff --git a/pkgs/tools/networking/eggdrop/default.nix b/pkgs/tools/networking/eggdrop/default.nix
index cf7fb20df68..623b42d6fc1 100644
--- a/pkgs/tools/networking/eggdrop/default.nix
+++ b/pkgs/tools/networking/eggdrop/default.nix
@@ -11,6 +11,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ tcl ];
 
+  patches = [
+    # https://github.com/eggheads/eggdrop/issues/123
+    ./b34a33255f56bbd2317c26da12d702796d67ed50.patch
+  ];
+
   preConfigure = ''
     prefix=$out/eggdrop
     mkdir -p $prefix
diff --git a/pkgs/tools/networking/pingtcp/default.nix b/pkgs/tools/networking/pingtcp/default.nix
index 4d99eaaeff6..a1b1f549ee4 100644
--- a/pkgs/tools/networking/pingtcp/default.nix
+++ b/pkgs/tools/networking/pingtcp/default.nix
@@ -13,11 +13,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  postPatch = ''
-    substituteInPlace {.,pfcquirks}/CMakeLists.txt \
-      --replace "-march=native" ""
-  '';
-
   enableParallelBuilding = true;
 
   doCheck = false;