1 |
eva 10/09/09 23:09:05 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: dbus-1.2.24-r2.ebuild dbus-1.3.0-r3.ebuild |
5 |
Removed: dbus-1.2.3-r1.ebuild |
6 |
Log: |
7 |
Apply thread safety patch from master, bug #336588. Sync dbus-1.2 with 1.3 ebuild enhancements. Clean up old revision. |
8 |
|
9 |
(Portage version: 2.2_rc78/cvs/Linux x86_64) |
10 |
|
11 |
Revision Changes Path |
12 |
1.258 sys-apps/dbus/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/ChangeLog?rev=1.258&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/ChangeLog?rev=1.258&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/ChangeLog?r1=1.257&r2=1.258 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v |
21 |
retrieving revision 1.257 |
22 |
retrieving revision 1.258 |
23 |
diff -u -r1.257 -r1.258 |
24 |
--- ChangeLog 5 Aug 2010 19:54:03 -0000 1.257 |
25 |
+++ ChangeLog 9 Sep 2010 23:09:05 -0000 1.258 |
26 |
@@ -1,6 +1,16 @@ |
27 |
# ChangeLog for sys-apps/dbus |
28 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.257 2010/08/05 19:54:03 lack Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.258 2010/09/09 23:09:05 eva Exp $ |
31 |
+ |
32 |
+*dbus-1.3.0-r3 (09 Sep 2010) |
33 |
+*dbus-1.2.24-r2 (09 Sep 2010) |
34 |
+ |
35 |
+ 09 Sep 2010; Gilles Dartiguelongue <eva@g.o> -dbus-1.2.3-r1.ebuild, |
36 |
+ -files/dbus-1.2.3-bsd.patch, |
37 |
+ -files/dbus-1.2.3-panic-from-dbus_signature_validate.patch, |
38 |
+ +dbus-1.2.24-r2.ebuild, +dbus-1.3.0-r3.ebuild: |
39 |
+ Apply thread safety patch from master, bug #336588. Sync dbus-1.2 with 1.3 |
40 |
+ ebuild enhancements. Clean up old revision. |
41 |
|
42 |
*dbus-1.3.0-r2 (05 Aug 2010) |
43 |
*dbus-1.2.24-r1 (05 Aug 2010) |
44 |
|
45 |
|
46 |
|
47 |
1.1 sys-apps/dbus/dbus-1.2.24-r2.ebuild |
48 |
|
49 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/dbus-1.2.24-r2.ebuild?rev=1.1&view=markup |
50 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/dbus-1.2.24-r2.ebuild?rev=1.1&content-type=text/plain |
51 |
|
52 |
Index: dbus-1.2.24-r2.ebuild |
53 |
=================================================================== |
54 |
# Copyright 1999-2010 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.2.24-r2.ebuild,v 1.1 2010/09/09 23:09:05 eva Exp $ |
57 |
|
58 |
EAPI="2" |
59 |
|
60 |
inherit eutils multilib flag-o-matic |
61 |
|
62 |
DESCRIPTION="A message bus system, a simple way for applications to talk to each other" |
63 |
HOMEPAGE="http://dbus.freedesktop.org/" |
64 |
SRC_URI="http://dbus.freedesktop.org/releases/dbus/${P}.tar.gz" |
65 |
|
66 |
LICENSE="|| ( GPL-2 AFL-2.1 )" |
67 |
SLOT="0" |
68 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" |
69 |
IUSE="debug doc selinux test X" |
70 |
|
71 |
RDEPEND="X? ( x11-libs/libXt x11-libs/libX11 ) |
72 |
selinux? ( sys-libs/libselinux |
73 |
sec-policy/selinux-dbus ) |
74 |
>=dev-libs/expat-1.95.8 |
75 |
!<sys-apps/dbus-0.91" |
76 |
DEPEND="${RDEPEND} |
77 |
dev-util/pkgconfig |
78 |
doc? ( |
79 |
app-doc/doxygen |
80 |
app-text/xmlto |
81 |
app-text/docbook-xml-dtd:4.1.2 )" |
82 |
|
83 |
# out of sources build directory |
84 |
BD=${WORKDIR}/${P}-build |
85 |
# out of sources build dir for make check |
86 |
TBD=${WORKDIR}/${P}-tests-build |
87 |
|
88 |
pkg_setup() { |
89 |
enewgroup messagebus |
90 |
enewuser messagebus -1 "-1" -1 messagebus |
91 |
} |
92 |
|
93 |
src_prepare() { |
94 |
# Tests were restricted because of this |
95 |
sed -e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \ |
96 |
-e '/"dispatch"/d' -i "${S}/bus/test-main.c" || die "sed failed" |
97 |
|
98 |
# Thread safety patch, upstream #17754 |
99 |
epatch "${FILESDIR}/${PN}-1.2.24-thread-safety.patch" |
100 |
} |
101 |
|
102 |
src_configure() { |
103 |
local my_conf |
104 |
|
105 |
# so we can get backtraces from apps |
106 |
append-flags -rdynamic |
107 |
|
108 |
# libaudit is *only* used in DBus wrt SELinux support, so disable it, if |
109 |
# not on an SELinux profile. |
110 |
my_conf="$(use_with X x) |
111 |
$(use_enable debug verbose-mode) |
112 |
$(use_enable debug asserts) |
113 |
$(use_enable kernel_linux inotify) |
114 |
$(use_enable kernel_FreeBSD kqueue) |
115 |
$(use_enable selinux) |
116 |
$(use_enable selinux libaudit) |
117 |
--with-xml=expat |
118 |
--with-system-pid-file=/var/run/dbus.pid |
119 |
--with-system-socket=/var/run/dbus/system_bus_socket |
120 |
--with-session-socket-dir=/tmp |
121 |
--with-dbus-user=messagebus |
122 |
--localstatedir=/var" |
123 |
|
124 |
mkdir "${BD}" |
125 |
cd "${BD}" |
126 |
einfo "Running configure in ${BD}" |
127 |
ECONF_SOURCE="${S}" econf ${my_conf} \ |
128 |
$(use_enable doc doxygen-docs) \ |
129 |
$(use_enable doc xml-docs) |
130 |
|
131 |
if use test; then |
132 |
mkdir "${TBD}" |
133 |
cd "${TBD}" |
134 |
einfo "Running configure in ${TBD}" |
135 |
ECONF_SOURCE="${S}" econf \ |
136 |
${my_conf} \ |
137 |
$(use_enable test checks) \ |
138 |
$(use_enable test tests) \ |
139 |
$(use_enable test asserts) |
140 |
fi |
141 |
} |
142 |
|
143 |
src_compile() { |
144 |
# after the compile, it uses a selinuxfs interface to |
145 |
# check if the SELinux policy has the right support |
146 |
use selinux && addwrite /selinux/access |
147 |
|
148 |
cd "${BD}" |
149 |
einfo "Running make in ${BD}" |
150 |
emake || die "make failed" |
151 |
|
152 |
if use doc; then |
153 |
einfo "Building API documentation..." |
154 |
doxygen || die "doxygen failed" |
155 |
fi |
156 |
|
157 |
if use test; then |
158 |
cd "${TBD}" |
159 |
einfo "Running make in ${TBD}" |
160 |
emake || die "make failed" |
161 |
fi |
162 |
} |
163 |
|
164 |
src_test() { |
165 |
cd "${TBD}" |
166 |
DBUS_VERBOSE=1 make check || die "make check failed" |
167 |
} |
168 |
|
169 |
src_install() { |
170 |
# initscript |
171 |
newinitd "${FILESDIR}"/dbus.init-1.0 dbus || die "newinitd failed" |
172 |
|
173 |
if use X ; then |
174 |
# dbus X session script (#77504) |
175 |
# turns out to only work for GDM (and startx). has been merged into |
176 |
# other desktop (kdm and such scripts) |
177 |
exeinto /etc/X11/xinit/xinitrc.d/ |
178 |
doexe "${FILESDIR}"/80-dbus || die "doexe failed" |
179 |
fi |
180 |
|
181 |
# needs to exist for the system socket |
182 |
keepdir /var/run/dbus |
183 |
# needs to exist for machine id |
184 |
keepdir /var/lib/dbus |
185 |
# needs to exist for dbus sessions to launch |
186 |
|
187 |
keepdir /usr/lib/dbus-1.0/services |
188 |
keepdir /usr/share/dbus-1/services |
189 |
keepdir /etc/dbus-1/system.d/ |
190 |
keepdir /etc/dbus-1/session.d/ |
191 |
|
192 |
dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO || die "dodoc failed" |
193 |
|
194 |
cd "${BD}" |
195 |
# FIXME: split dtd's in dbus-dtd ebuild |
196 |
emake DESTDIR="${D}" install || die "make install failed" |
197 |
if use doc; then |
198 |
dohtml doc/*.html doc/api/html/* || die "dohtml failed" |
199 |
fi |
200 |
} |
201 |
|
202 |
pkg_postinst() { |
203 |
elog "To start the D-Bus system-wide messagebus by default" |
204 |
elog "you should add it to the default runlevel :" |
205 |
elog "\`rc-update add dbus default\`" |
206 |
elog |
207 |
elog "Some applications require a session bus in addition to the system" |
208 |
elog "bus. Please see \`man dbus-launch\` for more information." |
209 |
elog |
210 |
ewarn "You must restart D-Bus \`/etc/init.d/dbus restart\` to run" |
211 |
ewarn "the new version of the daemon." |
212 |
|
213 |
if has_version x11-base/xorg-server[hal]; then |
214 |
elog |
215 |
ewarn "You are currently running X with the hal useflag enabled" |
216 |
ewarn "restarting the dbus service WILL restart X as well" |
217 |
ebeep 5 |
218 |
fi |
219 |
|
220 |
# Ensure unique id is generated |
221 |
dbus-uuidgen --ensure="${ROOT}"/var/lib/dbus/machine-id |
222 |
} |
223 |
|
224 |
|
225 |
|
226 |
1.1 sys-apps/dbus/dbus-1.3.0-r3.ebuild |
227 |
|
228 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/dbus-1.3.0-r3.ebuild?rev=1.1&view=markup |
229 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/dbus-1.3.0-r3.ebuild?rev=1.1&content-type=text/plain |
230 |
|
231 |
Index: dbus-1.3.0-r3.ebuild |
232 |
=================================================================== |
233 |
# Copyright 1999-2010 Gentoo Foundation |
234 |
# Distributed under the terms of the GNU General Public License v2 |
235 |
# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.3.0-r3.ebuild,v 1.1 2010/09/09 23:09:05 eva Exp $ |
236 |
|
237 |
EAPI="2" |
238 |
|
239 |
inherit autotools eutils multilib flag-o-matic |
240 |
|
241 |
DESCRIPTION="A message bus system, a simple way for applications to talk to each other" |
242 |
HOMEPAGE="http://dbus.freedesktop.org/" |
243 |
SRC_URI="http://dbus.freedesktop.org/releases/dbus/${P}.tar.gz" |
244 |
|
245 |
LICENSE="|| ( GPL-2 AFL-2.1 )" |
246 |
SLOT="0" |
247 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" |
248 |
IUSE="debug doc selinux test X" |
249 |
|
250 |
RDEPEND="X? ( x11-libs/libXt x11-libs/libX11 ) |
251 |
selinux? ( sys-libs/libselinux |
252 |
sec-policy/selinux-dbus ) |
253 |
>=dev-libs/expat-1.95.8 |
254 |
!<sys-apps/dbus-0.91" |
255 |
DEPEND="${RDEPEND} |
256 |
dev-util/pkgconfig |
257 |
doc? ( |
258 |
app-doc/doxygen |
259 |
app-text/xmlto |
260 |
app-text/docbook-xml-dtd:4.1.2 )" |
261 |
|
262 |
# out of sources build directory |
263 |
BD=${WORKDIR}/${P}-build |
264 |
# out of sources build dir for make check |
265 |
TBD=${WORKDIR}/${P}-tests-build |
266 |
|
267 |
pkg_setup() { |
268 |
enewgroup messagebus |
269 |
enewuser messagebus -1 "-1" -1 messagebus |
270 |
} |
271 |
|
272 |
src_prepare() { |
273 |
# Remove CFLAGS that is not supported by all gcc, bug #274456 |
274 |
sed 's/-Wno-pointer-sign//g' -i configure.in configure || die "sed failed" |
275 |
|
276 |
# Tests were restricted because of this |
277 |
sed -e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \ |
278 |
-e '/"dispatch"/d' -i "${S}/bus/test-main.c" || die "sed failed" |
279 |
|
280 |
# Thread safety patch, upstream #17754 |
281 |
epatch "${FILESDIR}/${PN}-1.2.24-thread-safety.patch" |
282 |
|
283 |
epatch "${FILESDIR}"/${P}-asneeded.patch |
284 |
epatch "${FILESDIR}"/${P}-no-cloexec.patch |
285 |
# required for asneeded patch but also for bug 263909, cross-compile so |
286 |
# don't remove eautoreconf |
287 |
eautoreconf |
288 |
} |
289 |
|
290 |
src_configure() { |
291 |
local my_conf |
292 |
|
293 |
# so we can get backtraces from apps |
294 |
append-flags -rdynamic |
295 |
|
296 |
# libaudit is *only* used in DBus wrt SELinux support, so disable it, if |
297 |
# not on an SELinux profile. |
298 |
my_conf="$(use_with X x) |
299 |
$(use_enable debug verbose-mode) |
300 |
$(use_enable debug asserts) |
301 |
$(use_enable kernel_linux inotify) |
302 |
$(use_enable kernel_FreeBSD kqueue) |
303 |
$(use_enable selinux) |
304 |
$(use_enable selinux libaudit) |
305 |
--with-xml=expat |
306 |
--with-system-pid-file=/var/run/dbus.pid |
307 |
--with-system-socket=/var/run/dbus/system_bus_socket |
308 |
--with-session-socket-dir=/tmp |
309 |
--with-dbus-user=messagebus |
310 |
--localstatedir=/var" |
311 |
|
312 |
mkdir "${BD}" |
313 |
cd "${BD}" |
314 |
einfo "Running configure in ${BD}" |
315 |
ECONF_SOURCE="${S}" econf ${my_conf} \ |
316 |
$(use_enable doc doxygen-docs) \ |
317 |
$(use_enable doc xml-docs) |
318 |
|
319 |
if use test; then |
320 |
mkdir "${TBD}" |
321 |
cd "${TBD}" |
322 |
einfo "Running configure in ${TBD}" |
323 |
ECONF_SOURCE="${S}" econf \ |
324 |
${my_conf} \ |
325 |
$(use_enable test checks) \ |
326 |
$(use_enable test tests) \ |
327 |
$(use_enable test asserts) |
328 |
fi |
329 |
} |
330 |
|
331 |
src_compile() { |
332 |
# after the compile, it uses a selinuxfs interface to |
333 |
# check if the SELinux policy has the right support |
334 |
use selinux && addwrite /selinux/access |
335 |
|
336 |
cd "${BD}" |
337 |
einfo "Running make in ${BD}" |
338 |
emake || die "make failed" |
339 |
|
340 |
if use doc; then |
341 |
einfo "Building API documentation..." |
342 |
doxygen || die "doxygen failed" |
343 |
fi |
344 |
|
345 |
if use test; then |
346 |
cd "${TBD}" |
347 |
einfo "Running make in ${TBD}" |
348 |
emake || die "make failed" |
349 |
fi |
350 |
} |
351 |
|
352 |
src_test() { |
353 |
cd "${TBD}" |
354 |
DBUS_VERBOSE=1 make check || die "make check failed" |
355 |
} |
356 |
|
357 |
src_install() { |
358 |
# initscript |
359 |
newinitd "${FILESDIR}"/dbus.init-1.0 dbus || die "newinitd failed" |
360 |
|
361 |
if use X ; then |
362 |
# dbus X session script (#77504) |
363 |
# turns out to only work for GDM (and startx). has been merged into |
364 |
# other desktop (kdm and such scripts) |
365 |
exeinto /etc/X11/xinit/xinitrc.d/ |
366 |
doexe "${FILESDIR}"/80-dbus || die "doexe failed" |
367 |
fi |
368 |
|
369 |
# needs to exist for the system socket |
370 |
keepdir /var/run/dbus |
371 |
# needs to exist for machine id |
372 |
keepdir /var/lib/dbus |
373 |
# needs to exist for dbus sessions to launch |
374 |
|
375 |
keepdir /usr/lib/dbus-1.0/services |
376 |
keepdir /usr/share/dbus-1/services |
377 |
keepdir /etc/dbus-1/system.d/ |
378 |
keepdir /etc/dbus-1/session.d/ |
379 |
|
380 |
dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO || die "dodoc failed" |
381 |
|
382 |
cd "${BD}" |
383 |
# FIXME: split dtd's in dbus-dtd ebuild |
384 |
emake DESTDIR="${D}" install || die "make install failed" |
385 |
if use doc; then |
386 |
dohtml doc/*.html doc/api/html/* || die "dohtml failed" |
387 |
fi |
388 |
} |
389 |
|
390 |
pkg_postinst() { |
391 |
elog "To start the D-Bus system-wide messagebus by default" |
392 |
elog "you should add it to the default runlevel :" |
393 |
elog "\`rc-update add dbus default\`" |
394 |
elog |
395 |
elog "Some applications require a session bus in addition to the system" |
396 |
elog "bus. Please see \`man dbus-launch\` for more information." |
397 |
elog |
398 |
ewarn "You must restart D-Bus \`/etc/init.d/dbus restart\` to run" |
399 |
ewarn "the new version of the daemon." |
400 |
|
401 |
if has_version "x11-base/xorg-server[hal]"; then |
402 |
elog |
403 |
ewarn "You are currently running X with the hal useflag enabled" |
404 |
ewarn "restarting the dbus service WILL restart X as well" |
405 |
ebeep 5 |
406 |
fi |
407 |
|
408 |
# Ensure unique id is generated |
409 |
dbus-uuidgen --ensure="${ROOT}"/var/lib/dbus/machine-id |
410 |
} |