1 |
pacho 14/03/30 14:06:53 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: audit-2.2.2-r1.ebuild |
5 |
Log: |
6 |
Install systemd unit files instead of not used rc/sysconfig fedora stuff that was being manually removed at install phase (#503374 by Reuben Martin) |
7 |
|
8 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A188FBD4) |
9 |
|
10 |
Revision Changes Path |
11 |
1.94 sys-process/audit/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/audit/ChangeLog?rev=1.94&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/audit/ChangeLog?rev=1.94&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/audit/ChangeLog?r1=1.93&r2=1.94 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/sys-process/audit/ChangeLog,v |
20 |
retrieving revision 1.93 |
21 |
retrieving revision 1.94 |
22 |
diff -u -r1.93 -r1.94 |
23 |
--- ChangeLog 3 Mar 2013 10:25:39 -0000 1.93 |
24 |
+++ ChangeLog 30 Mar 2014 14:06:53 -0000 1.94 |
25 |
@@ -1,6 +1,12 @@ |
26 |
# ChangeLog for sys-process/audit |
27 |
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/ChangeLog,v 1.93 2013/03/03 10:25:39 vapier Exp $ |
29 |
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
30 |
+# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/ChangeLog,v 1.94 2014/03/30 14:06:53 pacho Exp $ |
31 |
+ |
32 |
+*audit-2.2.2-r1 (30 Mar 2014) |
33 |
+ |
34 |
+ 30 Mar 2014; Pacho Ramos <pacho@g.o> +audit-2.2.2-r1.ebuild: |
35 |
+ Install systemd unit files instead of not used rc/sysconfig fedora stuff that |
36 |
+ was being manually removed at install phase (#503374 by Reuben Martin) |
37 |
|
38 |
03 Mar 2013; Mike Frysinger <vapier@g.o> audit-2.1.3-r1.ebuild, |
39 |
audit-2.2.2.ebuild: |
40 |
|
41 |
|
42 |
|
43 |
1.1 sys-process/audit/audit-2.2.2-r1.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/audit/audit-2.2.2-r1.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/audit/audit-2.2.2-r1.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: audit-2.2.2-r1.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2014 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/audit-2.2.2-r1.ebuild,v 1.1 2014/03/30 14:06:53 pacho Exp $ |
53 |
|
54 |
EAPI="5" |
55 |
PYTHON_DEPEND="python? 2" |
56 |
SUPPORT_PYTHON_ABIS="1" |
57 |
RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*" |
58 |
|
59 |
inherit autotools multilib toolchain-funcs python linux-info eutils |
60 |
|
61 |
DESCRIPTION="Userspace utilities for storing and processing auditing records" |
62 |
HOMEPAGE="http://people.redhat.com/sgrubb/audit/" |
63 |
SRC_URI="http://people.redhat.com/sgrubb/audit/${P}.tar.gz" |
64 |
|
65 |
LICENSE="GPL-2" |
66 |
SLOT="0" |
67 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" |
68 |
IUSE="ldap prelude python" |
69 |
# Testcases are pretty useless as they are built for RedHat users/groups and |
70 |
# kernels. |
71 |
RESTRICT="test" |
72 |
|
73 |
RDEPEND="ldap? ( net-nds/openldap ) |
74 |
prelude? ( dev-libs/libprelude ) |
75 |
sys-libs/libcap-ng" |
76 |
DEPEND="${RDEPEND} |
77 |
python? ( dev-lang/swig ) |
78 |
>=sys-kernel/linux-headers-2.6.34" |
79 |
# Do not use os-headers as this is linux specific |
80 |
|
81 |
CONFIG_CHECK="~AUDIT" |
82 |
PYTHON_DIRS="bindings/python swig" |
83 |
|
84 |
pkg_setup() { |
85 |
linux-info_pkg_setup |
86 |
use python && python_pkg_setup |
87 |
} |
88 |
|
89 |
src_prepare() { |
90 |
# Old patch applies fine |
91 |
#EPATCH_OPTS="-p0 -d${S}" epatch "${FILESDIR}"/${PN}-1.5.4-build.patch |
92 |
|
93 |
# Applied by upstream |
94 |
#EPATCH_OPTS="-p1 -d${S}" epatch "${FILESDIR}"/${PN}-1.5.4-swig-gcc-attribute.patch |
95 |
|
96 |
# Do not build GUI tools |
97 |
sed -i \ |
98 |
-e '/AC_CONFIG_SUBDIRS.*system-config-audit/d' \ |
99 |
"${S}"/configure.ac || die |
100 |
sed -i \ |
101 |
-e 's,system-config-audit,,g' \ |
102 |
"${S}"/Makefile.am || die |
103 |
rm -rf "${S}"/system-config-audit |
104 |
|
105 |
# Probably goes away in 1.6.9 |
106 |
#EPATCH_OPTS="-p1 -d${S}" epatch "${FILESDIR}"/audit-1.6.8-subdirs-fix.patch |
107 |
|
108 |
if ! use ldap; then |
109 |
sed -i \ |
110 |
-e '/^AC_OUTPUT/s,audisp/plugins/zos-remote/Makefile,,g' \ |
111 |
"${S}"/configure.ac || die |
112 |
sed -i \ |
113 |
-e '/^SUBDIRS/s,zos-remote,,g' \ |
114 |
"${S}"/audisp/plugins/Makefile.am || die |
115 |
fi |
116 |
|
117 |
# Don't build static version of Python module. |
118 |
epatch "${FILESDIR}"/${PN}-2.1.3-python.patch |
119 |
|
120 |
# glibc/kernel upstreams suck with both defining ia64_fpreg |
121 |
# This patch is a horribly workaround that is only valid as long as you |
122 |
# don't need the OTHER definitions in fpu.h. |
123 |
epatch "${FILESDIR}"/${PN}-2.1.3-ia64-compile-fix.patch |
124 |
|
125 |
# Python bindings are built/installed manually. |
126 |
sed -e "/^SUBDIRS =/s/ python//" -i bindings/Makefile.am |
127 |
sed -e "/^SUBDIRS .*=/s/ swig//" -i Makefile.am |
128 |
|
129 |
# Regenerate autotooling |
130 |
eautoreconf |
131 |
|
132 |
# Disable byte-compilation of Python modules. |
133 |
echo "#!/bin/sh" > py-compile |
134 |
|
135 |
# Bug 352198: Avoid parallel build fail |
136 |
cd "${S}"/src/mt |
137 |
[[ ! -s private.h ]] && ln -s ../../lib/private.h . |
138 |
} |
139 |
|
140 |
src_configure() { |
141 |
#append-flags -D'__attribute__(x)=' |
142 |
econf \ |
143 |
--sbindir=/sbin \ |
144 |
--enable-systemd \ |
145 |
$(use_with prelude) |
146 |
} |
147 |
|
148 |
src_compile_python() { |
149 |
python_copy_sources ${PYTHON_DIRS} |
150 |
|
151 |
building() { |
152 |
emake \ |
153 |
PYTHON_VERSION="$(python_get_version)" \ |
154 |
pyexecdir="$(python_get_sitedir)" |
155 |
} |
156 |
local dir |
157 |
for dir in ${PYTHON_DIRS}; do |
158 |
python_execute_function -s --source-dir ${dir} building |
159 |
done |
160 |
} |
161 |
|
162 |
src_compile() { |
163 |
default |
164 |
use python && src_compile_python |
165 |
} |
166 |
|
167 |
src_install_python() { |
168 |
installation() { |
169 |
emake \ |
170 |
DESTDIR="${D}" \ |
171 |
PYTHON_VERSION="$(python_get_version)" \ |
172 |
pyexecdir="$(python_get_sitedir)" \ |
173 |
install |
174 |
} |
175 |
local dir |
176 |
for dir in ${PYTHON_DIRS}; do |
177 |
python_execute_function -s --source-dir ${dir} installation |
178 |
done |
179 |
} |
180 |
|
181 |
src_install() { |
182 |
emake DESTDIR="${D}" install || die |
183 |
use python && src_install_python |
184 |
|
185 |
dodoc AUTHORS ChangeLog README* THANKS TODO |
186 |
docinto contrib |
187 |
dodoc contrib/{*.rules,avc_snap,skeleton.c} |
188 |
docinto contrib/plugin |
189 |
dodoc contrib/plugin/* |
190 |
|
191 |
newinitd "${FILESDIR}"/auditd-init.d-2.1.3 auditd |
192 |
newconfd "${FILESDIR}"/auditd-conf.d-2.1.3 auditd |
193 |
|
194 |
# things like shadow use this so we need to be in / |
195 |
gen_usr_ldscript -a audit auparse |
196 |
|
197 |
[ -f "${D}"/sbin/audisp-remote ] && \ |
198 |
dodir /usr/sbin && \ |
199 |
mv "${D}"/{sbin,usr/sbin}/audisp-remote || die |
200 |
|
201 |
# Gentoo rules |
202 |
insinto /etc/audit/ |
203 |
newins "${FILESDIR}"/audit.rules-2.1.3 audit.rules |
204 |
doins "${FILESDIR}"/audit.rules.stop* |
205 |
|
206 |
# audit logs go here |
207 |
keepdir /var/log/audit/ |
208 |
|
209 |
# Security |
210 |
lockdown_perms "${D}" |
211 |
|
212 |
# Don't install .la files in Python directories. |
213 |
use python && python_clean_installation_image |
214 |
} |
215 |
|
216 |
pkg_preinst() { |
217 |
# Preserve from the audit-1 series |
218 |
preserve_old_lib /$(get_libdir)/libau{dit,parse}.so.0 |
219 |
} |
220 |
|
221 |
pkg_postinst() { |
222 |
lockdown_perms "${ROOT}" |
223 |
use python && python_mod_optimize audit.py |
224 |
# Preserve from the audit-1 series |
225 |
preserve_old_lib_notify /$(get_libdir)/libau{dit,parse}.so.0 |
226 |
} |
227 |
|
228 |
pkg_postrm() { |
229 |
use python && python_mod_cleanup audit.py |
230 |
} |
231 |
|
232 |
lockdown_perms() { |
233 |
# upstream wants these to have restrictive perms |
234 |
basedir="$1" |
235 |
chmod 0750 "${basedir}"/sbin/au{ditctl,report,dispd,ditd,search,trace} 2>/dev/null |
236 |
chmod 0750 "${basedir}"/var/log/audit/ 2>/dev/null |
237 |
chmod 0640 "${basedir}"/etc/{audit/,}{auditd.conf,audit.rules*} 2>/dev/null |
238 |
} |