1 |
ssuominen 14/07/03 16:49:58 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: dbus-1.8.6.ebuild |
5 |
Log: |
6 |
Version bump wrt security #516080 |
7 |
|
8 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D) |
9 |
|
10 |
Revision Changes Path |
11 |
1.425 sys-apps/dbus/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/ChangeLog?rev=1.425&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/ChangeLog?rev=1.425&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/ChangeLog?r1=1.424&r2=1.425 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v |
20 |
retrieving revision 1.424 |
21 |
retrieving revision 1.425 |
22 |
diff -u -r1.424 -r1.425 |
23 |
--- ChangeLog 24 Jun 2014 19:15:14 -0000 1.424 |
24 |
+++ ChangeLog 3 Jul 2014 16:49:57 -0000 1.425 |
25 |
@@ -1,6 +1,11 @@ |
26 |
# ChangeLog for sys-apps/dbus |
27 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.424 2014/06/24 19:15:14 maekke Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.425 2014/07/03 16:49:57 ssuominen Exp $ |
30 |
+ |
31 |
+*dbus-1.8.6 (03 Jul 2014) |
32 |
+ |
33 |
+ 03 Jul 2014; Samuli Suominen <ssuominen@g.o> +dbus-1.8.6.ebuild: |
34 |
+ Version bump wrt security #516080 |
35 |
|
36 |
24 Jun 2014; Markus Meier <maekke@g.o> dbus-1.8.4.ebuild: |
37 |
arm stable, bug #512940 |
38 |
|
39 |
|
40 |
|
41 |
1.1 sys-apps/dbus/dbus-1.8.6.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/dbus-1.8.6.ebuild?rev=1.1&view=markup |
44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/dbus-1.8.6.ebuild?rev=1.1&content-type=text/plain |
45 |
|
46 |
Index: dbus-1.8.6.ebuild |
47 |
=================================================================== |
48 |
# Copyright 1999-2014 Gentoo Foundation |
49 |
# Distributed under the terms of the GNU General Public License v2 |
50 |
# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.8.6.ebuild,v 1.1 2014/07/03 16:49:57 ssuominen Exp $ |
51 |
|
52 |
EAPI=5 |
53 |
PYTHON_COMPAT=( python2_7 ) |
54 |
inherit autotools eutils linux-info flag-o-matic multilib-minimal python-any-r1 systemd virtualx user |
55 |
|
56 |
DESCRIPTION="A message bus system, a simple way for applications to talk to each other" |
57 |
HOMEPAGE="http://dbus.freedesktop.org/" |
58 |
SRC_URI="http://dbus.freedesktop.org/releases/dbus/${P}.tar.gz" |
59 |
|
60 |
LICENSE="|| ( AFL-2.1 GPL-2 )" |
61 |
SLOT="0" |
62 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux" |
63 |
IUSE="debug doc selinux static-libs systemd test X" |
64 |
|
65 |
RDEPEND=">=dev-libs/expat-2 |
66 |
selinux? ( |
67 |
sec-policy/selinux-dbus |
68 |
sys-libs/libselinux |
69 |
) |
70 |
systemd? ( sys-apps/systemd:0= ) |
71 |
X? ( |
72 |
x11-libs/libX11 |
73 |
x11-libs/libXt |
74 |
) |
75 |
abi_x86_32? ( |
76 |
!<=app-emulation/emul-linux-x86-baselibs-20131008-r4 |
77 |
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
78 |
)" |
79 |
DEPEND="${RDEPEND} |
80 |
app-text/xmlto |
81 |
app-text/docbook-xml-dtd:4.4 |
82 |
virtual/pkgconfig |
83 |
doc? ( app-doc/doxygen ) |
84 |
test? ( |
85 |
>=dev-libs/glib-2.24 |
86 |
${PYTHON_DEPS} |
87 |
)" |
88 |
|
89 |
# out of sources build dir for make check |
90 |
TBD=${WORKDIR}/${P}-tests-build |
91 |
|
92 |
pkg_setup() { |
93 |
enewgroup messagebus |
94 |
enewuser messagebus -1 -1 -1 messagebus |
95 |
|
96 |
use test && python-any-r1_pkg_setup |
97 |
|
98 |
if use kernel_linux; then |
99 |
CONFIG_CHECK="~EPOLL" |
100 |
linux-info_pkg_setup |
101 |
fi |
102 |
} |
103 |
|
104 |
src_prepare() { |
105 |
# Tests were restricted because of this |
106 |
sed -i \ |
107 |
-e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \ |
108 |
-e '/"dispatch"/d' \ |
109 |
bus/test-main.c || die |
110 |
|
111 |
epatch_user |
112 |
|
113 |
# required for asneeded patch but also for bug 263909, cross-compile so |
114 |
# don't remove eautoreconf |
115 |
eautoreconf |
116 |
} |
117 |
|
118 |
multilib_src_configure() { |
119 |
local docconf myconf |
120 |
|
121 |
# so we can get backtraces from apps |
122 |
case ${CHOST} in |
123 |
*-mingw*) |
124 |
# error: unrecognized command line option '-rdynamic' wrt #488036 |
125 |
;; |
126 |
*) |
127 |
append-flags -rdynamic |
128 |
;; |
129 |
esac |
130 |
|
131 |
# libaudit is *only* used in DBus wrt SELinux support, so disable it, if |
132 |
# not on an SELinux profile. |
133 |
myconf=( |
134 |
--localstatedir="${EPREFIX}/var" |
135 |
--docdir="${EPREFIX}/usr/share/doc/${PF}" |
136 |
--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" |
137 |
$(use_enable static-libs static) |
138 |
$(use_enable debug verbose-mode) |
139 |
--disable-asserts |
140 |
--disable-checks |
141 |
$(use_enable selinux) |
142 |
$(use_enable selinux libaudit) |
143 |
$(use_enable kernel_linux inotify) |
144 |
$(use_enable kernel_FreeBSD kqueue) |
145 |
$(use_enable systemd) |
146 |
--disable-embedded-tests |
147 |
--disable-modular-tests |
148 |
$(use_enable debug stats) |
149 |
--with-session-socket-dir=/tmp |
150 |
--with-system-pid-file=/var/run/dbus.pid |
151 |
--with-system-socket=/var/run/dbus/system_bus_socket |
152 |
--with-dbus-user=messagebus |
153 |
$(use_with X x) |
154 |
"$(systemd_with_unitdir)" |
155 |
) |
156 |
|
157 |
if multilib_is_native_abi; then |
158 |
docconf=( |
159 |
--enable-xml-docs |
160 |
$(use_enable doc doxygen-docs) |
161 |
) |
162 |
else |
163 |
docconf=( |
164 |
--disable-xml-docs |
165 |
--disable-doxygen-docs |
166 |
) |
167 |
myconf+=( |
168 |
--disable-selinux |
169 |
--disable-libaudit |
170 |
--disable-systemd |
171 |
--without-x |
172 |
) |
173 |
fi |
174 |
|
175 |
einfo "Running configure in ${BUILD_DIR}" |
176 |
ECONF_SOURCE="${S}" econf "${myconf[@]}" "${docconf[@]}" |
177 |
|
178 |
if multilib_is_native_abi && use test; then |
179 |
mkdir "${TBD}" |
180 |
cd "${TBD}" |
181 |
einfo "Running configure in ${TBD}" |
182 |
ECONF_SOURCE="${S}" econf "${myconf[@]}" \ |
183 |
$(use_enable test asserts) \ |
184 |
$(use_enable test checks) \ |
185 |
$(use_enable test embedded-tests) \ |
186 |
$(has_version dev-libs/dbus-glib && echo --enable-modular-tests) |
187 |
fi |
188 |
} |
189 |
|
190 |
multilib_src_compile() { |
191 |
if multilib_is_native_abi; then |
192 |
# after the compile, it uses a selinuxfs interface to |
193 |
# check if the SELinux policy has the right support |
194 |
use selinux && addwrite /selinux/access |
195 |
|
196 |
einfo "Running make in ${BUILD_DIR}" |
197 |
emake |
198 |
|
199 |
if multilib_is_native_abi && use test; then |
200 |
cd "${TBD}" |
201 |
einfo "Running make in ${TBD}" |
202 |
emake |
203 |
fi |
204 |
else |
205 |
emake -C dbus libdbus-1.la |
206 |
fi |
207 |
} |
208 |
|
209 |
src_test() { |
210 |
cd "${TBD}" |
211 |
DBUS_VERBOSE=1 Xemake -j1 check |
212 |
} |
213 |
|
214 |
multilib_src_install() { |
215 |
if multilib_is_native_abi; then |
216 |
emake DESTDIR="${D}" install |
217 |
else |
218 |
emake DESTDIR="${D}" install-pkgconfigDATA |
219 |
emake DESTDIR="${D}" -C dbus \ |
220 |
install-libLTLIBRARIES install-dbusincludeHEADERS \ |
221 |
install-nodist_dbusarchincludeHEADERS |
222 |
fi |
223 |
} |
224 |
|
225 |
multilib_src_install_all() { |
226 |
newinitd "${FILESDIR}"/dbus.initd dbus |
227 |
|
228 |
if use X; then |
229 |
# dbus X session script (#77504) |
230 |
# turns out to only work for GDM (and startx). has been merged into |
231 |
# other desktop (kdm and such scripts) |
232 |
exeinto /etc/X11/xinit/xinitrc.d |
233 |
doexe "${FILESDIR}"/80-dbus |
234 |
fi |
235 |
|
236 |
# needs to exist for dbus sessions to launch |
237 |
keepdir /usr/share/dbus-1/services |
238 |
keepdir /etc/dbus-1/{session,system}.d |
239 |
# machine-id symlink from pkg_postinst() |
240 |
keepdir /var/lib/dbus |
241 |
# let the init script create the /var/run/dbus directory |
242 |
rm -rf "${ED}"/var/run |
243 |
|
244 |
dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO |
245 |
prune_libtool_files --all |
246 |
} |
247 |
|
248 |
pkg_postinst() { |
249 |
if [ "$(rc-config list default | grep dbus)" = "" ] ; then |
250 |
elog "To start the D-Bus system-wide messagebus by default" |
251 |
elog "you should add it to the default runlevel :" |
252 |
elog "\`rc-update add dbus default\`" |
253 |
elog |
254 |
fi |
255 |
|
256 |
elog "Some applications require a session bus in addition to the system" |
257 |
elog "bus. Please see \`man dbus-launch\` for more information." |
258 |
elog |
259 |
|
260 |
if [ "$(rc-status | grep dbus | grep started)" ] ; then |
261 |
ewarn "You must restart D-Bus \`/etc/init.d/dbus restart\` to run" |
262 |
ewarn "the new version of the daemon." |
263 |
ewarn "Don't do this while X is running because it will restart your X as well." |
264 |
fi |
265 |
|
266 |
# Ensure unique id is generated and put it in /etc wrt #370451 but symlink |
267 |
# for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse |
268 |
# dependencies with hardcoded paths (although the known ones got fixed already) |
269 |
dbus-uuidgen --ensure="${EROOT%/}"/etc/machine-id |
270 |
ln -sf "${EROOT%/}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id |
271 |
} |