Merge ~ahasenack/ubuntu/+source/samba:bionic-smb-browse-nt1-1778322 into ubuntu/+source/samba:ubuntu/bionic-devel
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Andreas Hasenack | ||||
| Approved revision: | 8b6e3cc238c5fcdda0d179e441b1da4b7c3dc337 | ||||
| Merge reported by: | Andreas Hasenack | ||||
| Merged at revision: | 8b6e3cc238c5fcdda0d179e441b1da4b7c3dc337 | ||||
| Proposed branch: | ~ahasenack/ubuntu/+source/samba:bionic-smb-browse-nt1-1778322 | ||||
| Merge into: | ubuntu/+source/samba:ubuntu/bionic-devel | ||||
| Diff against target: |
105 lines (+72/-0) 4 files modified
debian/changelog (+9/-0) debian/libsmbclient.symbols (+1/-0) debian/patches/add-smbc_setOptionProtocols.patch (+61/-0) debian/patches/series (+1/-0) |
||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Christian Ehrhardt (community) | Approve | ||
| Canonical Server | Pending | ||
|
Review via email:
|
|||
Description of the change
This branch brings a new function into the bionic and cosmic samba packages. This function can be used by applications linked against libsmbclient in order to set the SMB protocol version they want to use.
gvfs in bionic and cosmic (and later) has already been changed to use this function if it is detected at build time. When that happens, this will close bug #1778322, allowing the gnome desktop (via gvfs) to display windows and samba machines from the local network.
Key points for this update:
- it's adding a new function, so the symbols file update includes the full version of the ubuntu package, and not just the upstream version
- gvfs needs to be rebuilt *after* the samba package has landed in proposed. I'm not adding any strict build-depends.
- gvfs build log *must* contain this line:
Checking for function "smbc_setOption
- gvfs, when rebuilt with this samba version, will change its depdendency on libsmbclient from a generic one to a very specific one. In bionic, for example, gvfs-backends currently depends on "libsmbclient (>= 2:4.0.3+dfsg1)". In the PPA I have for testing, that changed to "libsmbclient (>= 2:4.7.6+
I tried to come up with testing instructions that didn't require the installation of ubuntu desktop, but manipulating gvfsd and gio (command-line tool) didn't work unless I also had the desktop installed. And I did start a dbus session, so I don't know what else was missing. The bug has the SRU template filled out and testing instructions.
PPA with test builds: https:/
| Andreas Hasenack (ahasenack) wrote | # |
There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.
We already discussed about this last week.
So a lot is already resolved in this MP (e.g. the details of the symbols handling).
I checked the formats and styles in the patch/changelog that LGTM.
Furthermore I have checked Cosmic and Bionic build logs and agree that the GVFS build detected the new feature and as well picked up the new version dependency.
No "breaks" are needed since the new SMB won't break an old GVFS and vice versa the dependency is autogenerated by make shlibs.
The test steps also seem ok for me, more complex than preferred but working.
All of the above sums up to +1