Skip to content

Update samba #424

Merged
merged 1 commit into from
Jul 13, 2017
Merged

Update samba #424

merged 1 commit into from
Jul 13, 2017

Conversation

wwwutz
Copy link
Collaborator

@wwwutz wwwutz commented Jul 6, 2017

Very good samba. So good. So very very good.

@donald
Copy link
Collaborator

donald commented Jul 6, 2017

Do you want us to test/review that?

@wwwutz
Copy link
Collaborator Author

wwwutz commented Jul 6, 2017

yes please. I don't expected big configure changes.

@donald donald force-pushed the update-samba branch 2 times, most recently from eae776f to 84bdc37 Compare July 7, 2017 06:33
@donald
Copy link
Collaborator

donald commented Jul 11, 2017

In the current pull request, the individual commits are not very helpful, the commit messages don't explain what is being done and the commits contain unrelated changes or even changes which are reworked by later commits. This would call for some "rebase -i" action.

However: samba-3.5.14-0.bee was accidentally renamed by a7494cd "poppler: Update version from 0.35.0 to 0.54.0" to samba.be0. It was never able to run as "samba.be0" because it has no inline BEE_VERSION. samba-3.5.14-0.bee was from the initial import of all bee packages into the repository by 90f9822 and is neither based on the template nor has it any revision history in git.

samba-3.5.14-0.bee and samba4.be0 don't have much in common and the tiny bits they still do have in common are not explained by any samba-3.5.14-0.bee history.

So instead of redoing the commits to explain how we get from an samba3 to samba4, we could as well check in the end product samba4.be0 with a single commit and not base it on samba3 which itself is unexplained.

Of course, the perfect way would be to start with the default template and justify the required changes line by line.

@wwwutz
Copy link
Collaborator Author

wwwutz commented Jul 11, 2017

You are totally right. samba4.be0 should be seen as a separate software bundle. Sorry for the commit & branch mess.
I decided at a late point to move from samba.be0 to samba4.be0, so this chaos is also a rsult of this decision.

This update to samba v4 can be run in parallel to samba[34] instances.

Setup is handled via Makefile in /project/admin/samba4
@wwwutz
Copy link
Collaborator Author

wwwutz commented Jul 13, 2017

So, how about 590c34b ?

@wwwutz wwwutz merged commit 68b2c7c into master Jul 13, 2017
@pmenzel pmenzel deleted the update-samba branch July 13, 2017 14:28
@pmenzel
Copy link
Collaborator

pmenzel commented Jul 13, 2017

The patch file was probably created for another version. There is a small offset.

[BEE] patch -N -p1 -i /dev/shm/bee-pmenzel/samba4/files/samba4-add-config-file-configure-option.patch
patching file dynconfig/wscript
Hunk #1 succeeded at 244 (offset 5 lines).

The rest built fine on heulsuse under my username.

@wwwutz
Copy link
Collaborator Author

wwwutz commented Jul 13, 2017

wwwutz@eldersoftheinternet$ cat /dev/shm/bee-pmenzel/samba4/files/samba4-add-config-file-configure-option.patch
cat: /dev/shm/bee-pmenzel/samba4/files/samba4-add-config-file-configure-option.patch: No such file or directory

;-)

Sign in to join this conversation on GitHub.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants