* [gentoo-commits] dev/anarchy:master commit in: sys-apps/dbus/, net-wireless/blueman/, sys-apps/dbus/files/
@ 2012-05-28 15:07 Jory Pratt
0 siblings, 0 replies; only message in thread
From: Jory Pratt @ 2012-05-28 15:07 UTC (permalink / raw
To: gentoo-commits
commit: 4c11e214d819ac91647b0640b8f57893d68e574b
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Mon May 28 15:06:54 2012 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon May 28 15:06:54 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/anarchy.git;a=commit;h=4c11e214
update for blueman, fix dbus libaudit support for selinux
---
net-wireless/blueman/Manifest | 2 +
net-wireless/blueman/blueman-1.23.ebuild | 88 ++++++++++++++++++
sys-apps/dbus/Manifest | 6 +-
.../{dbus-1.4.20.ebuild => dbus-1.5.12.ebuild} | 61 +++++++------
sys-apps/dbus/files/dbus-1.4.0-asneeded.patch | 94 --------------------
.../dbus/files/dbus-1.5.12-selinux_fixup.patch | 38 ++++++++
6 files changed, 165 insertions(+), 124 deletions(-)
diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest
new file mode 100644
index 0000000..4978f23
--- /dev/null
+++ b/net-wireless/blueman/Manifest
@@ -0,0 +1,2 @@
+DIST blueman-1.23.tar.gz 1223094 RMD160 8e6d181e9f41b5b0bb99b3299a0d81f6c765e988 SHA1 3a6bb994e399c56d297abc84aae2ddcdfd459858 SHA256 50b261bcdc2e99e176c7c194825da1259500aaacaccb92714d97af0209a4f011
+EBUILD blueman-1.23.ebuild 2096 RMD160 1e159023c86005c6965d8ad803d6aef535d8c292 SHA1 bae51e7527505ea0abff55dd27f377e9bd88bbbd SHA256 102d7467189e55e8878b7d4f01d7d79a3971122d27b3afc9db309aa51fd3cfaa
diff --git a/net-wireless/blueman/blueman-1.23.ebuild b/net-wireless/blueman/blueman-1.23.ebuild
new file mode 100644
index 0000000..f00e284
--- /dev/null
+++ b/net-wireless/blueman/blueman-1.23.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/blueman-1.21-r1.ebuild,v 1.8 2012/05/04 06:41:54 jdhore Exp $
+
+EAPI="3"
+
+PYTHON_DEPEND="2"
+
+inherit python gnome2-utils
+
+DESCRIPTION="GTK+ Bluetooth Manager, designed to be simple and intuitive for everyday bluetooth tasks."
+HOMEPAGE="http://blueman-project.org/"
+SRC_URI="http://download.tuxfamily.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gnome network nls policykit pulseaudio"
+
+CDEPEND="dev-libs/glib:2
+ >=x11-libs/gtk+-2.12:2
+ x11-libs/startup-notification
+ dev-python/pygobject:2
+ >=net-wireless/bluez-4.21"
+DEPEND="${CDEPEND}
+ nls? ( dev-util/intltool sys-devel/gettext )
+ virtual/pkgconfig
+ >=dev-python/pyrex-0.9.8"
+RDEPEND="${CDEPEND}
+ >=app-mobilephone/obex-data-server-0.4.4
+ sys-apps/dbus
+ dev-python/pygtk
+ dev-python/notify-python
+ dev-python/dbus-python
+ gnome? ( dev-python/gconf-python )
+ network? ( || ( net-dns/dnsmasq
+ =net-misc/dhcp-3*
+ >=net-misc/networkmanager-0.8 ) )
+ policykit? ( sys-auth/polkit )
+ pulseaudio? ( media-sound/pulseaudio )"
+
+pkg_setup() {
+ python_set_active_version 2
+}
+
+src_prepare() {
+ # disable pyc compiling
+ ln -sf $(type -P true) py-compile
+
+ sed -i \
+ -e '/^Encoding/d' \
+ data/blueman-manager.desktop.in || die "sed failed"
+}
+
+src_configure() {
+ econf \
+ --disable-static \
+ $(use_enable policykit polkit) \
+ --disable-hal \
+ $(use_enable nls)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+ dodoc AUTHORS ChangeLog NEWS README
+
+ rm "${D}"/$(python_get_sitedir)/*.la
+
+ use gnome || rm "${D}"/$(python_get_sitedir)/${PN}/plugins/config/Gconf.py
+ use policykit || rm -rf "${D}"/usr/share/polkit-1
+ use pulseaudio || rm "${D}"/$(python_get_sitedir)/${PN}/{main/Pulse*.py,plugins/applet/Pulse*.py}
+
+ python_need_rebuild
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ python_mod_optimize ${PN}
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ python_mod_cleanup ${PN}
+ gnome2_icon_cache_update
+}
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 31a7b60..3118bc4 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,5 +1,5 @@
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-1.5.12-selinux_fixup.patch 1290 RMD160 fd2d1596f7ddef01f1b5687e88aecebb92bf6c7d SHA1 a12835122c6e1814edbb5bbb64e64d400c503843 SHA256 d77c27cd5f7eefabc757cc4b9c69e1b86fa1c9d144c887872dd91a20c28c79db
AUX dbus.initd 1185 RMD160 ddb4df28657c7cbceb20c67c95d78a982106759f SHA1 21cc5f013e061311d181b2eb6975f0fff48744da SHA256 98e37b8b6ed25004e48c5855d74c9361eea06d3fee13cefcc0ed10ccf452aa01
-DIST dbus-1.4.20.tar.gz 1895099 RMD160 c0e88ab6bf6afe93a243a42d26f3b6c03e7892cd SHA1 9761eca23c0e6ea4ad822d92748703f9a0f58858 SHA256 103bdcd261a13140730b5fa69f56a98ab5c89ba3f0116ea62fcfd639520d5aaf
-EBUILD dbus-1.4.20.ebuild 4881 RMD160 bf77c57d90d6ce521f28c349cca184b2c2f65588 SHA1 9b410e2e039416d794386fb94968361da9f8a1bd SHA256 45e3f0c4c40a17385696c1a2e4a0423d90e7044c51854d7c950971e0d678495f
+DIST dbus-1.5.12.tar.gz 1925770 RMD160 f65bccf6a22ce2e05df4e7388c064b54256ce7fa SHA1 3140ea452337d664dbe6d30f0d990c756d101694 SHA256 5d3e09a831259ca64b15357cfa1c60a5a7ab06ef469d5b82c2308de9cadf1094
+EBUILD dbus-1.5.12.ebuild 5044 RMD160 3b91f4a37220e03d90204d27c4400161e150cd3b SHA1 0d07c08332dd7adb3b991028705300a96628c774 SHA256 cdbfa501189cb93e8336b4e33ee73fd507869ba917c187392d8960fb5e27dedd
diff --git a/sys-apps/dbus/dbus-1.4.20.ebuild b/sys-apps/dbus/dbus-1.5.12.ebuild
similarity index 83%
rename from sys-apps/dbus/dbus-1.4.20.ebuild
rename to sys-apps/dbus/dbus-1.5.12.ebuild
index de38156..63bafc6 100644
--- a/sys-apps/dbus/dbus-1.4.20.ebuild
+++ b/sys-apps/dbus/dbus-1.5.12.ebuild
@@ -1,30 +1,31 @@
# 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.4.20.ebuild,v 1.1 2012/03/29 20:05:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.5.12.ebuild,v 1.3 2012/05/24 04:21:00 vapier Exp $
EAPI=4
-inherit autotools eutils multilib flag-o-matic python systemd virtualx
+inherit autotools 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="|| ( GPL-2 AFL-2.1 )"
+LICENSE="|| ( AFL-2.1 GPL-2 )"
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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+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-32 )
X? (
x11-libs/libX11
x11-libs/libXt
)"
DEPEND="${RDEPEND}
- dev-util/pkgconfig
+ virtual/pkgconfig
doc? (
app-doc/doxygen
app-text/docbook-xml-dtd:4.1.2
@@ -44,22 +45,27 @@ pkg_setup() {
enewgroup messagebus
enewuser messagebus -1 -1 -1 messagebus
- # FIXME: Test suite fails with Python 3.2 (last checked: 1.4.20)
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() {
+ # Do not assume assume we can keep CAP_AUDIT_WRITE unconditionally
+ epatch "${FILESDIR}"/dbus-1.5.12-selinux_fixup.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
- 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
@@ -74,44 +80,45 @@ src_configure() {
# libaudit is *only* used in DBus wrt SELinux support, so disable it, if
# not on an SELinux profile.
myconf=(
+ --localstatedir=/var
+ --docdir=/usr/share/doc/${PF}
+ --htmldir=/usr/share/doc/${PF}/html
+ $(use_enable static-libs static)
+ $(use_enable debug verbose-mode)
--disable-asserts
--disable-checks
- --disable-embedded-tests
- --disable-modular-tests
- --disable-libaudit
- $(use_with X x)
- $(use_enable debug verbose-mode)
+ $(use_enable selinux)
+ $(use_enable selinux libaudit)
$(use_enable kernel_linux inotify)
$(use_enable kernel_FreeBSD kqueue)
- $(use_enable selinux)
- $(use_enable static-libs static)
- --enable-shared
+ $(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-session-socket-dir=/tmp
--with-dbus-user=messagebus
+ $(use_with X x)
"$(systemd_with_unitdir)"
- --localstatedir=/var
- --docdir=/usr/share/doc/${PF}
- --htmldir=/usr/share/doc/${PF}/html
)
mkdir "${BD}"
cd "${BD}"
einfo "Running configure in ${BD}"
ECONF_SOURCE="${S}" econf "${myconf[@]}" \
- $(use_enable doc doxygen-docs) \
- $(use_enable doc xml-docs)
+ $(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) \
- $(use_enable test asserts) \
$(has_version dev-libs/dbus-glib && echo --enable-modular-tests)
fi
}
@@ -150,9 +157,9 @@ src_install() {
# needs to exist for dbus sessions to launch
keepdir /usr/share/dbus-1/services
- keepdir /etc/dbus-1/system.d
- keepdir /etc/dbus-1/session.d
- keepdir /var/lib/dbus # See pkg_postinst() for symlink creation
+ 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
diff --git a/sys-apps/dbus/files/dbus-1.4.0-asneeded.patch b/sys-apps/dbus/files/dbus-1.4.0-asneeded.patch
deleted file mode 100644
index baa7129..0000000
--- a/sys-apps/dbus/files/dbus-1.4.0-asneeded.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-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
diff --git a/sys-apps/dbus/files/dbus-1.5.12-selinux_fixup.patch b/sys-apps/dbus/files/dbus-1.5.12-selinux_fixup.patch
new file mode 100644
index 0000000..f655f90
--- /dev/null
+++ b/sys-apps/dbus/files/dbus-1.5.12-selinux_fixup.patch
@@ -0,0 +1,38 @@
+From e1b83fb58eadfd02227673db9a7e2833d29b0c98 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Mon, 23 Apr 2012 00:32:43 +0200
+Subject: [PATCH] selinux: when dropping capabilities only include AUDIT caps
+ if we have them
+
+When we drop capabilities we shouldn't assume we can keep
+CAP_AUDIT_WRITE unconditionally, since it will not be available when
+running in containers.
+
+This patch only adds CAP_AUDIT_WRITE to the list of caps we keep if we
+actually have it in the first place.
+
+This makes audit/selinux enabled D-Bus work in a Linux container.
+---
+ bus/selinux.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/bus/selinux.c b/bus/selinux.c
+index 36287e9..1bfc791 100644
+--- a/bus/selinux.c
++++ b/bus/selinux.c
+@@ -1053,8 +1053,9 @@ _dbus_change_to_daemon_user (const char *user,
+ int rc;
+
+ capng_clear (CAPNG_SELECT_BOTH);
+- capng_update (CAPNG_ADD, CAPNG_EFFECTIVE | CAPNG_PERMITTED,
+- CAP_AUDIT_WRITE);
++ if (capng_have_capability (CAPNG_PERMITTED, CAP_AUDIT_WRITE))
++ capng_update (CAPNG_ADD, CAPNG_EFFECTIVE | CAPNG_PERMITTED,
++ CAP_AUDIT_WRITE);
+ rc = capng_change_id (uid, gid, CAPNG_DROP_SUPP_GRP);
+ if (rc)
+ {
+--
+1.7.10
+
+
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2012-05-28 15:07 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-28 15:07 [gentoo-commits] dev/anarchy:master commit in: sys-apps/dbus/, net-wireless/blueman/, sys-apps/dbus/files/ Jory Pratt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox