summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* mediathekview: CVE-2021-45105 (log4j) mitigation•••Remove the affected JndiLookup.class until we can update to the lastest Mediathekview version. (cherry picked from commit 2a360652e2af41c7afdc4d15b96e187417aebb04) origin/backport-152261-to-release-21.05André-Patrick Bubel2021-12-281-2/+5
* Merge pull request #150295 from ius/zap-2.11.1_21.05•••[21.05] zap: 2.10.0 -> 2.11.1Robert Scott2021-12-281-2/+2
|\
| * zap: 2.11.0 -> 2.11.1•••Fixes CVE-2021-44228 #150288 Joerie de Gram2021-12-111-2/+2
| * zap: 2.10.0 -> 2.11.0R. Ryantm2021-12-111-2/+2
* | imagemagick: 7.1.0-17 -> 7.1.0-19•••(cherry picked from commit 2c526159cf348026233b67f239f9d80f6131d3b9) Robert Schütz2021-12-271-7/+5
* | imagemagick: 7.1.0-16 -> 7.1.0-17•••(cherry picked from commit 7617df63c2869e51cbbb323078c2c8e0c93b9d2c) Kerstin Humm2021-12-271-2/+2
* | imagemagick: 7.1.0-15 -> 7.1.0-16•••(cherry picked from commit 63ea61bcf0be615562d7d8f982c005d6c52d6118) Kerstin Humm2021-12-271-2/+2
* | imagemagick: 7.1.0-14 -> 7.1.0-15•••(cherry picked from commit d3c7e5801f572697f0483436dff80fc4ffa1658d) Kerstin Humm2021-12-271-2/+2
* | imagemagick: 7.1.0-13 -> 7.1.0-14•••(cherry picked from commit 4d5800ed103555675b600b9688c1733df6bf1e51) Kerstin Humm2021-12-271-2/+2
* | Merge pull request #151889 from thiagokokada/backport-151384-to-release-21.05•••[Backport release-21.05] firefox-unwrapped: 95.0.1 -> 95.0.2Thiago Kenji Okada2021-12-231-2/+2
|\ \
| * | firefox-unwrapped: 95.0.1 -> 95.0.2•••(cherry picked from commit a233df3bc97aebbbd95e20171549d321dc2b35a6) R. Ryantm2021-12-231-2/+2
* | | Merge pull request #151459 from risicle/ris-flask-appbuilder-3.3.4-r21.05•••[21.05] python3Packages.flask-appbuilder: 3.3.2 -> 3.3.4Thiago Kenji Okada2021-12-231-4/+4
|\ \ \
| * | | python3Packages.flask-appbuilder: 3.3.3 -> 3.3.4•••addressing CVE-2021-41265 (cherry picked from commit 948a3e264a3e6e7d35ca4d61b00495f54b0df752) Robert Scott2021-12-201-2/+2
| * | | python3Packages.flask-appbuilder: 3.3.2 -> 3.3.3•••(cherry picked from commit 0aca277bfb5df300030c9d664c03b38bc4da67b4) Fabian Affolter2021-12-201-4/+4
* | | | Merge pull request #151392 from NixOS/backport-151063-to-release-21.05•••[Backport release-21.05] graylog: 3.3.15 -> 3.3.16Thiago Kenji Okada2021-12-231-2/+2
|\ \ \ \
| * | | | graylog: 3.3.15 -> 3.3.16•••Bump log4j 2 to 2.6.0. https://www.graylog.org/post/announcing-graylog-v3-3-16 (cherry picked from commit ea5bc4fe75cb6695d446c026a8dd3ec7e54b1f9f) Thomas Gerbet2021-12-201-2/+2
| |/ / /
* | | | Merge pull request #151781 from ius/ghidra-21.05•••[21.05] ghidra: fix CVE-2021-45046, CVE-2021-45105Thiago Kenji Okada2021-12-231-5/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | ghidra: fix CVE-2021-45046, CVE-2021-45105•••Upgrade bundled log4j to 2.12.3 (#150288) Joerie de Gram2021-12-221-5/+5
* | | | Merge pull request #151451 from NixOS/backport-151279-to-release-21.05•••[Backport release-21.05] firefox-bin: 95.0 -> 95.0.2Thiago Kenji Okada2021-12-231-393/+393
|\ \ \ \ | |/ / / |/| | |
| * | | firefox-bin: 95.0.1 -> 95.0.2•••(cherry picked from commit cd2e8e29498d5ba910f28773773c76892be137fb) taku02021-12-201-393/+393
| * | | firefox-bin: 95.0 -> 95.0.1•••(cherry picked from commit 3ee12cf5287be7c50fb16e5428373cebf9eb9dd1) taku02021-12-201-393/+393
* | | | Merge pull request #150353 from NixOS/backport-149989-to-release-21.05•••[Backport release-21.05] papermc: 1.17.1r97 -> 1.17.1r399Bobby Rong2021-12-221-3/+3
|\ \ \ \
| * | | | Update pkgs/games/papermc/default.nix•••Co-authored-by: Joel <jyooru+github@protonmail.ch> (cherry picked from commit 53d7554d151c54489175fedca7f45a85d72ee59f) origin/backport-149989-to-release-21.05Aaron Janse2021-12-121-1/+1
| * | | | Update pkgs/games/papermc/default.nix•••Co-authored-by: Joel <jyooru+github@protonmail.ch> (cherry picked from commit 86f325b117bcc45d44f05a5a4da89c2d03bb41c4) Aaron Janse2021-12-121-1/+1
| * | | | papermc: 1.17.1r97 -> 1.17.1r399•••(cherry picked from commit f994bbb83f3d2fe3053b9bd16f25689b76e9356f) Aaron Janse2021-12-121-2/+2
* | | | | Merge pull request #151611 from NixOS/backport-148711-to-release-21.05•••[Backport release-21.05] pure-ftpd: add patch for CVE-2021-40524Robert Scott2021-12-211-0/+5
|\ \ \ \ \
| * | | | | pure-ftpd: add patch for CVE-2021-40524•••(cherry picked from commit 82f811e6ede5b137c2102167037308ae903fc0b4) Robert Scott2021-12-211-0/+5
|/ / / / /
* | | | | Merge pull request #149426 from risicle/ris-zydis-3.1.0-CVE-2021-41253-r21.05•••[21.05] zydis: add patch for CVE-2021-41253Robert Scott2021-12-211-1/+9
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | zydis: add patch for CVE-2021-41253Robert Scott2021-12-061-1/+9
* | | | | Merge pull request #151376 from mweinelt/21.05/firefoxMartin Weinelt2021-12-201-4/+4
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | firefox-esr-91-unwrapped: 91.4.0esr -> 91.4.1esr•••(cherry picked from commit 5ae25b97ad658d5c2f5f65cb8558af9c7cd96924) R. Ryantm2021-12-201-2/+2
| * | | | firefox-unwrapped: 95.0 -> 95.0.1•••(cherry picked from commit d76ff3c3f190ee35a4f103aa0510ff087952375c) R. Ryantm2021-12-201-2/+2
|/ / / /
* | | | Merge pull request #151326 from mweinelt/21.05/virtiokb•••[21.05] nixos/qemu-vm: add -device virtio-keyboard to optsArtturi2021-12-201-0/+1
|\ \ \ \
| * | | | nixos/qemu-vm: add -device virtio-keyboard to opts•••by default a ps/2 keyboard input is used which seems to cause issues on aarch64-linux when the machine is used high load, causing the keymap qwertz test to always fail and azerty to sometimes fail See https://github.com/NixOS/nixpkgs/issues/147294 (cherry picked from commit 39c5525cb157b09dc5eae482bcff82a1c477ad2f) Artturin2021-12-191-0/+1
|/ / / /
* | | | Merge pull request #151204 from NixOS/backport-150726-to-release-21.05•••[Backport release-21.05] Kernels 2021-12-17Maximilian Bosch2021-12-198-39/+39
|\ \ \ \
| * | | | linux/hardened/patches/5.4: 5.4.164-hardened1 -> 5.4.167-hardened1•••(cherry picked from commit 8d4c0567235f84bb4b15c05884fc14e586ce93ed) origin/backport-150726-to-release-21.05TredwellGit2021-12-181-5/+5
| * | | | linux/hardened/patches/5.15: 5.15.7-hardened1 -> 5.15.10-hardened1•••(cherry picked from commit f51d19746ae9645eca9fd2f33b470bc6660897f9) TredwellGit2021-12-181-5/+5
| * | | | linux/hardened/patches/5.10: 5.10.84-hardened1 -> 5.10.87-hardened1•••(cherry picked from commit a900de356782d4d24ea08fbd3dca8ba2faeca929) TredwellGit2021-12-181-5/+5
| * | | | linux/hardened/patches/4.19: 4.19.220-hardened1 -> 4.19.221-hardened1•••(cherry picked from commit 8e317ff982dcca9659207b1c284a7772a52a6e30) TredwellGit2021-12-181-5/+5
| * | | | linux/hardened/patches/4.14: 4.14.257-hardened1 -> 4.14.258-hardened1•••(cherry picked from commit d9fdc409d1e78f009c1a6140e52a430006805698) TredwellGit2021-12-181-5/+5
| * | | | linux: 5.4.164 -> 5.4.167•••(cherry picked from commit a1470e23da3bd6c2e82155eb71d3676c9ee2db6f) TredwellGit2021-12-181-2/+2
| * | | | linux: 5.15.7 -> 5.15.10•••(cherry picked from commit 8955b58c5ee023d49c225e9ae27b0187105316fc) TredwellGit2021-12-181-2/+2
| * | | | linux: 5.10.84 -> 5.10.87•••(cherry picked from commit 72b54385a5ece0ccb87357dc189cc025f60d4f9e) TredwellGit2021-12-181-2/+2
| * | | | linux: 4.9.292 -> 4.9.293•••(cherry picked from commit 837103a484869f29587fdbb652b1f41a95a2ef2c) TredwellGit2021-12-181-2/+2
| * | | | linux: 4.4.294 -> 4.4.295•••(cherry picked from commit 2deb4377d5ff1eee430327766df17a0974020099) TredwellGit2021-12-181-2/+2
| * | | | linux: 4.19.220 -> 4.19.221•••(cherry picked from commit 9eacb2bb44b449fb6edb7d76f3c6bf595f8247d7) TredwellGit2021-12-181-2/+2
| * | | | linux: 4.14.257 -> 4.14.258•••(cherry picked from commit 860b4c92b87238dc7caba9c6b93f961bfa77e218) TredwellGit2021-12-181-2/+2
* | | | | Merge #151141: staging-next: 2021-12-18 into release-21.05Vladimír Čunát2021-12-194-6/+13
|\ \ \ \ \
| * | | | | Merge release-21.05 into staging-next-21.05github-actions[bot]2021-12-192-2/+6
| |\| | | |
| * | | | | Merge staging-next-21.05 into staging-21.05github-actions[bot]2021-12-1718-94/+64
| |\ \ \ \ \