diff options
author | Paweł Hajdan <phajdan.jr@gentoo.org> | 2012-10-04 08:26:54 +0000 |
---|---|---|
committer | Paweł Hajdan <phajdan.jr@gentoo.org> | 2012-10-04 08:26:54 +0000 |
commit | cfb7ef1b3749bfc0d49a5a08e46802cb02900aa9 (patch) | |
tree | 86725ffa7563cc094687efc53629e6c696e3a4cb /sys-apps/dbus | |
parent | add a missing line (diff) | |
download | gentoo-2-cfb7ef1b3749bfc0d49a5a08e46802cb02900aa9.tar.gz gentoo-2-cfb7ef1b3749bfc0d49a5a08e46802cb02900aa9.tar.bz2 gentoo-2-cfb7ef1b3749bfc0d49a5a08e46802cb02900aa9.zip |
x86 stable wrt security bug #436028 (systemd-specific code rolled to -r1, since systemd is not stable)
(Portage version: 2.1.11.9/cvs/Linux i686)
Diffstat (limited to 'sys-apps/dbus')
-rw-r--r-- | sys-apps/dbus/ChangeLog | 9 | ||||
-rw-r--r-- | sys-apps/dbus/dbus-1.6.8-r1.ebuild | 188 | ||||
-rw-r--r-- | sys-apps/dbus/dbus-1.6.8.ebuild | 12 |
3 files changed, 201 insertions, 8 deletions
diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog index 6973094665c4..cf99641a2c13 100644 --- a/sys-apps/dbus/ChangeLog +++ b/sys-apps/dbus/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-apps/dbus # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.356 2012/10/02 15:40:09 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.357 2012/10/04 08:26:54 phajdan.jr Exp $ + +*dbus-1.6.8-r1 (04 Oct 2012) + + 04 Oct 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> dbus-1.6.8.ebuild, + +dbus-1.6.8-r1.ebuild: + x86 stable wrt security bug #436028 (systemd-specific code rolled to -r1, + since systemd is not stable) 02 Oct 2012; Jeroen Roovers <jer@gentoo.org> dbus-1.6.8.ebuild: Stable for HPPA (bug #436028). diff --git a/sys-apps/dbus/dbus-1.6.8-r1.ebuild b/sys-apps/dbus/dbus-1.6.8-r1.ebuild new file mode 100644 index 000000000000..38a326f29d79 --- /dev/null +++ b/sys-apps/dbus/dbus-1.6.8-r1.ebuild @@ -0,0 +1,188 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.6.8-r1.ebuild,v 1.1 2012/10/04 08:26:54 phajdan.jr Exp $ + +EAPI=4 +inherit autotools eutils linux-info flag-o-matic python systemd virtualx user + +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="|| ( AFL-2.1 GPL-2 )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux" +IUSE="debug doc selinux static-libs systemd test X" + +RDEPEND=">=dev-libs/expat-2 + selinux? ( + sec-policy/selinux-dbus + sys-libs/libselinux + ) + systemd? ( >=sys-apps/systemd-44-r1 ) + X? ( + x11-libs/libX11 + x11-libs/libXt + )" +DEPEND="${RDEPEND} + virtual/pkgconfig + doc? ( + app-doc/doxygen + app-text/docbook-xml-dtd:4.1.2 + app-text/xmlto + ) + test? ( + >=dev-libs/glib-2.24 + dev-lang/python:2.7 + )" + +# 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 + + if use kernel_linux; then + CONFIG_CHECK="~EPOLL" + linux-info_pkg_setup + fi +} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-1.5.12-selinux-when-dropping-capabilities-only-include-AUDI.patch + + # 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 + + # required for asneeded patch but also for bug 263909, cross-compile so + # don't remove eautoreconf + eautoreconf +} + +src_configure() { + local myconf + + # 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. + myconf=( + --localstatedir="${EPREFIX}/var" + --docdir="${EPREFIX}/usr/share/doc/${PF}" + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + $(use_enable static-libs static) + $(use_enable debug verbose-mode) + --disable-asserts + --disable-checks + $(use_enable selinux) + $(use_enable selinux libaudit) + $(use_enable kernel_linux inotify) + $(use_enable kernel_FreeBSD kqueue) + $(use_enable systemd) + --disable-embedded-tests + --disable-modular-tests + $(use_enable debug stats) + --with-xml=expat + --with-session-socket-dir=/tmp + --with-system-pid-file=/var/run/dbus.pid + --with-system-socket=/var/run/dbus/system_bus_socket + --with-dbus-user=messagebus + $(use_with X x) + "$(systemd_with_unitdir)" + ) + + mkdir "${BD}" + cd "${BD}" + einfo "Running configure in ${BD}" + ECONF_SOURCE="${S}" econf "${myconf[@]}" \ + $(use_enable doc xml-docs) \ + $(use_enable doc doxygen-docs) + + if use test; then + mkdir "${TBD}" + cd "${TBD}" + einfo "Running configure in ${TBD}" + ECONF_SOURCE="${S}" econf "${myconf[@]}" \ + $(use_enable test asserts) \ + $(use_enable test checks) \ + $(use_enable test embedded-tests) \ + $(has_version dev-libs/dbus-glib && echo --enable-modular-tests) + 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 + + if use test; then + cd "${TBD}" + einfo "Running make in ${TBD}" + emake + fi +} + +src_test() { + cd "${TBD}" + DBUS_VERBOSE=1 Xemake -j1 check +} + +src_install() { + newinitd "${FILESDIR}"/dbus.initd dbus + + 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 + fi + + # needs to exist for dbus sessions to launch + keepdir /usr/share/dbus-1/services + keepdir /etc/dbus-1/{session,system}.d + # machine-id symlink from pkg_postinst() + keepdir /var/lib/dbus + + dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO + + cd "${BD}" + emake DESTDIR="${D}" install + + prune_libtool_files --all +} + +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." + + # Ensure unique id is generated and put it in /etc wrt #370451 but symlink + # for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse + # dependencies with hardcoded paths (although the known ones got fixed already) + dbus-uuidgen --ensure="${EROOT}"/etc/machine-id + ln -sf "${EROOT}"/etc/machine-id "${EROOT}"/var/lib/dbus/machine-id +} diff --git a/sys-apps/dbus/dbus-1.6.8.ebuild b/sys-apps/dbus/dbus-1.6.8.ebuild index fd349313f6f7..62f8d2979467 100644 --- a/sys-apps/dbus/dbus-1.6.8.ebuild +++ b/sys-apps/dbus/dbus-1.6.8.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.6.8.ebuild,v 1.3 2012/10/02 15:40:09 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.6.8.ebuild,v 1.4 2012/10/04 08:26:54 phajdan.jr Exp $ EAPI=4 -inherit autotools eutils linux-info flag-o-matic python systemd virtualx user +inherit autotools eutils linux-info flag-o-matic python virtualx user DESCRIPTION="A message bus system, a simple way for applications to talk to each other" HOMEPAGE="http://dbus.freedesktop.org/" @@ -11,15 +11,14 @@ SRC_URI="http://dbus.freedesktop.org/releases/dbus/${P}.tar.gz" LICENSE="|| ( AFL-2.1 GPL-2 )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux" -IUSE="debug doc selinux static-libs systemd test X" +KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux" +IUSE="debug doc selinux static-libs test X" RDEPEND=">=dev-libs/expat-2 selinux? ( sec-policy/selinux-dbus sys-libs/libselinux ) - systemd? ( >=sys-apps/systemd-44-r1 ) X? ( x11-libs/libX11 x11-libs/libXt @@ -90,7 +89,7 @@ src_configure() { $(use_enable selinux libaudit) $(use_enable kernel_linux inotify) $(use_enable kernel_FreeBSD kqueue) - $(use_enable systemd) + --disable-systemd --disable-embedded-tests --disable-modular-tests $(use_enable debug stats) @@ -100,7 +99,6 @@ src_configure() { --with-system-socket=/var/run/dbus/system_bus_socket --with-dbus-user=messagebus $(use_with X x) - "$(systemd_with_unitdir)" ) mkdir "${BD}" |