Heimdal Patches (was: Re: [PATCH] Some coverity fixes)
abartlet at samba.org
Tue May 12 02:56:47 MDT 2015
On Tue, 2015-05-12 at 08:35 +0200, Volker Lendecke wrote:
> On Mon, May 11, 2015 at 05:48:29PM +0200, Volker Lendecke wrote:
> > If I look at http://h5l.org, there has not been a release
> > for 3 years. I'm not sure about the process to get upstream
> > back into Samba.
> I'm genuinely interested in the recommended process here:
> Where do we submit patches to upstream, and how do they
> trickle back into Samba?
Via updates of our lorikeet-heimdal tree, which is a rebased set of
patches (trending towards zero) on top of Heimdal master. Scripts in
our lorikeet-heimdal repo assist us with that rebase, and then assist us
to import (via an import commit) a subset of lorikeet-heimdal into
Samba's master, where it is built with our waf build system.
It is far from ideal, and I want to get out of this cycle, but for now I
ask that you assist me with that process.
If, after submitting the patch upstream to Heidmal and it being
accepted, you then apply it to Samba with a marker 'This is (based on)
upstream Heimdal commit xxx', that is totally fine - it is easy to
ignore such commits, knowing they will already be in the import.
Andrew Bartlett http://samba.org/~abartlet/
Authentication Developer, Samba Team http://samba.org
Samba Developer, Catalyst IT http://catalyst.net.nz/services/samba
More information about the samba-technical