On Mon, Sep 5, 2016 at 8:47 AM, Kat <uncommon...@gmail.com> wrote: > Hi all, > > Trying to figure out the different branches right now and what has been > integrated and what has not. Right now there seems to be the main branch, > then there is Dan's - (is that the main branch too?) and then there is > Wazuh, and of course Atomic. >
I believe these are forks, not branches. * github.com/ossec/ossec-hids MASTER is where the new stuff is happening. New releases/testing releases are branched/tagged from here. * github.com/ddpbsd/ossec-hids MASTER should follow the above fairly closely. I try not to add anything to this. Everything I work on gets its own branch, and I sometimes prune old branches. PRs I submit are usually from a branch (if I submit a PR from my MASTER, it's because I done did goof) * Wazuh's fork is for their version of OSSEC. They submit a number of things back to the main code. I don't follow this as well as I probably should. * Atomic's fork I think is for the work Scott does on OSSEC. I'm not positive whether it's the Atomic Corp code or just the fork he uses for working on the mainline code. * bitbucket.org/dcid/ossec-hids is Daniel Cid's OSSEC code (it feels weird calling it a fork). I believe he adds stuff that Sucuri uses. I also don't follow this is as well as I should. If you're working on the main OSSEC project, fork ossec/ossec-hids and work from there. If you prefer Wazuh's OSSEC, use theirs. The proliferation of OSSEC based projects using the name OSSEC can make this quite confusing. But there is cooperation between the projects, but that's limited by time. > Can someone summarize the different branches and make my brain stop > contorting please :-) I want to get all the best parts of all the > enhancements from all the teams, but I am not quite sure there is one branch > that incorporates them all? Then again, I could be completely wrong? > AFAIK Wazuh is the only company really pushing their OSSEC fork along quickly, one of the benefits of having employees who are paid to work on it. Daniel does dumps every once in a while to his version, but I'm sure he's time limited as well. Sucuri is looking for a C coder to work on their OSSEC (and probably other projects), but I don't know if this will translate to more work on the bitbucket repo. > Kat > > -- > > --- > You received this message because you are subscribed to the Google Groups > "ossec-list" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to ossec-list+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/d/optout. -- --- You received this message because you are subscribed to the Google Groups "ossec-list" group. To unsubscribe from this group and stop receiving emails from it, send an email to ossec-list+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.