From 2ba4f46752cbd9e6869a4c48fbea4033486c34c4 Mon Sep 17 00:00:00 2001
From: James Cook <james.cook@utoronto.ca>
Date: Thu, 17 Jan 2013 22:52:15 -0800
Subject: [PATCH 1/3] tinc:  A VPN daemon with full mesh routing.

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

diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix
new file mode 100644
index 000000000000..dadadc085205
--- /dev/null
+++ b/pkgs/tools/networking/tinc/default.nix
@@ -0,0 +1,30 @@
+{stdenv, fetchurl, lzo, openssl, zlib}:
+
+stdenv.mkDerivation rec {
+  version = "1.0.19";
+  name = "tinc-${version}";
+
+  src = fetchurl {
+    url = "http://www.tinc-vpn.org/packages/tinc-${version}.tar.gz";
+    sha256 = "183nxj23d05vc3pxwbb692lr048wr81wnv0avzlkdm4r6c3bp7jh";
+  };
+
+  buildInputs = [ lzo openssl zlib ];
+
+  configureFlags = ''
+    --localstatedir=/var
+    --sysconfdir=/etc
+  '';
+
+  meta = { 
+    description = "VPN daemon with full mesh routing";
+    longDescription = ''
+      tinc is a Virtual Private Network (VPN) daemon that uses tunnelling and
+      encryption to create a secure private network between hosts on the
+      Internet.  It features full mesh routing, as well as encryption,
+      authentication, compression and ethernet bridging.
+    '';
+    homepage="http://www.tinc-vpn.org/";
+    license = "gpl2Plus";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad19066617a8..a2551580e392 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1587,6 +1587,8 @@ let
     guile = guile_1_8;
   };
 
+  tinc = callPackage ../tools/networking/tinc { };
+
   tmux = callPackage ../tools/misc/tmux { };
 
   tor = callPackage ../tools/security/tor { };

From 3066f86e0dcd4629204e9643dfe6d67afb7c8269 Mon Sep 17 00:00:00 2001
From: James Cook <james.cook@utoronto.ca>
Date: Sat, 19 Jan 2013 11:25:43 -0800
Subject: [PATCH 2/3] Fixed tinc license.

---
 pkgs/tools/networking/tinc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix
index dadadc085205..b42b364f605b 100644
--- a/pkgs/tools/networking/tinc/default.nix
+++ b/pkgs/tools/networking/tinc/default.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
       authentication, compression and ethernet bridging.
     '';
     homepage="http://www.tinc-vpn.org/";
-    license = "gpl2Plus";
+    license = stdenv.lib.licenses.gpl2;
   };
 }

From 04194c576eca6d4f13e5a7c79a9a69e831365cd1 Mon Sep 17 00:00:00 2001
From: James Cook <james.cook@utoronto.ca>
Date: Sat, 19 Jan 2013 13:33:32 -0800
Subject: [PATCH 3/3] tinc: GPLv2+, not GPLv2.

---
 pkgs/tools/networking/tinc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix
index b42b364f605b..bcfb584da1b7 100644
--- a/pkgs/tools/networking/tinc/default.nix
+++ b/pkgs/tools/networking/tinc/default.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
       authentication, compression and ethernet bridging.
     '';
     homepage="http://www.tinc-vpn.org/";
-    license = stdenv.lib.licenses.gpl2;
+    license = stdenv.lib.licenses.gpl2Plus;
   };
 }