maksbotan 14/12/05 19:19:55 Added: sagan.init-r1 json_header_location.patch Log: Bump to 1.0.0_rc3, clean old, thanks to slepnoga (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key F8DBDADE)
Revision Changes Path 1.1 app-admin/sagan/files/sagan.init-r1 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/sagan/files/sagan.init-r1?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/sagan/files/sagan.init-r1?rev=1.1&content-type=text/plain Index: sagan.init-r1 =================================================================== #!/sbin/runscript # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-admin/sagan/files/sagan.init-r1,v 1.1 2014/12/05 19:19:55 maksbotan Exp $ pidfile="/var/run/sagan/sagan.pid" command="/usr/bin/sagan" command_args="-D \"${SAGAN_OPTS}\" -u \"${SAGAN_USER}\"" depend() { use logger mysql postgresql need localmount } start_pre() { checkpath -d -o sagan /run/sagan checkpath -p -o sagan -m 0644 /run/sagan/sagan.fifo } 1.1 app-admin/sagan/files/json_header_location.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/sagan/files/json_header_location.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/sagan/files/json_header_location.patch?rev=1.1&content-type=text/plain Index: json_header_location.patch =================================================================== diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -194,7 +194,7 @@ if test "$LOGNORM" = "yes"; then AC_MSG_RESULT([------- liblognorm support is enabled -------]) AC_CHECK_HEADER([liblognorm.h]) - AC_CHECK_HEADERS([json/json.h json.h], [break], [AC_MSG_ERROR([json-c headers not found or not usable. + AC_CHECK_HEADERS([json-c/json.h json.h], [break], [AC_MSG_ERROR([json-c headers not found or not usable. This library is important for the correlation aspects of Sagan! Please see https://wiki.quadrantsec.com/bin/view/Main/LibLogNorm. To disable this feature use the --disable-lognorm flag.])]) diff --git a/src/sagan-liblognorm.c b/src/sagan-liblognorm.c --- a/src/sagan-liblognorm.c +++ b/src/sagan-liblognorm.c @@ -40,9 +40,7 @@ #include <lognorm.h> #if defined(HAVE_JSON_JSON_H) -# include <json/json.h> -#else -# include <json.h> +# include <json-c/json.h> #endif #include "sagan.h"
