From 1646bc36da84728cba2c5b7441dbafc908591e36 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Jan 2012 20:32:29 +0000
Subject: wpa_supplicant: fixed crashing bug

on some hardware, wpa_supplicant would crash when controlled via dbus
(wicd/networkmanager), this patch fixes it.

svn path=/nixpkgs/trunk/; revision=31651
---
 pkgs/os-specific/linux/wpa_supplicant/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'pkgs/os-specific/linux')

diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index fcb6641dfd9..8d216f7899d 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -32,7 +32,15 @@ in
     url = "http://w1.fi/gitweb/gitweb.cgi?p=hostap-07.git;a=commitdiff_plain;h=b80b5639935d37b95d00f86b57f2844a9c775f57";
     name = "wpa_supplicant-nm-0.9.patch";
     sha256 = "1pqba0l4rfhba5qafvvbywi9x1qmphs944p704bh1flnx7cz6ya8";
-    }) ];
+    })
+    # wpa_supplicant crashes when controlled through dbus (wicd/nm)
+    # see: https://bugzilla.redhat.com/show_bug.cgi?id=678625
+    (fetchurl {
+      url = "https://bugzilla.redhat.com/attachment.cgi?id=491018";
+      name = "dbus-assertion-fix.patch";
+      sha256 = "6206d79bcd800d56cae73e2a01a27ac2bee961512f77e5d62a59256a9919077a";
+    })
+  ];
 
   postInstall = ''
     ensureDir $out/share/man/man5 $out/share/man/man8
-- 
cgit 1.4.1


From 652712b77ae16096e335bcfbbcb847cab052385a Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Thu, 19 Jan 2012 09:23:24 +0000
Subject: udisks: Autoreconf properly.

svn path=/nixpkgs/trunk/; revision=31679
---
 pkgs/os-specific/linux/udisks/default.nix | 9 ++++++---
 pkgs/top-level/all-packages.nix           | 4 +++-
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'pkgs/os-specific/linux')

diff --git a/pkgs/os-specific/linux/udisks/default.nix b/pkgs/os-specific/linux/udisks/default.nix
index 191f34489a7..30353be390c 100644
--- a/pkgs/os-specific/linux/udisks/default.nix
+++ b/pkgs/os-specific/linux/udisks/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl, pkgconfig, sg3_utils, udev, glib, dbus, dbus_glib
 , polkit, parted, lvm2, libatasmart, intltool, libuuid, mdadm
-, libxslt, docbook_xsl, utillinux, automake, autoconf }:
+, libxslt, docbook_xsl, utillinux
+, automake, autoconf, libtool, gtkdoc }:
 
 stdenv.mkDerivation rec {
   name = "udisks-1.0.4";
@@ -23,7 +24,7 @@ stdenv.mkDerivation rec {
       lvm2 libatasmart intltool libuuid libxslt docbook_xsl
     ];
 
-  buildNativeInputs = [ automake autoconf pkgconfig ];
+  buildNativeInputs = [ automake autoconf libtool gtkdoc pkgconfig ];
 
   configureFlags = "--localstatedir=/var --enable-lvm2";
 
@@ -34,7 +35,9 @@ stdenv.mkDerivation rec {
         "/sbin:/bin:/usr/sbin:/usr/bin" \
         "${utillinux}/bin:${mdadm}/sbin:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin"
 
-      automake
+      # The patch above modifies Makefile.am, so redo the whole thing.
+      # FIXME: Remove that ASAP---e.g., by writing the patch differently.
+      autoreconf -vfi
     '';
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 937a79e73b7..51b5fcc8144 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6127,7 +6127,9 @@ let
   udev173 = callPackage ../os-specific/linux/udev/173.nix { };
   udev = pkgs.udev173;
 
-  udisks = callPackage ../os-specific/linux/udisks { };
+  udisks = callPackage ../os-specific/linux/udisks {
+    inherit (gnome) gtkdoc;
+  };
 
   uml = import ../os-specific/linux/kernel/linux-2.6.29.nix {
     inherit fetchurl stdenv perl mktemp module_init_tools;
-- 
cgit 1.4.1