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

xorg.xorgserver: 1.20.9 -> 1.20.10 (CVE-2020-14360 CVE-2020-25712) #105631

Merged
merged 1 commit into from Dec 4, 2020
Merged

xorg.xorgserver: 1.20.9 -> 1.20.10 (CVE-2020-14360 CVE-2020-25712) #105631

merged 1 commit into from Dec 4, 2020

Conversation

TredwellGit
Copy link
Member

Motivation for this change

https://lists.x.org/archives/xorg-announce/2020-December/003067.html
https://lists.x.org/archives/xorg-announce/2020-December/003066.html

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
  • Tested execution of all binary files (usually in ./result/bin/)
    Tested Xwayland
  • Fits CONTRIBUTING.md.

@mweinelt mweinelt added 1.severity: security 9.needs: port to stable A PR needs a backport to the stable release. labels Dec 2, 2020
@mweinelt
Copy link
Member

mweinelt commented Dec 2, 2020

@GrahamcOfBorg test gnome3-xorg

@timokau
Copy link
Member

timokau commented Dec 4, 2020

I rebuilt my system with this, it fixes a xorg crash on startup for me (probably related to the CVE). ofBorg fails to build /nix/store/3f2kq1iwnih2ajyh1hj7ildwfy264f64-dbus-1.drv on aarch64. Do you know if that is a regression @mweinelt?

@mweinelt
Copy link
Member

mweinelt commented Dec 4, 2020

I don't know.

@ajs124
Copy link
Member

ajs124 commented Dec 4, 2020

/nix/store/84s7ilmxc34fspl9dhgrnmi86g0s251v-xorg-server-1.20.10 builds for me on aarch64 from this PR on top of b93a198

timokau
timokau approved these changes Dec 4, 2020
View reviewed changes
Copy link
Member

@timokau timokau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried to build the test on the aarch64 community box. It failed at a different derivation (/nix/store/pks75fwq9yh1pyicnb707nfblmibk3x4-gst-plugins-good-1.18.1.drv). Then I tried to build it on master (1917e6f) and it failed on yet another derivation (/nix/store/gv7lm6z08s2q8a46nlbj6ddighf7yglr-bolt-0.9.drv). So either way, looks like this is not a regression.

Thanks @TredwellGit!

@timokau timokau merged commit 925640d into NixOS:master Dec 4, 2020
@TredwellGit TredwellGit deleted the xorg.xorgserver branch December 4, 2020 22:33
@mweinelt mweinelt mentioned this pull request Dec 8, 2020
Merged
10 tasks
@vcunat vcunat removed the 9.needs: port to stable A PR needs a backport to the stable release. label Dec 9, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@timokau timokau timokau approved these changes

Assignees
No one assigned
Labels
1.severity: security 10.rebuild-darwin: 0 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@TredwellGit @mweinelt @timokau @ajs124 @vcunat