From cb0eb1e934a04673a7127c82ea3b32f927c71e04 Mon Sep 17 00:00:00 2001 From: Maxim Koltsov Date: Fri, 5 Dec 2014 19:20:04 +0000 Subject: [PATCH] Bump to 1.0.0_rc3, clean old, thanks to slepnoga Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xF8DBDADE --- app-admin/sagan/ChangeLog | 9 +++- app-admin/sagan/Manifest | 18 +++++--- .../sagan/files/json_header_location.patch | 26 +++++++++++ app-admin/sagan/files/sagan.init-r1 | 18 ++++++++ ....2_p2-r2.ebuild => sagan-1.0.0_rc3.ebuild} | 45 ++++++++++--------- 5 files changed, 87 insertions(+), 29 deletions(-) create mode 100644 app-admin/sagan/files/json_header_location.patch create mode 100644 app-admin/sagan/files/sagan.init-r1 rename app-admin/sagan/{sagan-0.2.2_p2-r2.ebuild => sagan-1.0.0_rc3.ebuild} (69%) 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/Manifest b/app-admin/sagan/Manifest index 9f88ba7c8864..c4b5b4e22a7c 100644 --- a/app-admin/sagan/Manifest +++ b/app-admin/sagan/Manifest @@ -1,19 +1,25 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX json_header_location.patch 966 SHA256 3b01b5827c74b53b97851711ecafd2074a7741466a92dd9b96f4f3cad0916a63 SHA512 e1f10d5e2c2ffd3c8cf1d00a32cced479755a65eaabb1001f108a40f8cd80bd7cf71abf15d4d6a5a5fd9ff622a55daf0d449c51a5cd639b72b1d4d51e7292826 WHIRLPOOL 21b824e62ab7ef544fe07a43876ab2838d6a0d1c62ee10177fe4bb651b7ef189b7ffad32656b3b2360ac0f0065616da04f00c4dabfc149a67ea41ee06010082f AUX mysql_check.patch 944 SHA256 61d570ffb48659837adaa61d76c1d7e61f4bc42910f8bf814153b911f061fde9 SHA512 5758990b9c85a73d38c00d03a0ff9812e3ffe18a8831daebc01329c2db9253d75467b341aeffe563adcbd4fc907c510991ccf2e9bd8d9c6e7b6b353e7d2a4412 WHIRLPOOL 4a76da71cdca1eb14b30823f33f56216f443b72d8d74f1271c8ec123fec3285c69e103fc7261d59abfc040ef2ecdc479c68911d3518997742d7e71dc9426ca4e AUX sagan.confd 239 SHA256 ef5a99015369648e88e32ec8325261b1bdf53900543f86b77fea5aeb6387de51 SHA512 7ee746984d3bb3361e3155860d54e307f9b94b9e3f98c09c29b4259cd37d7aefe969b5b942c04048328ec23265a2689b22403c32e3552b8062201aca2ef3ac34 WHIRLPOOL 0c0e580d220d5abec71d888531554f9b9a4848dc6bc21bff98931082618cf4b446197ec1a6a38c83d4950d878dfd87050ba8112468ec8d361b63a77541a47d8c AUX sagan.init 538 SHA256 8e92c2f337f0dad09c5380d0351ed53509da9d39ff37e3183af8eeef2feeed21 SHA512 caf31bfedf5880487049987a49e205f2fb5645fca8d3c1b9c1def7c1e05364ace1798a1d4e2195e8a884079bd4d713e4c76b0cff083fe2aad78bed00169d8655 WHIRLPOOL 93158d12bc7c096f3cbe2934e9c7a7796e5b6a6f242e4c47741c4bd1554f4be963fba9ebf1f61320e4fcaf6d47e1922dcfd81ced633f387c89e616ce549ce8eb -DIST sagan-0.2.2-r2.tar.gz 247104 SHA256 be6670e0348dc0beeeed08b50a5997ba69a5996bdbf2603dfb0c8f80c88c0065 SHA512 aa724386d42862329ca2f3b4ff1ffcd0f984e17161fbfa26d06343805d51b9504af076efc518b8b56bdfd75ca349387a777f5128a93dc42fb6ea793cee0d580b WHIRLPOOL 9bc8e011bde5e7eb1d588f45d9e0d8a23807094c9cdc6b75af65b07075054ff62549a92cda6a596e37de218ea24cda44519abc4134c4bef3b7511e838468de3d +AUX sagan.init-r1 536 SHA256 53aa18978214aae65983ed299c60c2092bf560359614bdac6f5fab6b8a4a62dd SHA512 d81a54529b6058e3bab9edfdecdeaf02fa58cf1aa23720b28ee220840c920054a7a17a7244209679054e4d2f225dd528268fb11bd96ee75cdf48f4ab4860861a WHIRLPOOL 8653e4cdb16de19f4b030416626794f2452021037dd74778cf5f1abc0955d2bc6b79c57a08738436f1b72ad3793291d7fe25f733a92c5f2901dc54da0cc249cc DIST sagan-0.2.3.tar.gz 231774 SHA256 fc50697cf8ce0fe7c1c662a57a9526710e649c2bf8088acdef46010e06e5ddf2 SHA512 2110f3d34db69cb5c453b8e37d06debeea7531ebf15a9b78954ac1657ddce34feaaff87d14695759c3deb2eed5ecc0e6fec5881fb5037af8efa6c3c9600242cc WHIRLPOOL 417d78263a907c89a865a41228ffc6e2184e1d37d1d583ee0c42da991c411cd40e99b2d537e11a7712615643f57b406439cb5af84a1eacc12a2ef7ca96c72533 -EBUILD sagan-0.2.2_p2-r2.ebuild 2240 SHA256 9c631c143c416ba3fd1a3f421495c176c5defe9fceeb1d2d726e6cfb1a542025 SHA512 3592dc1085b95b8082562dd882c18d6f4ee2271e7992c970e6a164e2c897f250b0547ea1cf1da8c7a5d16e7f153f3459cd259ea7b05c4c5a24975128cdbb9b7e WHIRLPOOL 28b0a0f47d010572fcd1e195f6025a1c377bcbdcebf90fe78a1b537d8a8bdf56a0221a65aa0e2816ee6b230b9fe6ea99d79a887f25ef7c4d4a3e46491aa83b4b +DIST sagan-1.0.0RC3.tar.gz 285207 SHA256 527ddcb583f362c92eca5557cda2116a64200da3f868b512f42abbf78b961508 SHA512 29388a339b290bb4de2359c0c54b9e1d43ef207b223a499a1a4faa36de4d9590a777a796dd773948e995d052b71f3ef47ca5bad5c133116c4dbb53b4fe336123 WHIRLPOOL 35e18084056d15dae578378df4c335fb98ebbb1514b0762a573e4b3507253ac00ee944f06f2f443a2e8cef44c19d312e936923f9223314d8970cec4ae332f36e EBUILD sagan-0.2.3.ebuild 2136 SHA256 91f5cbe2355c3b52adb1ab02b4d4323eca19a1410d60d0bbfe75ad3d2477464d SHA512 4148a57c2464b4d2f6ff2eb6aa6963c09e893bdc56ac8508ed35443fa032d8e2c9eec52a9a48eb61898494005c5cdcca01565cf504757940afdfe36caf913976 WHIRLPOOL 04009fe924b2b9a1184d5a31e072548bd378fa818629b675d582f2231b4c81fe7abfc46740d6020d0219ca0eabca0db233b73918f59ac2c7cc207b2cd138241b -MISC ChangeLog 4186 SHA256 6b808247e72af4abb8388461f77bc3376d7306c2d5a2a37718fceaa3ebcd11d2 SHA512 d94eb6c1c2cf1210a5cc0b94b02854f03dc1e0becc0a4e449bca2414e038c941522b9408bfb8d26e5a5f294c2f3d400f4279c89299df75484e62c8937d5a911f WHIRLPOOL f82bc1925a4fdd270ce1649e64dad9af6845bd486214c38de1c44a6dd89e8d5f608712bbb09eb6c21f0aa2cce71ec7c4c27706d87fa0ab716593dc93214f8b2a +EBUILD sagan-1.0.0_rc3.ebuild 2187 SHA256 983df6ef7ba0e5bf645b88cafc4ac9ecd7591af4769e38ddbf2df1d99b00bd64 SHA512 6d88a57bbbd1102a7b49c28399dfcde76b3eae2937d54a3b51d4f6a5a5cff1d7a45f1ee39e3b70c4fbf06ad73bb2170509a3f24b03abbf41760e7c177ccf5d8e WHIRLPOOL fde513bb39e2edf2b385e1eeab892f936adbb9181e54acd65b1bfb3e8794b41afa07f2aad4c9b05dd25850e1b9f52b16a5227e9e7e35fee2825c10569b1bb6c8 +MISC ChangeLog 4434 SHA256 e23fbda2aff1f32f1b9fd4e99fc0f45e3a5b50b7c07d9290342870628aa3bf14 SHA512 2c5b5f9f6b380065d259d22b44c376be8fb55af0adf54fd8c3bb6bb6ab39f5843044c3f341cde8dc52d3264d78088c1970e91cc53ce25ff6605e59a332334e42 WHIRLPOOL 721530455840cc44f5fe6fdad199df8cbd3e2fbc536253e43026da2c99f33eb71d428771ba943f40aff948787384dff02ccf12de800f28bf3bee17901b56e8cf MISC metadata.xml 939 SHA256 c90aeaf4b26a00afdc062e21e5409b841f1e5fe6e5ea57c64f4d794a14cf12fa SHA512 9bf9a940f276a9686bbaaf2b2ad07813d119e2d1e7bf1d8dee0a5db7ade6f2dc3f5d9a0b7c114560b6ec8fcf159280d06e6ca02862b9209bf75c6bbe07ad3df0 WHIRLPOOL 80a83bff799137a0ed76bb04cb9592aac557e02b42199d1f810c135171b8b7d85372dadd0c351180625ad9930f69971bdd4c365699eabb199a5ce924e6a8763d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iF4EAREIAAYFAlRXYMsACgkQVxOqA9G7/aC69QEAiyurnBAhVvLMXD8g8rswoDzG -sjqcpK9U1tKClGaOxsIBAIpx2wOp8pI8eYeYdcdN2pbO8Dxv1uPU33oQINT+85lD -=6EIr +iQEcBAEBCAAGBQJUggU7AAoJEAmJmMX429reM70H/RhiweTLH11W60wXbO4KCqXH +6gROeOaSTo5AG4YCAdmt4yHoGSznLHmBOmZUf9Ux/82ANk65uwoLtDwSB4miFIo9 +RGSWEXAitZMctoX9Qao355A7NnudK+B7Y9wDNTBCrBf8zF1oMZ7LHwmgbeIFCN2K +drgnVud05zymkzPdXQMDUBYQxKLlNhElCaGrTKogH1bRxLcEBrktFqRyyj0ec/NE +HVwIkzxd60K3BLx4WN9f/smeo9/rRLsxV5LpfuCfBzx0Cr5hrFopYt1Hc8APcMYv +ef+vrWjTGEXdAtzwlcgZ3Yv/LipNa1fQC9PxDnRb6Eh9zaiJXCarksUfAoEdJ0U= +=1xb1 -----END PGP SIGNATURE----- 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-1.0.0_rc3.ebuild similarity index 69% rename from app-admin/sagan/sagan-0.2.2_p2-r2.ebuild rename to app-admin/sagan/sagan-1.0.0_rc3.ebuild index cdb86a6d2146..64bf3a796d5b 100644 --- a/app-admin/sagan/sagan-0.2.2_p2-r2.ebuild +++ b/app-admin/sagan/sagan-1.0.0_rc3.ebuild @@ -1,42 +1,45 @@ # 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 $ +# $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 -EAPI=4 AUTOTOOLS_AUTORECONF=1 -MY_PV="0.2.2-r2" +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.softwink.com/" -SRC_URI="http://sagan.softwink.com/download/${PN}-${MY_PV}.tar.gz" +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="smtp +mysql postgres prelude snort +lognorm +libdnet +pcap" - -DEPEND="virtual/pkgconfig - ${RDEPEND}" +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 ) - postgres? ( virtual/postgresql ) - prelude? ( dev-libs/libprelude ) - lognorm? ( dev-libs/liblognorm ) + 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 ) " -AUTOTOOLS_IN_SOURCE_BUILD=1 -DOCS=(AUTHORS ChangeLog FAQ INSTALL README NEWS TODO) -PATCHES=( "${FILESDIR}"/mysql_check.patch ) +DEPEND="virtual/pkgconfig + ${RDEPEND}" -S="${WORKDIR}/${PN}-${MY_PV}" +DOCS=( AUTHORS ChangeLog FAQ INSTALL README NEWS TODO ) +PATCHES=( "${FILESDIR}"/json_header_location.patch ) +S="${WORKDIR}/sagan-1.0.0RC3/" pkg_setup() { enewgroup sagan @@ -45,15 +48,13 @@ pkg_setup() { 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) - ) + $(use_enable geoip) + ) autotools-utils_src_configure } @@ -70,7 +71,7 @@ src_install() { touch "${ED}"/var/log/sagan/sagan.log chown sagan.sagan "${ED}"/var/log/sagan/sagan.log - newinitd "${FILESDIR}"/sagan.init sagan + newinitd "${FILESDIR}"/sagan.init-r1 sagan newconfd "${FILESDIR}"/sagan.confd sagan insinto /usr/share/doc/${PF}/examples -- 2.26.2