[Oisf-devel] libhtp upgrade

Victor Julien victor at inliniac.net
Thu Jul 11 10:01:04 UTC 2013

On 07/09/2013 05:30 PM, Anoop Saldanha wrote:
> On Fri, Jul 5, 2013 at 2:01 PM, Peter Manev <petermanev at gmail.com> wrote:
>> On Thu, Jul 4, 2013 at 1:49 PM, Victor Julien <victor at inliniac.net> wrote:
>>> Anoop's work to upgrade our libhtp support to 0.5.x is pretty much done
>>> and ready to be merged.
>>> I think this is a good moment to reconsider how we distribute libhtp.
>>> Currently we have it merged in our git repo. This is convenient for the
>>> users, as they always have the correct libhtp.
>>> However, it's a major hassle for us devs, as we need to keep it in sync
>>> with the official libhtp. So I would like to remove libhtp from our git
>>> repo.
>>> I think it is still a good idea to bundle libhtp in our tarball though,
>>> that way users will still be able to have the hassle free experience.
>>> Any thoughts about this? I was thinking to just script up the tarball
>>> creation to include a checkout of libhtp. Not sure how easy it will be
>>> to make our autotools play well with this though.
>> As long as the stable version's tarball has it (the way it is now)  -
>> it is ok for the  the PPA packaging stuff I think, even though we
>> compile with non-bundled-htp.
> +1 on non-bundled htp.  Easier to stay with the libhtp mainline.
> Bundling it along with the suricata tarball seems convenient enough.

So for 2.0beta1 and up we'll no longer have libhtp in our git tree. This
will require some adjusting to our dev set ups, but nothing big I think.
For release tarballs we'll just bundle the latests htp lib, so that for
users nothing changes.

In this branch I've updated the autotools we use to work both if a local
libhtp dir exists and when it does not exist.


The beef of the change is moving all conditionals from the Makefile.am
files into configure.ac:


This makes sure the build sys doesn't error out if the local libhtp/ dir
does not exist.

I additionally changed the way we generate the src/build-info.h. I had
seen errors with it before, but now for some reason they became more
apparent. Please check:


I will probably merge this branch tomorrow, so please take a moment
today to review it.

Victor Julien
PGP: http://www.inliniac.net/victorjulien.asc

More information about the Oisf-devel mailing list