search

fumiyas / samba-virusfilter

Samba-VirusFilter - On-access anti-virus filter for Samba (DISCONTINUED. See vfs_virusfilter(8) in Samba upstream)
GNU General Public License v3.0
8 stars 7 forks source link

Virusfilter merge master #25

Closed treveradams closed 7 months ago

treveradams commented 8 years ago

I believe this has much of the work done for merging into Samba-master. The changes in the examples directory are incomplete as mentioned elsewhere.

fumiyas commented 8 years ago

Oh... Ummm... I think we should do the following steps:

  1. Fork https://github.com/samba-team/samba to your account or your (our?) organization on GitHub.
  2. Clone it to your local environment.
  3. Create a branch for Samba-VirusFilter merge.
  4. Merge files from Samba-VirusFilter to the branch.
  5. Push the branch to GitHub.
  6. Create a pull request from the branch on GitHub.
treveradams commented 8 years ago

Thank you. Per your request: https://github.com/samba-team/samba/pull/63

treveradams commented 8 years ago

fumiyas and Luke Dixon, I have one more ground work patch to get committed (waiting on feed back from the Samba team). After that, I will be posting the patch for the actual VirusFilter vfs module. Would the two of you please sign off on it at that point since you both have code in it (at least one of you significantly more than me)? Also, fumiyas, would you mind if I added my copyright notice to the vfs_virusfilter_vfs.c and vfs_virusfilter_utils.c as I have more than small chunks of code there? Your choice.

On the https://github.com/samba-team/samba/pull/63, both of you are no longer participants as I had to redo the branch. A few of the changes became quite out of sync and I wasn't sure of a simpler way to do it other than make a patch and recreate the branch (losing the history, but since the pull request won't be used, it is lost anyway).

Finally, in the commit message for the actual virusfilter, I want to make sure some information is retained, maybe something like this:

Contributors SATOH Fumiyasu @ OSS Technology Corp., Japan Module creator/maintainer Luke Dixon luke.dixon@zynstra.com Samba 4 support Trever L. Adams Documentation Code contributions Samba-master merge work

With many thanks to the Samba Team.

Any input from the participants here?

treveradams commented 8 years ago

The outstanding patch has the subject "Proposed Patch: write_data_iov_timeout, etc." It may be possible to use only one version instead of the existing one and my addition, so long as the timeout does not count down, but is per call to the functions in that file (not read/write).

treveradams commented 8 years ago

Hopefully, with the latest push the module is now much more in line with Samba coding standards and style.

fumiyas commented 8 years ago

Would the two of you please sign off on it at that point since you both have code in it (at least one of you significantly more than me)?

OK! But I don't know how to sign off and what the "Signed-off-by" does mean. :confounded: I'm a newbie in Git and have no experience of OSS delopment with another person...

Also, fumiyas, would you mind if I added my copyright notice to the vfs_virusfilter_vfs.c and vfs_virusfilter_utils.c as I have more than small chunks of code there? Your choice.

Yes! Absolutely no problem. Please add your copyright notice.

Many thanks to your great works!!

Finally, in the commit message for the actual virusfilter, I want to make sure some information is retained, maybe something like this:

It seems good.

fumiyas commented 8 years ago

I've read the following article:

Now I know what the "Signed-off-by" means. :smile:

treveradams commented 8 years ago

For the purposes of this discussion, to sign off, in response (reply to all please) to the email I am just now sending to Samba-technical, you and Jeremy Allison about the copyright policy (which you need to submit if you haven't) saying something like: " Once you have added your copyright notice to the two files in question, I sign off on the submission with the commit message with discussed.

Signed-off-by: SATOH Fumiyasu"

I think that will satisfy legal and project needs.

Luke Dixon, I think I just need the posting with your signed off. I don't think it will be required, but I do prefer it is there.

I'm a newbie in Git and have no experience of OSS delopment with another person...

This one is my second, or first, project using git involving other people as well. It has been a good experience working with you and the Samba team! Thank you for the code and thank you for the experience!

fumiyas commented 7 months ago

Already merged into Samba upstream.

Thank you!!