[gentoo-commits] repo/gentoo:master commit in: net-analyzer/ossec-hids/, net-analyzer/ossec-hids/files/
commit: cc358dded272e5f8313f7ec2762af2f11f6c
Author: Ralph Seichter seichter de>
AuthorDate: Sun May 24 15:02:32 2020 +
Commit: Aaron Bauman gentoo org>
CommitDate: Thu Jun 4 17:05:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc35
net-analyzer/ossec-hids: Add GCC -fno-common fix
Add an upstream-provided fix for the impending GCC-10 change regarding
the -fno-common flag.
Bugs: https://bugs.gentoo.org/720088
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Ralph Seichter seichter.de>
Closes: https://github.com/gentoo/gentoo/pull/15953
Signed-off-by: Aaron Bauman gentoo.org>
.../ossec-hids/files/gcc-fno-common-3.6.0.patch| 402 +
net-analyzer/ossec-hids/ossec-hids-3.6.0.ebuild| 9 +-
2 files changed, 410 insertions(+), 1 deletion(-)
diff --git a/net-analyzer/ossec-hids/files/gcc-fno-common-3.6.0.patch
b/net-analyzer/ossec-hids/files/gcc-fno-common-3.6.0.patch
new file mode 100644
index 000..e8ed3c66dd9
--- /dev/null
+++ b/net-analyzer/ossec-hids/files/gcc-fno-common-3.6.0.patch
@@ -0,0 +1,402 @@
+diff --git a/src/addagent/main.c b/src/addagent/main.c
+index 587a8a3d8..ab12f0326 100644
+--- a/src/addagent/main.c
b/src/addagent/main.c
+@@ -17,6 +17,7 @@ static void print_banner(void);
+ static void manage_shutdown(int sig) __attribute__((noreturn));
+ #endif
+
++int willchroot;
+
+ #if defined(__MINGW32__)
+ static int setenv(const char *name, const char *val, __attribute__((unused))
int overwrite)
+diff --git a/src/addagent/manage_agents.c b/src/addagent/manage_agents.c
+index ac39c1e66..4f9c266ff 100644
+--- a/src/addagent/manage_agents.c
b/src/addagent/manage_agents.c
+@@ -85,6 +85,8 @@ int add_agent(int json_output)
+
+ char authfile[257];
+
++extern int willchroot;
++
+ if(willchroot > 0) {
+ snprintf(authfile, 256, "%s", AUTH_FILE); //XXX
+ } else {
+diff --git a/src/addagent/manage_agents.h b/src/addagent/manage_agents.h
+index 4812dba43..f2962e80b 100644
+--- a/src/addagent/manage_agents.h
b/src/addagent/manage_agents.h
+@@ -147,4 +147,4 @@ extern fpos_t fp_pos;
+ #define GMF_UNKN_ERROR ARGV0 ": Could not run GetModuleFileName which
returned (%ld).\n"
+
+
+-int willchroot;
++//int willchroot;
+diff --git a/src/addagent/manage_keys.c b/src/addagent/manage_keys.c
+index 146b48326..ffb9a1f21 100644
+--- a/src/addagent/manage_keys.c
b/src/addagent/manage_keys.c
+@@ -336,6 +336,8 @@ int k_bulkload(const char *cmdbulk)
+ char delims[] = ",";
+ char *token = NULL;
+
++extern int willchroot;
++
+ /* Check if we can open the input file */
+ printf("Opening: [%s]\n", cmdbulk);
+ infp = fopen(cmdbulk, "r");
+diff --git a/src/analysisd/analysisd.c b/src/analysisd/analysisd.c
+index a220f4421..0a81971de 100644
+--- a/src/analysisd/analysisd.c
b/src/analysisd/analysisd.c
+@@ -42,7 +42,12 @@
+ #endif
+
+ #ifdef SQLITE_ENABLED
+-#include "syscheck-sqlite.h"
++#include
++sqlite3 *conn;
++#endif
++
++#ifdef LIBGEOIP_ENABLED
++GeoIP *geoipdb;
+ #endif
+
+ /** Prototypes **/
+diff --git a/src/analysisd/config.h b/src/analysisd/config.h
+index 8d74c756e..976d1942e 100644
+--- a/src/analysisd/config.h
b/src/analysisd/config.h
+@@ -12,6 +12,7 @@
+
+ #include "config/config.h"
+ #include "config/global-config.h"
++
+ #ifdef LIBGEOIP_ENABLED
+ #include "GeoIP.h"
+ #endif
+@@ -20,9 +21,11 @@
+ extern long int __crt_ftell; /* Global ftell pointer */
+ extern _Config Config; /* Global Config structure */
+
++/*
+ #ifdef LIBGEOIP_ENABLED
+ GeoIP *geoipdb;
+ #endif
++*/
+
+ int GlobalConf(const char *cfgfile);
+
+diff --git a/src/analysisd/decoders/geoip.c b/src/analysisd/decoders/geoip.c
+index 464e4bb71..9816b4c81 100644
+--- a/src/analysisd/decoders/geoip.c
b/src/analysisd/decoders/geoip.c
+@@ -30,6 +30,7 @@ char *GetGeoInfobyIP(char *ip_addr)
+ GeoIPRecord *geoiprecord;
+ char *geodata = NULL;
+ char geobuffer[256 +1];
++extern GeoIP *geoipdb;
+
+ if(!geoipdb)
+ {
+diff --git a/src/analysisd/decoders/syscheck.c
b/src/analysisd/decoders/syscheck.c
+index a6d675892..30339a00d 100644
+--- a/src/analysisd/decoders/syscheck.c
b/src/analysisd/decoders/syscheck.c
+@@ -16,7 +16,7 @@
+ #include "decoder.h"
+
+ #ifdef SQLITE_ENABLED
+-#include "syscheck-sqlite.h"
++#include
+ #endif
+
+ typedef struct __sdb {
+diff --git a/src/analysisd/makelists.c b/src/analysisd/makelists.c
+index 06c90db70..dfbe6a4a3 100644
+--- a/src/analysisd/makelists.c
b/src/analysisd/makelists.c
+@@ -32,6 +32,10 @@ time_t c_time;
+ char __shost[512];
+ OSDecoderInfo *NULL_Decoder;
+
++#ifdef LIBGEOIP_ENABLED
++GeoIP *geoipdb;
++#endif
++
+ /* print help statement */
+ __attribute__((noreturn))
+ static void help_makelists(void)
+diff --git a/src/analysisd/syscheck-sqlite.h b/src/analysisd/syscheck-sqlite.h
+deleted file mode 100644
+index 526cab26e..0
+---
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/ossec-hids/, net-analyzer/ossec-hids/files/
commit: cc56e191d778f684fd3da1ae45c10e1ff3cd2f9e
Author: Ralph Seichter seichter de>
AuthorDate: Fri Jun 28 17:29:32 2019 +
Commit: Michał Górny gentoo org>
CommitDate: Fri Jul 5 17:30:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc56e191
net-analyzer/ossec-hids: Fix build issue, version bump
Added enewgroup to fix bug #688892. Updated to release 3.3.0.
Closes: https://bugs.gentoo.org/688892
Signed-off-by: Ralph Seichter seichter.de>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
Closes: https://github.com/gentoo/gentoo/pull/12350
Signed-off-by: Michał Górny gentoo.org>
net-analyzer/ossec-hids/Manifest | 1 +
net-analyzer/ossec-hids/files/makefile-3.3.0.patch | 28 +
net-analyzer/ossec-hids/ossec-hids-3.3.0.ebuild| 67 ++
3 files changed, 96 insertions(+)
diff --git a/net-analyzer/ossec-hids/Manifest b/net-analyzer/ossec-hids/Manifest
index 9fd4fe3f66d..e33470f61e0 100644
--- a/net-analyzer/ossec-hids/Manifest
+++ b/net-analyzer/ossec-hids/Manifest
@@ -1,2 +1,3 @@
DIST ossec-hids-3.1.0.tar.gz 1886469 BLAKE2B
c175c8659a8b5d0d269a5cb6bf142276f29e6f676afc6029accf854d68299d71147ba65a667601e77c6db8ca49a29afa49534e5683369f420f6389059ae61fc3
SHA512
fe55f82ac354d9fcd767d8379a492279644308788535780bb029d46688c93f259771686462570137555b40082c6756daad44bbdd1ddc953ed0bb22b65c6cb566
DIST ossec-hids-3.2.0.tar.gz 1896977 BLAKE2B
d77cff3a3a72287ad2235f346c7d07cfdad83872d956f57877ed44ad21bb717e4b4ddcfd0e8b2ce45cb90160bb63a28a7d06bc6225b53cc5ed42f7a97c5a1765
SHA512
40b25b97c43a66b8a145914ab0badd9d4f7de7d2168aa7a49abdf778c620a4b533ce3de0883d26c4c39816cf78674a053788a57c5f9c38fbea7cd8b13a35d18f
+DIST ossec-hids-3.3.0.tar.gz 1900070 BLAKE2B
a18a1e55ba44450c634b59099f10b674d27b2079ff456a034dc7bb4bbaf3c89b96f197515f3fb7aa54c248643f333e830a519b04cd4a9402cec2c32597fd96b2
SHA512
97c7e7b21ce88a3f1c89b79ff74b0c13804ba313cf3f30b98bcb4011f422ca050876e780c30624812d399d6b5c59629e52f6772b9ee0cd7cead1d66044dca627
diff --git a/net-analyzer/ossec-hids/files/makefile-3.3.0.patch
b/net-analyzer/ossec-hids/files/makefile-3.3.0.patch
new file mode 100644
index 000..810bc077d43
--- /dev/null
+++ b/net-analyzer/ossec-hids/files/makefile-3.3.0.patch
@@ -0,0 +1,28 @@
+--- a/Makefile 2019-03-09 16:33:13.465947636 +0100
b/Makefile 2019-03-09 16:32:57.105946856 +0100
+@@ -370,7 +370,6 @@
+ install-server: install-server-generic
+
+ install-common: build
+- ./init/adduser.sh ${OSSEC_USER} ${OSSEC_USER_MAIL} ${OSSEC_USER_REM}
${OSSEC_GROUP} ${PREFIX}
+ $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/
+ $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/logs
+ $(call INSTALL_CMD,0660,${OSSEC_USER},${OSSEC_GROUP}) /dev/null
${PREFIX}/logs/ossec.log
+@@ -1160,7 +1159,7 @@
+ test ##
+
+
+-CFLAGS_TEST = -g -O0 --coverage
++CFLAGS_TEST = -g -O0
+
+ LDFLAGS_TEST = -lcheck -lm -pthread -lrt
+
+@@ -1171,7 +1170,7 @@
+
+ test_programs = test_os_zlib test_os_xml test_os_regex test_os_crypto
test_shared
+
+-.PHONY: test run_tests build_tests test_valgrind test_coverage
++.PHONY: test run_tests build_tests test_valgrind
+
+ test: build_tests
+ ${MAKE} run_tests
diff --git a/net-analyzer/ossec-hids/ossec-hids-3.3.0.ebuild
b/net-analyzer/ossec-hids/ossec-hids-3.3.0.ebuild
new file mode 100644
index 000..c9b83c7daa3
--- /dev/null
+++ b/net-analyzer/ossec-hids/ossec-hids-3.3.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user
+
+DESCRIPTION="Open Source Host-based Intrusion Detection System"
+HOMEPAGE="https://www.ossec.net/;
+SRC_URI="https://github.com/ossec/ossec-hids/archive/${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="agent hybrid local mysql postgres server sqlite"
+REQUIRED_USE="^^ ( agent hybrid local server )
+ ?? ( mysql postgres )"
+
+DEPEND="dev-libs/libpcre2
+ mysql? ( virtual/mysql )
+ sqlite? ( dev-db/sqlite:3 )
+ postgres? ( dev-db/postgresql:= )"
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/${P}/src"
+PATCHES=( "${FILESDIR}/makefile-${PV}.patch" )
+
+declare -a MY_OPT
+
+pkg_setup() {
+ enewgroup ossec
+ enewuser ossec -1 -1 /var/ossec ossec
+ enewuser ossecm -1 -1 -1 ossec
+ enewuser ossecr -1 -1 -1 ossec
+}
+
+src_configure() {
+ local target="local"
+ use agent && target="agent"
+ use hybrid && target="hybrid"
+ use server && target="server"
+ MY_OPT=(
+ PCRE2_SYSTEM=yes
+ TARGET=${target}
+ USE_SQLITE=$(usex sqlite)
+ V=0
+ ZLIB_SYSTEM=yes
+ )
+ use mysql && MY_OPT+=( DATABASE=mysql )
+ use postgres && MY_OPT+=( DATABASE=pgsql )
+}
+
+src_compile() {
+ emake "${MY_OPT[@]}" PREFIX=/var/ossec
+}
+
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/ossec-hids/, net-analyzer/ossec-hids/files/
commit: 9fcab634ffa351e9821d8ae2539aef280f751a25
Author: Ralph Seichter seichter de>
AuthorDate: Sat Oct 20 19:30:21 2018 +
Commit: Michał Górny gentoo org>
CommitDate: Tue Oct 30 10:27:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fcab634
net-analyzer/ossec-hids: open source HIDS (new package)
OSSEC is a full platform to monitor and control your systems. It mixes
together all the aspects of HIDS (host-based intrusion detection), log
monitoring and SIM/SIEM together in a simple, powerful and open source
solution.
Signed-off-by: Ralph Seichter seichter.de>
Closes: https://bugs.gentoo.org/545788
Package-Manager: Portage-2.3.49, Repoman-2.3.11
Closes: https://github.com/gentoo/gentoo/pull/10189
Signed-off-by: Michał Górny gentoo.org>
net-analyzer/ossec-hids/Manifest| 1 +
net-analyzer/ossec-hids/files/makefile.patch| 28 ++
net-analyzer/ossec-hids/metadata.xml| 30 +++
net-analyzer/ossec-hids/ossec-hids-3.1.0.ebuild | 68 +
4 files changed, 127 insertions(+)
diff --git a/net-analyzer/ossec-hids/Manifest b/net-analyzer/ossec-hids/Manifest
new file mode 100644
index 000..f36a96f0d3e
--- /dev/null
+++ b/net-analyzer/ossec-hids/Manifest
@@ -0,0 +1 @@
+DIST ossec-hids-3.1.0.tar.gz 1886469 BLAKE2B
c175c8659a8b5d0d269a5cb6bf142276f29e6f676afc6029accf854d68299d71147ba65a667601e77c6db8ca49a29afa49534e5683369f420f6389059ae61fc3
SHA512
fe55f82ac354d9fcd767d8379a492279644308788535780bb029d46688c93f259771686462570137555b40082c6756daad44bbdd1ddc953ed0bb22b65c6cb566
diff --git a/net-analyzer/ossec-hids/files/makefile.patch
b/net-analyzer/ossec-hids/files/makefile.patch
new file mode 100644
index 000..2169b5287fd
--- /dev/null
+++ b/net-analyzer/ossec-hids/files/makefile.patch
@@ -0,0 +1,28 @@
+--- a/Makefile 2018-10-12 00:25:16.0 +0200
b/Makefile 2018-10-26 17:59:44.458689842 +0200
+@@ -378,7 +378,6 @@
+ install-server: install-server-generic
+
+ install-common: build
+- ./init/adduser.sh ${OSSEC_USER} ${OSSEC_USER_MAIL} ${OSSEC_USER_REM}
${OSSEC_GROUP} ${PREFIX}
+ install -d -m 0550 -o root -g ${OSSEC_GROUP} ${PREFIX}/
+ install -d -m 0750 -o ${OSSEC_USER} -g ${OSSEC_GROUP} ${PREFIX}/logs
+ install -m 0660 -o ${OSSEC_USER} -g ${OSSEC_GROUP} /dev/null
${PREFIX}/logs/ossec.log
+@@ -1166,7 +1165,7 @@
+ test ##
+
+
+-CFLAGS_TEST = -g -O0 --coverage
++CFLAGS_TEST = -g -O0
+
+ LDFLAGS_TEST = -lcheck -lm -pthread -lrt
+
+@@ -1177,7 +1176,7 @@
+
+ test_programs = test_os_zlib test_os_xml test_os_regex test_os_crypto
test_shared
+
+-.PHONY: test run_tests build_tests test_valgrind test_coverage
++.PHONY: test run_tests build_tests test_valgrind
+
+ test: build_tests
+ ${MAKE} run_tests
diff --git a/net-analyzer/ossec-hids/metadata.xml
b/net-analyzer/ossec-hids/metadata.xml
new file mode 100644
index 000..a6ba742f6ee
--- /dev/null
+++ b/net-analyzer/ossec-hids/metadata.xml
@@ -0,0 +1,30 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+ gen...@seichter.de
+ Ralph Seichter
+
+
+ proxy-ma...@gentoo.org
+ Proxy Maintainers
+
+
+ OSSEC is a full platform to monitor and control your systems.
It mixes
+ together all the aspects of HIDS (host-based intrusion
detection), log
+ monitoring and SIM/SIEM together in a simple, powerful and open
source
+ solution.
+ To determine which build target (agent, server, hybrid or
local) best
+ suits your needs, please visit https://www.ossec.net/ and
review the
+ documentation provided there.
+
+
+ Build "agent" installation target (see
package description)
+ Build "hybrid" installation target
+ Build "local" installation target
+ Build "server" installation target
+
+
+ ossec/ossec-hids
+
+
diff --git a/net-analyzer/ossec-hids/ossec-hids-3.1.0.ebuild
b/net-analyzer/ossec-hids/ossec-hids-3.1.0.ebuild
new file mode 100644
index 000..9df4ea46973
--- /dev/null
+++ b/net-analyzer/ossec-hids/ossec-hids-3.1.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user
+
+DESCRIPTION="Open Source Host-based Intrusion Detection System"
+HOMEPAGE="https://www.ossec.net/;
+SRC_URI="https://github.com/ossec/ossec-hids/archive/${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="agent hybrid local mysql postgres server sqlite"
+REQUIRED_USE="^^ ( agent hybrid local server )
+ ?? ( mysql postgres )"
+
+DEPEND="mysql? ( virtual/mysql )
+ sqlite? ( dev-db/sqlite:3 )
+ postgres? ( dev-db/postgresql:= )
+
