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

apacheHttpd: 2.4.47 -> 2.4.48 #126422

Merged
merged 1 commit into from
Jun 10, 2021
Merged

apacheHttpd: 2.4.47 -> 2.4.48 #126422

merged 1 commit into from
Jun 10, 2021

Conversation

alyssais
Copy link
Member

@alyssais alyssais commented Jun 9, 2021

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • 21.11 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.

@ofborg ofborg bot requested review from peti and lovek323 June 10, 2021 00:05
SuperSandro2000
SuperSandro2000 approved these changes Jun 10, 2021
View reviewed changes
Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

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

diff LGTM

@alyssais alyssais merged commit b7abce5 into NixOS:master Jun 10, 2021
@alyssais alyssais deleted the apache branch June 11, 2021 00:17
@alyssais alyssais added backport release-21.05 1.severity: security Issues which raise a security issue, or PRs that fix one labels Jun 11, 2021
@github-actions
Copy link
Contributor

Backport failed for release-20.09, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally:

git fetch origin release-20.09
git worktree add -d .worktree/backport-126422-to-release-20.09 origin/release-20.09
cd .worktree/backport-126422-to-release-20.09
git checkout -b backport-126422-to-release-20.09
ancref=$(git merge-base 0d977fbddb0cdef97b4e97e9c8f04820363c9ff3 8da3370dbd62379bbc14fc57ba04a10f7456690f)
git cherry-pick -x $ancref..8da3370dbd62379bbc14fc57ba04a10f7456690f

@github-actions github-actions bot mentioned this pull request Jun 11, 2021
Merged
@github-actions
Copy link
Contributor

Successfully created backport PR #126553 for release-21.05.

@github-actions
Copy link
Contributor

Backport failed for release-20.09, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally:

git fetch origin release-20.09
git worktree add -d .worktree/backport-126422-to-release-20.09 origin/release-20.09
cd .worktree/backport-126422-to-release-20.09
git checkout -b backport-126422-to-release-20.09
ancref=$(git merge-base 0d977fbddb0cdef97b4e97e9c8f04820363c9ff3 8da3370dbd62379bbc14fc57ba04a10f7456690f)
git cherry-pick -x $ancref..8da3370dbd62379bbc14fc57ba04a10f7456690f

@github-actions
Copy link
Contributor

The process '/usr/bin/git' failed with exit code 1

@github-actions
Copy link
Contributor

Backport failed for release-20.09, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally:

git fetch origin release-20.09
git worktree add -d .worktree/backport-126422-to-release-20.09 origin/release-20.09
cd .worktree/backport-126422-to-release-20.09
git checkout -b backport-126422-to-release-20.09
ancref=$(git merge-base 0d977fbddb0cdef97b4e97e9c8f04820363c9ff3 8da3370dbd62379bbc14fc57ba04a10f7456690f)
git cherry-pick -x $ancref..8da3370dbd62379bbc14fc57ba04a10f7456690f

@github-actions
Copy link
Contributor

The process '/usr/bin/git' failed with exit code 1

@mohe2015 mohe2015 mentioned this pull request Jun 16, 2021
Merged
11 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 approved these changes

@peti peti Awaiting requested review from peti

@lovek323 lovek323 Awaiting requested review from lovek323

Assignees
No one assigned
Labels
1.severity: security Issues which raise a security issue, or PRs that fix one 10.rebuild-darwin: 11-100 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@alyssais @SuperSandro2000