On Mon, May 2, 2016 at 10:49 AM, dan (ddp) <ddp...@gmail.com> wrote: > On Mon, May 2, 2016 at 10:36 AM, Robert Micallef <robertm...@gmail.com> wrote: >> Third time's the charm. Is PR #821 ok? >> > > At a glance, I don't see the df changes in it. I'll try to take a > better look in a bit. >
The steps to submit the PR should basically be the following: 1. Fork the repository on github (fork button in the top right of the page) 2. Clone your fork (git clone https://github.com/USER/ossec-hids.git) 3. OPTIONAL: Create a branch for your changes (git checkout -b df_issue) 4. Make your changes (modify install.sh and etc/rules/ossec_rules.xml) 5. Add and commit your changes (git add install.sh etc/rules/ossec_rules.xml && git commit) 6. Push your changes to a new branch on your fork on github (git push --set-upstream origin df_issue) 7. Open a pull request on the ossec/ossec-hids repo. a. Click "New pull request" at https://github.com/ossec/ossec-hids b. Click "compare across forks" link c. Ensure the left hand drop down boxes say "base fork: ossec/ossec-hids" and "base: master" d. In the right hand drop boxes select "head fork: USERNAME/ossec-hids" and "compare: BRANCH" e. Review the changes and write a brief title and comment f. Click "Create pull request" I've opened #822 with the proposed change as kind of a demonstration (since I made did the above steps while documenting them). >> >> On Monday, May 2, 2016 at 4:15:55 PM UTC+2, dan (ddpbsd) wrote: >>> >>> On Mon, May 2, 2016 at 10:12 AM, Robert Micallef <rober...@gmail.com> >>> wrote: >>> > I'm sorry about that. I never used github before. I didn't know P and h >>> > are >>> > incompatible for OpenBSD. But I think the rule should still work by just >>> > modifying <match>. >>> > >>> >>> No worries, we'll figure it all out. >>> >>> > So how can I fix the PR? Do I close it and try opening it again? I >>> > cannot >>> > find where to edit anything apart from the title. >>> > >>> >>> I'm not sure, but I'd probably close it and open a new one against MASTER. >>> >>> > On Monday, May 2, 2016 at 4:02:08 PM UTC+2, dan (ddpbsd) wrote: >>> >> >>> >> On Mon, May 2, 2016 at 9:57 AM, Robert Micallef <rober...@gmail.com> >>> >> wrote: >>> >> > Hi Dan, >>> >> > >>> >> > Created PR #819. I hope I chose the correct branches.. >>> >> > >>> >> >>> >> Thanks for submitting that, but I left a comment in the PR. New >>> >> changes should be against MASTER, and the "h" and "P" flags are >>> >> incompatible together on OpenBSD. >>> >> >>> >> > -- >>> >> > >>> >> > --- >>> >> > 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+...@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+...@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. -- --- 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.
