commit: 8fd1adf3979ea262690000ae1c3069c7ece0dbdd Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Feb 11 02:09:50 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Feb 11 02:10:15 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fd1adf3
app-admin/sagan: port to EAPI 7 Closes: https://bugs.gentoo.org/756871 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/sagan-1.0.0-liblognorm-json-c.patch | 10 +++--- app-admin/sagan/sagan-1.0.0_rc3-r1.ebuild | 33 +++++++++++-------- app-admin/sagan/sagan-1.0.0_rc3.ebuild | 37 ++++++++++++---------- 3 files changed, 44 insertions(+), 36 deletions(-) diff --git a/app-admin/sagan/files/sagan-1.0.0-liblognorm-json-c.patch b/app-admin/sagan/files/sagan-1.0.0-liblognorm-json-c.patch index f9540652717..a1b3fb290f5 100644 --- a/app-admin/sagan/files/sagan-1.0.0-liblognorm-json-c.patch +++ b/app-admin/sagan/files/sagan-1.0.0-liblognorm-json-c.patch @@ -1,6 +1,5 @@ -diff -rupN old/sagan-1.0.0RC3/configure.ac new/sagan-1.0.0RC3/configure.ac ---- old/sagan-1.0.0RC3/configure.ac 2014-06-16 22:23:22.000000000 +0200 -+++ new/sagan-1.0.0RC3/configure.ac 2015-10-11 21:04:26.493632624 +0200 +--- a/configure.ac ++++ b/configure.ac @@ -192,29 +192,15 @@ If you're not interested in libesmtp sup fi @@ -40,9 +39,8 @@ diff -rupN old/sagan-1.0.0RC3/configure.ac new/sagan-1.0.0RC3/configure.ac if test "$LIBPCAP" = "yes"; then AC_MSG_RESULT([------- libpcap support is enabled -------]) -diff -rupN old/sagan-1.0.0RC3/src/Makefile.am new/sagan-1.0.0RC3/src/Makefile.am ---- old/sagan-1.0.0RC3/src/Makefile.am 2014-06-16 22:23:22.000000000 +0200 -+++ new/sagan-1.0.0RC3/src/Makefile.am 2015-10-11 21:05:28.754492699 +0200 +--- a/src/Makefile.am ++++ b/src/Makefile.am @@ -2,6 +2,9 @@ AUTOMAKE_OPIONS=foreign no-dependencies bin_PROGRAMS = sagan diff --git a/app-admin/sagan/sagan-1.0.0_rc3-r1.ebuild b/app-admin/sagan/sagan-1.0.0_rc3-r1.ebuild index c9406818811..c8aa88cac0d 100644 --- a/app-admin/sagan/sagan-1.0.0_rc3-r1.ebuild +++ b/app-admin/sagan/sagan-1.0.0_rc3-r1.ebuild @@ -1,22 +1,21 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -AUTOTOOLS_AUTORECONF=1 -AUTOTOOLS_IN_SOURCE_BUILD=1 - -inherit eutils autotools-utils user flag-o-matic +inherit autotools flag-o-matic 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"; +S="${WORKDIR}/sagan-1.0.0RC3/" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="geoip +libdnet +lognorm mysql +pcap smtp snort" +BDEPEND="virtual/pkgconfig" RDEPEND="dev-libs/libpcre app-admin/sagan-rules[lognorm?] smtp? ( net-libs/libesmtp ) @@ -31,9 +30,7 @@ RDEPEND="dev-libs/libpcre snort? ( >=net-analyzer/snortsam-2.50 ) geoip? ( dev-libs/geoip ) " - -DEPEND="virtual/pkgconfig - ${RDEPEND}" +DEPEND="${RDEPEND}" # Package no longer logs directly to a database # and relies on Unified2 format to accomplish it @@ -42,14 +39,22 @@ RDEPEND="${RDEPEND} mysql? ( net-analyzer/barnyard2[mysql] )" REQUIRED_USE="mysql? ( libdnet )" DOCS=( AUTHORS ChangeLog FAQ INSTALL README NEWS TODO ) -PATCHES=( "${FILESDIR}"/${PN}-1.0.0-liblognorm-json-c.patch ) -S="${WORKDIR}/sagan-1.0.0RC3/" + +PATCHES=( + "${FILESDIR}"/${PN}-1.0.0-liblognorm-json-c.patch +) pkg_setup() { enewgroup sagan enewuser sagan -1 -1 /dev/null sagan } +src_prepare() { + default + + eautoreconf +} + src_configure() { append-flags -fcommon @@ -62,11 +67,11 @@ src_configure() { $(use_enable geoip) ) - autotools-utils_src_configure + econf "${myeconfargs[@]}" } src_install() { - autotools-utils_src_install + default diropts -g sagan -o sagan -m 775 @@ -74,8 +79,8 @@ src_install() { keepdir /var/log/sagan - touch "${ED}"/var/log/sagan/sagan.log - chown sagan.sagan "${ED}"/var/log/sagan/sagan.log + touch "${ED}"/var/log/sagan/sagan.log || die + chown sagan.sagan "${ED}"/var/log/sagan/sagan.log || die newinitd "${FILESDIR}"/sagan.init-r1 sagan newconfd "${FILESDIR}"/sagan.confd sagan diff --git a/app-admin/sagan/sagan-1.0.0_rc3.ebuild b/app-admin/sagan/sagan-1.0.0_rc3.ebuild index 2fe8dd00f3c..9b3b1068ece 100644 --- a/app-admin/sagan/sagan-1.0.0_rc3.ebuild +++ b/app-admin/sagan/sagan-1.0.0_rc3.ebuild @@ -1,22 +1,21 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -AUTOTOOLS_AUTORECONF=1 -AUTOTOOLS_IN_SOURCE_BUILD=1 - -inherit eutils autotools-utils user flag-o-matic +inherit autotools flag-o-matic 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"; +S="${WORKDIR}/sagan-1.0.0RC3/" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" IUSE="geoip +libdnet +lognorm mysql +pcap smtp snort" +BDEPEND="virtual/pkgconfig" RDEPEND="dev-libs/libpcre app-admin/sagan-rules[lognorm?] smtp? ( net-libs/libesmtp ) @@ -27,24 +26,30 @@ RDEPEND="dev-libs/libpcre 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}" +" +DEPEND="${RDEPEND}" DOCS=( AUTHORS ChangeLog FAQ INSTALL README NEWS TODO ) -PATCHES=( "${FILESDIR}"/${PN}-1.0.0-liblognorm-json-c.patch ) -S="${WORKDIR}/sagan-1.0.0RC3/" + +PATCHES=( + "${FILESDIR}"/${PN}-1.0.0-liblognorm-json-c.patch +) pkg_setup() { enewgroup sagan enewuser sagan -1 -1 /dev/null sagan } +src_prepare() { + default + + eautoreconf +} + src_configure() { append-flags -fcommon @@ -57,11 +62,11 @@ src_configure() { $(use_enable geoip) ) - autotools-utils_src_configure + econf "${myeconfargs[@]}" } src_install() { - autotools-utils_src_install + default diropts -g sagan -o sagan -m 775 @@ -69,8 +74,8 @@ src_install() { keepdir /var/log/sagan - touch "${ED}"/var/log/sagan/sagan.log - chown sagan.sagan "${ED}"/var/log/sagan/sagan.log + touch "${ED}"/var/log/sagan/sagan.log || die + chown sagan.sagan "${ED}"/var/log/sagan/sagan.log || die newinitd "${FILESDIR}"/sagan.init-r1 sagan newconfd "${FILESDIR}"/sagan.confd sagan
