Commit Graph
14542 Commits
Author SHA1 Message Date
Jonathan Ringer bb60ebee93 Merge remote-tracking branch 'origin/release-21.05' into staging-next-21.05 2021-06-28 10:04:12 -07:00
R. RyanTM 5c4faf5e5a jetty: 9.4.39.v20210325 -> 9.4.41.v20210516
backport jetty-9.4.41.v20210516 to nixos-21.05
to address CVE-2021-28169.

Closes #128381

(cherry picked from commit 8bfc237eb3bf79b42def350c5cf8b7c673deda79)
2021-06-28 15:58:24 +07:00
Maciej Krüger 1a409bd977 [Backport release-21.05] matomo: 4.2.1 -> 4.3.1
(cherry picked from commit 41ebb21aa46045d02fb8e7240c5f3fb01f7b1581)
2021-06-28 08:18:06 +02:00
Jonathan Ringer 5299f12e63 Merge branch 'staging-next-21.05' into staging-21.05 2021-06-25 00:15:49 -07:00
Maxine Aubrey 8112fbe212 consul: 1.9.6 -> 1.9.7
(cherry picked from commit 0fdfa3172d6918124370af8dc3fc394bc8b7dbdd)
2021-06-24 18:13:28 -07:00
R. RyanTM b41d5aa715 consul: 1.9.5 -> 1.9.6
(cherry picked from commit 35ea60a0ff7e1c1a1bc7bc10515ce22c35c88ad8)
2021-06-24 18:13:28 -07:00
TredwellGit 0ad342052e xorg.libX11: 1.7.1 -> 1.7.2
https://lists.x.org/archives/xorg-announce/2021-June/003092.html
(cherry picked from commit e46a6ab222e5073df1cb6497a60e3aa7a613feba)
2021-06-24 10:26:02 +00:00
TredwellGit 64946bc3c2 xorg.libX11: 1.7.0 -> 1.7.1
https://lists.x.org/archives/xorg-announce/2021-May/003089.html
https://lists.x.org/archives/xorg-announce/2021-May/003088.html
(cherry picked from commit fa8d1b336de1603a8babb713fdbe57f8413df617)
2021-06-24 06:37:52 +00:00
Maximilian Bosch e579ac33d2 grafana: 7.5.7 -> 7.5.9
ChangeLog: https://github.com/grafana/grafana/releases/tag/v7.5.8
ChangeLog: https://github.com/grafana/grafana/releases/tag/v7.5.9

While I don't think we should backport Grafana 8 to 21.05 without a good
reason, it still makes sense to apply patch-updates of v7 here.
2021-06-23 17:54:56 +02:00
Alvar Penning 8cdb09ee5e nginxModules.rtmp: 1.2.1 -> 1.2.2
This new release fixes segfaults,
https://github.com/arut/nginx-rtmp-module/compare/v1.2.1...v1.2.2

(cherry picked from commit 3690ae13a4ff9bedf7f1d12a139b2ae308c8afd0)
2021-06-22 00:12:15 +00:00
ajs124 c466620ad2 dovecout: fix systemd unit dir
the configure flag we were using was dropped in
https://github.com/dovecot/core/commit/a42bb363b4ab475ced72fada57cc3e1de8b05bca

(cherry picked from commit 5fa6e9c403940c7c641356daf9c7ac05e464f58f)
2021-06-21 20:23:26 +00:00
ajs124 1f762dbf63 dovecot_pigeonhole: add myself as maintainer
and fix licensing information

(cherry picked from commit fd83b193ac343e69980978a1e4abb7a0f1a8ff5a)
2021-06-21 20:23:26 +00:00
ajs124 c7db318b24 dovecot_pigeonhole: 0.5.14 -> 0.5.15
(cherry picked from commit 0187e72b571e3afc3e761d101deadf15b6c5b760)
2021-06-21 20:23:25 +00:00
ajs124 0761599dd1 dovecot: add licenses
(cherry picked from commit 0fb5b6c648e14b61c3304266561c366f869af836)
2021-06-21 20:23:25 +00:00
ajs124 588eb83ca7 dovecot: 2.3.14 -> 2.3.15
(cherry picked from commit 075fb19d81f4da81943f4127eba632b46368022f)
2021-06-21 20:23:25 +00:00
R. RyanTM 184202407f keycloak: 13.0.1 -> 14.0.0
(cherry picked from commit 0b204c6f48f7e6d890e4a69da55e946a5e6c8ae7)
2021-06-21 09:59:00 +00:00
rnhmjoj 459ad47968 searx: patch to fix a crash
If the `default_doi_resolver` and `use_default_settings` are used
together searx crashes.

(cherry picked from commit 2a90b3329b18fadf35bf79966cd2330d83547b7e)
2021-06-19 22:10:57 +00:00
Martin Weinelt 246502ae2d Merge pull request #126553 from NixOS/backport-126422-to-release-21.05
[Backport release-21.05] apacheHttpd: 2.4.47 -> 2.4.48
2021-06-17 01:05:00 +02:00
Vladimír Čunát 73d3525b3d knot-dns: add passthru.tests
I hope I got the conventions right (found in doc/stdenv/meta.chapter.md)

(cherry picked from commit cf0b179b5ea78ff8fd34763c48da4323739fa5fb)
2021-06-16 11:40:01 +00:00
Vladimír Čunát 26febe6bdc knot-dns: 3.0.6 -> 3.0.7
Fixes various bugs and introduces a few requested features.
https://gitlab.nic.cz/knot/knot-dns/-/tags/v3.0.7

(cherry picked from commit 28dd3b6177dae61005cfdaebac405e8dbf70b2dc)
2021-06-16 11:40:01 +00:00
Martin Weinelt b8780177a7 Merge pull request #127016 from mweinelt/21.05/solanum 2021-06-16 12:18:53 +02:00
Maximilian Bosch b3761f1173 Merge pull request #125967 from NixOS/backport-125953-to-release-21.05
[Backport release-21.05] matrix-appservice-discord: increase test timeout
2021-06-16 11:48:48 +02:00
Sumner Evans 3840b4082c matrix-synapse: 1.35.1 -> 1.36.0
(cherry picked from commit 3acb9eb23f4e7f8557fd1bf5b0fad98568a1ceac)
2021-06-16 08:35:39 +00:00
Kim Lindberger dfbaf6023d Merge pull request #127014 from NixOS/backport-126969-to-release-21.05
[Backport release-21.05] discourse: 2.7.0 -> 2.7.4
2021-06-16 09:26:57 +02:00
Maximilian Bosch f6ed1a99f4 mautrix-whatsapp: unstable-2021-06-15 -> 0.1.7
ChangeLog: https://github.com/tulir/mautrix-whatsapp/releases/tag/v0.1.7

Not a functional change as I already included all the fixes in my
previous bump, but I think it's better to use a stable tag by default to
build :)

(cherry picked from commit 6e4ce705350a2adf5a14bc2a9a830d87f03c1ee5)
2021-06-16 01:48:55 +00:00
Martin Weinelt b36d51733c solanum: clarify license to be gpl2 or later
(cherry picked from commit 2441e82399ad349bac570cbbe72cfe1b3158cc59)
2021-06-16 02:09:13 +02:00
lassulus 0a8684cadd solanum: remove obsolete BANDB settings/patches
(cherry picked from commit 8eb5701aaf0eb7ad842a67f09e2f80826ac1ce80)
2021-06-16 02:09:00 +02:00
talyz 4eec52ae4e discourse: 2.7.0 -> 2.7.4
(cherry picked from commit f7fb0d20a624c4d7fa12ba8a6e6d551655106a29)
2021-06-15 23:21:04 +00:00
Christine Dodrill f5c9fcff45 solanum: fix MOTD
Previously this defaulted to the default MOTD in the solanum source
tree, and I don't want my friends to laugh at me. Includes a patch to
the tests to ensure that the MOTD is actually set.

This replicates the fix done in #109705 (solanum is a fork of charybdis,
so they share fundamental logic for this).

Signed-off-by: Christine Dodrill <me@christine.website>
(cherry picked from commit b1fe9fab6fcfa4cdefe7370ba264b281e48de0f8)
2021-06-15 22:54:15 +00:00
Martin Weinelt f3df87c34e Merge pull request #126370 from NixOS/backport-126245-to-release-21.05
[Backport release-21.05] matrix-appservice-irc: 0.26.0 -> 0.26.1
2021-06-15 23:58:18 +02:00
Maximilian Bosch 123ba7a68b mautrix-whatsapp: 0.1.6 -> unstable-2021-06-15
On `master` there are a few more bugfixes. Most notably, each message
sent by me was marked as "not sent" by WhatsApp for the last four days
until you hit a "Resend" in WhatsApp.

As the update to the latest `master` has solved the issue and being able
to correctly send messages is one of the core features of this package,
I decided to update the package in `nixpkgs` as well.

(cherry picked from commit 5c7156faf1c766166d663a68e666678992ca2b2a)
2021-06-15 17:44:36 +00:00
Guillaume Girol c98f59e292 Merge pull request #126700 from symphorien/ttrss-tumblr-gdpr-stable
[21.05] tt-rss-plugin-tumblr-gdpr: 2.1 -> 2.2
2021-06-15 17:37:51 +00:00
ajs124 e6d907f59e Merge pull request #126951 from NixOS/backport-126741-to-release-21.05
[Backport release-21.05] sogo: 5.0.1 -> 5.1.1
2021-06-15 17:43:34 +02:00
github-actions[bot]andMaximilian Bosch fe67150321 prometheus-node-exporter: fix version info (#126722)
Closes #126359

(cherry picked from commit ad5830098f6add9a4fae2b0fe01afcd374292eaa)

Co-authored-by: Maximilian Bosch <maximilian@mbosch.me>
2021-06-15 10:12:28 -04:00
Thomas Gerbet 9ec98998e2 sogo: 5.0.1 -> 5.1.1
Fixes CVE-2021-33054.
https://github.com/inverse-inc/sogo/blob/SOGo-5.1.1/CHANGELOG.md

(cherry picked from commit f528b1e43ee53751cd09207d13a300e93daf02cc)
2021-06-15 14:01:08 +00:00
Vladimír Čunát c15b784d29 Merge branch 'staging-next-21.05' into release-21.05
PR #126251.  I think it's high time.  Hydra's eval
https://hydra.nixos.org/eval/1677846
isn't perfect yet, but there doesn't seem to be anything really risky.
2021-06-13 21:12:02 +02:00
Robert Scott dd24b1bc0a envoy: 1.16.2 -> 1.16.4
resolving CVE-2021-29258
2021-06-12 22:59:29 +01:00
Vladimír Čunát 1ba7a494bf Merge #126619: knot-resolver: skip tests on aarch64-darwin
(cherry picked from commit 9affc60b0cd7575c075a7be13d500928b0909fd1)
It looks good on nixpkgs master (and other platforms don't even rebuild):
https://hydra.nixos.org/build/145261694
2021-06-12 16:51:53 +02:00
Guillaume Girol c5811ce005 tt-rss-plugin-tumblr-gdpr: 2.1 -> 2.2
fixes adding a new feed to ttrss.
the release only contains the fix, so it's low risk.
It's not a backport because the plugin has become unnecessary so we are
simply removing it from unstable.
2021-06-12 12:00:00 +00:00
Alyssa Ross 8d292bd4f7 apacheHttpd: 2.4.47 -> 2.4.48
(cherry picked from commit 8da3370dbd62379bbc14fc57ba04a10f7456690f)
2021-06-11 00:22:01 +00:00
piegames 19a1348fbb matrix-appservice-irc: 0.26.0 -> 0.26.1
(cherry picked from commit 6a18a9a2c517c7e9a8a1b3490502ad54583bbf62)
2021-06-09 13:59:33 +00:00
Jonathan Ringer 8e20586f52 Merge branch 'staging-next-21.05' into staging-21.05 2021-06-08 12:21:49 -07:00
fortuneteller2k ba61fdde58 openafs_1_9, linuxPackages.openafs_1_9: 1.9.0 -> 1.9.1
(cherry picked from commit 5f394e5ef55627f619e641263154950ad5a5953d)
2021-06-08 14:31:03 +00:00
Janne Heß c525d5cf31 389-base: Add CVE-2021-3514
(cherry picked from commit fb7a3e1086debb3c47f0881724caccaa1a82642c)
2021-06-08 11:59:05 +00:00
pacien 1b06bcfeea matrix-appservice-discord: increase test timeout
Hydra and my local machine are sometimes hitting the default timeout.
See https://hydra.nixos.org/build/138032455/nixlog/8/tail

(cherry picked from commit 92f62de6f1ee9c9e31a8432ad222e79deef2ad87)
2021-06-06 15:53:17 +00: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