From b95eebec653c749cbc2c2b3932d5b075d566e9b5 Mon Sep 17 00:00:00 2001
From: Alexander Ried <ried@mytum.de>
Date: Tue, 3 May 2016 20:03:14 +0200
Subject: connman: 1.31 -> 1.32 fetch release tarball instead of git checkout
 and drop autotools

This update is compatible with iptables 1.6.0 (see #12178)
---
 pkgs/tools/networking/connman/default.nix | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'pkgs/tools/networking')

diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix
index 7af692f782e8..f8abdb33d9d6 100644
--- a/pkgs/tools/networking/connman/default.nix
+++ b/pkgs/tools/networking/connman/default.nix
@@ -1,26 +1,25 @@
-{ stdenv, fetchgit, autoconf, automake, libtool, pkgconfig, openconnect, file,
+{ stdenv, fetchurl, pkgconfig, openconnect, file,
   openvpn, vpnc, glib, dbus, iptables, gnutls, polkit,
-  wpa_supplicant, readline6, pptp, ppp, tree }:
+  wpa_supplicant, readline6, pptp, ppp }:
 
 stdenv.mkDerivation rec {
   name = "connman-${version}";
-  version = "1.31";
-  src = fetchgit {
-    url = "git://git.kernel.org/pub/scm/network/connman/connman.git";
-    rev = "refs/tags/${version}";
-    sha256 = "90dab6b11841cb4b6400711d234b59fb4fad4e8778bed6e7ad3ac7ac135d6893";
+  version = "1.32";
+  src = fetchurl {
+    url = "mirror://kernel/linux/network/connman/${name}.tar.xz";
+    sha256 = "0k4kw2j78gwxf0rq79a099qkzl6wi4v5i7rfs4rn0si0fd68d19i";
   };
 
-  buildInputs = [ autoconf automake libtool pkgconfig openconnect polkit
-                  file openvpn vpnc glib dbus iptables gnutls
-                  wpa_supplicant readline6 pptp ppp tree ];
+  buildInputs = [ openconnect polkit
+                  openvpn vpnc glib dbus iptables gnutls
+                  wpa_supplicant readline6 pptp ppp ];
+
+  nativeBuildInputs = [ pkgconfig file ];
 
   preConfigure = ''
     export WPASUPPLICANT=${wpa_supplicant}/sbin/wpa_supplicant
-    ./bootstrap
+    export PPPD=${ppp}/sbin/pppd
     sed -i "s/\/usr\/bin\/file/file/g" ./configure
-    substituteInPlace configure --replace /usr/sbin/pptp ${pptp}/sbin/pptp
-    substituteInPlace configure --replace /usr/sbin/pppd ${ppp}/sbin/pppd
   '';
 
   configureFlags = [
@@ -43,6 +42,7 @@ stdenv.mkDerivation rec {
     "--enable-tools"
     "--enable-datafiles"
     "--enable-pptp"
+    "--with-pptp=${pptp}/sbin/pptp"
   ];
 
   postInstall = ''
-- 
cgit 1.4.1


From d74335da85c33ef9d0539a94cd9e0f209cb7ff98 Mon Sep 17 00:00:00 2001
From: Alexander Ried <ried@mytum.de>
Date: Tue, 3 May 2016 20:05:57 +0200
Subject: connman: make dependency on awk explicit

---
 pkgs/tools/networking/connman/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'pkgs/tools/networking')

diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix
index f8abdb33d9d6..c9380761f9fa 100644
--- a/pkgs/tools/networking/connman/default.nix
+++ b/pkgs/tools/networking/connman/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, openconnect, file,
+{ stdenv, fetchurl, pkgconfig, openconnect, file, gawk,
   openvpn, vpnc, glib, dbus, iptables, gnutls, polkit,
   wpa_supplicant, readline6, pptp, ppp }:
 
@@ -14,11 +14,12 @@ stdenv.mkDerivation rec {
                   openvpn vpnc glib dbus iptables gnutls
                   wpa_supplicant readline6 pptp ppp ];
 
-  nativeBuildInputs = [ pkgconfig file ];
+  nativeBuildInputs = [ pkgconfig file gawk ];
 
   preConfigure = ''
     export WPASUPPLICANT=${wpa_supplicant}/sbin/wpa_supplicant
     export PPPD=${ppp}/sbin/pppd
+    export AWK=${gawk}/bin/gawk
     sed -i "s/\/usr\/bin\/file/file/g" ./configure
   '';
 
-- 
cgit 1.4.1