ssuominen    14/06/18 14:47:52

  Modified:             ChangeLog
  Added:                dbus-1.8.4.ebuild
  Log:
  Version bump wrt security #513698
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
4868F14D)

Revision  Changes    Path
1.420                sys-apps/dbus/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/ChangeLog?rev=1.420&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/ChangeLog?rev=1.420&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/ChangeLog?r1=1.419&r2=1.420

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v
retrieving revision 1.419
retrieving revision 1.420
diff -u -r1.419 -r1.420
--- ChangeLog   10 Jun 2014 00:47:05 -0000      1.419
+++ ChangeLog   18 Jun 2014 14:47:52 -0000      1.420
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/dbus
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.419 2014/06/10 
00:47:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.420 2014/06/18 
14:47:52 ssuominen Exp $
+
+*dbus-1.8.4 (18 Jun 2014)
+
+  18 Jun 2014; Samuli Suominen <ssuomi...@gentoo.org> +dbus-1.8.4.ebuild:
+  Version bump wrt security #513698
 
   10 Jun 2014; Mike Frysinger <vap...@gentoo.org> dbus-1.6.18-r1.ebuild,
   dbus-1.8.0.ebuild, dbus-1.8.2.ebuild:



1.1                  sys-apps/dbus/dbus-1.8.4.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/dbus-1.8.4.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/dbus-1.8.4.ebuild?rev=1.1&content-type=text/plain

Index: dbus-1.8.4.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.8.4.ebuild,v 1.1 
2014/06/18 14:47:52 ssuominen Exp $

EAPI=5
PYTHON_COMPAT=( python2_7 )
inherit autotools eutils linux-info flag-o-matic multilib-minimal python-any-r1 
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 ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~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:0= )
        X? (
                x11-libs/libX11
                x11-libs/libXt
                )
        abi_x86_32? (
                !<=app-emulation/emul-linux-x86-baselibs-20131008-r4
                !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
        )"
DEPEND="${RDEPEND}
        app-text/xmlto
        app-text/docbook-xml-dtd:4.4
        virtual/pkgconfig
        doc? ( app-doc/doxygen )
        test? (
                >=dev-libs/glib-2.24
                ${PYTHON_DEPS}
                )"

# out of sources build dir for make check
TBD=${WORKDIR}/${P}-tests-build

pkg_setup() {
        enewgroup messagebus
        enewuser messagebus -1 -1 -1 messagebus

        use test && python-any-r1_pkg_setup

        if use kernel_linux; then
                CONFIG_CHECK="~EPOLL"
                linux-info_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_user

        # required for asneeded patch but also for bug 263909, cross-compile so
        # don't remove eautoreconf
        eautoreconf
}

multilib_src_configure() {
        local docconf myconf

        # so we can get backtraces from apps
        case ${CHOST} in
                *-mingw*)
                        # error: unrecognized command line option '-rdynamic' 
wrt #488036
                        ;;
                *)
                        append-flags -rdynamic
                        ;;
        esac

        # 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-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)"
                )

        if multilib_is_native_abi; then
                docconf=(
                        --enable-xml-docs
                        $(use_enable doc doxygen-docs)
                )
        else
                docconf=(
                        --disable-xml-docs
                        --disable-doxygen-docs
                )
                myconf+=(
                        --disable-selinux
                        --disable-libaudit
                        --disable-systemd
                        --without-x
                )
        fi

        einfo "Running configure in ${BUILD_DIR}"
        ECONF_SOURCE="${S}" econf "${myconf[@]}" "${docconf[@]}"

        if multilib_is_native_abi && 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
}

multilib_src_compile() {
        if multilib_is_native_abi; then
                # after the compile, it uses a selinuxfs interface to
                # check if the SELinux policy has the right support
                use selinux && addwrite /selinux/access

                einfo "Running make in ${BUILD_DIR}"
                emake

                if multilib_is_native_abi && use test; then
                        cd "${TBD}"
                        einfo "Running make in ${TBD}"
                        emake
                fi
        else
                emake -C dbus libdbus-1.la
        fi
}

src_test() {
        cd "${TBD}"
        DBUS_VERBOSE=1 Xemake -j1 check
}

multilib_src_install() {
        if multilib_is_native_abi; then
                emake DESTDIR="${D}" install
        else
                emake DESTDIR="${D}" install-pkgconfigDATA
                emake DESTDIR="${D}" -C dbus \
                        install-libLTLIBRARIES install-dbusincludeHEADERS \
                        install-nodist_dbusarchincludeHEADERS
        fi
}

multilib_src_install_all() {
        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
        # let the init script create the /var/run/dbus directory
        rm -rf "${ED}"/var/run

        dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO
        prune_libtool_files --all
}

pkg_postinst() {
        if [ "$(rc-config list default | grep dbus)" = "" ] ; then
                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
        fi

        elog "Some applications require a session bus in addition to the system"
        elog "bus. Please see \`man dbus-launch\` for more information."
        elog

        if [ "$(rc-status | grep dbus | grep started)" ] ; then
                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."
        fi

        # 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
}




Reply via email to