Unverified Commit 875ba23d authored by Franz Pletz's avatar Franz Pletz Committed by GitHub
Browse files

iwd: 3.8 -> 3.9 and fix error msg in the system log (#418124)

parents 0710bede b6596b40
Loading
Loading
Loading
Loading
+30 −0
Original line number Diff line number Diff line
diff --git a/src/iwd-dbus.conf b/src/iwd-dbus.conf
index f2509ebc..a443987d 100644
--- a/src/iwd-dbus.conf
+++ b/src/iwd-dbus.conf
@@ -19,10 +19,6 @@
     <allow send_destination="net.connman.iwd"/>
   </policy>
 
-  <policy group="netdev">
-    <allow send_destination="net.connman.iwd"/>
-  </policy>
-
   <policy context="default">
     <deny send_destination="net.connman.iwd"/>
   </policy>
diff --git a/wired/ead-dbus.conf b/wired/ead-dbus.conf
index 8a685e0a..749d0c05 100644
--- a/wired/ead-dbus.conf
+++ b/wired/ead-dbus.conf
@@ -17,10 +17,6 @@
     <allow send_destination="net.connman.ead"/>
   </policy>
 
-  <policy group="netdev">
-    <allow send_destination="net.connman.ead"/>
-  </policy>
-
   <policy context="default">
     <deny send_destination="net.connman.ead"/>
   </policy>
+15 −9
Original line number Diff line number Diff line
@@ -13,16 +13,22 @@
  gitUpdater,
}:

stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
  pname = "iwd";
  version = "3.8";
  version = "3.9";

  src = fetchgit {
    url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git";
    rev = version;
    hash = "sha256-BNGXOiyV+aTHym4EBStVdQ0XekmkFEyx7PqmlG8HcVc=";
    tag = finalAttrs.version;
    hash = "sha256-NY0WB62ehxKH64ssAF4vkF6YroG5HHH+ii+AFG9EaE4=";
  };

  patches = [
    # Remove dbus config referencing the netdev group, which we don't have.
    # Users are advised to use the wheel group instead.
    ./no_netdev_group.diff
  ];

  outputs = [
    "out"
    "man"
@@ -101,14 +107,14 @@ stdenv.mkDerivation rec {
    url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git";
  };

  meta = with lib; {
  meta = {
    homepage = "https://git.kernel.org/pub/scm/network/wireless/iwd.git";
    description = "Wireless daemon for Linux";
    license = licenses.lgpl21Plus;
    platforms = platforms.linux;
    maintainers = with maintainers; [
    license = lib.licenses.lgpl21Plus;
    platforms = lib.platforms.linux;
    maintainers = with lib.maintainers; [
      dtzWill
      fpletz
    ];
  };
}
})