Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-forensics/aide/files/, app-forensics/aide/
Date: Sat, 01 Jul 2017 21:41:29
Message-Id: 1498945272.2c86304fc737dd5468fd4f90f4ab70ae79ee6c07.mgorny@gentoo
1 commit: 2c86304fc737dd5468fd4f90f4ab70ae79ee6c07
2 Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
3 AuthorDate: Sat Jul 1 13:41:54 2017 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 1 21:41:12 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c86304f
7
8 app-forensics/aide: remove old
9
10 Closes: https://github.com/gentoo/gentoo/pull/5021
11 Package-Manager: Portage-2.3.6, Repoman-2.3.2
12
13 app-forensics/aide/Manifest | 1 -
14 app-forensics/aide/aide-0.14.2.ebuild | 113 ---------------------
15 app-forensics/aide/files/aide-0.14-as-needed.patch | 20 ----
16 app-forensics/aide/files/aide-0.14-configure.patch | 38 -------
17 app-forensics/aide/files/aide-0.14-gentoo.patch | 26 -----
18 5 files changed, 198 deletions(-)
19
20 diff --git a/app-forensics/aide/Manifest b/app-forensics/aide/Manifest
21 index a586feab16c..0eef896e096 100644
22 --- a/app-forensics/aide/Manifest
23 +++ b/app-forensics/aide/Manifest
24 @@ -1,2 +1 @@
25 -DIST aide-0.14.2.tar.gz 418098 SHA256 bf4cd417b0f4778b4f9a618d23e0b0b7db10349ba6a0129394dc82fbc2fa8b9b SHA512 4ef96078fde057a54dda467fb55711e30d947969873715a02052362c57112f5bfd3155460ef353f70ce69fea3a3c491b7925bebbdb7034dbf618c63c360347df WHIRLPOOL fa91e4493bcac4cf11a8fedfd5e3c490752936f9ea04871d812b831f33089b694892e32ed19cef273926d3a8c091fb15a7b98a5e5303f08609f164773475d142
26 DIST aide-0.16.tar.gz 391009 SHA256 a81c53a131c4fd130b169b3a26ac35386a2f6e1e014f12807524cc273ed97345 SHA512 29ad97756e3e2fb21dc332ed03b494a1c73e621266f8622ec80bdba23092a38ee975b97f3cff2330e4c16e64e2f672259eea9291ca706a4009e7399b4e14e6a7 WHIRLPOOL d9ecba06d8367ed2ef622ee6b3ccf6a0ed37bad52548063c5c153bd31b856ed8a3379e6057cc1d4aebd29473ded71e9190c8c17dbeaa65eec3365be1d43d5f46
27
28 diff --git a/app-forensics/aide/aide-0.14.2.ebuild b/app-forensics/aide/aide-0.14.2.ebuild
29 deleted file mode 100644
30 index 20322e586e7..00000000000
31 --- a/app-forensics/aide/aide-0.14.2.ebuild
32 +++ /dev/null
33 @@ -1,113 +0,0 @@
34 -# Copyright 1999-2014 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI="3"
38 -
39 -inherit autotools confutils eutils
40 -
41 -DESCRIPTION="AIDE (Advanced Intrusion Detection Environment) is a replacement for Tripwire"
42 -HOMEPAGE="http://aide.sourceforge.net/"
43 -SRC_URI="mirror://sourceforge/aide/${P}.tar.gz"
44 -
45 -SLOT="0"
46 -LICENSE="GPL-2"
47 -KEYWORDS="amd64 x86"
48 -IUSE="acl audit curl mhash nls postgres prelink selinux static xattr zlib"
49 -
50 -CDEPEND="acl? ( virtual/acl )
51 - audit? ( sys-process/audit )
52 - curl? ( net-misc/curl )
53 - mhash? ( >=app-crypt/mhash-0.9.2 )
54 - !mhash? ( dev-libs/libgcrypt:0 )
55 - nls? ( virtual/libintl )
56 - postgres? ( dev-db/postgresql )
57 - prelink? ( sys-devel/prelink )
58 - selinux? (
59 - sys-libs/libselinux
60 - )
61 - xattr? ( sys-apps/attr )
62 - zlib? ( sys-libs/zlib )"
63 -
64 -RDEPEND="!static? ( ${CDEPEND} )
65 - selinux? ( sec-policy/selinux-aide )"
66 -
67 -DEPEND="${CDEPEND}
68 - nls? ( sys-devel/gettext )
69 - sys-devel/bison
70 - sys-devel/flex"
71 -
72 -pkg_setup() {
73 - confutils_use_conflict mhash postgres
74 - confutils_use_conflict static curl postgres
75 -}
76 -
77 -src_prepare() {
78 - epatch "${FILESDIR}/${PN}-0.14-gentoo.patch"
79 -
80 - # fix as-need issue, bug #271326
81 - epatch "${FILESDIR}/${PN}-0.14-as-needed.patch"
82 -
83 - # fix configure issue, bug #323187
84 - epatch "${FILESDIR}/${PN}-0.14-configure.patch"
85 -
86 - eautoreconf
87 -}
88 -
89 -src_configure() {
90 - econf \
91 - $(use_with acl posix-acl) \
92 - $(use_with audit) \
93 - $(use_with curl) \
94 - $(use_with !mhash gcrypt) \
95 - $(use_with mhash mhash) \
96 - $(use_with nls locale) \
97 - $(use_with postgres psql) \
98 - $(use_with prelink) \
99 - $(use_with selinux) \
100 - $(use_enable static) \
101 - $(use_with xattr) \
102 - $(use_with zlib) \
103 - --sysconfdir="${EPREFIX}/etc/aide" || die "econf failed"
104 -}
105 -
106 -src_install() {
107 - emake DESTDIR="${D}" install install-man || die "emake install failed"
108 -
109 - keepdir /var/lib/aide || die
110 - fowners root:0 /var/lib/aide || die
111 - fperms 0755 /var/lib/aide || die
112 -
113 - keepdir /var/log/aide || die
114 -
115 - insinto /etc/aide
116 - doins "${FILESDIR}"/aide.conf || die
117 -
118 - dosbin "${FILESDIR}"/aideinit || die
119 -
120 - dodoc AUTHORS ChangeLog NEWS README Todo "${FILESDIR}"/aide.cron || die
121 - dohtml doc/manual.html || die
122 -}
123 -
124 -pkg_postinst() {
125 - elog
126 - elog "A sample configuration file has been installed as"
127 - elog "/etc/aide/aide.conf. Please edit to meet your needs."
128 - elog "Read the aide.conf(5) manual page for more information."
129 - elog "A helper script, aideinit, has been installed and can"
130 - elog "be used to make AIDE management easier. Please run"
131 - elog "aideinit --help for more information"
132 - elog
133 -
134 - if use postgres; then
135 - elog "Due to a bad assumption by aide, you must issue the following"
136 - elog "command after the database initialization (aide --init ...):"
137 - elog
138 - elog 'psql -c "update pg_index set indisunique=false from pg_class \\ '
139 - elog " where pg_class.relname='TABLE_pkey' and \ "
140 - elog ' pg_class.oid=pg_index.indexrelid" -h HOSTNAME -p PORT DBASE USER'
141 - elog
142 - elog "where TABLE, HOSTNAME, PORT, DBASE, and USER are the same as"
143 - elog "your aide.conf."
144 - elog
145 - fi
146 -}
147
148 diff --git a/app-forensics/aide/files/aide-0.14-as-needed.patch b/app-forensics/aide/files/aide-0.14-as-needed.patch
149 deleted file mode 100644
150 index 7a90b4e2507..00000000000
151 --- a/app-forensics/aide/files/aide-0.14-as-needed.patch
152 +++ /dev/null
153 @@ -1,20 +0,0 @@
154 ---- aide-0.14.orig/configure.in 2010-02-26 17:25:29.000000000 +0900
155 -+++ aide-0.14/configure.in 2010-05-27 00:11:34.000000000 +0900
156 -@@ -42,7 +42,7 @@
157 - AC_ARG_WITH(extra-libs,
158 - AC_HELP_STRING([--with-extra-libs],
159 - [Specify additional paths with -L to find libraries]),
160 -- [LDFLAGS="$LDFLAGS $withval"]
161 -+ [LIBS="$LIBS $withval"]
162 - )
163 - AC_ARG_WITH(extra-link-libs,
164 - AC_HELP_STRING([--with-extra-link-libs],
165 -@@ -671,7 +671,7 @@
166 - AC_CHECK_HEADERS(curl/curl.h,,
167 - [AC_MSG_ERROR([You don't have curl properly installed. Install it or try --without-curl.])])
168 - CFLAGS="$CFLAGS $CURL_CFLAGS"
169 -- LDFLAGS="$LDFLAGS $CURL_LIBS"
170 -+ LIBS="$LIBS $CURL_LIBS"
171 - AC_CHECK_LIB(curl,curl_easy_init,havecurl=yes,
172 - [AC_MSG_ERROR([You don't have curl properly installed. Install it or try --without-curl.])]
173 - )
174
175 diff --git a/app-forensics/aide/files/aide-0.14-configure.patch b/app-forensics/aide/files/aide-0.14-configure.patch
176 deleted file mode 100644
177 index 54afd8c4f4c..00000000000
178 --- a/app-forensics/aide/files/aide-0.14-configure.patch
179 +++ /dev/null
180 @@ -1,38 +0,0 @@
181 -diff -Naur aide-0.14.orig/configure.in aide-0.14/configure.in
182 ---- aide-0.14.orig/configure.in 2010-02-26 17:25:29.000000000 +0900
183 -+++ aide-0.14/configure.in 2010-06-09 14:24:43.000000000 +0900
184 -@@ -407,14 +407,14 @@
185 - AC_ARG_WITH([zlib],
186 - AC_HELP_STRING([--with-zlib],
187 - [use zlib compression]),
188 -- ,
189 -+ [with_zlib="$withval"],
190 - [with_zlib=yes]
191 - )
192 -
193 - AC_ARG_WITH([curl],
194 - AC_HELP_STRING([--with-curl],
195 - [use curl for http,https and ftp backends]),
196 -- ,
197 -+ [with_curl="$withval"],
198 - [with_curl=no]
199 - )
200 -
201 -@@ -422,7 +422,7 @@
202 - AC_ARG_WITH([sun-acl],
203 - [AC_HELP_STRING([--with-sun-acl],
204 - [use ACL on solaris (no checking)])],
205 -- [],
206 -+ [with_sun_acl="$withval"],
207 - [with_sun_acl=no]
208 - )
209 -
210 -@@ -440,7 +440,7 @@
211 - AC_ARG_WITH([posix-acl],
212 - [AC_HELP_STRING([--with-posix-acl],
213 - [use POSIX ACLs (no checking)])],
214 -- [],
215 -+ [with_posix_acl_support="$withval"],
216 - [with_posix_acl_support=no]
217 - )
218 -
219
220 diff --git a/app-forensics/aide/files/aide-0.14-gentoo.patch b/app-forensics/aide/files/aide-0.14-gentoo.patch
221 deleted file mode 100644
222 index f2c8156ed16..00000000000
223 --- a/app-forensics/aide/files/aide-0.14-gentoo.patch
224 +++ /dev/null
225 @@ -1,26 +0,0 @@
226 -diff -Naur aide-0.14.orig//src/Makefile.am aide-0.14//src/Makefile.am
227 ---- aide-0.14.orig//src/Makefile.am 2010-02-20 04:23:08.000000000 +0900
228 -+++ aide-0.14//src/Makefile.am 2010-05-26 23:56:47.000000000 +0900
229 -@@ -26,7 +26,7 @@
230 - LEX_OUTPUT_ROOT = lex.yy
231 -
232 - LDADD = -lm @CRYPTLIB@ @ACLLIB@ @SELINUXLIB@ @AUDITLIB@ @ATTRLIB@ @ELFLIB@
233 --AM_CFLAGS = @AIDE_DEFS@ -W -Wall -g
234 -+AM_CFLAGS = -DLOCALEDIR=\"$(localedir)\" @AIDE_DEFS@ -W -Wall -g
235 -
236 - CLEANFILES = conf_yacc.h conf_yacc.c conf_lex.c db_lex.c *~
237 -
238 -diff -Naur aide-0.14.orig//src/db.c aide-0.14//src/db.c
239 ---- aide-0.14.orig//src/db.c 2010-02-18 05:06:57.000000000 +0900
240 -+++ aide-0.14//src/db.c 2010-05-27 00:16:07.000000000 +0900
241 -@@ -26,6 +26,10 @@
242 - #include "db_file.h"
243 - #include "db_disk.h"
244 -
245 -+#ifdef WITH_CURL
246 -+#include "fopen.h"
247 -+#endif
248 -+
249 - #ifdef WITH_PSQL
250 - #include "db_sql.h"
251 - #endif