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: 21.1.13 -> 21.1.14 #352191

Merged
merged 1 commit into from
Oct 30, 2024
Merged

xorg.xorgserver: 21.1.13 -> 21.1.14 #352191

merged 1 commit into from
Oct 30, 2024

Conversation

Scrumplex
Copy link
Member

@Scrumplex Scrumplex commented Oct 29, 2024 •
edited
Loading

https://www.openwall.com/lists/oss-security/2024/10/29/2

https://gitlab.freedesktop.org/xorg/xserver/-/commit/85b776571487f52e756f68a069c768757369bfe3

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@Scrumplex Scrumplex added 1.severity: security Issues which raise a security issue, or PRs that fix one backport release-24.05 Backport PR automatically labels Oct 29, 2024
@Scrumplex Scrumplex marked this pull request as draft October 29, 2024 21:07
@Scrumplex Scrumplex force-pushed the pkgs/xorg/cve-fix branch 2 times, most recently from 106410c to 33e9e5a Compare October 29, 2024 21:15
@Scrumplex Scrumplex changed the title Update all X.Org packages xwayland: 24.1.3 -> 24.1.4; xorg.xorgserver: 21.1.13 -> 21.1.14 Oct 29, 2024
@Scrumplex Scrumplex changed the base branch from master to staging October 29, 2024 21:20
@Scrumplex Scrumplex marked this pull request as ready for review October 29, 2024 21:21
@Scrumplex Scrumplex added backport staging-24.05 Backport PR automatically and removed backport release-24.05 Backport PR automatically labels Oct 29, 2024
@Scrumplex
Copy link
Member Author

As this has to target staging anyway, should I update other xorg.* packages too while we are at it?

@JohnRTitor
Copy link
Contributor

JohnRTitor commented Oct 29, 2024 •
edited
Loading

Sure, but make sure it's backportable.

@Scrumplex
Copy link
Member Author

Scrumplex commented Oct 29, 2024 •
edited
Loading

Sure, but make sure it's backportable.

It's probably not. staging-24.05 has not had any backports for xorg stuff since July, including xwayland.

See
https://github.com/NixOS/nixpkgs/commits/staging-24.05/pkgs/servers/x11/xorg
https://github.com/NixOS/nixpkgs/commits/staging/pkgs/servers/x11/xorg

@Scrumplex Scrumplex changed the title xwayland: 24.1.3 -> 24.1.4; xorg.xorgserver: 21.1.13 -> 21.1.14 xwayland: 24.1.3 -> 24.1.4; xorg.*: update Oct 29, 2024
@JohnRTitor
Copy link
Contributor

JohnRTitor commented Oct 29, 2024 •
edited
Loading

Wait, are those are security related updates as well? Else they should not be mixed. (this makes backporting harder, unless we manually backport them)

@ofborg ofborg bot added 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild 10.rebuild-linux-stdenv This PR causes stdenv to rebuild 8.has: clean-up 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ and removed 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild 10.rebuild-linux-stdenv This PR causes stdenv to rebuild labels Oct 30, 2024
@ofborg ofborg bot requested review from Emantor and K900 October 30, 2024 04:24
@K900
Copy link
Contributor

K900 commented Oct 30, 2024

We should be able to split off the xwayland change at least to target master.

@Scrumplex
Copy link
Member Author

Okay, in that case. I will rebase this PR to just update xorgserver.

We can then merge @trofi's #352289 and @NickCao's #349897 into master, as both of those don't cause many rebuilds.

@Scrumplex Scrumplex changed the title xwayland: 24.1.3 -> 24.1.4; xorg.*: update xorg.xorgserver: 21.1.13 -> 21.1.14 Oct 30, 2024
@K900 K900 merged commit 27e5ad0 into NixOS:staging Oct 30, 2024
15 of 16 checks passed
@github-actions github-actions bot mentioned this pull request Oct 30, 2024
Merged
1 task
@github-actions GitHub Actions
Copy link
Contributor

Successfully created backport PR for staging-24.05:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mweinelt mweinelt Awaiting requested review from mweinelt

@NickCao NickCao Awaiting requested review from NickCao

@Emantor Emantor Awaiting requested review from Emantor

@K900 K900 Awaiting requested review from K900

Assignees
No one assigned
Labels
1.severity: security Issues which raise a security issue, or PRs that fix one 8.has: clean-up 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ 10.rebuild-darwin: 1001-2500 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ backport staging-24.05 Backport PR automatically
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Scrumplex @JohnRTitor @K900