Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[20.09] Staging next #111020

Merged
merged 72 commits into from Feb 1, 2021
Merged

[20.09] Staging next #111020

merged 72 commits into from Feb 1, 2021

Conversation

roberth
Copy link
Member

@roberth roberth commented Jan 28, 2021 •
edited

Motivation for this change

Deliver staging changes.

Things done

Latest hydra (as of description update time)

https://hydra.nixos.org/eval/1646124

NeQuissimus and others added 30 commits January 10, 2021 14:22
@NeQuissimus
linux: Add 5.10
50664aa 
Validated via
```
 nix-build ./nixos/release.nix -A tests.kernel-latest.x86_64-linux -A tests.latestKernel.login.x86_64-linux
```

(cherry picked from commit c1ef6d2)
@NeQuissimus
linux: 5.10 -> 5.10.1
412c56a 
(cherry picked from commit a83bf32)
@NeQuissimus
linux: 5.10.1 -> 5.10.2
09d78d0 
(cherry picked from commit 9dc0ab9)
@NeQuissimus
linux: 5.10.2 -> 5.10.3
75e95c9 
(cherry picked from commit b24e814)
@NeQuissimus
linux: 5.10.3 -> 5.10.4
823be7a 
(cherry picked from commit 3785b18)
@NeQuissimus
linux: 5.10.4 -> 5.10.5
202f7ad 
(cherry picked from commit 6d1f725)
@NeQuissimus
linux/hardened/patches/5.10: init at 5.10.4.a
6b7e8bc 
(cherry picked from commit 5f4c27e)
@NeQuissimus
linux-hardened: Switch to 5.10
c00fcdf 
(cherry picked from commit ed4d6a8)
@NeQuissimus
linux: Remove 5.8
6205feb 
Kernel version is EOL
@NeQuissimus
linux: Remove 5.9
390cc18 
Kernel version is EOL
@NeQuissimus
linux/hardened/patches/5.10: 5.10.4.a -> 5.10.5.a
5095099 
(cherry picked from commit 91e76b1)
@NeQuissimus
linux/hardened/patches/5.4: 5.4.86.a -> 5.4.87.a
3d1b69f 
(cherry picked from commit 2fe7c5c)
@NeQuissimus
linux/hardened/patches/4.19: 4.19.164.a -> 4.19.165.a
af50a34 
(cherry picked from commit 2a23529)
@NeQuissimus
linux-hardened: Track extra version
7e6e434 
Fixes #108707

(cherry picked from commit 4312cd7)
@NeQuissimus
linux-hardened: Add extra to 5.8
384095f
@NeQuissimus
linux-hardened: Remove 5.8 and 5.9
074a3dd
@lheckemann
Merge pull request #108609 from NeQuissimus/2009_kernel510
f2ce6f0 
[20.09] Switch latest kernel to 5.10
@lheckemann
zfsUnstable: 2.0.0 -> 2.0.1
c021683 
Fixes build with Linux 5.10
@TredwellGit
openjpeg: 2.3.1 -> 2.4.0
1671412 
https://github.com/uclouvain/openjpeg/blob/v2.4.0/CHANGELOG.md

Fixes CVE-2020-15389, CVE-2020-27841, CVE-2020-27842, CVE-2020-27843, CVE-2020-27844, and CVE-2020-27845.

(cherry-picked from commit 6769eca)
@erictapen
openjpeg: use stable patch URLs
8f2460d
@marsam
libuv: 1.38.1 -> 1.39.0
4a600d8 
(cherry picked from commit 90c5f2f)
@marsam
libuv: 1.39.0 -> 1.40.0
4da0df1 
(cherry picked from commit 13eb51b)
@marsam
nodejs-10_x: 10.22.1 -> 10.23.1
9530a77
@marsam
nodejs-12_x: 12.18.4 -> 12.20.1
4dc5d36
@marsam
nodejs-14_x: 14.9.0 -> 14.15.4
af2e868
@marsam
Merge pull request #109336 from marsam/backport-nodejs-20.09
7172fda 
[20.09] nodejs: 10.22.1 -> 10.23.1, 12.18.4 -> 12.20.1, 14.9.0 -> 14.15.4
@NeQuissimus
linux/hardened/patches/5.10: 5.10.5.a -> 5.10.6.a
b785047 
(cherry picked from commit 0d2b827)
@kraem @NeQuissimus
linux/hardened/patches/5.10: 5.10.6.a -> 5.10.7.a
2b278ca 
(cherry picked from commit e408bd8)
@NeQuissimus
linux/hardened/patches/5.10: 5.10.7.a -> 5.10.8.a
90b9a67 
(cherry picked from commit c08ed15)
@NeQuissimus
linux: 5.10.5 -> 5.10.6
5e76d2d 
(cherry picked from commit 25aed14)
@NeQuissimus
Copy link
Member

Stale attribute gone as well.

@mweinelt
Copy link
Member

ZFS does not yet work.

$ nix-build -A linuxPackages.zfs
[...]
substitute(): ERROR: file './module/zfs/zfs_ctldir.c' does not exist
builder for '/nix/store/5wsjzfkyrqz7r3lmmq0ywwvybnfyzh2k-zfs-kernel-2.0.1-5.4.93.drv' failed with exit code 1

@NeQuissimus
Copy link
Member

@mweinelt I am just picking the necessary ZFS changes onto staging-20.09 and building them. Give me an hour

@NeQuissimus
Copy link
Member

Verified with nix-build -A linuxPackages.zfs -A linuxPackages.zfsUnstable -A linuxPackages_latest.zfs -A linuxPackages_latest.zfsUnstable and nix-build ./nixos/tests/zfs.nix.

@Ma27
Merge pull request #110868 from helsinki-systems/backport/20.09/zope.…
a4ea9cf 
…interface

[20.09] python3Packages.zope.interface: 5.1.0 -> 5.1.2
@jonringer
Copy link
Contributor

I believe there's also a patch that should be included as there was a regression with people using legacy mounts

@NeQuissimus
Copy link
Member

Oh, which patch is this?

@NeQuissimus NeQuissimus mentioned this pull request Jan 30, 2021
Merged
3 tasks
@roberth
Copy link
Member Author

roberth commented Jan 30, 2021

@NeQuissimus @jonringer I think this is the zfs legacy mount issue you're talking about #110376.

@NeQuissimus What's the reason to remove Linux 5.9? Seems wrong to do so on the stable branch.

I'd like to merge staging-20.09 asap, before it gets delayed any further due to scope creep.

@mweinelt
Copy link
Member

@NeQuissimus What's the reason to remove Linux 5.9? Seems wrong to do so on the stable branch.

Because 5.9 is EOL and the next LTS release cycle is 5.10.

@jonringer
Copy link
Contributor

Oh, which patch is this?

this one #111375

@NeQuissimus NeQuissimus mentioned this pull request Feb 1, 2021
Merged
10 tasks
@vcunat vcunat merged commit 3acad94 into release-20.09 Feb 1, 2021
@thefloweringash thefloweringash mentioned this pull request Feb 4, 2021
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@blitz blitz blitz approved these changes

@FRidh FRidh Awaiting requested review from FRidh FRidh is a code owner

@jonringer jonringer Awaiting requested review from jonringer

Assignees
No one assigned
Labels
6.topic: python 8.has: clean-up 8.has: package (new) 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet