Upgrade the following Portage package

Upgrade sys-apps/dbus-1.2.20-r4 to sys-apps/dbus-1.4.12

BUG=chromium-os:15436
TEST=./lab_test.py --platforms=netbook_MARIO_MP --board=x86-mario --mail=mtennant@google.com suite_Smoke
./lab_test.py --platforms=netbook_KAEN --board=tegra2_kaen --mail=mtennant@google.com suite_Smoke

Change-Id: If726496c1d0f7029c875cacc4120dc7a94561e4f
Reviewed-on: http://gerrit.chromium.org/gerrit/3884
Reviewed-by: Matt Tennant <mtennant@chromium.org>
Tested-by: Matt Tennant <mtennant@chromium.org>
Reviewed-by: Anush Elangovan <anush@chromium.org>
This commit is contained in:
Matt Tennant 2011-07-11 13:09:38 -07:00
parent 4fb7b0b902
commit 9e1c04b853
7 changed files with 1608 additions and 0 deletions

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
AUX 80-dbus 341 RMD160 3b7f55906289d91a1f0ed87edec7902ddac076c5 SHA1 df1f96934fbe164dc4f4e2e4d4b4cdeaf8cef2b5 SHA256 76ce25ce8769cdfcb0d7b7e52e5a7e6474448fc34e8ad9393afac1eca1e07fd2
AUX dbus-1.4.0-asneeded.patch 3696 RMD160 360f21c06d268116884ed441e7b91478829f1be5 SHA1 a15445bcc5d811276c681b543d0bcd14df9db32f SHA256 f785afd7943b3220ebcf2603b1c059a2dec46bdbfba376e60d8373ba3f933562
AUX dbus.init-1.0 1152 RMD160 f0f409b59167beef2e2b8c14f701fbeaa54c3bc9 SHA1 b00e23868046c67eaec87220e92ffcea5d9dd911 SHA256 a2e13a025faa488ff35521188c0d44909bc82c55e8676a24a5a5179545303d98
DIST dbus-1.4.10.tar.gz 1862554 RMD160 7eb3fd372eca42331541eb7465b62c18cd4a2546 SHA1 8a35d253d444d1450a206f717445b371e1d936a1 SHA256 fcb4b41121525d485da32b5c988e1b31cab109c74d72c5abf05ae2a5b7db9517
DIST dbus-1.4.12.tar.gz 1878025 RMD160 4c5c718117ebf453844743f6d3c3525d7593d722 SHA1 6288a0826fe02d02ddbe62af03c9401501e69cc2 SHA256 da3c97fd546610558d588799e27c4fa81101e754acbcd34747a42c131f30dbe7
DIST dbus-1.4.6.tar.gz 1835214 RMD160 c751630654225b729512d7a996e5ad70dbfc59fc SHA1 e87520518dfa0bfc4b8791105673e48f993874d7 SHA256 753e1e64df2de518ec93bdee9a813a85b3c147a363615412818c3c095cb8a567
DIST dbus-1.4.8.tar.gz 1841864 RMD160 3f0f7ff7e952b93c33fe27862d2b4191394e0032 SHA1 68076715cc600964967715fff927face01313b6e SHA256 48bf73a35be0f0e2d9a5071d8f2d9c7c40b4254d9b405dee57f0fb07c9c3cf58
EBUILD dbus-1.4.10.ebuild 4774 RMD160 23eae6495a2153a1b6658a93a43817fab51d7865 SHA1 97b6190c6949c92d956d210279ca4dd68b44867e SHA256 323b8bfbee5072119bee57f4f8ec8df16f4d5cbcfc456651c3097ad8a318d016
EBUILD dbus-1.4.12.ebuild 5031 RMD160 46bf309b0a213992725f68d8d23ede5297e29955 SHA1 0c69c262459980fb39b68d127eac09a88192010b SHA256 769c3dd6b9dd8360bcc0b7d4dea8db520858d8b9b26bfd8560e48eca9e2070b0
EBUILD dbus-1.4.6.ebuild 4672 RMD160 bf4985c13160d74929a42ee11fc00ca7b9a355c6 SHA1 640c6ace3c712307c540bf5ba371736f805ecf57 SHA256 88b4b014c7618ae2369ff350886c83249a597fe2c3ce85b7dfded590da3df948
EBUILD dbus-1.4.8-r1.ebuild 4698 RMD160 16110f83ebe71536dffbdad3021a5fbcd3042bf0 SHA1 1b9da73f3b1a183e79ea515570f2460e0ebfeaca SHA256 1aa36033de2cf4603d2d51b08bc5ba0b7414c5cd312adab5f7cb329fe796ea46
MISC ChangeLog 44446 RMD160 32a8142629f0e72ed0d281b56450366a7df33da4 SHA1 3e5b72b60bd41be63bee803fc3c0149e44e56306 SHA256 63609f3c5b7e9df7a899a8454a907526a3e9cd39a39deb4b8a50ac034b8c7bd4
MISC metadata.xml 285 RMD160 a557848c4782030e9eeb3dc1f06d98840ad7f73a SHA1 e0ba318a0e1a819cc360ea98cc3477dcf52a1526 SHA256 f0df8a3ebe8d22c87645cf66ed8c50c4e64ded6ad1e279e9912cb5074feb5a82
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
iEYEARECAAYFAk4HDgkACgkQuQc30/atMkBV2ACguSVPb2FnH540uiqcnrAVZLWk
mLUAn1jwKPSSP5U8sd/9PNQWLBrDD70j
=yWQc
-----END PGP SIGNATURE-----

View File

@ -0,0 +1,199 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.4.12.ebuild,v 1.7 2011/06/26 10:44:46 armin76 Exp $
EAPI=2
inherit autotools eutils multilib flag-o-matic python systemd virtualx
DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
HOMEPAGE="http://dbus.freedesktop.org/"
SRC_URI="http://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
LICENSE="|| ( GPL-2 AFL-2.1 )"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd"
IUSE="debug doc selinux static-libs test X"
RDEPEND="
X? (
x11-libs/libX11
x11-libs/libXt
)
selinux? (
sys-libs/libselinux
sec-policy/selinux-dbus
)
>=dev-libs/expat-1.95.8
"
DEPEND="${RDEPEND}
dev-util/pkgconfig
doc? (
app-doc/doxygen
app-text/docbook-xml-dtd:4.1.2
app-text/xmlto
)
test? (
=dev-lang/python-2*
>=dev-libs/glib-2.22:2
)
"
# out of sources build directory
BD=${WORKDIR}/${P}-build
# out of sources build dir for make check
TBD=${WORKDIR}/${P}-tests-build
pkg_setup() {
enewgroup messagebus
enewuser messagebus -1 "-1" -1 messagebus
if use test; then
python_set_active_version 2
python_pkg_setup
fi
}
src_prepare() {
# Tests were restricted because of this
sed -i \
-e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \
-e '/"dispatch"/d' \
bus/test-main.c || die
epatch "${FILESDIR}"/${PN}-1.4.0-asneeded.patch
# required for asneeded patch but also for bug 263909, cross-compile so
# don't remove eautoreconf
eautoreconf
}
src_configure() {
local my_conf
# so we can get backtraces from apps
append-flags -rdynamic
# libaudit is *only* used in DBus wrt SELinux support, so disable it, if
# not on an SELinux profile.
my_conf="$(use_with X x)
$(use_enable debug verbose-mode)
$(use_enable debug asserts)
$(use_enable kernel_linux inotify)
$(use_enable kernel_FreeBSD kqueue)
$(use_enable selinux)
$(use_enable selinux libaudit)
$(use_enable static-libs static)
--enable-shared
--with-xml=expat
--with-system-pid-file=/var/run/dbus.pid
--with-system-socket=/var/run/dbus/system_bus_socket
--with-session-socket-dir=/tmp
--with-dbus-user=messagebus
$(systemd_with_unitdir)
--localstatedir=/var"
mkdir "${BD}"
cd "${BD}"
einfo "Running configure in ${BD}"
ECONF_SOURCE="${S}" econf ${my_conf} \
$(use_enable doc doxygen-docs) \
$(use_enable doc xml-docs)
if use test; then
local circular
if ! has_version dev-libs/dbus-glib; then
circular="--disable-modular-tests"
ewarn "Skipping modular tests because dev-libs/dbus-glib is missing"
fi
mkdir "${TBD}"
cd "${TBD}"
einfo "Running configure in ${TBD}"
ECONF_SOURCE="${S}" econf \
${my_conf} \
$(use_enable test checks) \
$(use_enable test embedded-tests) \
$(use_enable test modular-tests) \
$(use_enable test asserts) \
${circular}
fi
}
src_compile() {
# after the compile, it uses a selinuxfs interface to
# check if the SELinux policy has the right support
use selinux && addwrite /selinux/access
cd "${BD}"
einfo "Running make in ${BD}"
emake || die
if use doc; then
doxygen || die
fi
if use test; then
cd "${TBD}"
einfo "Running make in ${TBD}"
emake || die
fi
}
src_test() {
cd "${TBD}"
DBUS_VERBOSE=1 Xemake -j1 check || die
}
src_install() {
# initscript
newinitd "${FILESDIR}"/dbus.init-1.0 dbus || die
if use X; then
# dbus X session script (#77504)
# turns out to only work for GDM (and startx). has been merged into
# other desktop (kdm and such scripts)
exeinto /etc/X11/xinit/xinitrc.d/
doexe "${FILESDIR}"/80-dbus || die
fi
# needs to exist for the system socket
keepdir /var/run/dbus
# needs to exist for dbus sessions to launch
keepdir /usr/lib/dbus-1.0/services
keepdir /usr/share/dbus-1/services
keepdir /etc/dbus-1/system.d/
keepdir /etc/dbus-1/session.d/
dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO || die
cd "${BD}"
# FIXME: split dtd's in dbus-dtd ebuild
emake DESTDIR="${D}" install || die
if use doc; then
dohtml -p api/ doc/api/html/* || die
cd "${S}"
dohtml doc/*.html || die
fi
# Remove .la files
find "${D}" -type f -name '*.la' -exec rm -f {} +
}
pkg_postinst() {
elog "To start the D-Bus system-wide messagebus by default"
elog "you should add it to the default runlevel :"
elog "\`rc-update add dbus default\`"
elog
elog "Some applications require a session bus in addition to the system"
elog "bus. Please see \`man dbus-launch\` for more information."
elog
ewarn "You must restart D-Bus \`/etc/init.d/dbus restart\` to run"
ewarn "the new version of the daemon."
ewarn "Don't do this while X is running because it will restart your X as well."
# Move to /etc per #370451 and ensure unique id is generated
[[ -e ${ROOT}/var/lib/dbus/machine-id ]] && \
mv -vf "${ROOT}"/var/lib/dbus/machine-id "${ROOT}"/etc/machine-id
dbus-uuidgen --ensure="${ROOT}"/etc/machine-id
}

View File

@ -0,0 +1,13 @@
#!/bin/bash
# launches a session dbus instance
dbuslaunch="`which dbus-launch 2>/dev/null`"
if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
if [ -n "$command" ]; then
command="$dbuslaunch --exit-with-session $command"
else
eval `$dbuslaunch --sh-syntax --exit-with-session`
fi
fi

View File

@ -0,0 +1,94 @@
http://bugs.freedesktop.org/show_bug.cgi?id=23162
--- dbus/Makefile.am
+++ dbus/Makefile.am
@@ -277,7 +277,7 @@
dbus_test_SOURCES= \
dbus-test-main.c
-dbus_test_LDADD=libdbus-internal.la $(DBUS_TEST_LIBS)
+dbus_test_LDADD=$(DBUS_TEST_LIBS) libdbus-internal.la
dbus_test_LDFLAGS=@R_DYNAMIC_LDFLAG@
## mop up the gcov files
--- test/Makefile.am
+++ test/Makefile.am
@@ -63,17 +63,17 @@
# When any programs are not linked to libdbus-internal, fix this.
AM_CPPFLAGS=-DDBUS_STATIC_BUILD
-TEST_LIBS=$(top_builddir)/dbus/libdbus-internal.la $(DBUS_TEST_LIBS)
+TEST_LIBS=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-internal.la
-test_service_LDADD=libdbus-testutils.la $(TEST_LIBS)
+test_service_LDADD=$(TEST_LIBS) libdbus-testutils.la
test_service_LDFLAGS=@R_DYNAMIC_LDFLAG@
-test_names_LDADD=libdbus-testutils.la $(TEST_LIBS)
+test_names_LDADD=$(TEST_LIBS) libdbus-testutils.la
test_names_LDFLAGS=@R_DYNAMIC_LDFLAG@
## break_loader_LDADD= $(TEST_LIBS)
## break_loader_LDFLAGS=@R_DYNAMIC_LDFLAG@
-test_shell_service_LDADD=libdbus-testutils.la $(TEST_LIBS)
+test_shell_service_LDADD=$(TEST_LIBS) libdbus-testutils.la
test_shell_service_LDFLAGS=@R_DYNAMIC_LDFLAG@
-shell_test_LDADD=libdbus-testutils.la $(TEST_LIBS)
+shell_test_LDADD=$(TEST_LIBS) libdbus-testutils.la
shell_test_LDFLAGS=@R_DYNAMIC_LDFLAG@
spawn_test_LDADD=$(TEST_LIBS)
spawn_test_LDFLAGS=@R_DYNAMIC_LDFLAG@
--- test/name-test/Makefile.am
+++ test/name-test/Makefile.am
@@ -22,46 +22,46 @@
test_pending_call_dispatch_SOURCES = \
test-pending-call-dispatch.c
-test_pending_call_dispatch_LDADD=$(top_builddir)/dbus/libdbus-internal.la $(DBUS_TEST_LIBS)
+test_pending_call_dispatch_LDADD=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-internal.la
test_pending_call_dispatch_LDFLAGS=@R_DYNAMIC_LDFLAG@
test_pending_call_timeout_SOURCES = \
test-pending-call-timeout.c
-test_pending_call_timeout_LDADD=$(top_builddir)/dbus/libdbus-internal.la $(DBUS_TEST_LIBS)
+test_pending_call_timeout_LDADD=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-internal.la
test_pending_call_timeout_LDFLAGS=@R_DYNAMIC_LDFLAG@
test_threads_init_SOURCES = \
test-threads-init.c
-test_threads_init_LDADD=$(top_builddir)/dbus/libdbus-internal.la $(DBUS_TEST_LIBS)
+test_threads_init_LDADD=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-internal.la
test_threads_init_LDFLAGS=@R_DYNAMIC_LDFLAG@
test_ids_SOURCES = \
test-ids.c
-test_ids_LDADD=$(top_builddir)/dbus/libdbus-internal.la $(DBUS_TEST_LIBS)
+test_ids_LDADD=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-internal.la
test_ids_LDFLAGS=@R_DYNAMIC_LDFLAG@
test_shutdown_SOURCES = \
test-shutdown.c
test_shutdown_CFLAGS=
-test_shutdown_LDADD=$(top_builddir)/dbus/libdbus-internal.la ../libdbus-testutils.la $(DBUS_TEST_LIBS)
+test_shutdown_LDADD=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-internal.la ../libdbus-testutils.la
test_shutdown_LDFLAGS=@R_DYNAMIC_LDFLAG@
test_privserver_SOURCES = \
test-privserver.c
test_privserver_CFLAGS=
-test_privserver_LDADD=$(top_builddir)/dbus/libdbus-internal.la ../libdbus-testutils.la $(DBUS_TEST_LIBS)
+test_privserver_LDADD=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-internal.la ../libdbus-testutils.la
test_privserver_LDFLAGS=@R_DYNAMIC_LDFLAG@
test_privserver_client_SOURCES = \
test-privserver-client.c
test_privserver_client_CFLAGS=
-test_privserver_client_LDADD=$(top_builddir)/dbus/libdbus-internal.la ../libdbus-testutils.la $(DBUS_TEST_LIBS)
+test_privserver_client_LDADD=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-internal.la ../libdbus-testutils.la
test_privserver_client_LDFLAGS=@R_DYNAMIC_LDFLAG@
endif

View File

@ -0,0 +1,51 @@
#!/sbin/runscript
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2 or later
# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/files/dbus.init-1.0,v 1.4 2007/04/04 13:35:25 cardoe Exp $
opts="reload"
depend() {
need localmount
after bootmisc
}
start() {
ebegin "Starting D-BUS system messagebus"
/usr/bin/dbus-uuidgen --ensure
# We need to test if /var/run/dbus exists, since script will fail if it does not
[ ! -e /var/run/dbus ] && mkdir /var/run/dbus
start-stop-daemon --start --pidfile /var/run/dbus.pid --exec /usr/bin/dbus-daemon -- --system
eend $?
}
stop() {
local retval
ebegin "Stopping D-BUS system messagebus"
start-stop-daemon --stop --pidfile /var/run/dbus.pid
retval=$?
eend ${retval}
[ -S /var/run/dbus/system_bus_socket ] && rm -f /var/run/dbus/system_bus_socket
return ${retval}
}
reload() {
local retval
ebegin "Reloading D-BUS messagebus config"
/usr/bin/dbus-send --print-reply --system --type=method_call \
--dest=org.freedesktop.DBus \
/ org.freedesktop.DBus.ReloadConfig > /dev/null
retval=$?
eend ${retval}
return ${retval}
}

View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>freedesktop</herd>
<maintainer>
<email>cardoe@gentoo.org</email>
</maintainer>
<maintainer>
<email>steev@gentoo.org</email>
</maintainer>
</pkgmetadata>