Skip to content

samba: 4.15.2 -> 4.15.5#157729

Merged
bachp merged 2 commits intoNixOS:masterfrom
mweinelt:samba-pick
Feb 1, 2022
Merged

samba: 4.15.2 -> 4.15.5#157729
bachp merged 2 commits intoNixOS:masterfrom
mweinelt:samba-pick

Conversation

@mweinelt
Copy link
Member

@mweinelt mweinelt commented Feb 1, 2022

Motivation for this change

Less than 500 rebuilds so cherry-picked from staging into master.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 22.05 Release Notes (or backporting 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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@mweinelt mweinelt added 1.severity: security Issues which raise a security issue, or PRs that fix one backport release-21.11 labels Feb 1, 2022
@mweinelt mweinelt requested review from bachp and vcunat February 1, 2022 18:20
@mweinelt mweinelt mentioned this pull request Feb 1, 2022
13 tasks
@bachp bachp merged commit d4ca3af into NixOS:master Feb 1, 2022
@github-actions
Copy link
Contributor

github-actions bot commented Feb 1, 2022

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

Please cherry-pick the changes locally.

git fetch origin release-21.11
git worktree add -d .worktree/backport-157729-to-release-21.11 origin/release-21.11
cd .worktree/backport-157729-to-release-21.11
git checkout -b backport-157729-to-release-21.11
ancref=$(git merge-base 1705882eb6d2c716e6ce500f32e92b0055d3a5c2 d4aac5cd60c14f9ed1dd97c2138cbcd56fe24dd8)
git cherry-pick -x $ancref..d4aac5cd60c14f9ed1dd97c2138cbcd56fe24dd8

@bachp bachp mentioned this pull request Feb 1, 2022
@mweinelt mweinelt deleted the samba-pick branch February 1, 2022 19:11
@mweinelt mweinelt mentioned this pull request Feb 1, 2022
13 tasks
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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants