1 |
commit: cef734e130eb7d9e83750ccf89c69c533b195747 |
2 |
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue May 23 17:14:42 2017 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 27 20:59:28 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cef734e1 |
7 |
|
8 |
app-forensics/aide: verbump to 0.16 |
9 |
|
10 |
Notable ebuild changes: |
11 |
- fix deps; |
12 |
- fix broken static USE; |
13 |
- add e2fs USE to check file attributes on ext2/ext3/ext4; |
14 |
- drop broken and completely useless nls USE; |
15 |
- modernize ebuild, EAPI=6; |
16 |
- drop useless dodoc, dohtml, fowners, fperms calls; |
17 |
- stop repeating to users about example configuration; |
18 |
- cleanup patches and send them upstream. |
19 |
|
20 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
21 |
|
22 |
app-forensics/aide/Manifest | 1 + |
23 |
app-forensics/aide/aide-0.16.ebuild | 141 +++++++++++++++++++++ |
24 |
.../aide/files/aide-0.16-add-missing-include.patch | 24 ++++ |
25 |
.../files/aide-0.16-fix-LIBS-LDFLAGS-mixing.patch | 23 ++++ |
26 |
.../files/aide-0.16-fix-acl-configure-option.patch | 23 ++++ |
27 |
app-forensics/aide/metadata.xml | 3 +- |
28 |
6 files changed, 214 insertions(+), 1 deletion(-) |
29 |
|
30 |
diff --git a/app-forensics/aide/Manifest b/app-forensics/aide/Manifest |
31 |
index 6c9b019e22c..ed8aa2cff1c 100644 |
32 |
--- a/app-forensics/aide/Manifest |
33 |
+++ b/app-forensics/aide/Manifest |
34 |
@@ -1,2 +1,3 @@ |
35 |
DIST aide-0.14.2.tar.gz 418098 SHA256 bf4cd417b0f4778b4f9a618d23e0b0b7db10349ba6a0129394dc82fbc2fa8b9b SHA512 4ef96078fde057a54dda467fb55711e30d947969873715a02052362c57112f5bfd3155460ef353f70ce69fea3a3c491b7925bebbdb7034dbf618c63c360347df WHIRLPOOL fa91e4493bcac4cf11a8fedfd5e3c490752936f9ea04871d812b831f33089b694892e32ed19cef273926d3a8c091fb15a7b98a5e5303f08609f164773475d142 |
36 |
DIST aide-0.15.1.tar.gz 424970 SHA256 303e5c186257df8c86e418193199f4ea2183fc37d3d4a9098a614f61346059ef SHA512 6afe327474858c697ba017b02bd40717c33874e69b801c171c2496ff9042b557e840bef4a151bda0e4d835ddb0d972b88790237a72f250525dc1fc6b8fa673e7 WHIRLPOOL 4c21221cfbaeff3aa00a3f22c4e31c1fffd3f00d112828540ab6ab94dd019086244de71e5d19d1120078acc7b81b9efa5a36d55937292f523bcb4e064830ba6a |
37 |
+DIST aide-0.16.tar.gz 391009 SHA256 a81c53a131c4fd130b169b3a26ac35386a2f6e1e014f12807524cc273ed97345 SHA512 29ad97756e3e2fb21dc332ed03b494a1c73e621266f8622ec80bdba23092a38ee975b97f3cff2330e4c16e64e2f672259eea9291ca706a4009e7399b4e14e6a7 WHIRLPOOL d9ecba06d8367ed2ef622ee6b3ccf6a0ed37bad52548063c5c153bd31b856ed8a3379e6057cc1d4aebd29473ded71e9190c8c17dbeaa65eec3365be1d43d5f46 |
38 |
|
39 |
diff --git a/app-forensics/aide/aide-0.16.ebuild b/app-forensics/aide/aide-0.16.ebuild |
40 |
new file mode 100644 |
41 |
index 00000000000..be5144222bd |
42 |
--- /dev/null |
43 |
+++ b/app-forensics/aide/aide-0.16.ebuild |
44 |
@@ -0,0 +1,141 @@ |
45 |
+# Copyright 1999-2017 Gentoo Foundation |
46 |
+# Distributed under the terms of the GNU General Public License v2 |
47 |
+ |
48 |
+EAPI=6 |
49 |
+ |
50 |
+inherit autotools readme.gentoo-r1 |
51 |
+ |
52 |
+DESCRIPTION="AIDE (Advanced Intrusion Detection Environment) is a file integrity checker" |
53 |
+HOMEPAGE="http://aide.sourceforge.net/" |
54 |
+SRC_URI="mirror://sourceforge/aide/${P}.tar.gz" |
55 |
+ |
56 |
+LICENSE="GPL-2" |
57 |
+SLOT="0" |
58 |
+KEYWORDS="~amd64 ~x86" |
59 |
+IUSE="acl audit curl e2fs mhash postgres prelink selinux static xattr zlib" |
60 |
+ |
61 |
+COMMON_DEPEND=" |
62 |
+ !mhash? ( |
63 |
+ dev-libs/libgcrypt:0= |
64 |
+ dev-libs/libgpg-error |
65 |
+ ) |
66 |
+ mhash? ( app-crypt/mhash ) |
67 |
+ dev-libs/libpcre |
68 |
+ acl? ( virtual/acl ) |
69 |
+ audit? ( sys-process/audit ) |
70 |
+ curl? ( net-misc/curl ) |
71 |
+ e2fs? ( sys-fs/e2fsprogs ) |
72 |
+ postgres? ( dev-db/postgresql:= ) |
73 |
+ prelink? ( dev-libs/elfutils ) |
74 |
+ selinux? ( sys-libs/libselinux ) |
75 |
+ xattr? ( sys-apps/attr ) |
76 |
+ zlib? ( sys-libs/zlib ) |
77 |
+" |
78 |
+RDEPEND=" |
79 |
+ !static? ( ${COMMON_DEPEND} ) |
80 |
+ prelink? ( sys-devel/prelink ) |
81 |
+ selinux? ( sec-policy/selinux-aide ) |
82 |
+" |
83 |
+DEPEND="${COMMON_DEPEND} |
84 |
+ sys-devel/bison |
85 |
+ sys-devel/flex |
86 |
+ virtual/pkgconfig |
87 |
+ static? ( |
88 |
+ !mhash? ( |
89 |
+ dev-libs/libgcrypt:0[static-libs] |
90 |
+ dev-libs/libgpg-error[static-libs] |
91 |
+ ) |
92 |
+ mhash? ( app-crypt/mhash[static-libs] ) |
93 |
+ dev-libs/libpcre[static-libs] |
94 |
+ acl? ( virtual/acl[static-libs] ) |
95 |
+ e2fs? ( sys-fs/e2fsprogs[static-libs] ) |
96 |
+ prelink? ( dev-libs/elfutils[static-libs] ) |
97 |
+ selinux? ( sys-libs/libselinux[static-libs] ) |
98 |
+ xattr? ( sys-apps/attr[static-libs] ) |
99 |
+ zlib? ( sys-libs/zlib[static-libs] ) |
100 |
+ ) |
101 |
+" |
102 |
+ |
103 |
+REQUIRED_USE=" |
104 |
+ postgres? ( !mhash ) |
105 |
+ static? ( !audit !curl !postgres ) |
106 |
+" |
107 |
+ |
108 |
+HTML_DOCS=( doc/manual.html ) |
109 |
+ |
110 |
+DISABLE_AUTOFORMATTING=1 |
111 |
+DOC_CONTENTS=" |
112 |
+Example configuration file was installed at '${EPREFIX}/etc/aide/aide.conf'. |
113 |
+Please edit it to meet your needs. Refer to aide.conf(5) manual page |
114 |
+for more information. |
115 |
+ |
116 |
+A helper script, aideinit, was installed and can be used to make AIDE |
117 |
+management easier. Please run 'aideinit --help' for more information. |
118 |
+" |
119 |
+ |
120 |
+PATCHES=( |
121 |
+ "${FILESDIR}/${P}-add-missing-include.patch" |
122 |
+ "${FILESDIR}/${P}-fix-LIBS-LDFLAGS-mixing.patch" |
123 |
+ "${FILESDIR}/${P}-fix-acl-configure-option.patch" |
124 |
+) |
125 |
+ |
126 |
+src_prepare() { |
127 |
+ default_src_prepare |
128 |
+ sed -i -e 's| -Werror||g' configure.ac || die |
129 |
+ eautoreconf |
130 |
+} |
131 |
+ |
132 |
+src_configure() { |
133 |
+ local myeconfargs=( |
134 |
+ --sysconfdir="${EPREFIX}/etc/${PN}" |
135 |
+ --with-confighmactype="sha512" # Override default weak MD5 hash. |
136 |
+ --with-dbhmackey="sha512" # Override default weak MD5 hash. |
137 |
+ # Disable broken l10n support: https://sourceforge.net/p/aide/bugs/98/ |
138 |
+ # This doesn't affect anything because there are no localizations yet. |
139 |
+ --without-locale |
140 |
+ $(use_enable static) |
141 |
+ $(use_with zlib) |
142 |
+ $(use_with curl) |
143 |
+ $(use_with acl posix-acl) |
144 |
+ $(use_with selinux) |
145 |
+ $(use_with prelink prelink "${EPREFIX}/usr/sbin/prelink") |
146 |
+ $(use_with xattr) |
147 |
+ $(use_with e2fs e2fsattrs) |
148 |
+ $(use_with mhash mhash) |
149 |
+ $(use_with !mhash gcrypt) |
150 |
+ $(use_with postgres psql) |
151 |
+ $(use_with audit) |
152 |
+ ) |
153 |
+ econf "${myeconfargs[@]}" |
154 |
+} |
155 |
+ |
156 |
+src_install() { |
157 |
+ default_src_install |
158 |
+ readme.gentoo_create_doc |
159 |
+ |
160 |
+ insinto /etc/${PN} |
161 |
+ doins "${FILESDIR}"/aide.conf |
162 |
+ |
163 |
+ dosbin "${FILESDIR}"/aideinit |
164 |
+ dodoc "${FILESDIR}"/aide.cron |
165 |
+ |
166 |
+ keepdir /var/{lib,log}/${PN} |
167 |
+} |
168 |
+ |
169 |
+pkg_postinst() { |
170 |
+ readme.gentoo_print_elog |
171 |
+ |
172 |
+ if use postgres; then |
173 |
+ elog |
174 |
+ elog "Due to a bad assumption by aide, you must issue the following" |
175 |
+ elog "command after the database initialization (aide --init ...):" |
176 |
+ elog |
177 |
+ elog 'psql -c "update pg_index set indisunique=false from pg_class \\ ' |
178 |
+ elog " where pg_class.relname='TABLE_pkey' and \ " |
179 |
+ elog ' pg_class.oid=pg_index.indexrelid" -h HOSTNAME -p PORT DBASE USER' |
180 |
+ elog |
181 |
+ elog "where TABLE, HOSTNAME, PORT, DBASE, and USER are the same as" |
182 |
+ elog "in your aide.conf." |
183 |
+ elog |
184 |
+ fi |
185 |
+} |
186 |
|
187 |
diff --git a/app-forensics/aide/files/aide-0.16-add-missing-include.patch b/app-forensics/aide/files/aide-0.16-add-missing-include.patch |
188 |
new file mode 100644 |
189 |
index 00000000000..75f0403c968 |
190 |
--- /dev/null |
191 |
+++ b/app-forensics/aide/files/aide-0.16-add-missing-include.patch |
192 |
@@ -0,0 +1,24 @@ |
193 |
+commit 1cbb888d55388d6bb88141c946bd6993b3e9872f |
194 |
+Author: Ilya Tumaykin <itumaykin@×××××.com> |
195 |
+Date: Tue May 23 17:24:29 2017 +0300 |
196 |
+ |
197 |
+db: add missing include |
198 |
+ |
199 |
+url_fclose() function used in this file is defined in fopen.h. |
200 |
+See https://sourceforge.net/p/aide/bugs/99/ |
201 |
+ |
202 |
+diff --git a/src/db.c b/src/db.c |
203 |
+index dd133d4..858240d 100644 |
204 |
+--- a/src/db.c |
205 |
++++ b/src/db.c |
206 |
+@@ -28,6 +28,10 @@ |
207 |
+ #include "db_disk.h" |
208 |
+ #include "md.h" |
209 |
+ |
210 |
++#ifdef WITH_CURL |
211 |
++#include "fopen.h" |
212 |
++#endif |
213 |
++ |
214 |
+ #ifdef WITH_PSQL |
215 |
+ #include "db_sql.h" |
216 |
+ #endif |
217 |
|
218 |
diff --git a/app-forensics/aide/files/aide-0.16-fix-LIBS-LDFLAGS-mixing.patch b/app-forensics/aide/files/aide-0.16-fix-LIBS-LDFLAGS-mixing.patch |
219 |
new file mode 100644 |
220 |
index 00000000000..453abe5f1ea |
221 |
--- /dev/null |
222 |
+++ b/app-forensics/aide/files/aide-0.16-fix-LIBS-LDFLAGS-mixing.patch |
223 |
@@ -0,0 +1,23 @@ |
224 |
+commit 6da37687ba7cf259ac19cae2e1c16115b6848143 |
225 |
+Author: Ilya Tumaykin <itumaykin@×××××.com> |
226 |
+Date: Thu May 25 13:34:55 2017 +0300 |
227 |
+ |
228 |
+build: fix incorrect LIBS/LDFLAGS mixing |
229 |
+ |
230 |
+Otherwise build with LDFLAGS='-Wl,--as-needed' and curl support fails. |
231 |
+See https://bugs.gentoo.org/show_bug.cgi?id=271326 |
232 |
+and https://sourceforge.net/p/aide/bugs/96/ |
233 |
+ |
234 |
+diff --git a/configure.ac b/configure.ac |
235 |
+index 3598ebe..0c5cb0c 100644 |
236 |
+--- a/configure.ac |
237 |
++++ b/configure.ac |
238 |
+@@ -713,7 +713,7 @@ if test x$with_curl = xyes; then |
239 |
+ AC_CHECK_HEADERS(curl/curl.h,, |
240 |
+ [AC_MSG_ERROR([You don't have curl properly installed. Install it or try --without-curl.])]) |
241 |
+ CFLAGS="$CFLAGS $CURL_CFLAGS" |
242 |
+- LDFLAGS="$LDFLAGS $CURL_LIBS" |
243 |
++ LIBS="$LIBS $CURL_LIBS" |
244 |
+ AC_CHECK_LIB(curl,curl_easy_init,havecurl=yes, |
245 |
+ [AC_MSG_ERROR([You don't have curl properly installed. Install it or try --without-curl.])] |
246 |
+ ) |
247 |
|
248 |
diff --git a/app-forensics/aide/files/aide-0.16-fix-acl-configure-option.patch b/app-forensics/aide/files/aide-0.16-fix-acl-configure-option.patch |
249 |
new file mode 100644 |
250 |
index 00000000000..a989e379039 |
251 |
--- /dev/null |
252 |
+++ b/app-forensics/aide/files/aide-0.16-fix-acl-configure-option.patch |
253 |
@@ -0,0 +1,23 @@ |
254 |
+commit 3d9746bccbb50809e4c3de90ab5145a17af39aeb |
255 |
+Author: Ilya Tumaykin <itumaykin@×××××.com> |
256 |
+Date: Thu May 25 14:38:02 2017 +0300 |
257 |
+ |
258 |
+build: respect user choice for posix-acl configure option |
259 |
+ |
260 |
+Otherwise acl support is enabled automagically, which is bad. |
261 |
+See https://wiki.gentoo.org/wiki/Project:Quality_Assurance/Automagic_dependencies |
262 |
+and https://sourceforge.net/p/aide/bugs/97/ |
263 |
+ |
264 |
+diff --git a/configure.ac b/configure.ac |
265 |
+index 3598ebe..c45bbee 100644 |
266 |
+--- a/configure.ac |
267 |
++++ b/configure.ac |
268 |
+@@ -450,7 +450,7 @@ AC_MSG_CHECKING(for posix-acl-support) |
269 |
+ AC_ARG_WITH([posix-acl], |
270 |
+ [AC_HELP_STRING([--with-posix-acl], |
271 |
+ [use POSIX ACLs (no checking)])], |
272 |
+- [], |
273 |
++ [with_posix_acl_support="$withval"], |
274 |
+ [with_posix_acl_support=no] |
275 |
+ ) |
276 |
+ |
277 |
|
278 |
diff --git a/app-forensics/aide/metadata.xml b/app-forensics/aide/metadata.xml |
279 |
index cfb8d84da80..b39aaf5590b 100644 |
280 |
--- a/app-forensics/aide/metadata.xml |
281 |
+++ b/app-forensics/aide/metadata.xml |
282 |
@@ -6,7 +6,8 @@ |
283 |
<name>Gentoo Forensics Project</name> |
284 |
</maintainer> |
285 |
<use> |
286 |
- <flag name="prelink">Enable support for <pkg>sys-devel/prelink</pkg></flag> |
287 |
+ <flag name="e2fs">Enable support for checking file attributes on ext2/ext3/ext4 filesystems</flag> |
288 |
+ <flag name="prelink">Bypass prelinking when calculating checksums</flag> |
289 |
</use> |
290 |
<upstream> |
291 |
<remote-id type="sourceforge">aide</remote-id> |