292251 Commits

Author SHA1 Message Date
Luke Granger-Brown
dbf7af9afc
Merge pull request #125996 from NixOS/backport-125632-to-staging-21.05
[Backport staging-21.05] python3Packages.certifi: 2020.12.5 -> 2021.05.30
2021-06-06 20:50:31 +01:00
Fabian Affolter
d607e3143f python3Packages.certifi: enable tests
(cherry picked from commit 19f90b99e7451160d3a13a404d5a8194ef60a27a)
2021-06-06 19:23:11 +00:00
Fabian Affolter
4af78d9ddb python3Packages.certifi: 2020.12.5 -> 2021.05.30
(cherry picked from commit 32e061be5275054fa6cc227d0ebaf76fd0288e02)
2021-06-06 19:23:11 +00:00
Mario Rodas
15087f578c
Merge pull request #125820 from NixOS/backport-125751-to-staging-21.05
[Backport staging-21.05] postgresql: 9.6.21 -> 9.6.22, 10.16 -> 10.17, 11.11 -> 11.12, 12.6 -> 12.7, 13.2 -> 13.3
2021-06-05 15:05:04 -05:00
Martin Weinelt
4a7770bfd6 postgresql_9_6: 9.6.21 -> 9.6.22
Fixes: CVE-2021-32027, CVE-2021-32028
(cherry picked from commit 062e1e595fe8bde889c73c2954fb2c5617dcf42c)
2021-06-05 17:09:24 +00:00
Martin Weinelt
731e67c871 postgresql_10: 10.16 -> 10.17
Fixes: CVE-2021-32027, CVE-2021-32028
(cherry picked from commit 376197bc5e9501febea4b6ab46b8073374d52c08)
2021-06-05 17:09:24 +00:00
Martin Weinelt
8d97696b86 postgresql_11: 11.11 -> 11.12
Fixes: CVE-2021-32027, CVE-2021-32028, CVE-2021-32029
(cherry picked from commit daedf20fa605c859a3c4b4c60d1ad0ba88261d4e)
2021-06-05 17:09:24 +00:00
Martin Weinelt
942a01e232 postgresql_12: 12.6 -> 12.7
Fixes: CVE-2021-32027, CVE-2021-32028, CVE-2021-32029
(cherry picked from commit b786157de875702c9a40b0945597ba25e83d918c)
2021-06-05 17:09:23 +00:00
Martin Weinelt
894d6ab2de postgresql_13: 13.2 -> 13.3
Fixes: CVE-2021-32027, CVE-2021-32028, CVE-2021-32029
(cherry picked from commit 3318a937ef800d2ba7818dc50be01bc4319dc0ad)
2021-06-05 17:09:23 +00:00
Vladimír Čunát
99995bc930
zstd.patches: clean up
This was discussed on PR #125185.
2021-06-05 07:34:46 +02:00
Vladimír Čunát
7b686ba07b
Merge branch 'release-21.05' into staging-21.05 2021-06-05 07:30:40 +02:00
Jörg Thalheim
0edbcd01f6
Merge pull request #125349 from Mic92/containerd-backport
[21.05] containerd: fix checksum
2021-06-05 07:28:48 +02:00
Maximilian Bosch
aa57635767
Merge pull request #125684 from NixOS/backport-125483-to-release-21.05
[Backport release-21.05] nixos/prometheus-exporters: improve docs & fix rspamd exporter
2021-06-04 17:36:38 +02:00
Sandro
503638304e
Merge pull request #125526 from wizeman/u/fix-libraspberrypi-url-backport
[21.05] libraspberrypi: fix URL
2021-06-04 17:18:22 +02:00
Maximilian Bosch
3c8dcd902a nixos/mail-exporter: add note about rspamd marking probe mails as spam
(cherry picked from commit ba9768f3143c728a47515d0548025a103fca9013)
2021-06-04 14:14:35 +00:00
Maximilian Bosch
d7fbcd60a3 nixos/dovecot-exporter: fix documentation for old stats
(cherry picked from commit 6fb847c55643780c1ba3a98c57ba57541ed33d14)
2021-06-04 14:14:35 +00:00
Maximilian Bosch
619cf60d25 nixos/rspamd-exporter: fix metrics
In 0.3.0 of the json-exporter[1] it was switched to a different jsonpath
library which made some changes - especially for spaces in keys -
necessary. Also I decided to remove the pretty-printed JSON as this
would interfere with the bash quoting too much. If one needs
pretty-printed output, they can still pipe the output to `jq`.

[1] https://github.com/prometheus-community/json_exporter/releases/tag/v0.3.0

(cherry picked from commit 976d668e5c5566c3e96b17d667830a0f3ed1bbb5)
2021-06-04 14:14:35 +00:00
stigtsp
5f244caea7
Merge pull request #125646 from stigtsp/package/perl-Mojolicious-9.19-backport-21.05
[21.05] perlPackages.Mojolicious: 9.17 -> 9.19
2021-06-04 14:54:40 +02:00
Robert Hensing
f52ff6ed96 arion: 0.1.2.0 -> 0.1.3.0 2021-06-04 14:02:39 +02:00
lsix
65a1f5fbdc
Merge pull request #125436 from NixOS/backport-125375-to-staging-21.05
[Backport staging-21.05] python3Packages.django: 2.2.22 -> 2.2.24; python3Packages.django3_: 3.2.2 -> 3.2.4
2021-06-04 12:03:03 +01:00
Zak B. Elep
467ae337e8 perlPackages.Mojolicious: 9.17 -> 9.19
(cherry picked from commit 15f6e4ed3b734d00066e5a1401e45f554fc9c7bd)
2021-06-04 12:21:36 +02:00
Sandro
e829bef3ca
Merge pull request #125633 from NixOS/backport-125537-to-release-21.05
[Backport release-21.05] nixos/release-notes: Fix link to GNOME 40 release notes
2021-06-04 11:40:03 +02:00
Sandro
67cda28baa
Merge pull request #125635 from NixOS/backport-125394-to-release-21.05
[Backport release-21.05] win-spice: say yes to all 7z dialogs
2021-06-04 11:39:52 +02:00
Maximilian Bosch
3dd3f4e578
Merge pull request #125629 from NixOS/backport-125536-to-release-21.05
[Backport release-21.05] matrix-synapse: 1.35.0 -> 1.35.1
2021-06-04 11:25:17 +02:00
fortuneteller2k
96882387e5 win-spice: say yes to all 7z dialogs
(cherry picked from commit 0c245a39a9ab4eb0ed98892645ae5d726ee8c50c)
2021-06-04 09:22:28 +00:00
Anders Kaseorg
19f959fccb nixos/release-notes: Fix link to GNOME 40 release notes
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
(cherry picked from commit a681951902631d20e439fc60f53100967ba1cc72)
2021-06-04 09:17:01 +00:00
Sumner Evans
b5cec505c1 matrix-synapse: 1.35.0 -> 1.35.1
(cherry picked from commit 10cbea574d4882a8b58b74fd594ae55c64540797)
2021-06-04 08:43:14 +00:00
Vladimír Čunát
3903d2d41d
Merge #125139: firefox: 88.0.1 -> 89.0 (into release-21.05) 2021-06-04 09:35:18 +02:00
Vladimír Čunát
729e236f7a
Merge #125593: polkit: Fix authentication bypass vulnerability 2021-06-04 08:47:51 +02:00
Jonathan Ringer
4c2e84394c linuxPackages.ati_drivers_x11: move to alias set
(cherry picked from commit 095e6fdd126c91f3196bf19cbbc5caf8d6c292a9)
2021-06-03 23:01:50 -07:00
Jonathan Ringer
d0db001244 tdesktop: add optional dependencies
(cherry picked from commit fa3517c57a831f56fdb5c60f573ac1c70d5f16eb)
2021-06-03 22:24:50 -07:00
Jonathan Ringer
1de618903e tdesktop: 2.7.4 -> 2.7.5
(cherry picked from commit be72f6a7ce5f2cefbfc7ade175669494e65c3d8a)
2021-06-03 22:24:50 -07:00
Martin Weinelt
715c85757b polkit: Fix local privilege escalation vulnerability
Fixes a local privilege escalation using polkit_system_bus_name_get_creds_sync()

Fixes: CVE-2021-3560
(cherry picked from commit 26ac1d5db953292d78f0585dd8baccd9a36a44a4)
2021-06-04 00:36:44 +00:00
Martin Weinelt
c0e22c259c
Merge pull request #125582 from NixOS/backport-125576-to-release-21.05 2021-06-04 01:31:34 +02:00
Martin Weinelt
4827d347cc matrix-synapse.tools.synadm: init at 0.29
(cherry picked from commit 7efe82966df83ed82938912c4ecdf705ed49be4a)
2021-06-03 23:15:30 +00:00
Martin Weinelt
47f12a4002 python3Packages.click-option-group: init at 0.5.3
(cherry picked from commit c06b1086c0962a5909432c5b9590fc510926802a)
2021-06-03 23:15:29 +00:00
Robert Scott
9cfa9a79cc
Merge pull request #125353 from petabyteboy/feature/gitlab-13-12-2-backport
[21.05] gitlab: 13.12.0 -> 13.12.2
2021-06-03 22:33:34 +01:00
Robert Scott
4714dcf148
Merge pull request #125385 from mweinelt/21.05/lasso
[21.05] lasso: Fix signature verification in AuthnResponse messages
2021-06-03 20:44:50 +01:00
Martin Weinelt
54fd06550c
Merge pull request #125546 from NixOS/backport-125105-to-release-21.05 2021-06-03 20:56:27 +02:00
Martin Weinelt
58bf12dbbf samba4Full: disable glusterfs support
The samba package was marked as broken, when enableGlusterFS is true.

The samba build with glusterfs fails due to API breakage that I am
unable to debug:

[3562/4088] Compiling source3/modules/vfs_virusfilter.c
../../source3/modules/vfs_glusterfs.c: In function ‘vfs_gluster_pread’:
../../source3/modules/vfs_glusterfs.c:856:8: error: too few arguments to function ‘glfs_pread’
  856 |  ret = glfs_pread(glfd, data, n, offset, 0);
      |        ^~~~~~~~~~
In file included from ../../source3/modules/vfs_glusterfs.c:41:
/nix/store/0gzaf6fqgfxfns19zlc07dyjqigj7ak7-glusterfs-9.0/include/glusterfs/api/glfs.h:713:1: note: declared here
  713 | glfs_pread(glfs_fd_t *fd, void *buf, size_t count, off_t offset, int flags,
      | ^~~~~~~~~~
../../source3/modules/vfs_glusterfs.c: In function ‘vfs_gluster_pread_do’:
../../source3/modules/vfs_glusterfs.c:938:16: error: too few arguments to function ‘glfs_pread’
  938 |   state->ret = glfs_pread(state->fd, state->buf, state->count,
      |                ^~~~~~~~~~
In file included from ../../source3/modules/vfs_glusterfs.c:41:
/nix/store/0gzaf6fqgfxfns19zlc07dyjqigj7ak7-glusterfs-9.0/include/glusterfs/api/glfs.h:713:1: note: declared here
  713 | glfs_pread(glfs_fd_t *fd, void *buf, size_t count, off_t offset, int flags,
      | ^~~~~~~~~~
../../source3/modules/vfs_glusterfs.c: In function ‘vfs_gluster_pwrite_do’:
../../source3/modules/vfs_glusterfs.c:1077:16: error: too few arguments to function ‘glfs_pwrite’
 1077 |   state->ret = glfs_pwrite(state->fd, state->buf, state->count,
      |                ^~~~~~~~~~~
In file included from ../../source3/modules/vfs_glusterfs.c:41:
/nix/store/0gzaf6fqgfxfns19zlc07dyjqigj7ak7-glusterfs-9.0/include/glusterfs/api/glfs.h:717:1: note: declared here
  717 | glfs_pwrite(glfs_fd_t *fd, const void *buf, size_t count, off_t offset,
      | ^~~~~~~~~~~
../../source3/modules/vfs_glusterfs.c: In function ‘vfs_gluster_pwrite’:
../../source3/modules/vfs_glusterfs.c:1161:8: error: too few arguments to function ‘glfs_pwrite’
 1161 |  ret = glfs_pwrite(glfd, data, n, offset, 0);
      |        ^~~~~~~~~~~
In file included from ../../source3/modules/vfs_glusterfs.c:41:
/nix/store/0gzaf6fqgfxfns19zlc07dyjqigj7ak7-glusterfs-9.0/include/glusterfs/api/glfs.h:717:1: note: declared here
  717 | glfs_pwrite(glfs_fd_t *fd, const void *buf, size_t count, off_t offset,
      | ^~~~~~~~~~~
../../source3/modules/vfs_glusterfs.c: In function ‘vfs_gluster_fsync_do’:
../../source3/modules/vfs_glusterfs.c:1287:16: error: too few arguments to function ‘glfs_fsync’
 1287 |   state->ret = glfs_fsync(state->fd);
      |                ^~~~~~~~~~
In file included from ../../source3/modules/vfs_glusterfs.c:41:
/nix/store/0gzaf6fqgfxfns19zlc07dyjqigj7ak7-glusterfs-9.0/include/glusterfs/api/glfs.h:790:1: note: declared here
  790 | glfs_fsync(glfs_fd_t *fd, struct glfs_stat *prestat,
      | ^~~~~~~~~~
../../source3/modules/vfs_glusterfs.c: In function ‘vfs_gluster_ftruncate’:
../../source3/modules/vfs_glusterfs.c:1621:8: error: too few arguments to function ‘glfs_ftruncate’
 1621 |  ret = glfs_ftruncate(glfd, offset);
      |        ^~~~~~~~~~~~~~
In file included from ../../source3/modules/vfs_glusterfs.c:41:
/nix/store/0gzaf6fqgfxfns19zlc07dyjqigj7ak7-glusterfs-9.0/include/glusterfs/api/glfs.h:768:1: note: declared here
  768 | glfs_ftruncate(glfs_fd_t *fd, off_t length, struct glfs_stat *prestat,
      | ^~~~~~~~~~~~~~

../../source3/modules/vfs_virusfilter.c: In function ‘quarantine_create_dir’:
../../source3/modules/vfs_virusfilter.c:132:13: warning: implicit declaration of function ‘strlcat’; did you mean ‘strncat’? [-Wimplicit-function-declaration]
  132 |   cat_len = strlcat(new_dir, "/", len + 1);
      |             ^~~~~~~
      |             strncat

Waf: Leaving directory `/build/samba-4.14.4/bin/default'
Build failed
 -> task in 'vfs_glusterfs.objlist' failed with exit status 1 (run with -v to display more information)

(cherry picked from commit fac761a55ad4d6c6a8498c468ec7e5c43b984264)
2021-06-03 18:19:49 +00:00
Maxine Aubrey
282a4d554e samba: add missing python dependencies for ldap and domain controller
(cherry picked from commit b760ab8cfbac9894b8b8e472c2810f8d4ea60b91)
2021-06-03 18:19:49 +00:00
Ricardo M. Correia
3b96c770a8 libraspberrypi: fix URL
(cherry picked from commit 3915d2fd27e2d8a62cff752bd1e4146317c76f31)
2021-06-03 18:08:13 +02:00
Jonathan Ringer
592df52aa1 nix: 2.3.11 -> 2.3.12
(cherry picked from commit ff50095bd4121f35e1ca73b4df68912db1bff2a4)
2021-06-03 08:11:52 -07:00
Jonathan Ringer
b78bd862e3 nixUnstable: 2.4pre20210503_6d2553a -> 2.4pre20210601_5985b8b5
(cherry picked from commit f7fe3008d106b8b8834a4f64868ae386a9b26e08)
2021-06-03 08:11:52 -07:00
Samuel Dionne-Riel
7953561a9d iso-image: Improve disk detection
This should help in rare hardware-specific situations where the root is
not automatically detected properly.

We search using a marker file. This should help some weird UEFI setups
where the root is set to `(hd0,msdos2)` by default.

Defaulting to `(hd0)` by looking for the ESP **will break themeing**. It
is unclear why, but files in `(hd0,msdos2)` are not all present as they
should be.

This also fixes an issue introduced with cb5c4fcd3c5d4070f040d591b2dd1da580f234d1
where rEFInd stopped booting in many cases. This is because it ended up
using (hd0) rather than using the `search` which was happening
beforehand, which in turn uses (hd0,msdos2), which is the ESP.
Putting back the `search` here fixes that.

(cherry picked from commit 20b023b5ea63a6513a4dce7f162736a00bce5cc8)
2021-06-03 08:03:07 -07:00
Samuel Dionne-Riel
2f5e4928c0 iso-image: unqualified root → ($root)
This technically changes nothing. In practice `$root` is always the
"CWD", whether searched for automatically or not.

But this serves to announce we are relying on `$root`... I guess...

(cherry picked from commit c9bb054dd68964b0eb9a38c51bdf824bfb212fc7)
2021-06-03 08:03:07 -07:00
Samuel Dionne-Riel
190f44da28 iso-image: change date on all files
It may be that in some conditions dates earlier than 1980 on FAT on GRUB
2.06~ish will cause failures

https://github.com/NixOS/nixpkgs/issues/123376#issuecomment-845515035
(cherry picked from commit 15eaed0718515db3f2fa7d4ed71676e6069d3fb5)
2021-06-03 08:03:07 -07:00
Samuel Dionne-Riel
8cb2ce0f52 iso-image: Force gfxmode
https://www.gnu.org/software/grub/manual/grub/html_node/gfxmode.html
(cherry picked from commit f93f0e72e9ef423ed591951030f08cafd209e637)
2021-06-03 08:03:07 -07:00
Sandro
91afc72d9e
Merge pull request #125342 from NixOS/backport-125334-to-release-21.05
[Backport release-21.05] matterbridge: 1.12.1 -> 1.12.2
2021-06-03 16:42:43 +02:00
Domen Kožar
0f8f64b54e
Merge pull request #125475 from NixOS/backport-125372-to-release-21.05
[Backport release-21.05] nixos/tests/test-driver: add shell_interact
2021-06-03 13:11:46 +02:00