samba: 4.12.6 -> 4.13.3 #105486
Merged
samba: 4.12.6 -> 4.13.3 #105486
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Result of 17 packages marked as broken and skipped:
6 packages failed to build:
samba: |
|
Result of 7 packages marked as broken and skipped:
2 packages failed to build:
153 packages built:
Both linux failures are unrelated. |
|
@SuperSandro2000 It looks like the issue on darwin was fixed on samba master: https://gitlab.com/samba-team/samba/-/commit/53a1d034f3e47ed3c5ec4f9b6ca0d2d695e8d873#39819601027099d9f300b2c257f529bac01b4ae2 I modified the patch to apply to 4.13.2 and included it in the build. Could you please verify if this fixes the issue? |
|
Now it builds except that the tests for python38Packages.pysmbc fail with: Do you know if this could be an issue with samba or is this one with pysmbc? |
|
Result of 17 packages marked as broken and skipped:
3 packages failed to build:
3 packages built:
|
|
Result of 7 packages marked as broken and skipped:
2 packages failed to build:
153 packages built:
|
Izorkin
approved these changes
Dec 2, 2020
|
4.13.3 is out by now. The build system warns about the lack of Additionally, Python 3 is supported since Samba 4.10, so switching does not break anything (I'm running a domain controller with it which works fine).
io_uring won't work unless you do {
nativeBuildInputs = [ patchelf ];
postFixup = ''
p="$out/lib/samba/vfs/io_uring.so"
patchelf --set-rpath "$(patchelf --print-rpath "$p"):${liburing.lib}/lib" "$p"
'';
}However, you can not use the domain controller functionality unless you do {
nativeBuildInputs = [ python3.pkgs.wrapPython ];
pythonPath = [ python3.pkgs.dnspython tdb ];
postFixup = ''
wrapPythonPrograms
'';
} |
|
Also this PR fixes these CVEs: |
|
@SuperSandro2000 From what I can tell However I don't think we should block this PR if the issue was present on master before. |
Previously, `vfs_snapper` was only built if `dbus` was found. Now, `vfs_snapper` is enabled by default (on Linux) and it requires dbus to be available: ``` Checking for dbus: not found vfs_snapper is enabled but prerequisite dbus-1 package not found. Use --with-shared-modules=!vfs_snapper to disable vfs_snapper support. ``` We could pass `--with-shared-modules=!vfs_snapper` to disable it, but currently pass `--with-shared-modules=ALL`, so add dbus as a dependency instead.
|
I updated the PR to 4.13.3. |
|
I checked and it seems smbclient on samba is broken since at least 19.03 on darwin. |
Then just mark it as broken otherwise it blocks the PR for me. |
smbclient does not properly link and when trying to run it it fails with messages like: dyld: Library not loaded: /private/tmp/nix-build-samba-4.7.12.drv-0/samba-4.7.12/bin/default/source3/libpopt-samba3-samba4.dylib Referenced from: result/bin/smbclient Reason: image not found
|
@SuperSandro2000 I marked it as broken on darwin |
doronbehar
approved these changes
Dec 23, 2020
|
The version on 20.09 should also have been updated: #110638 |
This was referenced Jul 28, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Update to latest Samba version: https://www.samba.org/samba/history/samba-4.13.2.html
Continuation of #99059 which seems to be stale.
A patch is backported from samba master to make it build on darwin. The patches can't directly be applied to 4.13.x so fetchpatch is not an option.
Things done
Using this on my main file server since more than two weeks.
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)