gentoo resync : 24.07.2021

6 files changed, 9 insertions, 189 deletions

diff --git a/app-admin/sagan/Manifest b/app-admin/sagan/Manifest
index 9b4086b3e747..d73a80f70e15 100644
--- a/app-admin/sagan/Manifest
+++ b/app-admin/sagan/Manifest
@@ -1,12 +1,8 @@
-AUX sagan-1.0.0-liblognorm-json-c.patch 2472 BLAKE2B dc04f9949709523c3516d7b9693bba7aca5ff354c9c40df30fa16d668c3e08bb79f49f97806bc3659022ffb9a499f9ea843022c68045ffc2d43dcf7ac5e7ba42 SHA512 15308ca18901a9f6ca069f2067d83199b7461a6fcdfc54f171796ebf4578c2ccf19ecf2737aae0e03a21927f959aac1688e5c0e319b3dcf30a2dde4643b53ea5
 AUX sagan.confd 239 BLAKE2B 2ca76c1bd5bdb7b29f007a4d93602f020f76b10d6e4313e138e09b49de0b0c6796bc729f32e88831881bdcd52637bfb3a8e42481d89a09648a2833a000570ace SHA512 7ee746984d3bb3361e3155860d54e307f9b94b9e3f98c09c29b4259cd37d7aefe969b5b942c04048328ec23265a2689b22403c32e3552b8062201aca2ef3ac34
-AUX sagan.init 432 BLAKE2B 561344909a8f6610504f91bf72ba6fa89ac03fdacacd3189372f466b690b3421c3f1a8ce4750b747c53613c75f9b61696ec7b3c490597eb0eca36ebece23a26e SHA512 c5ec82e48ac33785a0e63deb6b2079e97a2f9b5f96682ccbf646b4deae5782cbceb5756b17fdff7af8cafd4e561e298d842c4c4f4aa5229ccc58f5f0fc06e6f7
 AUX sagan.init-r1 424 BLAKE2B e6fdd676e772d2abfca02215026a95321edecb41fcbeec3aa45afe15abd667e323ec2f21375d41c692b9648017002c0b410d551034dcbd3f060f5bb1e2f95026 SHA512 341754a9b18fa4b4082a852cec2eaa5ea78be33eb9d8cdef5b7ec61a9d67d3b264b2c6a2aef030bd85d3644539447345c88fd23ebe99145e40f990f565706809
 AUX sagan.logrotate 239 BLAKE2B d3feae0843f34cc66ae930b694924a5a79ad580356c338e5f7473530a4fdd3bbadf4a849c749481dd281940b7116f4778bec55436b966df5ffdea0fc26ae9c2f SHA512 20111f2d1131c58fbd2b11e9c0946e53f100a09042d1c2e7a0204647523afe581da5f3777ce215e7da37d9ed9fa99663e31733d7d4df0cff31ebaea37a816b2e
 AUX sagan.service 277 BLAKE2B 524e83a05a0a7e8f83585add01f3365f573dbb0d1dc773ab68b42078267cad1d45f3cf872dfdf2048f8639d1c6edfdf94d5b7c31d7f5760f86430e7b84db6ee4 SHA512 ba8efb9e7f42f15789d63bc7ae0a4c77391ae14c1bb44924634f9fb63c8f2b44d920bce564d60e10816f605c3e6ef572438ca637c9853a350d551462a502a723
 AUX sagan.tmpfiles 32 BLAKE2B c00a177b7ea9df47a878783f3372f6d9709ea50e6c8bdde81f7d84bd01ecae1b084cf26ac4d5eeb891034fad29fc67802c557d495d312deb4fb3425a112bfe2f SHA512 7c65575415eaabdad9864f9af14042def57d9de24b4306037f78eda00b4c4d7de5a3b4849a316ee7519a239db2848cf94fb862a23c4b126575d200903389df22
-DIST sagan-1.0.0RC3.tar.gz 285207 BLAKE2B 7322ffc73a8e86f07ef106b04feb9140ba94a51b9e286ef0c0b0d3fa609e8e03cef4c75e1d32502c1b70a4c078d8601d2a1c58058137bb793c8a52cecc4be20b SHA512 29388a339b290bb4de2359c0c54b9e1d43ef207b223a499a1a4faa36de4d9590a777a796dd773948e995d052b71f3ef47ca5bad5c133116c4dbb53b4fe336123
 DIST sagan-2.0.1.tar.gz 487936 BLAKE2B 84a137bb0001c6758979d17cf67442262f732f7d49ce397183c0c226d6135e2c3cd8362452ef6b893e75a9cf5e874256d88f740b94df0dfa39587fc771ad4f8d SHA512 0cc288b67f641346bb0dbfcac2682c8c2b09e3e508b94dd5b2d5a81c2a80c7989f1d54725041210511877bd6b2338e8b0fdcae01f7084d39d48abef073d1fe64
-EBUILD sagan-1.0.0_rc3-r1.ebuild 2237 BLAKE2B d911a530d495310f1e98294063d5a181cd391fde4c5385f0f79c206c75caf735d3a1edb7f14c9cee86d8248b601dcadc7c229dce09f010e06e8e15bb55fc892a SHA512 c26f4a6bdb8c8f51b4b98e202f25351e202ad57f350ad7eda2d6982dc109aebfaa06bdd10cd4818fbb1f8ae12b7a1efba5b962cb67de0a130937fbaf2cd4ba6d
-EBUILD sagan-2.0.1-r4.ebuild 3219 BLAKE2B 2fa76b99db74c9b4e74ad01f8b0dcf40d186c55cd8345910045b67723db4d84403e765e28312c0ff2ceb708a2a3713f4ab0dd6e91e20bb8a74a96c18fbde1a02 SHA512 e31b945927f06265217a76c3f597f9e15d841602c3eb1e5bfa53afdeb3ff57e8032f91042a4cd9a9ed5efa020ad0f9b5bf0c35aaee903ae399447127f0024bfe
-MISC metadata.xml 805 BLAKE2B fe11cb2f2a1d73d2c8da9ef9df8abe1974e4e8ac95a0c91e3eca63828a3db2f8872c43961af2b279a942e299c1b2bc7a1ecd781b3051d92775339b2653c27ee0 SHA512 9a85b9166631c8522f4939876af5a9094f1637659d1ffce0c72707415a9433e0075cc240e2222e101640e21e9fc6f514c37d347915831254edf8e08e7239042d
+EBUILD sagan-2.0.1-r5.ebuild 3175 BLAKE2B 468db3eac3ac60b1b8987dbfbf2be71615995d1f5a7e4eebf540f70f2f92b73bed5fa97bf715831ab891c3e2095d1cd110e4a41c5c84c7a87d4c3c9207456643 SHA512 657806dda8e3cc565bc6cdc942e9d0edcc58e5da94a20a14a5b360e37ee9b2c1713039a8547c22ecf376875ce4331052654de6add33197ca31375f444239c677
+MISC metadata.xml 592 BLAKE2B dc7dff5c573af3496c1edadbde487e16db5af058d3b09d9ffd09b5044726e3c65ab6b84b4de2a009a7d04bab7942003e9fb5e093c41ec9ae68286b36ad12be61 SHA512 6f401f45231af2a53173626339d906113e9fc3bbccde3e72ef2ed0bafe35110861e689a3a8c8862fa671013da0e97a0375d2a1b4165e954b8afcb34e6d91cd8f
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
deleted file mode 100644
index a1b3fb290f50..000000000000
--- a/app-admin/sagan/files/sagan-1.0.0-liblognorm-json-c.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -192,29 +192,15 @@ If you're not interested in libesmtp sup
-        fi
- 
- 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.
--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.])]) 
--       AC_CHECK_LIB(estr, main,,AC_MSG_ERROR(The libestr library cannot be found.
--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. ))
--       AC_CHECK_LIB(ee, main,,AC_MSG_ERROR(The libee library cannot be found.
--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. ))
--       AC_CHECK_LIB(lognorm, main,,AC_MSG_ERROR(The liblognorm library cannot be found.
--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. ))
--       AC_CHECK_LIB(json, json_object_put,, [ AC_CHECK_LIB(json-c, json_object_put,,AC_MSG_ERROR(The json library cannot be found.
--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.)) ],)
--       fi
-+	AC_MSG_RESULT([------- liblognorm support is enabled -------])
-+
-+	PKG_CHECK_MODULES(LIBEE, libee >= 0.3.2)
-+	PKG_CHECK_MODULES(LIBESTR, libestr >= 0.1.9)
-+	PKG_CHECK_MODULES([JSON_C], [json-c],, [
-+		PKG_CHECK_MODULES([JSON_C], [json],,)
-+	])
-+	PKG_CHECK_MODULES(LIBLOGNORM, lognorm >= 1.0.2)
-+fi
- 
- if test "$LIBPCAP" = "yes"; then
-        AC_MSG_RESULT([------- libpcap support is enabled -------])
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -2,6 +2,9 @@ AUTOMAKE_OPIONS=foreign no-dependencies
- 
- bin_PROGRAMS = sagan
- 
-+sagan_CFLAGS = $(JSON_C_CFLAGS) $(LIBESTR_CFLAGS) $(LIBLOGNORM_CFLAGS)
-+sagan_LDFLAGS = $(JSON_C_LIBS) $(LIBESTR_LIBS) $(LIBLOGNORM_LIBS)
-+
- sagan_SOURCES = sagan.c \
- sagan-classifications.c \
- sagan-config.c \
diff --git a/app-admin/sagan/files/sagan.init b/app-admin/sagan/files/sagan.init
deleted file mode 100644
index 99f1f24e3bfa..000000000000
--- a/app-admin/sagan/files/sagan.init
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 /var/run/sagan
-    checkpath -p -o sagan -m 0644 /var/run/sagan/sagan.fifo
-}
diff --git a/app-admin/sagan/metadata.xml b/app-admin/sagan/metadata.xml
index 4a81536f6250..69fe306ea6a4 100644
--- a/app-admin/sagan/metadata.xml
+++ b/app-admin/sagan/metadata.xml
@@ -4,11 +4,9 @@
 	<!-- maintainer-needed -->
 	<use>
 		<flag name="smtp">Build witch SMTP (E-Mail) support</flag>
-		<flag name="lognorm">Add support for log/rules normalizations via <pkg>dev-libs/liblognorm</pkg></flag>
 		<flag name="redis">Add support for the Redis database via <pkg>dev-libs/hiredis</pkg></flag>
 		<flag name="pcap">Add support for network packet capture via <pkg>net-libs/libpcap</pkg></flag>
 		<flag name="libdnet">Add support for <pkg>dev-libs/libdnet</pkg></flag>
-		<flag name="snort">Add support to interact with Snort IDE using  <pkg>net-analyzer/snortsam</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="github">quadrantsec/sagan</remote-id>
diff --git a/app-admin/sagan/sagan-1.0.0_rc3-r1.ebuild b/app-admin/sagan/sagan-1.0.0_rc3-r1.ebuild
deleted file mode 100644
index 959ab0672dc9..000000000000
--- a/app-admin/sagan/sagan-1.0.0_rc3-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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="
-	app-admin/sagan-rules[lognorm?]
-	dev-libs/libpcre
-	geoip? ( dev-libs/geoip )
-	lognorm? (
-		dev-libs/liblognorm
-		dev-libs/json-c:=
-		dev-libs/libee
-		dev-libs/libestr
-	)
-	libdnet? ( dev-libs/libdnet )
-	pcap? ( net-libs/libpcap )
-	smtp? ( net-libs/libesmtp )
-	snort? ( >=net-analyzer/snortsam-2.50 )
-"
-DEPEND="${RDEPEND}"
-
-# Package no longer logs directly to a database
-# and relies on Unified2 format to accomplish it
-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
-)
-
-pkg_setup() {
-	enewgroup sagan
-	enewuser sagan -1 -1 /dev/null sagan
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fcommon
-
-	local myeconfargs=(
-		$(use_enable smtp esmtp)
-		$(use_enable lognorm)
-		$(use_enable libdnet)
-		$(use_enable pcap libpcap)
-		$(use_enable snort snortsam)
-		$(use_enable geoip)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	diropts -g sagan -o sagan -m 775
-
-	dodir /var/log/sagan
-
-	keepdir /var/log/sagan
-
-	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
-
-	docinto examples
-	dodoc -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-2.0.1-r4.ebuild b/app-admin/sagan/sagan-2.0.1-r5.ebuild
index 6cd0b6adfd46..77ee263296c7 100644
--- a/app-admin/sagan/sagan-2.0.1-r4.ebuild
+++ b/app-admin/sagan/sagan-2.0.1-r5.ebuild
@@ -11,22 +11,20 @@ SRC_URI="https://sagan.quadrantsec.com/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="geoip +libdnet +lognorm mysql redis +pcap smtp"
+KEYWORDS="amd64 x86"
+IUSE="geoip +libdnet mysql redis +pcap smtp"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="
 	acct-group/sagan
 	acct-user/sagan
-	app-admin/sagan-rules[lognorm?]
+	app-admin/sagan-rules
+	dev-libs/libestr
+	dev-libs/libfastjson:=
+	dev-libs/liblognorm
 	dev-libs/libpcre
 	dev-libs/libyaml
 	geoip? ( dev-libs/geoip )
-	lognorm? (
-		dev-libs/liblognorm
-		dev-libs/libfastjson:=
-		dev-libs/libestr
-	)
 	redis? ( dev-libs/hiredis )
 	pcap? ( net-libs/libpcap )
 	smtp? ( net-libs/libesmtp )
@@ -57,8 +55,8 @@ src_configure() {
 	# Note that not all of these are used:
 	# https://github.com/quadrantsec/sagan/blob/main/m4/ax_ext.m4
 	local myeconfargs=(
+		--enable-lognorm
 		$(use_enable smtp esmtp)
-		$(use_enable lognorm)
 		$(use_enable redis)
 		$(use_enable pcap libpcap)
 		$(use_enable geoip)