From 4fea2833497ade8266c0b69788baf9a304e5ca8e Mon Sep 17 00:00:00 2001
From: Sergey Mironov <grrwlf@gmail.com>
Date: Fri, 16 Jan 2015 15:04:12 +0300
Subject: [PATCH 1/3] sipcmd: add the command-line SIP client

---
 .../networking/sipcmd/default.nix             | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/applications/networking/sipcmd/default.nix

diff --git a/pkgs/applications/networking/sipcmd/default.nix b/pkgs/applications/networking/sipcmd/default.nix
new file mode 100644
index 00000000000..e45f8c4f84c
--- /dev/null
+++ b/pkgs/applications/networking/sipcmd/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchgit, opal, ptlib }:
+
+stdenv.mkDerivation rec {
+
+  rev = "3090e9f";
+
+  name = "sipcmd-${rev}";
+  
+  src = fetchgit {
+    url = "https://github.com/tmakkonen/sipcmd";
+    rev = "${rev}";
+    sha256 = "072h9qapmz46r8pxbzkfmc4ikd7dv9g8cgrfrw21q942icbrvq2c";
+  };
+
+  buildInputs = [ opal ptlib ];
+
+  buildPhase = ''
+    make IFLAGS="-I${opal}/include/opal -I${ptlib}/include -Isrc/ -L${opal}/lib -L${ptlib}/lib"
+  '';
+
+  installPhase = ''
+    mkdir -pv $out/bin
+    cp sipcmd $out/bin/sipcmd
+  '';
+
+  meta = {
+    homepage = https://github.com/tmakkonen/sipcmd;
+    description = "sipcmd - the command line SIP/H.323/RTP softphone";
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 82e86264c5d..c50d4018827 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8178,6 +8178,8 @@ let
 
   shishi = callPackage ../servers/shishi { };
 
+  sipcmd = callPackage ../applications/networking/sipcmd { };
+
   sipwitch = callPackage ../servers/sip/sipwitch { };
 
   spawn_fcgi = callPackage ../servers/http/spawn-fcgi { };

From b7adfe0e7d4a3c2128d986c77977350862b10d86 Mon Sep 17 00:00:00 2001
From: Sergey Mironov <grrwlf@gmail.com>
Date: Mon, 19 Jan 2015 17:19:36 +0300
Subject: [PATCH 2/3] sipp: add the package

---
 pkgs/development/tools/misc/sipp/default.nix | 29 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/tools/misc/sipp/default.nix

diff --git a/pkgs/development/tools/misc/sipp/default.nix b/pkgs/development/tools/misc/sipp/default.nix
new file mode 100644
index 00000000000..d3373e9f4a6
--- /dev/null
+++ b/pkgs/development/tools/misc/sipp/default.nix
@@ -0,0 +1,29 @@
+{stdenv, fetchurl, ncurses, libpcap }:
+
+stdenv.mkDerivation rec {
+
+  version = "3.4-beta2";
+
+  name = "sipp-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/SIPp/sipp/archive/${version}.tar.gz";
+    sha256 = "0rr3slarh5dhpinif5aqji9c9krnpvl7z49w7qahvsww1niawwdv";
+  };
+
+  configurePhase = ''
+    export ac_cv_lib_curses_initscr=yes
+    export ac_cv_lib_pthread_pthread_mutex_init=yes
+    sed -i "s@-lcurses@-lncurses@g" ./configure
+    sed -i "s@pcap/\(.*\).pcap@$out/share/pcap/\1.pcap@g" src/scenario.cpp
+    ./configure --prefix=$out --with-pcap
+  '';
+
+  postInstall = ''
+    mkdir -pv $out/share/pcap
+    cp pcap/* $out/share/pcap
+  '';
+
+  buildInputs = [ncurses libpcap];
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c50d4018827..d24d46d9732 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11169,6 +11169,8 @@ let
 
   shntool = callPackage ../applications/audio/shntool { };
 
+  sipp = callPackage ../development/tools/misc/sipp { };
+
   sonic-visualiser = callPackage ../applications/audio/sonic-visualiser {
     inherit (pkgs.vamp) vampSDK;
     inherit (pkgs.xlibs) libX11;

From 0a006c78bf1b55af38587d1b229a87ff6a4873d3 Mon Sep 17 00:00:00 2001
From: Sergey Mironov <smironov@ecotelecom.ru>
Date: Thu, 5 Feb 2015 16:52:14 +0300
Subject: [PATCH 3/3] dhcpdump: add the tool

---
 pkgs/tools/networking/dhcpdump/default.nix | 23 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/tools/networking/dhcpdump/default.nix

diff --git a/pkgs/tools/networking/dhcpdump/default.nix b/pkgs/tools/networking/dhcpdump/default.nix
new file mode 100644
index 00000000000..778cfc3b5ed
--- /dev/null
+++ b/pkgs/tools/networking/dhcpdump/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, libpcap, perl }:
+
+stdenv.mkDerivation rec {
+  name = "dhcpdump-1.8";
+
+  src = fetchurl {
+    url = "http://archive.ubuntu.com/ubuntu/pool/universe/d/dhcpdump/dhcpdump_1.8.orig.tar.gz";
+    sha256 = "143iyzkqvhj4dscwqs75jvfr4wvzrs11ck3fqn5p7yv2h50vjpkd";
+  };
+
+  buildInputs = [libpcap perl];
+
+  installPhase = ''
+    mkdir -pv $out/bin
+    cp dhcpdump $out/bin
+  '';
+
+  meta = {
+    description = "A tool for visualization of DHCP packets as recorded and output by tcpdump to analyze DHCP server responses";
+    homepage = http://packages.ubuntu.com/ru/lucid/dhcpdump;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d24d46d9732..d6c61a375a3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1037,6 +1037,8 @@ let
 
   dhcp = callPackage ../tools/networking/dhcp { };
 
+  dhcpdump = callPackage ../tools/networking/dhcpdump { };
+
   dhcpcd = callPackage ../tools/networking/dhcpcd { };
 
   di = callPackage ../tools/system/di { };