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.

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

emacs30: 30.0.92 -> 30.0.93 #367148

Merged
merged 1 commit into from
Dec 22, 2024
Merged

Conversation

panchoh
Copy link
Contributor

@panchoh panchoh commented Dec 21, 2024

Announcement: https://lists.gnu.org/archive/html/emacs-devel/2024-12/msg00869.html

diff: emacs-mirror/emacs@emacs-30.0.92...emacs-30.0.93

CVE-2024-53920

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

@github-actions github-actions bot added the 6.topic: emacs Text editor label Dec 21, 2024
@ofborg ofborg bot requested review from lovek323 and jwiegley December 22, 2024 03:05
@adisbladis adisbladis merged commit 9563848 into NixOS:master Dec 22, 2024
34 of 36 checks passed
jian-lin added a commit to linj-fork/nixpkgs that referenced this pull request Dec 22, 2024
This reverts commit 5514e1e.

This fixes conflicts between staging-next and master after NixOS#367148 is
merged to master.  In addition, this patch does not need to go through
a staging cycle.  We can reapply it directly to master and it will
probably reach users sooner.
jian-lin added a commit to linj-fork/nixpkgs that referenced this pull request Dec 22, 2024
This reverts commit 5514e1e.

This resolves conflicts between staging-next and master after NixOS#367148
is merged into master.  In addition, this patch does not need to go
through a staging cycle.  We can reapply it directly to master and it
will probably reach users sooner.
@jian-lin jian-lin added the 1.severity: security Issues which raise a security issue, or PRs that fix one label Dec 22, 2024
@panchoh panchoh deleted the bump-emacs-30.0.93 branch December 22, 2024 09:23
@nix-backports
Copy link

nix-backports bot commented Dec 22, 2024

Successfully created backport PR for release-24.05:

@nix-backports
Copy link

nix-backports bot commented Dec 22, 2024

Git push to origin failed for release-24.05 with exitcode 1

@nix-backports
Copy link

nix-backports bot commented Dec 22, 2024

Git push to origin failed for release-24.11 with exitcode 1

@nix-backports
Copy link

nix-backports bot commented Dec 22, 2024

Successfully created backport PR for release-24.11:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
1.severity: security Issues which raise a security issue, or PRs that fix one 6.topic: emacs Text editor 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 backport release-24.11 Backport PR automatically
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants