1 |
commit: cc56e191d778f684fd3da1ae45c10e1ff3cd2f9e |
2 |
Author: Ralph Seichter <github <AT> seichter <DOT> de> |
3 |
AuthorDate: Fri Jun 28 17:29:32 2019 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jul 5 17:30:26 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc56e191 |
7 |
|
8 |
net-analyzer/ossec-hids: Fix build issue, version bump |
9 |
|
10 |
Added enewgroup to fix bug #688892. Updated to release 3.3.0. |
11 |
|
12 |
Closes: https://bugs.gentoo.org/688892 |
13 |
Signed-off-by: Ralph Seichter <gentoo <AT> seichter.de> |
14 |
Package-Manager: Portage-2.3.66, Repoman-2.3.11 |
15 |
Closes: https://github.com/gentoo/gentoo/pull/12350 |
16 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
17 |
|
18 |
net-analyzer/ossec-hids/Manifest | 1 + |
19 |
net-analyzer/ossec-hids/files/makefile-3.3.0.patch | 28 +++++++++ |
20 |
net-analyzer/ossec-hids/ossec-hids-3.3.0.ebuild | 67 ++++++++++++++++++++++ |
21 |
3 files changed, 96 insertions(+) |
22 |
|
23 |
diff --git a/net-analyzer/ossec-hids/Manifest b/net-analyzer/ossec-hids/Manifest |
24 |
index 9fd4fe3f66d..e33470f61e0 100644 |
25 |
--- a/net-analyzer/ossec-hids/Manifest |
26 |
+++ b/net-analyzer/ossec-hids/Manifest |
27 |
@@ -1,2 +1,3 @@ |
28 |
DIST ossec-hids-3.1.0.tar.gz 1886469 BLAKE2B c175c8659a8b5d0d269a5cb6bf142276f29e6f676afc6029accf854d68299d71147ba65a667601e77c6db8ca49a29afa49534e5683369f420f6389059ae61fc3 SHA512 fe55f82ac354d9fcd767d8379a492279644308788535780bb029d46688c93f259771686462570137555b40082c6756daad44bbdd1ddc953ed0bb22b65c6cb566 |
29 |
DIST ossec-hids-3.2.0.tar.gz 1896977 BLAKE2B d77cff3a3a72287ad2235f346c7d07cfdad83872d956f57877ed44ad21bb717e4b4ddcfd0e8b2ce45cb90160bb63a28a7d06bc6225b53cc5ed42f7a97c5a1765 SHA512 40b25b97c43a66b8a145914ab0badd9d4f7de7d2168aa7a49abdf778c620a4b533ce3de0883d26c4c39816cf78674a053788a57c5f9c38fbea7cd8b13a35d18f |
30 |
+DIST ossec-hids-3.3.0.tar.gz 1900070 BLAKE2B a18a1e55ba44450c634b59099f10b674d27b2079ff456a034dc7bb4bbaf3c89b96f197515f3fb7aa54c248643f333e830a519b04cd4a9402cec2c32597fd96b2 SHA512 97c7e7b21ce88a3f1c89b79ff74b0c13804ba313cf3f30b98bcb4011f422ca050876e780c30624812d399d6b5c59629e52f6772b9ee0cd7cead1d66044dca627 |
31 |
|
32 |
diff --git a/net-analyzer/ossec-hids/files/makefile-3.3.0.patch b/net-analyzer/ossec-hids/files/makefile-3.3.0.patch |
33 |
new file mode 100644 |
34 |
index 00000000000..810bc077d43 |
35 |
--- /dev/null |
36 |
+++ b/net-analyzer/ossec-hids/files/makefile-3.3.0.patch |
37 |
@@ -0,0 +1,28 @@ |
38 |
+--- a/Makefile 2019-03-09 16:33:13.465947636 +0100 |
39 |
++++ b/Makefile 2019-03-09 16:32:57.105946856 +0100 |
40 |
+@@ -370,7 +370,6 @@ |
41 |
+ install-server: install-server-generic |
42 |
+ |
43 |
+ install-common: build |
44 |
+- ./init/adduser.sh ${OSSEC_USER} ${OSSEC_USER_MAIL} ${OSSEC_USER_REM} ${OSSEC_GROUP} ${PREFIX} |
45 |
+ $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/ |
46 |
+ $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/logs |
47 |
+ $(call INSTALL_CMD,0660,${OSSEC_USER},${OSSEC_GROUP}) /dev/null ${PREFIX}/logs/ossec.log |
48 |
+@@ -1160,7 +1159,7 @@ |
49 |
+ #### test ########## |
50 |
+ #################### |
51 |
+ |
52 |
+-CFLAGS_TEST = -g -O0 --coverage |
53 |
++CFLAGS_TEST = -g -O0 |
54 |
+ |
55 |
+ LDFLAGS_TEST = -lcheck -lm -pthread -lrt |
56 |
+ |
57 |
+@@ -1171,7 +1170,7 @@ |
58 |
+ |
59 |
+ test_programs = test_os_zlib test_os_xml test_os_regex test_os_crypto test_shared |
60 |
+ |
61 |
+-.PHONY: test run_tests build_tests test_valgrind test_coverage |
62 |
++.PHONY: test run_tests build_tests test_valgrind |
63 |
+ |
64 |
+ test: build_tests |
65 |
+ ${MAKE} run_tests |
66 |
|
67 |
diff --git a/net-analyzer/ossec-hids/ossec-hids-3.3.0.ebuild b/net-analyzer/ossec-hids/ossec-hids-3.3.0.ebuild |
68 |
new file mode 100644 |
69 |
index 00000000000..c9b83c7daa3 |
70 |
--- /dev/null |
71 |
+++ b/net-analyzer/ossec-hids/ossec-hids-3.3.0.ebuild |
72 |
@@ -0,0 +1,67 @@ |
73 |
+# Copyright 1999-2019 Gentoo Authors |
74 |
+# Distributed under the terms of the GNU General Public License v2 |
75 |
+ |
76 |
+EAPI=7 |
77 |
+ |
78 |
+inherit user |
79 |
+ |
80 |
+DESCRIPTION="Open Source Host-based Intrusion Detection System" |
81 |
+HOMEPAGE="https://www.ossec.net/" |
82 |
+SRC_URI="https://github.com/ossec/ossec-hids/archive/${PV}.tar.gz -> ${P}.tar.gz" |
83 |
+ |
84 |
+LICENSE="GPL-2" |
85 |
+SLOT="0" |
86 |
+KEYWORDS="~amd64" |
87 |
+IUSE="agent hybrid local mysql postgres server sqlite" |
88 |
+REQUIRED_USE="^^ ( agent hybrid local server ) |
89 |
+ ?? ( mysql postgres )" |
90 |
+ |
91 |
+DEPEND="dev-libs/libpcre2 |
92 |
+ mysql? ( virtual/mysql ) |
93 |
+ sqlite? ( dev-db/sqlite:3 ) |
94 |
+ postgres? ( dev-db/postgresql:= )" |
95 |
+RDEPEND="${DEPEND}" |
96 |
+S="${WORKDIR}/${P}/src" |
97 |
+PATCHES=( "${FILESDIR}/makefile-${PV}.patch" ) |
98 |
+ |
99 |
+declare -a MY_OPT |
100 |
+ |
101 |
+pkg_setup() { |
102 |
+ enewgroup ossec |
103 |
+ enewuser ossec -1 -1 /var/ossec ossec |
104 |
+ enewuser ossecm -1 -1 -1 ossec |
105 |
+ enewuser ossecr -1 -1 -1 ossec |
106 |
+} |
107 |
+ |
108 |
+src_configure() { |
109 |
+ local target="local" |
110 |
+ use agent && target="agent" |
111 |
+ use hybrid && target="hybrid" |
112 |
+ use server && target="server" |
113 |
+ MY_OPT=( |
114 |
+ PCRE2_SYSTEM=yes |
115 |
+ TARGET=${target} |
116 |
+ USE_SQLITE=$(usex sqlite) |
117 |
+ V=0 |
118 |
+ ZLIB_SYSTEM=yes |
119 |
+ ) |
120 |
+ use mysql && MY_OPT+=( DATABASE=mysql ) |
121 |
+ use postgres && MY_OPT+=( DATABASE=pgsql ) |
122 |
+} |
123 |
+ |
124 |
+src_compile() { |
125 |
+ emake "${MY_OPT[@]}" PREFIX=/var/ossec |
126 |
+} |
127 |
+ |
128 |
+src_test() { |
129 |
+ emake "${MY_OPT[@]}" PREFIX=/var/ossec test |
130 |
+} |
131 |
+ |
132 |
+src_install() { |
133 |
+ keepdir /var/ossec/logs/{alerts,archives,firewall} |
134 |
+ keepdir /var/ossec/lua/{compiled,native} |
135 |
+ keepdir /var/ossec/queue/{agent-info,agentless,alerts,diff,fts,ossec,rids,rootcheck,syscheck} |
136 |
+ keepdir /var/ossec/{.ssh,stats,tmp,var/run} |
137 |
+ newenvd - 50ossec-hids <<<'CONFIG_PROTECT="/var/ossec/etc"' |
138 |
+ emake "${MY_OPT[@]}" PREFIX="${D}/var/ossec" install |
139 |
+} |