Page MenuHomeFreeBSD

security/suricata: Add REDIS option
ClosedPublic

Authored by garga on Jun 10 2017, 8:24 PM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Apr 3, 4:35 PM
Unknown Object (File)
Mon, Mar 25, 6:32 PM
Unknown Object (File)
Jan 26 2024, 6:10 PM
Unknown Object (File)
Jan 9 2024, 4:58 AM
Unknown Object (File)
Jan 2 2024, 7:51 PM
Unknown Object (File)
Dec 26 2023, 11:49 PM
Unknown Object (File)
Dec 23 2023, 12:22 PM
Unknown Object (File)
Dec 21 2023, 5:21 PM

Details

Summary

Add a new option, REDIS, to enable redis output. Since this options is OFF
by default, no bump on PORTREVISION was done

Diff Detail

Repository
rP FreeBSD ports repository
Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 9789
Build 10226: arc lint + arc unit

Event Timeline

looks good, will accept after typo fix :)

security/suricata/Makefile
56

small typo here

Fixed, thanks!

This revision is now accepted and ready to land.Jun 12 2017, 4:36 AM
security/suricata/Makefile
108

This should probably be a REDIS_CONFIGURE_ENABLE=hiredis so that a --disable-hiredis is added when the option is disabled.

See "feature auto-activation" in https://www.freebsd.org/doc/en/books/porters-handbook/makefile-options.html

security/suricata/Makefile
108

the style of the port should be updated, but we can do this after initial merge. I have a larger 3.2.2 update waiting anyway and can look at it then?

security/suricata/Makefile
108

I would rather bad things never go in, there are already enough in this port.
Fixing this will take about 15 seconds.

security/suricata/Makefile
108

fine, let @garga mop this one up and I'll take care of the others with the version update :)

garga edited edge metadata.

Use REDIS_CONFIGURE_ENABLE for hiredis option

This revision now requires review to proceed.Jun 12 2017, 2:38 PM
franco_opnsense.org added inline comments.
security/suricata/Makefile
108

ok, now I'm seeing this with REDIS disabled, REDIS_CONFIGURE_ENABLE does something that suricata doesn't like.

checking hiredis/hiredis.h usability... no
checking hiredis/hiredis.h presence... no
checking for hiredis/hiredis.h... no

   ERROR!  libhiredis library not found, go get it
   from https://github.com/redis/hiredis or your distribution:

   Ubuntu: apt-get install libhiredis-dev
   Fedora: dnf install hiredis-devel
   RHEL/CentOS: yum install hiredis-devel

===>  Script "configure" failed unexpectedly.
Please report the problem to franco@opnsense.org [maintainer] and attach the
"/usr/obj/usr/ports/security/suricata/work/suricata-3.2.2/config.log" including
the output of the failure of your make command. Also, it might be a good idea
to provide an overview of all packages installed on your system (e.g. a
/usr/local/sbin/pkg-static info -g -Ea).
*** Error code 1
This revision now requires changes to proceed.Jun 13 2017, 10:01 AM
security/suricata/Makefile
108

What is the content of CONFIGURE_ARGS ?

security/suricata/Makefile
108
$ ./configure --enable-gccprotect --with-libpcre-includes=/usr/local/include --with-libpcre-libraries=/usr/local/lib --with-libyaml-includes=/usr/local/include --with-libyaml-libraries=/usr/local/lib --with-libnet-includes=/usr/local/include --with-libnet-libraries=/usr/local/lib --with-libhtp-includes=/usr/local/include/ --with-libhtp-libraries=/usr/local/lib --disable-gccmarch-native --enable-geoip --enable-bundled-htp --with-libhs-includes=/usr/local/include --with-libhs-libraries=/usr/local/lib --enable-ipfw --with-libjansson-includes=/usr/local/include --with-libjansson-libraries=/usr/local/lib --enable-netmap --with-libpcap-includes=/usr/include --with-libpcap-libraries=/usr/lib --disable-prelude --disable-hiredis --disable-unittests --prefix=/usr/local --localstatedir=/var --mandir=/usr/local/man --disable-silent-rules --infodir=/usr/local/info/ --build=amd64-portbld-freebsd11.0

--disable-hiredis seems to achieve the opposite, I verified this manually on 3.2.1 and 3.2.2

So FWIW I stand by the approval of the previous version that does not use REDIS_CONFIGURE_ENABLE.

As a heads-up note: 3.2.2 is out and I will add the update to bugzilla now, commits may collide slightly as PRELUDE dependencies are being adjusted.

security/suricata/Makefile
108

Suricata configure scripts only deal with --enable options and don't support --disable-FEATURE that is the cause of confusion. We can report it upstream to see if it can be improved for future versions. I'll update to old patch here to get it committed

garga edited edge metadata.

Suricata doesn't support --disable-hiredis so move back to original patch

can you rebase this patch? it looks off with the update to 3.2.2 and no OPTIONS_DEFINE like it was already applied

Nevermind, now it displays correctly. Please commit. :)

This revision is now accepted and ready to land.Jul 13 2017, 3:44 PM
This revision was automatically updated to reflect the committed changes.