3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

14813 commits

Author SHA1 Message Date
Maximilian Bosch 08ced9d67f
nixos/wpa_supplicant: make new behavior opt-in 2021-04-16 13:18:46 +02:00
Maximilian Bosch de0a39166b
wpa_supplicant: allow both imperative and declarative networks
For a while now it's possible to specify an additional config file in
`wpa_supplicant`[1]. In contrast to the file specified via `-c` this was
supposed to be used for immutable settings and not e.g. additional
networks.

However I'm a little bit unhappy about the fact that one has to choose
between a fully imperative setup and a fully declarative one where the
one would have to write credentials for e.g. WPA2-enterprise networks
into the store.

The primary problem with the current state of `wpa_supplicant` is that
if the `SAVE_CONFIG` command is invoked (e.g. via `wpa_cli`), all known
networks will be written to `/etc/wpa_supplicant.conf` and thus all
declarative networks would get out of sync with the declarative
settings.

To work around this, I had to change the following things:

* The `networking.wireless`-module now uses `-I` for declarative config,
  so the user-controlled mode can be used along with the
  `networks`-option.

* I added an `ro`-field to the `ssid`-struct in the
  `wpa_supplicant`-sources. This will be set to `1` for each network
  specified in the config passed via `-I`.

  Whenever config is written to the disk, those networks will be
  skipped, so changes to declarative networks are only temporary.

[1] https://w1.fi/cgit/hostap/commit/wpa_supplicant?id=e6304cad47251e88d073553042f1ea7805a858d1
2021-04-16 13:18:25 +02:00
Sandro 6de0cfabf9
Merge pull request #119533 from fortuneteller2k/update-xanmod
linux_xanmod: 5.11.13 -> 5.11.14
2021-04-15 23:19:35 +02:00
Sandro 47761b6aa8
Merge pull request #119520 from Atemu/update/zen-kernels
zen-kernels: 5.11.13 -> 5.11.14
2021-04-15 23:15:20 +02:00
fortuneteller2k fc0daf4bd3 linux_xanmod: 5.11.13 -> 5.11.14 2021-04-15 19:56:59 +08:00
Alyssa Ross ea50a8c811
netbsd.man: fix hash
This was identical to the hash for "misc" above, so was obviously just
a copy and paste error.
2021-04-15 09:24:14 +00:00
Atemu 87e667540a zen-kernels: 5.11.13 -> 5.11.14 2021-04-15 10:36:16 +02:00
Alyssa Ross 2dba1df37e
Revert "netbsd: take fetchcvs from buildPackages to fix eval"
This reverts commit 6dff63294a.

We have a more general fix now, so don't need this any more.
2021-04-14 21:38:23 +00:00
sternenseemann 6dff63294a netbsd: take fetchcvs from buildPackages to fix eval
For some reason fetchcvs was taken from the cross package set when
cross compiling netbsd.* instead of from buildPackages. I suspect that
this was no issue previously because it just could be substituted as it
only ever produced fixed output derivations. However since
00a2084a40 the evaluation of fetchcvs
would depend on `stdenv.cc` (via its openssh dependency). Since
netbsd.libc is required to evaluate stdenv.cc this caused a infinite
recursion when staging the cross stdenv for pkgsCross.amd64-netbsd. The
fix for this is pretty easy: Just take fetchcvs from buildPackages
explicitly instead of hoping for mkDerivation to get it right.

Resolves #119323.
2021-04-14 14:58:08 +00:00
Ninjatrappeur be07f22e46
Merge pull request #119347 from mweinelt/wpa_supplicant 2021-04-13 20:14:25 +02:00
Martin Weinelt 4480a056c9
hostapd: add patch for CVE-2021-30004
In wpa_supplicant and hostapd 2.9, forging attacks may occur because
AlgorithmIdentifier parameters are mishandled in tls/pkcs1.c and
tls/x509v3.c.

Fixes: CVE-2021-30004
2021-04-13 19:32:22 +02:00
Tim Steinbach b9446623dc linux/hardened/patches/5.4: 5.4.109-hardened1 -> 5.4.111-hardened1 2021-04-13 12:46:15 -04:00
Tim Steinbach cafd9c382d linux/hardened/patches/5.11: 5.11.11-hardened1 -> 5.11.13-hardened1 2021-04-13 12:46:15 -04:00
Tim Steinbach e52ba0e7b6 linux/hardened/patches/5.10: 5.10.27-hardened1 -> 5.10.29-hardened1 2021-04-13 12:46:15 -04:00
Tim Steinbach 517f128cc7 linux/hardened/patches/4.19: 4.19.184-hardened1 -> 4.19.186-hardened1 2021-04-13 12:46:15 -04:00
Tim Steinbach bb6534f61c linux/hardened/patches/4.14: 4.14.228-hardened1 -> 4.14.230-hardened1 2021-04-13 12:46:15 -04:00
Tim Steinbach 5a28ce6480 linux_latest-libre: 17920 -> 17990 2021-04-13 12:46:15 -04:00
Tim Steinbach c0a9755988 linux-rt_5_10: 5.10.25-rt35 -> 5.10.27-rt36 2021-04-13 12:46:15 -04:00
Tim Steinbach 82c70ee99a linux: 5.4.109 -> 5.4.111 2021-04-13 12:46:15 -04:00
Tim Steinbach 1c797af547 linux: 5.11.11 -> 5.11.13 2021-04-13 12:46:15 -04:00
Tim Steinbach 72fb1c7a91 linux: 5.10.27 -> 5.10.29 2021-04-13 12:46:15 -04:00
Tim Steinbach 643d4c3e4b linux: 4.9.264 -> 4.9.266 2021-04-13 12:46:15 -04:00
Tim Steinbach de1c135d6c linux: 4.4.264 -> 4.4.266 2021-04-13 12:46:15 -04:00
Tim Steinbach 1a15aabb7e linux: 4.19.184 -> 4.19.186 2021-04-13 12:46:15 -04:00
Martin Weinelt 9f9ab6fffc wpa_supplicant: add patch for CVE-2021-30004
In wpa_supplicant and hostapd 2.9, forging attacks may occur because
AlgorithmIdentifier parameters are mishandled in tls/pkcs1.c and
tls/x509v3.c.

Fixes: CVE-2021-30004
2021-04-13 18:45:44 +02:00
Sandro 0177881cbe
Merge pull request #119119 from Atemu/update/zen-kernels
zen-kernels: 5.11.11 -> 5.11.13
2021-04-13 01:12:48 +02:00
Sandro 0fefa42678
Merge pull request #118792 from Riey/rtl88x2bu
linuxPackages.rtl88x2bu: 2020-08-20 -> 2021-01-21
2021-04-12 02:55:14 +02:00
Sandro df61c055c7
Merge pull request #119080 from fortuneteller2k/update-xanmod
linux_xanmod: 5.11.12 -> 5.11.13
2021-04-11 16:06:14 +02:00
Alyssa Ross 441f0c894a mdevd: init at 0.1.3.0 2021-04-11 10:22:29 +00:00
Atemu 45a6e42ce8 zen-kernels: 5.11.11 -> 5.11.13 2021-04-11 11:48:37 +02:00
fortuneteller2k b9e7778877 linux_xanmod: 5.11.12 -> 5.11.13 2021-04-11 04:14:34 +08:00
Sandro 7ed23e37bd
Merge pull request #112956 from r-ryantm/auto-update/openvswitch
openvswitch: 2.14.1 -> 2.14.2
2021-04-10 17:24:22 +02:00
Sandro 69e3e6d07c
Merge pull request #118485 from risicle/ris-openvswitch-lts-2.5.12
openvswitch-lts: 2.5.9 -> 2.5.12
2021-04-10 17:23:25 +02:00
Riey 29f26a9b80
linuxPackages.rtl88x2bu: 2020-08-20 -> 2021-01-21 2021-04-09 04:26:26 +09:00
github-actions[bot] 85b57e4446
Merge master into staging-next 2021-04-08 18:14:17 +00:00
Sandro a5fa1a5d87
Merge pull request #117217 from midchildan/feat/sshfs/darwin
sshfs: add darwin build
2021-04-08 15:51:03 +02:00
Tim Steinbach d3d40b09fd kernel: Add test for RC kernels 2021-04-08 09:00:15 -04:00
Tim Steinbach 491f0a677b kernel: Add test for 4.4 2021-04-08 09:00:15 -04:00
Tim Steinbach 00c364a929 kernel: Add test for 4.9 2021-04-08 09:00:15 -04:00
Tim Steinbach 8c82c8a11c kernel: Add test for 4.14 2021-04-08 09:00:15 -04:00
Tim Steinbach 621a979bfe kernel: Add test for 4.19 2021-04-08 09:00:15 -04:00
Tim Steinbach 060e94136f kernel: Add test for 5.4 2021-04-08 09:00:15 -04:00
Tim Steinbach 1dc38fbbc2 kernel: Add test for 5.10 2021-04-08 09:00:15 -04:00
Tim Steinbach bd7fed9a2f kernel: Add tests to passthru.tests 2021-04-08 09:00:15 -04:00
github-actions[bot] bf6abedefb
Merge master into staging-next 2021-04-08 12:06:16 +00:00
Sandro 61b8c50e4d
Merge pull request #103816 from wedens/vendor-reset 2021-04-08 09:45:33 +02:00
Sandro e4d3ea862a
Merge pull request #118762 from fortuneteller2k/update-xanmod
linux_xanmod: 5.11.10 -> 5.11.12
2021-04-08 09:43:45 +02:00
github-actions[bot] 0ba1008684
Merge master into staging-next 2021-04-08 06:05:39 +00:00
Orivej Desh 90691042af libcap: fix static build
It supports static build with SHARED=no; the patch no longer applies.

Tested by building pkgsStatic.libcap.
2021-04-08 05:51:56 +00:00
fortuneteller2k 9c529802fa linux_xanmod: 5.11.10 -> 5.11.12 2021-04-08 05:39:30 +08:00