From 748a0f607b126ef1130293072d72f11ee34bff77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Fri, 28 Jun 2013 23:47:54 +0200
Subject: [PATCH] Updating siproxd to 0.8.1, and libosip.

---
 pkgs/applications/networking/siproxd/cheaders.patch | 13 +++++++++++++
 pkgs/applications/networking/siproxd/default.nix    | 10 ++++++----
 pkgs/development/libraries/osip/default.nix         |  4 ++--
 3 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/applications/networking/siproxd/cheaders.patch

diff --git a/pkgs/applications/networking/siproxd/cheaders.patch b/pkgs/applications/networking/siproxd/cheaders.patch
new file mode 100644
index 000000000000..53c4813cc335
--- /dev/null
+++ b/pkgs/applications/networking/siproxd/cheaders.patch
@@ -0,0 +1,13 @@
+diff --git a/src/dejitter.c b/src/dejitter.c
+index 1904ab3..cb3624d 100644
+--- a/src/dejitter.c
++++ b/src/dejitter.c
+@@ -22,6 +22,8 @@
+ 
+ #include <errno.h>
+ 
++#include <string.h>
++#include <sys/time.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
diff --git a/pkgs/applications/networking/siproxd/default.nix b/pkgs/applications/networking/siproxd/default.nix
index 3395ba6947aa..69ebab78f947 100644
--- a/pkgs/applications/networking/siproxd/default.nix
+++ b/pkgs/applications/networking/siproxd/default.nix
@@ -1,13 +1,15 @@
 { stdenv, fetchurl, libosip }:
 
-stdenv.mkDerivation {
-  name = "siproxd-0.8.0";
+stdenv.mkDerivation rec {
+  name = "siproxd-0.8.1";
   
   src = fetchurl {
-    url = mirror://sourceforge/siproxd/siproxd-0.8.0.tar.gz;
-    sha256 = "0hl51z33cf68ki707jkrrjjc3a5vpaf49gbrsz3g4rfxypdhc0qs";
+    url = "mirror://sourceforge/siproxd/${name}.tar.gz";
+    sha256 = "1bcxl0h5nc28m8lcdhpbl5yc93w98xm53mfzrf04knsvmx7z0bfz";
   };
 
+  patches = [ ./cheaders.patch ];
+
   buildInputs = [ libosip ];
 
   meta = {
diff --git a/pkgs/development/libraries/osip/default.nix b/pkgs/development/libraries/osip/default.nix
index 2c1b148251c6..3ec3dac221f2 100644
--- a/pkgs/development/libraries/osip/default.nix
+++ b/pkgs/development/libraries/osip/default.nix
@@ -1,9 +1,9 @@
 {stdenv, fetchurl}:
 stdenv.mkDerivation rec {
-  version = "3.6.0";
+  version = "4.0.0";
   src = fetchurl {
     url = "mirror://gnu/osip/libosip2-${version}.tar.gz";
-    sha256 = "1kcndqvsyxgbhkksgydvvjw15znfq6jiznvw058d21h5fq68p8f9";
+    sha256 = "05dhj4s5k4qmhn2amca070xgh1gkcl42n040fhwsn3vm86524bdv";
   };
   name = "libosip2-${version}";