[Pkg-samba-maint] I'm back working on the full Samba 4.0 package

[Ivo De Decker]

Hi Andrew,

On Mon, May 06, 2013 at 09:16:18AM +1200, Andrew Bartlett wrote:
> The branch I'm working with is at:
> 
> git://git.samba.org/abartlet/samba-debian.git samba-full-package

Ah, ok. Nice.

> For my next task I'll pull in your repo and rebase on the current 3.6
> there, but at some point soon I'll want to stop moving the base around
> too much.

Once we agree on the new repo (which we seem to have done now :), you can just
continue to develop there. If you create an alioth account, we can just give
you commit access, so there is no need to rebase anymore. You could also push
to a copy of our repo somewhere and we could pull from there, but that seems
like an unnecessary extra step.

I will move the samba-test.git repo to samba.git tomorrow. The cvs repo
should not be used anymore.

> I also need to move to Samba 4.0.5.  Once we address the TODO
> items I hope to just do incremental development, rather than a rebased
> series of patches, if that's OK.  

Sure. That should be the way to go. Just create a branch and push there.

> I would really like some help getting a repo and workflow that looks
> standard, as this is what I currently do on the VM:
> 
> (cd samba4 && git fetch jesse-full-package && git reset --hard
> jesse-full-package/samba-full-package) && tar -zxvf samba4_4.0.3
> +dfsg1.orig.tar.gz  && rm -rf samba-4.0.3+dfsg1 && mv samba4-4.0.3
> +dfsg1/ samba-4.0.3+dfsg1 && cd samba-4.0.3+dfsg1 && rsync -a
> --delete ../samba4/debian . && CC="ccache gcc" dpkg-buildpackage
> -rfakeroot -us -uc  2>&1 | tee ../samba-build.log.txt


Once the upstream part of the repo is up-to-date, there is no need to do the
untarring. You should be able to just run something like
git-buildpackage -us -uc

To import the upstream tarballs, you can use git-import-orig. I will document
this process. The current CVS documentation should be replaced anyway.

> Specificity I need help with FHS:  
> 
> I've finally dropped the FHS patch, because I
> think /var/lib/samba/private is a perfectly good place for our private
> files, but debian is forcing passdb.tdb and secrets.tdb
> to /var/lib/samba.  I just need the upgrade script written.  
> 
> We can't just change where the private dir is, because the samba4
> packages have been using the correct /var/lib/samba/private and other
> parts of 3.6 have been using that as the real private dir (the perils of
> patching each database instance, not the source variable).  

I totally agree that we should get rid of these patches. We had issues with
these as well in samba 3.6 just a few weeks ago. If I remember correctly, the
only real exception is smbpasswd, which is in /etc/samba instead of
/var/lib/samba. If smbpasswd is still supported in samba 4, maybe we should
get a separate upstream build option to move smbpasswd, so that all other
files can be put in their location with build options instead of patches.

Once it's clear where everything was and where it needs to be, it's just a
matter of moving everything on upgrade. As we had to do this for samba 3.6, we
unfortunately have example scripts for this, so this shouldn't be a big deal.


> > It should be possible to merge this work by next weekend, and hopefully get a
> > first combined samba package into experimental (well, into the new queue
> > anyway).
> 
> At this stage there is still much to do, but it is great to feel there
> is some momentum here. 

Indeed. And once there is something in experimental that isn't too bad, we can
hopefully get some user feedback as well.

> > BTW anybody else coming to SambaXP? Andrew? Jelmer?
> 
> I'm sorry, I'm not able to be there this year. 

Too bad. Maybe next year or so...

Cheers,

Ivo