Skip to content
This repository has been archived by the owner on Jan 27, 2019. It is now read-only.

Update to AFL 2.52b #4

Closed
wants to merge 12 commits into from
Closed

Conversation

anon8675309
Copy link

Get ready for an incredible contribution:
Resolves shellphish/shellphish-afl#8 :-)

Will also require a PR to shellphish-afl to patch up the eflload patch.

@zardus
Copy link
Member

zardus commented May 16, 2018

Thank you for this PR!

Rather than merge the new version into the old, could you rebase the repo on top of the new version? Similar to #2.

Thank you!

@anon8675309
Copy link
Author

OK, we can do that if that's what it takes to get accepted, but why on Earth would you want that?

This does, however, explain why we got merge conflicts out of nowhere when we were trying to submit our PR.

@zardus
Copy link
Member

zardus commented May 16, 2018

We have a few commits to adapt AFL, and they're done on top of the AFL source code. If those commits are rebased when each new version of AFL is released, then the commit log makes sense. Otherwise, it becomes a nightmarish graph of merge conflict resolutions, and our actual modifications are lost in the chaos.

The current graph of commits shows the optimal solution: https://github.com/shellphish/afl-other-arch/commits/master

Basically, best-case scenario, the "update AFL to 2.52b" commit would go between 9263d45 and d04ba73.

@anon8675309
Copy link
Author

New pull request submitted. It won't merge cleanly, but I think this is what you wanted.

@bannsec
Copy link

bannsec commented Sep 8, 2018

Was actually going to look into this exact thing. What needs to be done to get this updated to a non-archaic version of afl?

@zardus
Copy link
Member

zardus commented Jan 27, 2019

Years later, this can be closed! This repo has been obsoleted by build process updates in shellphish-afl.

@zardus zardus closed this Jan 27, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants