From 0c6bea39cffb6bcaddd2b8188b207d6cf6476e24 Mon Sep 17 00:00:00 2001 From: Maxim Koltsov Date: Fri, 5 Dec 2014 19:19:55 +0000 Subject: 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) --- app-admin/sagan/ChangeLog | 9 ++- app-admin/sagan/files/json_header_location.patch | 26 +++++++ app-admin/sagan/files/sagan.init-r1 | 18 +++++ app-admin/sagan/sagan-0.2.2_p2-r2.ebuild | 89 ----------------------- app-admin/sagan/sagan-1.0.0_rc3.ebuild | 90 ++++++++++++++++++++++++ 5 files changed, 142 insertions(+), 90 deletions(-) create mode 100644 app-admin/sagan/files/json_header_location.patch create mode 100644 app-admin/sagan/files/sagan.init-r1 delete mode 100644 app-admin/sagan/sagan-0.2.2_p2-r2.ebuild create mode 100644 app-admin/sagan/sagan-1.0.0_rc3.ebuild (limited to 'app-admin/sagan') diff --git a/app-admin/sagan/ChangeLog b/app-admin/sagan/ChangeLog index 88c52e30fff1..b32f0754be93 100644 --- a/app-admin/sagan/ChangeLog +++ b/app-admin/sagan/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-admin/sagan # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/sagan/ChangeLog,v 1.27 2014/11/03 11:02:34 titanofold Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/sagan/ChangeLog,v 1.28 2014/12/05 19:19:55 maksbotan Exp $ + +*sagan-1.0.0_rc3 (05 Dec 2014) + + 05 Dec 2014; Maxim Koltsov + +files/json_header_location.patch, +files/sagan.init-r1, + +sagan-1.0.0_rc3.ebuild, -sagan-0.2.2_p2-r2.ebuild: + Bump to 1.0.0_rc3, clean old, thanks to slepnoga 03 Nov 2014; Aaron W. Swenson sagan-0.2.2_p2-r2.ebuild, sagan-0.2.3.ebuild: diff --git a/app-admin/sagan/files/json_header_location.patch b/app-admin/sagan/files/json_header_location.patch new file mode 100644 index 000000000000..78a34886a73d --- /dev/null +++ b/app-admin/sagan/files/json_header_location.patch @@ -0,0 +1,26 @@ +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 + + #if defined(HAVE_JSON_JSON_H) +-# include +-#else +-# include ++# include + #endif + + #include "sagan.h" diff --git a/app-admin/sagan/files/sagan.init-r1 b/app-admin/sagan/files/sagan.init-r1 new file mode 100644 index 000000000000..ef75f5bb0dcf --- /dev/null +++ b/app-admin/sagan/files/sagan.init-r1 @@ -0,0 +1,18 @@ +#!/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 +} diff --git a/app-admin/sagan/sagan-0.2.2_p2-r2.ebuild b/app-admin/sagan/sagan-0.2.2_p2-r2.ebuild deleted file mode 100644 index cdb86a6d2146..000000000000 --- a/app-admin/sagan/sagan-0.2.2_p2-r2.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/sagan/sagan-0.2.2_p2-r2.ebuild,v 1.5 2014/11/03 11:02:34 titanofold Exp $ - -EAPI=4 -AUTOTOOLS_AUTORECONF=1 -MY_PV="0.2.2-r2" - -inherit eutils autotools-utils user - -DESCRIPTION="Sagan is a multi-threaded, real time system and event log monitoring system" -HOMEPAGE="http://sagan.softwink.com/" -SRC_URI="http://sagan.softwink.com/download/${PN}-${MY_PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="smtp +mysql postgres prelude snort +lognorm +libdnet +pcap" - -DEPEND="virtual/pkgconfig - ${RDEPEND}" - -RDEPEND="dev-libs/libpcre - app-admin/sagan-rules[lognorm?] - smtp? ( net-libs/libesmtp ) - pcap? ( net-libs/libpcap ) - mysql? ( virtual/mysql ) - postgres? ( virtual/postgresql ) - prelude? ( dev-libs/libprelude ) - lognorm? ( dev-libs/liblognorm ) - libdnet? ( dev-libs/libdnet ) - snort? ( >=net-analyzer/snortsam-2.50 ) - " - -AUTOTOOLS_IN_SOURCE_BUILD=1 -DOCS=(AUTHORS ChangeLog FAQ INSTALL README NEWS TODO) -PATCHES=( "${FILESDIR}"/mysql_check.patch ) - -S="${WORKDIR}/${PN}-${MY_PV}" - -pkg_setup() { - enewgroup sagan - enewuser sagan -1 -1 /dev/null sagan -} - -src_configure() { - local myeconfargs=( - $(use_enable mysql) - $(use_enable postgres postgresql) - $(use_enable smtp esmtp) - $(use_enable prelude ) - $(use_enable lognorm) - $(use_enable libdnet) - $(use_enable pcap libpcap) - $(use_enable snort snortsam) - ) - - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install - - diropts -g sagan -o sagan -m 775 - - dodir /var/log/sagan - - keepdir /var/log/sagan - - touch "${ED}"/var/log/sagan/sagan.log - chown sagan.sagan "${ED}"/var/log/sagan/sagan.log - - newinitd "${FILESDIR}"/sagan.init sagan - newconfd "${FILESDIR}"/sagan.confd sagan - - insinto /usr/share/doc/${PF}/examples - doins -r extra/* -} - -pkg_postinst() { - if use smtp; then - ewarn "You have enabled smtp use flag. If you plan on using Sagan with" - ewarn "email, create valid writable home directory for user 'sagan'" - ewarn "For security reasons it was created with /dev/null home directory" - fi - - einfo "For configuration assistance see" - einfo "http://wiki.quadrantsec.com/bin/view/Main/SaganHOWTO" -} diff --git a/app-admin/sagan/sagan-1.0.0_rc3.ebuild b/app-admin/sagan/sagan-1.0.0_rc3.ebuild new file mode 100644 index 000000000000..64bf3a796d5b --- /dev/null +++ b/app-admin/sagan/sagan-1.0.0_rc3.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/sagan/sagan-1.0.0_rc3.ebuild,v 1.1 2014/12/05 19:19:55 maksbotan Exp $ + +EAPI=5 + +AUTOTOOLS_AUTORECONF=1 +AUTOTOOLS_IN_SOURCE_BUILD=1 + +inherit eutils autotools-utils user + +DESCRIPTION="Sagan is a multi-threaded, real time system and event log monitoring system" +HOMEPAGE="http://sagan.quadrantsec.com/" +SRC_URI="http://sagan.quadrantsec.com/download/sagan-1.0.0RC3.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="geoip +libdnet +lognorm mysql +pcap smtp snort" + +RDEPEND="dev-libs/libpcre + app-admin/sagan-rules[lognorm?] + smtp? ( net-libs/libesmtp ) + pcap? ( net-libs/libpcap ) + mysql? ( virtual/mysql ) + lognorm? ( + dev-libs/liblognorm + dev-libs/json-c + dev-libs/libee + dev-libs/libestr + ) + libdnet? ( dev-libs/libdnet ) + snort? ( >=net-analyzer/snortsam-2.50 ) + geoip? ( dev-libs/geoip ) + " + +DEPEND="virtual/pkgconfig + ${RDEPEND}" + +DOCS=( AUTHORS ChangeLog FAQ INSTALL README NEWS TODO ) +PATCHES=( "${FILESDIR}"/json_header_location.patch ) +S="${WORKDIR}/sagan-1.0.0RC3/" + +pkg_setup() { + enewgroup sagan + enewuser sagan -1 -1 /dev/null sagan +} + +src_configure() { + local myeconfargs=( + $(use_enable smtp esmtp) + $(use_enable lognorm) + $(use_enable libdnet) + $(use_enable pcap libpcap) + $(use_enable snort snortsam) + $(use_enable geoip) + ) + + autotools-utils_src_configure +} + +src_install() { + autotools-utils_src_install + + diropts -g sagan -o sagan -m 775 + + dodir /var/log/sagan + + keepdir /var/log/sagan + + touch "${ED}"/var/log/sagan/sagan.log + chown sagan.sagan "${ED}"/var/log/sagan/sagan.log + + newinitd "${FILESDIR}"/sagan.init-r1 sagan + newconfd "${FILESDIR}"/sagan.confd sagan + + insinto /usr/share/doc/${PF}/examples + doins -r extra/* +} + +pkg_postinst() { + if use smtp; then + ewarn "You have enabled smtp use flag. If you plan on using Sagan with" + ewarn "email, create valid writable home directory for user 'sagan'" + ewarn "For security reasons it was created with /dev/null home directory" + fi + + einfo "For configuration assistance see" + einfo "http://wiki.quadrantsec.com/bin/view/Main/SaganHOWTO" +} -- cgit v1.2.3-65-gdbad