From d933c4394e718324ae5a02acdf70e1bb4d429473 Mon Sep 17 00:00:00 2001 From: Marinus Schraal Date: Sun, 6 Feb 2005 17:09:45 +0000 Subject: bump with fixes --- sys-apps/dbus/ChangeLog | 9 +- sys-apps/dbus/Manifest | 19 +-- sys-apps/dbus/dbus-0.23-r2.ebuild | 130 +++++++++++++++++++++ .../files/dbus-0.23-dbus_session_connect.patch | 35 ++++++ sys-apps/dbus/files/dbus-0.23-fd_set.patch | 10 ++ sys-apps/dbus/files/digest-dbus-0.23-r2 | 1 + 6 files changed, 195 insertions(+), 9 deletions(-) create mode 100644 sys-apps/dbus/dbus-0.23-r2.ebuild create mode 100644 sys-apps/dbus/files/dbus-0.23-dbus_session_connect.patch create mode 100644 sys-apps/dbus/files/dbus-0.23-fd_set.patch create mode 100644 sys-apps/dbus/files/digest-dbus-0.23-r2 diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog index 7c19b7cb602c..adfa0c957122 100644 --- a/sys-apps/dbus/ChangeLog +++ b/sys-apps/dbus/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-apps/dbus # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.29 2005/01/21 04:35:39 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.30 2005/02/06 17:09:45 foser Exp $ + +*dbus-0.23-r2 (06 Feb 2005) + + 06 Feb 2005; foser dbus-0.23-r2.ebuild : + Add include fix (#78617) + Add fix for unsafe default permissions (#80601) + Fix the X switch to actually work 20 Jan 2005; Aron Griffis dbus-0.22-r1.ebuild, dbus-0.22-r2.ebuild, dbus-0.22-r3.ebuild, dbus-0.23-r1.ebuild: diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest index dbb763b1708b..a0f02ac9c2af 100644 --- a/sys-apps/dbus/Manifest +++ b/sys-apps/dbus/Manifest @@ -1,17 +1,20 @@ -MD5 3bf740f374fb313deb9b0ba1b4918c45 ChangeLog 4176 -MD5 40b9483d4e9dd11a2b9446183ac3ea78 dbus-0.22-r1.ebuild 2860 MD5 081b6d3af8939f80d4654048c47d99bc dbus-0.22-r2.ebuild 3220 -MD5 213654f1fac483bd4221675c772972a6 dbus-0.22-r3.ebuild 3247 MD5 7ee805daac6b0f53d1320a2f2130a70c dbus-0.23-r1.ebuild 2845 +MD5 40b9483d4e9dd11a2b9446183ac3ea78 dbus-0.22-r1.ebuild 2860 +MD5 213654f1fac483bd4221675c772972a6 dbus-0.22-r3.ebuild 3247 +MD5 3bf740f374fb313deb9b0ba1b4918c45 ChangeLog 4176 +MD5 f6f6d765d9bcc5bb62c3ec394a59727b dbus-0.23-r2.ebuild 2925 MD5 5b5bcd9c1a432b2c8157b0004a073f72 metadata.xml 224 MD5 5ad50ae94f784548fc0d6f1364ce23bb files/dbus 544 -MD5 0bbcecc888e29256a5b9a8b1b110099c files/dbus-0.22-bus_driver_know_thyself.patch 1373 -MD5 89670f39c616e08e472a236ed9079b34 files/dbus-0.22-mono_bindings.patch 5122 -MD5 0c8ee5b60e0dd01baea0e398f7ee5559 files/dbus-0.22-mono_service_owner.patch 905 +MD5 db2189cd44431086b05de29565090861 files/dbus-0.23-qt.patch 816 MD5 032a780f5d3dd0c743f2b932424fd39c files/dbus-0.22-python_int64.patch 5448 +MD5 c49fcde6901ac5aa1fd257a826a933c0 files/dbus-0.23-dbus_session_connect.patch 1939 MD5 b0cc4f0bb3505fb083602b48c09f25a6 files/digest-dbus-0.22-r1 62 MD5 b0cc4f0bb3505fb083602b48c09f25a6 files/digest-dbus-0.22-r2 62 -MD5 03e75c073a6db22f85e5c58b795a6e42 files/dbus-0.22-qt.patch 2191 MD5 b0cc4f0bb3505fb083602b48c09f25a6 files/digest-dbus-0.22-r3 62 -MD5 db2189cd44431086b05de29565090861 files/dbus-0.23-qt.patch 816 MD5 b683f990bc7207366b4dac487a8d1416 files/digest-dbus-0.23-r1 62 +MD5 b683f990bc7207366b4dac487a8d1416 files/digest-dbus-0.23-r2 62 +MD5 0c8ee5b60e0dd01baea0e398f7ee5559 files/dbus-0.22-mono_service_owner.patch 905 +MD5 89670f39c616e08e472a236ed9079b34 files/dbus-0.22-mono_bindings.patch 5122 +MD5 0bbcecc888e29256a5b9a8b1b110099c files/dbus-0.22-bus_driver_know_thyself.patch 1373 +MD5 03e75c073a6db22f85e5c58b795a6e42 files/dbus-0.22-qt.patch 2191 diff --git a/sys-apps/dbus/dbus-0.23-r2.ebuild b/sys-apps/dbus/dbus-0.23-r2.ebuild new file mode 100644 index 000000000000..c888ea2c9709 --- /dev/null +++ b/sys-apps/dbus/dbus-0.23-r2.ebuild @@ -0,0 +1,130 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.23-r2.ebuild,v 1.1 2005/02/06 17:09:45 foser Exp $ + +# because of the experimental nature debug by default +inherit debug eutils mono python + +# FIXME : fix docs +#IUSE="X gtk qt python mono doc xml2" +IUSE="X gtk qt python mono xml2" + +DESCRIPTION="A message bus system, a simple way for applications to talk to eachother" +HOMEPAGE="http://dbus.freedesktop.org/" +SRC_URI="http://dbus.freedesktop.org/releases/${P}.tar.gz" + +SLOT="0" +LICENSE="|| ( GPL-2 AFL-2.1 )" +KEYWORDS="~x86 ~ppc ~amd64 ~ppc64 ~ia64" + +RDEPEND=">=dev-libs/glib-2 + xml2? ( >=dev-libs/libxml2-2.6 ) + !xml2? ( dev-libs/expat ) + X? ( virtual/x11 ) + gtk? ( >=x11-libs/gtk+-2 ) + python? ( >=dev-lang/python-2.2 + >=dev-python/pyrex-0.9 ) + !ppc64? ( + mono? ( >=dev-dotnet/mono-0.95 ) + ) + qt? ( >=x11-libs/qt-3 )" + + +DEPEND="${RDEPEND} + dev-util/pkgconfig" +# doc? ( app-doc/doxygen +# app-text/xmlto )" + +# needs gcj, we have no neat way of knowing if it was enabled +# java? ( sys-devel/gcc ) + +src_unpack() { + + unpack ${A} + cd ${S} + + epatch ${FILESDIR}/${P}-qt.patch + # fix security issue (#80601) + epatch ${FILESDIR}/${P}-dbus_session_connect.patch + # add missing include (#78617) + epatch ${FILESDIR}/${P}-fd_set.patch + +} + +src_compile() { + + local myconf + + if use xml2; then + myconf="--with-xml=libxml"; + else + myconf="--with-xml=expat"; + fi + + econf \ + `use_with X x` \ + `use_enable gtk` \ + `use_enable qt` \ + `use_enable python` \ + `use_enable mono` \ + --enable-glib \ + --enable-verbose-mode \ + --enable-checks \ + --enable-asserts \ + --with-system-pid-file=/var/run/dbus.pid \ + --with-system-socket=/var/lib/dbus/system_bus_socket \ + --with-session-socket-dir=/tmp \ + --disable-doxygen-docs \ + --disable-xml-docs \ + --disable-mono-docs \ + ${myconf} \ + || die + +# `use_enable doc doxygen-docs` \ +# `use_enable doc xml-docs` \ + + # do not build the mono examples, they need gtk-sharp + touch ${S}/mono/example/{bus-listener,echo-{server,client}}.exe + + # this gets around a lib64 sandbox bug. note that this addpredict is + # added automatically by sandbox.c for lib. + addpredict /usr/lib64/python2.3/ + addpredict /usr/lib64/python2.2/ + addpredict /usr/lib64/python2.1/ + + emake || die + +} + +src_install() { + + make DESTDIR=${D} install || die + + # initscript + exeinto /etc/init.d/ + doexe ${FILESDIR}/dbus + + # needs to exist for the system socket + keepdir /var/lib/dbus + + keepdir /usr/lib/dbus-1.0/services + keepdir /usr/share/dbus-1/services + + dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO doc/*html + +} + +pkg_preinst() { + + enewgroup messagebus || die "Problem adding messagebus group" + enewuser messagebus -1 /bin/false /dev/null messagebus || die "Problem adding messagebus user" + +} + +pkg_postinst() { + + einfo "To start the DBUS system-wide messagebus by default" + einfo "you should add it to the default runlevel :" + einfo "\`rc-update add dbus default\`" + +} diff --git a/sys-apps/dbus/files/dbus-0.23-dbus_session_connect.patch b/sys-apps/dbus/files/dbus-0.23-dbus_session_connect.patch new file mode 100644 index 000000000000..2247e4b5241f --- /dev/null +++ b/sys-apps/dbus/files/dbus-0.23-dbus_session_connect.patch @@ -0,0 +1,35 @@ +Index: bus/policy.c +=================================================================== +RCS file: /cvs/dbus/dbus/bus/policy.c,v +retrieving revision 1.22 +diff -u -p -u -r1.22 policy.c +--- bus/policy.c 25 Aug 2004 22:11:49 -0000 1.22 ++++ bus/policy.c 31 Jan 2005 23:57:32 -0000 +@@ -453,8 +453,9 @@ bus_policy_allow_user (BusPolicy + uid); + return FALSE; + } +- +- allowed = FALSE; ++ ++ /* Default to "user owning bus" or root can connect */ ++ allowed = uid == _dbus_getuid (); + + allowed = list_allows_user (allowed, + &policy->default_rules, +Index: bus/session.conf.in +=================================================================== +RCS file: /cvs/dbus/dbus/bus/session.conf.in,v +retrieving revision 1.8 +diff -u -p -u -r1.8 session.conf.in +--- bus/session.conf.in 25 Oct 2004 18:48:58 -0000 1.8 ++++ bus/session.conf.in 31 Jan 2005 23:57:32 -0000 +@@ -19,8 +19,6 @@ + + + +- +- + + +