2008-08-20 Brian Cameron <[email protected]>
authoryippi
Wed, 20 Aug 2008 07:06:44 +0000
changeset 13189 836ff5d12ba2
parent 13188 e0c5cb3dd2ad
child 13190 e651e76c97e3
2008-08-20 Brian Cameron <[email protected]> * base-specs/libwnck.spec, base-specs/pyspi.spec patches/libwnck-02-no-x11-dependency.diff, patches/pyspi-01-solaris.diff: Remove unneeded patches now that the x11.pc file is delivered into the OS. * SUNWdbus.spec, ext-sources/dbus.xml, manpages/Makefile, manpages/man1/dbus-daemon.1: Move dbus-daemon manpage from section 3 to section 1. * manpages/man1/*dbus*.1, manpages/man3/libdbus-glib-1.3: Update SEE ALSO sections to refer to dbus-daemon as a section 1 manpage.
ChangeLog
SUNWdbus.spec
base-specs/libwnck.spec
base-specs/pyspi.spec
ext-sources/dbus.xml
manpages/Makefile
manpages/man1/dbus-cleanup-sockets.1
manpages/man1/dbus-daemon.1
manpages/man1/dbus-launch.1
manpages/man1/dbus-monitor.1
manpages/man1/dbus-send.1
manpages/man1/dbus-uuidgen.1
manpages/man3/dbus-daemon.3
manpages/man3/libdbus-glib-1.3
patches/libwnck-02-no-x11-dependency.diff
patches/pyspi-01-solaris.diff
--- a/ChangeLog	Wed Aug 20 06:41:03 2008 +0000
+++ b/ChangeLog	Wed Aug 20 07:06:44 2008 +0000
@@ -1,3 +1,15 @@
+2008-08-20 Brian Cameron <[email protected]>
+
+	* base-specs/libwnck.spec, base-specs/pyspi.spec
+	  patches/libwnck-02-no-x11-dependency.diff,
+	  patches/pyspi-01-solaris.diff:  Remove unneeded patches now that
+	  the x11.pc file is delivered into the OS.
+	* SUNWdbus.spec, ext-sources/dbus.xml, manpages/Makefile,
+	  manpages/man1/dbus-daemon.1:  Move dbus-daemon manpage from section
+	  3 to section 1.
+	* manpages/man1/*dbus*.1, manpages/man3/libdbus-glib-1.3: Update SEE
+	  ALSO sections to refer to dbus-daemon as a section 1 manpage.
+
 2008-08-20  Dave Lin <[email protected]>
 
 	* base-specs/gtk2-engines.spec: Bump to 2.15.3.
--- a/SUNWdbus.spec	Wed Aug 20 06:41:03 2008 +0000
+++ b/SUNWdbus.spec	Wed Aug 20 07:06:44 2008 +0000
@@ -181,9 +181,7 @@
 %{_datadir}/dbus-1
 %dir %attr(0755, root, bin) %{_mandir}
 %dir %attr(0755, root, bin) %{_mandir}/man1
-%dir %attr(0755, root, bin) %{_mandir}/man3
 %{_mandir}/man1/*
-%{_mandir}/man3/*
 %ifarch amd64 sparcv9
 %dir %attr (0755, root, bin) %{_libdir}/%{_arch64}
 %{_libdir}/%{_arch64}/libdbus*
@@ -224,6 +222,8 @@
 %endif
 
 %changelog
+* Wed Aug 20 2008 - [email protected]
+- Move dbus-daemon.3 manpage to dbus-daemon.1 manpage.
 * Thu Mar 27 2008 - [email protected]
 - Add SUNW_Copyright.
 * Wed Mar 19 2008 - [email protected]
--- a/base-specs/libwnck.spec	Wed Aug 20 06:41:03 2008 +0000
+++ b/base-specs/libwnck.spec	Wed Aug 20 07:06:44 2008 +0000
@@ -23,8 +23,6 @@
 %endif
 #owner:niall date:2006-10-11 type:feature
 Patch1:       libwnck-01-trusted-extensions.diff
-#owner:dcarbery date:2007-11-13 type:branding
-Patch2:       libwnck-02-no-x11-dependency.diff
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/doc
@@ -63,7 +61,6 @@
 cd po-sun; make; cd ..
 %endif
 %patch1 -p1
-%patch2 -p1
 
 %build
 %ifos linux
@@ -119,6 +116,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Wed Aug 20 2008 - [email protected]
+- Remove patch libwnck-02-no-x11-dependency.diff since it is no longer needed
+  now that the x11.pc file is in our builds.
 * Thu Aug 07 2008 - [email protected]
 - Bump to 2.23.6.
 * Tue Jun 17 2008 - [email protected]
--- a/base-specs/pyspi.spec	Wed Aug 20 06:41:03 2008 +0000
+++ b/base-specs/pyspi.spec	Wed Aug 20 07:06:44 2008 +0000
@@ -20,11 +20,6 @@
 Vendor:       Sun Microsystems, Inc.
 Summary:      Python bindings for CSPI
 Source:       http://people.redhat.com/zcerza/dogtail/releases/%{name}-%{version}.tar.gz
-# date:2006-10-07 owner:yippi type:feature
-# This patch is a temporary hack because we currently don't ship Xorg pc
-# files into Solaris.  This will be fixed when Xorg 7.2 integrates and this
-# patch can go away.
-Patch1:       pyspi-01-solaris.diff
 URL:          http://gnome.org/projects/pyspi
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/doc
@@ -41,7 +36,6 @@
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 make
@@ -57,6 +51,10 @@
 %{_libdir}/python?.?/vendor-packages
 
 %changelog
+* Wed Aug 20 2008 - [email protected]
+- Remove patch pyspi-01-solaris.diff since it is no longer needed now that the
+  x11.pc file is in our builds.
+
 * Mon Aug 11 2008 - [email protected]
 - Remove the site-packages to vendor-packages as it is done in the top level
   spec file now.
--- a/ext-sources/dbus.xml	Wed Aug 20 06:41:03 2008 +0000
+++ b/ext-sources/dbus.xml	Wed Aug 20 07:06:44 2008 +0000
@@ -83,7 +83,7 @@
 			</loctext>
 		</common_name>
 		<documentation>
-			<manpage title='dbus-daemon' section='3' manpath='/usr/man' />
+			<manpage title='dbus-daemon' section='1' manpath='/usr/man' />
 		</documentation>
 	</template>
 
--- a/manpages/Makefile	Wed Aug 20 06:41:03 2008 +0000
+++ b/manpages/Makefile	Wed Aug 20 07:06:44 2008 +0000
@@ -57,7 +57,7 @@
 # MANPAGE_VERSION is maintained by RE and only gets bumped when spec-files gets
 # branched. PLEASE do not change this.
 #
-
+SHELL=/bin/ksh
 MANPAGE_VERSION=0.1
 MANPAGE_DIR=sun-manpages
 TARBALL_DIR=sun-manpage-tarballs
@@ -281,11 +281,11 @@
 
 SUNWdbus_PAGES =	\
 	man1/dbus-cleanup-sockets.1	\
+	man1/dbus-daemon.1		\
 	man1/dbus-launch.1		\
 	man1/dbus-monitor.1		\
 	man1/dbus-send.1		\
-	man1/dbus-uuidgen.1		\
-	man3/dbus-daemon.3
+	man1/dbus-uuidgen.1
 SUNWdbus.PAGES: $(SUNWdbus_PAGES)
 
 SUNWdbus-bindings_PAGES =	\
--- a/manpages/man1/dbus-cleanup-sockets.1	Wed Aug 20 06:41:03 2008 +0000
+++ b/manpages/man1/dbus-cleanup-sockets.1	Wed Aug 20 07:06:44 2008 +0000
@@ -146,11 +146,11 @@
 <!--Reference to a Help manual-->
 <!--Reference to a book.-->
 <para>
+<citerefentry><refentrytitle>dbus-daemon</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>dbus-launch</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>dbus-monitor</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>dbus-send</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>dbus-uuidgen</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-<citerefentry><refentrytitle>dbus-daemon</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>libdbus-glib-1</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>attributes</refentrytitle><manvolnum>5</manvolnum></citerefentry>
 </para>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/manpages/man1/dbus-daemon.1	Wed Aug 20 07:06:44 2008 +0000
@@ -0,0 +1,963 @@
+<!DOCTYPE REFENTRY PUBLIC "-//Sun Microsystems//DTD DocBook V3.0-Based SolBook Subset V2.0//EN" [
+<!--ArborText, Inc., 1988-1999, v.4002-->
+<!ENTITY cmd "dbus-daemon">
+<!ENTITY % commonents SYSTEM "smancommon.ent">
+%commonents;
+<!ENTITY % booktitles SYSTEM "booktitles.ent">
+%booktitles;
+<!ENTITY suncopy "Copyright (c) 2007 Sun Microsystems, Inc. All Rights Reserved.">
+]>
+<?Pub UDT _bookmark _target>
+<?Pub Inc>
+<refentry id="dbus-daemon-1">
+<!-- %Z%%M% %I% %E% SMI; -->
+<refmeta><refentrytitle>&cmd;</refentrytitle><manvolnum>3</manvolnum>
+<refmiscinfo class="date">19 Nov 2007</refmiscinfo>
+<refmiscinfo class="sectdesc">&man3;</refmiscinfo>
+<refmiscinfo class="software">&release;</refmiscinfo>
+<refmiscinfo class="arch">generic</refmiscinfo>
+<refmiscinfo class="copyright">&suncopy;</refmiscinfo>
+</refmeta>
+<indexterm><primary>&cmd;</primary></indexterm><indexterm><primary>
+Message bus daemon
+</primary></indexterm><refnamediv id="dbus-daemon-1-name">
+<refname>&cmd;</refname><refpurpose>
+Message bus daemon
+</refpurpose></refnamediv>
+<refsynopsisdiv id="dbus-daemon-1-synp"><title>&synp-tt;</title>
+<cmdsynopsis><command>&cmd;</command>
+<arg choice="opt"><option>-config-file=<replaceable>file</replaceable></option></arg>
+<arg choice="opt"><option>-fork</option> | <option>-nofork</option></arg>
+<arg choice="opt"><option>-introspect</option></arg>
+<arg choice="opt"><option>-print-address[=<replaceable>descriptor</replaceable>]</option></arg>
+<arg choice="opt"><option>-print-pid[=<replaceable>descriptor</replaceable>]</option></arg>
+<arg choice="opt"><option>-session</option></arg>
+<arg choice="opt"><option>-system</option></arg>
+<arg choice="opt"><option>-version</option></arg>
+</cmdsynopsis></refsynopsisdiv>
+<refsect1 id="dbus-daemon-1-desc"><title>&desc-tt;</title>
+<para>
+&cmd; is the D\-Bus message bus daemon.  See
+<literal>http://www.freedesktop.org/software/dbus/</literal>
+for more information.  D\-Bus is first a library that provides one\-to\-one
+communication between any two applications; &cmd; is an application that uses
+this library to implement a message bus daemon.  Multiple programs connect to
+the message bus daemon and can exchange messages with one another.
+</para>
+<para>
+There are two standard message bus instances.  &cmd; is used for both of these
+instances, but with a different configuration file.
+</para>
+<itemizedlist>
+<listitem><para>
+systemwide message bus - Disabled and not supported on Solaris, but installed
+on many systems as the "messagebus" init service.  Note that the
+<option>-system</option> option is equivalent to:
+</para>
+<para>
+"<option>-config\-file=/etc/dbus\-1/system.conf</option>"
+</para></listitem>
+<listitem><para>
+per-user-login-session message bus - Enabled and supported on Solaris, and
+started each time a user logs in.  Note that the 
+<option>-session</option> option is equivalent to:
+</para>
+<para>
+"<option>-config\-file=/etc/dbus\-1/session.conf</option>"
+</para></listitem>
+</itemizedlist>
+<para>
+By creating additional configuration files and using the
+<option>-config\-file</option> option, additional special-purpose message bus
+daemons could be created.
+</para>
+<para>
+On Solaris, D\-Bus is configured with the systemwide message bus disabled.
+The systemwide message bus is not used by any applications that are currently
+shipped with Solaris.
+</para>
+<para>
+The systemwide daemon is normally launched by an init script, standardly called
+simply "messagebus".
+</para>
+<para>
+The systemwide daemon is largely used for broadcasting system events, such as
+changes to the printer queue, or adding/removing devices.
+</para>
+<para>
+The per-session daemon is used for various interprocess communication among
+desktop applications (however, it is not tied to X or the GUI in any way).
+</para>
+<para>
+SIGHUP will cause the D\-Bus daemon to PARTIALLY reload its configuration file
+and to flush its user/group information caches.  Some configuration changes
+would require kicking all apps off the bus; so they will only take effect if
+you restart the daemon. Policy changes should take effect with SIGHUP.
+</para>
+</refsect1>
+<refsect1 id="dbus-daemon-1-opts"><title>&opts-tt;</title>
+<para>The following options are supported:</para>
+<variablelist termlength="wholescreen">
+<varlistentry>
+<term><option>-config-file=<replaceable>file</replaceable></option></term>
+<listitem><para>
+Use the given configuration <replaceable>file</replaceable>.
+</para>
+</listitem></varlistentry>
+<varlistentry>
+<term><option>-fork</option></term>
+<listitem><para>
+Force the message bus to fork and become a daemon, regardless of configuration
+file settings.
+</para>
+</listitem></varlistentry>
+<varlistentry>
+<term><option>-introspect</option></term>
+<listitem><para>
+Print introspect data and exit.
+</para>
+</listitem></varlistentry>
+<varlistentry>
+<term><option>-nofork</option></term>
+<listitem><para>
+Avoid running the message bus as a daemon, regardless of configuration file
+settings.
+</para>
+</listitem></varlistentry>
+<varlistentry>
+<term><option>-print-address[=<replaceable>descriptor</replaceable>]</option></term>
+<listitem><para>
+Print the address of the message bus to standard output, or to the given file
+<replaceable>descriptor</replaceable>.  This is used by programs that launch
+the message bus.
+</para>
+</listitem></varlistentry>
+<varlistentry>
+<term><option>-print-pid[=<replaceable>descriptor</replaceable>]</option></term>
+<listitem><para>
+Print the process ID of the message bus to standard output, or to the given
+file <replaceable>descriptor</replaceable>.  This is used by programs that
+launch the message bus.
+</para>
+</listitem></varlistentry>
+<varlistentry>
+<term><option>-session</option></term>
+<listitem><para>
+Use the standard configuration file for the per-login-session message bus.
+</para>
+</listitem></varlistentry>
+<varlistentry>
+<term><option>-system</option></term>
+<listitem><para>
+Use the standard configuration file for the systemwide message bus.
+</para>
+</listitem></varlistentry>
+<varlistentry>
+<term><option>-version</option></term>
+<listitem><para>
+Print the version of the daemon.
+</para>
+</listitem></varlistentry>
+</variablelist></refsect1>
+<refsect1 id="dbus-daemon-1-exde"><title>&exde-tt;</title>
+<refsect2>
+<title>CONFIGURATION FILE</title>
+<para>
+A message bus daemon has a configuration file that specializes it for a
+particular application. For example, one configuration file might set up the
+message bus to be a systemwide message bus, while another might set it
+up to be a per-user-login-session bus.
+</para>
+<para>
+The configuration file also establishes resource limits, security parameters,
+and so forth.
+</para>
+<para>
+The configuration file is not part of any interoperability specification and
+its backward compatibility is not guaranteed; this document is documentation,
+not specification.
+</para>
+<para>
+The standard systemwide and per-session message bus setups are configured in
+the files "<filename>/etc/dbus-1/system.conf</filename>" and
+"<filename>/etc/dbus-1/session.conf</filename>".  These files normally
+&lt;include&gt; a <filename>system-local.conf</filename> or
+<filename>session-local.conf</filename>; you can put local overrides in those
+files to avoid modifying the primary configuration files.
+</para>
+<para>
+The configuration file is an XML document.  It must have the following doctype
+declaration:
+</para>
+<screen>
+   &lt;!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D\-Bus Bus Configuration 1.0//EN"
+    "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"&gt;
+</screen>
+<para>
+The following elements may be present in the configuration file.
+Note that some configuration file options are only meaningful with 
+the systemwide message bus, which is disabled on Solaris.  Such options
+are only documented for reference.
+</para>
+<para>
+&lt;busconfig&gt;
+</para>
+<para>
+Root element.
+</para>
+<para>
+&lt;type&gt;
+</para>
+<para>
+The well-known type of the message bus.  Currently known values are "system"
+and "session"; if other values are set, they should be either added to the
+D\-Bus specification, or namespaced.  The last &lt;type&gt; element "wins"
+(previous values are ignored).
+</para>
+<para>
+Example: &lt;type&gt;session&lt;/type&gt;
+</para>
+<para>
+&lt;include&gt;
+</para>
+<para>
+Include a file &lt;include&gt;filename.conf&lt;/include&gt; at this point.  If
+the filename is relative, it is located relative to the configuration file
+doing the including.
+</para>
+<para>
+&lt;include&gt; has an optional attribute "ignore_missing=(yes|no)" which
+defaults to "no" if not provided.  This attribute controls whether it is a
+fatal error for the included file to be absent.
+</para>
+<para>
+&lt;includedir&gt;
+</para>
+<para>
+Include all files in &lt;includedir&gt;foo.d&lt;/includedir&gt; at this point.
+Files in the directory are included in undefined order.  Only files ending in
+".conf" are included.
+</para>
+<para>
+This is intended to allow extension of the system bus by particular packages.
+For example, if CUPS wants to be able to send out notification of printer queue
+changes, it could install a file to /etc/dbus-1/system.d that allowed all apps
+to receive this message and allowed the printer daemon user to send it.
+</para>
+<para>
+&lt;user&gt;
+</para>
+<para>
+The user account the daemon should run as, as either a username or a UID.
+If the daemon cannot change to this UID on startup, it will exit.  If this
+element is not present, the daemon will not change or care about its UID.
+</para>
+<para>
+The last &lt;user&gt; entry in the file "wins", the others are ignored.
+</para>
+<para>
+The user is changed after the bus has completed initialization.  So sockets
+etc. will be created before changing user, but no data will be read from
+clients before changing user.  This means that sockets and PID files can be
+created in a location that requires root privileges for writing.
+</para>
+<para>
+&lt;fork&gt;
+</para>
+<para>
+If present, the bus daemon becomes a real daemon (forks into the background,
+etc.).  This is generally used rather than the <option>-fork</option> command
+line option.
+</para>
+<para>
+&lt;listen&gt;
+</para>
+<para>
+Add an address that the bus should listen on. The address is in the standard
+D\-Bus format that contains a transport name plus possible parameters/options.
+</para>
+<screen>
+     Example: &lt;listen&gt;unix:path=/tmp/foo&lt;/listen&gt;
+     Example: &lt;listen&gt;tcp:host=localhost,port=1234&lt;/listen&gt;
+</screen>
+<para>
+If there are multiple &lt;listen&gt; elements, then the bus listens on multiple
+addresses.  The bus will pass its address to started services or other
+interested parties with the last address given in &lt;listen&gt; first. That
+is, apps will try to connect to the last &lt;listen&gt; address first.
+</para>
+<para>
+tcp sockets can accept IPv4 addresses, IPv6 addresses or hostnames.  If a
+hostname resolves to multiple addresses, the server will bind to all of them.
+The family=ipv4 or family=ipv6 options can be used to force it to bind to a
+subset of addresses.
+</para>
+<screen>
+     Example:
+     &lt;listen&gt;tcp:host=localhost,port=0,family=ipv4&lt;/listen&gt;
+</screen>
+<para>
+A special case is using a port number of zero (or omitting the port), which
+means to choose an available port selected by the operating system.  The port
+number chosen can be obtained with the <option>-print-address</option> command
+line parameter and will be present in other cases where the server reports its
+own address, such as when DBUS_SESSION_BUS_ADDRESS is set.
+</para>
+<screen>
+     Example: &lt;listen&gt;tcp:host=localhost,port=0&lt;/listen&gt;
+</screen>
+<para>
+tcp addresses also allow a bind=hostname option, which will override the host
+option specifying what address to bind to, without changing the address
+reported by the bus.  The bind option can also take a special name '*' to
+cause the bus to listen on all local address (INADDR_ANY). The specified host
+should be a valid name of the local machine or weird stuff will happen.
+</para>
+<screen>
+     Example: &lt;listen&gt;tcp:host=localhost,bind=*,port=0&lt;/listen&gt;
+</screen>
+<para>
+&lt;auth&gt;
+</para>
+<para>
+Lists permitted authorization mechanisms.  If this element does not exist, then
+all known mechanisms are allowed.  If there are multiple &lt;auth&gt; elements,
+all the listed mechanisms are allowed.  The order in which mechanisms are
+listed is not meaningful.
+</para>
+<screen>
+     Example: &lt;auth&gt;EXTERNAL&lt;/auth&gt;
+     Example: &lt;auth&gt;DBUS_COOKIE_SHA1&lt;/auth&gt;
+</screen>
+<para>
+&lt;servicedir&gt;
+</para>
+<para>
+Adds a directory to scan for <filename>.service</filename> files.  Directories
+are scanned starting with the last to appear in the config file (the first
+<filename>.service</filename> file found that provides a particular service
+will be used).
+</para>
+<para>
+Service files tell the bus how to automatically start a program.  They are
+primarily used with the per-user-session bus, not the systemwide bus.
+</para>
+<para>
+&lt;standard session servicedirs/&gt;
+</para>
+<para>
+&lt;standard_session_servicedirs/&gt; is equivalent to specifying a series of
+&lt;servicedir/&gt; elements for each of the data directories in the "XDG Base
+Directory Specification" with the subdirectory "dbus-1/services", so for
+example "/usr/share/dbus-1/services" would be among the directories searched.
+</para>
+<para>
+The "XDG Base Directory Specification" should be found at
+<literal>http://freedesktop.org/wiki/Standards/basedir-spec</literal>.
+</para>
+<para>
+The &lt;standard_session_servicedirs/&gt; option is only relevant to the
+per-user-session bus daemon defined in
+<filename>/etc/dbus\-1/session.conf</filename>.  Putting it in any other
+configuration file would probably be nonsense.
+</para>
+<para>
+&lt;standard system servicedirs/&gt;
+</para>
+<para>
+&lt;standard_system_servicedirs/&gt; specifies the standard systemwide
+activation directories that should be searched for service files.  This option
+defaults to <filename>/usr/share/dbus-1/system-services</filename>.
+</para>
+<para>
+The &lt;standard_system_servicedirs/&gt; option is only relevant
+to the per-system bus daemon defined in
+<filename>/etc/dbus\-1/system.conf</filename>.  Putting it in any other
+configuration file would probably be nonsense.
+</para>
+<para>
+&lt;servicehelper/&gt;
+</para>
+<para>
+&lt;servicehelper/&gt; specifies the setuid helper that is used to launch
+system daemons with an alternate user.  Typically this would be the
+<command>dbus-daemon-launch-helper</command> executable.  Because the
+systemwide message bus is disabled on Solaris, the
+<command>dbus-daemon-launch-helper</command> executable is not distributed
+with Solaris.
+</para>
+<para>
+The &lt;servicehelper/&gt; option is only relevant to the per-system bus
+daemon defined in <filename>/etc/dbus-1/system.conf</filename>.  Putting it in
+any other configuration file would probably be nonsense.
+</para>
+<para>
+&lt;limit&gt;
+</para>
+<para>
+&lt;limit&gt; establishes a resource limit. For example:
+</para>
+<screen>
+       &lt;limit name="max_message_size"&gt;64&lt;/limit&gt;
+       &lt;limit name="max_completed_connections"&gt;512&lt;/limit&gt;
+</screen>
+<para>
+The name attribute is mandatory.  Available limit names are:
+</para>
+
+<screen>
+    "max_incoming_bytes"             : total size in bytes
+                                       of messages incoming
+                                       from a single
+                                       connection
+    "max_outgoing_bytes"             : total size in bytes
+                                       of messages queued up
+                                       for a single
+                                       connection
+    "max_message_size"               : max size of a single
+                                       message in bytes
+    "service_start_timeout"          : milliseconds
+                                       (thousandths) until
+                                       a started service has
+                                       to connect
+    "auth_timeout"                   : milliseconds
+                                       (thousandths) a
+                                       connection is given
+                                       to authenticate
+    "max_completed_connections"      : max number of
+                                       authenticated
+                                       connections
+    "max_incomplete_connections"     : max number of
+                                       unauthenticated
+                                       connections
+    "max_connections_per_user"       : max number of
+                                       completed connections
+                                       from the same user
+    "max_pending_service_starts"     : max number of service
+                                       launches in progress
+                                       at the same time
+    "max_names_per_connection"       : max number of names a
+                                       single connection can
+                                       own
+    "max_match_rules_per_connection" : max number of match
+                                       rules for a single
+                                       connection
+    "max_replies_per_connection"     : max number of pending
+                                       method replies per
+                                       connection (number of
+                                       calls-in-progress)
+    "reply_timeout"                  : milliseconds
+                                       (thousandths) until a
+                                       method call times out
+</screen>
+<para>
+The max incoming/outgoing queue sizes allow a new message to be queued if one
+byte remains below the max.  So you can in fact exceed the max by
+max_message_size.
+</para>
+<para>
+max_completed_connections divided by max_connections_per_user is the number of
+users that can work together to denial-of-service all other users by using up
+all connections on the systemwide bus.
+</para>
+<para>
+Limits are normally only of interest on the systemwide bus, not the user
+session buses.
+</para>
+<para>
+&lt;policy&gt;
+</para>
+<para>
+The &lt;policy&gt; element defines a security policy to be applied to a
+particular set of connections to the bus. A policy is made up of &lt;allow&gt;
+and &lt;deny&gt; elements.  Policies are normally used with the systemwide bus;
+they are analogous to a firewall in that they allow expected traffic and
+prevent unexpected traffic.
+</para>
+<para>
+The &lt;policy&gt; element has one of three attributes:
+</para>
+<itemizedlist>
+<listitem><para>
+context="(default|mandatory)"
+</para></listitem>
+<listitem><para>
+user="username or userid"
+</para></listitem>
+<listitem><para>
+group="group name or gid"
+</para></listitem>
+</itemizedlist>
+<para>
+Policies are applied to a connection as follows:
+</para>
+<itemizedlist>
+<listitem><para>
+all context="default" policies are applied
+</para></listitem>
+<listitem><para>
+all group="connection's user's group" policies are applied
+in undefined order
+</para></listitem>
+<listitem><para>
+all user="connection's auth user" policies are applied
+in undefined order
+</para></listitem>
+<listitem><para>
+all context="mandatory" policies are applied
+</para></listitem>
+</itemizedlist>
+<para>
+Policies applied later will override those applied earlier, when the policies
+overlap.  Multiple policies with the same user/group/context are applied in the
+order they appear in the config file.
+</para>
+<para>
+&lt;deny&gt; and &lt;allow&gt;
+</para>
+<para>
+A &lt;deny&gt; element appears below a &lt;policy&gt; element and prohibits
+some action. The &lt;allow&gt; element makes an exception to previous
+&lt;deny&gt; statements, and works just like &lt;deny&gt; but with the inverse
+meaning.
+</para>
+<para>
+The possible attributes of these elements are:
+</para>
+<screen>
+        send_interface="interface_name"
+        send_member="method_or_signal_name"
+        send_error="error_name"
+        send_destination="name"
+        send_type="method_call" | "method_return" | "signal" | "error"
+        send_path="/path/name"
+</screen>
+<screen>
+        receive_interface="interface_name"
+        receive_member="method_or_signal_name"
+        receive_error="error_name"
+        receive_sender="name"
+        receive_type="method_call" | "method_return" | "signal" | "error"
+        receive_path="/path/name"
+</screen>
+<screen>
+        send_requested_reply="true" | "false"
+        receive_requested_reply="true" | "false"
+</screen>
+<screen>
+        eavesdrop="true" | "false"
+</screen>
+<screen>
+        own="name"
+        user="username"
+        group="groupname"
+</screen>
+<para>
+Examples:
+</para>
+<screen>
+        &lt;deny send_interface="org.freedesktop.System" send_member="Reboot"/&gt;
+        &lt;deny receive_interface="org.freedesktop.System" receive_member="Reboot"/&gt;
+        &lt;deny own="org.freedesktop.System"/&gt;
+        &lt;deny send_destination="org.freedesktop.System"/&gt;
+        &lt;deny receive_sender="org.freedesktop.System"/&gt;
+        &lt;deny user="john"/&gt;
+        &lt;deny group="enemies"/&gt;
+</screen>
+<para>
+The &lt;deny&gt; element's attributes determine whether the deny "matches" a
+particular action.  If it matches, the action is denied (unless later rules in
+the config file allow it).
+</para>
+<para>
+send_destination and receive_sender rules mean that messages may not be sent to
+or received from the *owner* of the given name, not that they may not be sent
+*to that name*.  That is, if a connection owns services A, B, C, and sending to
+A is denied, sending to B or C will not work either.
+</para>
+<para>
+The other send_* and receive_* attributes are purely textual/by-value matches
+against the given field in the message header.
+</para>
+<para>
+"Eavesdropping" occurs when an application receives a message that was
+explicitly addressed to a name the application does not own, or is a reply to
+such a message. Eavesdropping thus only applies to messages that are addressed
+to services and replies to such messages (i.e. it does not apply to signals).
+</para>
+<para>
+For &lt;allow&gt;, eavesdrop="true" indicates that the rule matches even when
+eavesdropping. eavesdrop="false" is the default and means that the rule only
+allows messages to go to their specified recipient.  For &lt;deny&gt;,
+eavesdrop="true" indicates that the rule matches only when eavesdropping.
+eavesdrop="false" is the default for &lt;deny&gt; also, but here it means that
+the rule applies always, even when not eavesdropping.  The eavesdrop attribute
+can only be combined with send and receive rules (with send_* and receive_*
+attributes).
+</para>
+<para>
+The [send|receive]_requested_reply attribute works similarly to the eavesdrop
+attribute. It controls whether the &lt;deny&gt; or &lt;allow&gt; matches a
+reply that is expected (corresponds to a previous method call message).  This
+attribute only makes sense for reply messages (errors and method returns), and
+is ignored for other message types.
+</para>
+<para>
+For &lt;allow&gt;, [send|receive]_requested_reply="true" is the default and
+indicates that only requested replies are allowed by the rule.
+[send|receive]_requested_reply="false" means that the rule allows any reply
+even if unexpected.
+</para>
+<para>
+For &lt;deny&gt;, [send|receive]_requested_reply="false" is the default but
+indicates that the rule matches only when the reply was not requested.
+[send|receive]_requested_reply="true" indicates that the rule applies always,
+regardless of pending reply state.
+</para>
+<para>
+user and group denials mean that the given user or group may not connect to the
+message bus.
+</para>
+<para>
+For "name", "username", "groupname", etc. the character "*" can be substituted,
+meaning "any."  Complex globs like "foo.bar.*" aren't allowed for now because
+they would be work to implement and maybe encourage sloppy security anyway.
+</para>
+<para>
+It does not make sense to deny a user or group inside a &lt;policy&gt; for
+a user or group; user/group denials can only be inside context="default" or
+context="mandatory" policies.
+</para>
+<para>
+A single &lt;deny&gt; rule may specify combinations of attributes such as
+send_destination and send_interface and send_type.  In this case, the denial
+applies only if both attributes match the message being denied. e.g. &lt;deny
+send_interface="foo.bar" send_destination="foo.blah"/&gt; would deny messages
+with the given interface AND the given bus name.  To get an OR effect you
+specify multiple &lt;deny&gt; rules.
+</para>
+<para>
+You can't include both send_ and receive_ attributes on the same rule, since
+"whether the message can be sent" and "whether it can be received" are
+evaluated separately.
+</para>
+<para>
+Be careful with send_interface/receive_interface, because the interface field
+in messages is optional.
+</para>
+<para>
+&lt;selinux&gt;
+</para>
+<para>
+The &lt;selinux&gt; element contains settings related to Security Enhanced
+Linux.  More details below.  Note, SELinux is not supported on Solaris.
+</para>
+<para>
+&lt;associate&gt;
+</para>
+<para>
+An &lt;associate&gt; element appears below an &lt;selinux&gt; element and
+creates a mapping.  Right now only one kind of association is possible:
+</para>
+<screen>
+        &lt;associate own="org.freedesktop.Foobar" context="foo_t"/&gt;
+</screen>
+<para>
+This means that if a connection asks to own the name "org.freedesktop.Foobar"
+then the source context will be the context of the connection and the target
+context will be "foo_t" - see the short discussion of SELinux below.
+</para>
+<para>
+Note, the context here is the target context when requesting a name, NOT the
+context of the connection owning the name.
+</para>
+<para>
+There is currently no way to set a default for owning any name, if we add this
+syntax it will look like:
+</para>
+<screen>
+        &lt;associate own="*" context="foo_t"/&gt;
+</screen>
+<para>
+If you find a reason this is useful, let the developers know.  Right now the
+default will be the security context of the bus itself.
+</para>
+<para>
+If two &lt;associate&gt; elements specify the same name, the element appearing
+later in the configuration file will be used.
+</para>
+</refsect2>
+<refsect2>
+<title>SELinux</title>
+<para>
+SELinux is not supported on Solaris.  It is used with the systemwide bus
+which is disabled on Solaris.
+</para>
+<para>
+See <literal>http://www.nsa.gov/selinux/</literal> for full details on SELinux.
+Some useful excerpts:
+</para>
+<variablelist termlength="xtranarrow">
+<varlistentry>
+<term></term>
+<listitem>
+<para>
+Every subject (process) and object (e.g. file, socket, IPC object, etc) in the
+system is assigned a collection of security attributes, known as a security
+context. A security context contains all of the security attributes associated
+with a particular subject or object that are relevant to the security policy.
+</para>
+</listitem></varlistentry>
+<varlistentry>
+<term></term>
+<listitem>
+<para>
+In order to better encapsulate security contexts and to provide greater
+efficiency, the policy enforcement code of SELinux typically handles security
+identifiers (SIDs) rather than security contexts. A SID is an integer that is
+mapped by the security server to a security context at runtime.
+</para>
+</listitem></varlistentry>
+<varlistentry>
+<term></term>
+<listitem>
+<para>
+When a security decision is required, the policy enforcement code passes a pair
+of SIDs (typically the SID of a subject and the SID of an object, but sometimes
+a pair of subject SIDs or a pair of object SIDs), and an object security class
+to the security server. The object security class indicates the kind of object,
+e.g. a process, a regular file, a directory, a TCP socket, etc.
+</para>
+</listitem></varlistentry>
+<varlistentry>
+<term></term>
+<listitem>
+<para>
+Access decisions specify whether or not a permission is granted for a given
+pair of SIDs and class. Each object class has a set of associated permissions
+defined to control operations on objects with that class.
+</para>
+</listitem></varlistentry>
+</variablelist>
+<para>
+D\-Bus performs SELinux security checks in two places.
+</para>
+</listitem></varlistentry>
+<para>
+First, any time a message is routed from one connection to another connection,
+the bus daemon will check permissions with the security context of the first
+connection as source, security context of the second connection as target,
+object class "dbus" and requested permission "send_msg".
+</para>
+<para>
+If a security context is not available for a connection (impossible when using
+UNIX domain sockets), then the target context used is the context of the bus
+daemon itself.  There is currently no way to change this default, because we
+are assuming that only UNIX domain sockets will be used to connect to the
+systemwide bus. If this changes, we'll probably add a way to set the default
+connection context.
+</para>
+<para>
+Second, any time a connection asks to own a name, the bus daemon will check
+permissions with the security context of the connection as source, the security
+context specified for the name in the config file as target, object class
+"dbus" and requested permission "acquire_svc".
+</para>
+<para>
+The security context for a bus name is specified with the &lt;associate&gt;
+element described earlier in this document.  If a name has no security context
+associated in the configuration file, the security context of the bus daemon
+itself will be used.
+</para>
+</refsect2>
+<refsect2>
+<title>DEBUGGING</title>
+<para>
+If you are trying to figure out where your messages are going or why you are
+not getting messages, there are several things you can try.
+</para>
+<para>
+Remember that the system bus is heavily locked down and if you have not
+installed a security policy file to allow your message through, it won't work.
+For the session bus, this is not a concern.
+</para>
+<para>
+The simplest way to figure out what's happening on the bus is to run the
+<command>dbus-monitor</command> program, which comes with the D\-Bus package.
+You can also send test messages with <command>dbus-send</command>.  These
+programs have their own man pages.
+</para>
+<para>
+If you want to know what the daemon itself is doing, you might consider running
+a separate copy of the daemon to test against. This will allow you to put the
+daemon under a debugger, or run it with verbose output, without messing up your
+real session and system daemons.
+</para>
+<para>
+To run a separate test copy of the daemon, for example you might open a
+terminal and type:
+</para>
+<screen>
+       DBUS_VERBOSE=1 &cmd; --session --print-address
+</screen>
+<para>
+The test daemon address will be printed when the daemon starts. You will need
+to copy-and-paste this address and use it as the value of the
+DBUS_SESSION_BUS_ADDRESS environment variable when you launch the applications
+you want to test.  This will cause those applications to connect to your test
+bus instead of the DBUS_SESSION_BUS_ADDRESS of your real session bus.
+</para>
+<para>
+DBUS_VERBOSE=1 will have NO EFFECT unless your copy of D\-Bus was compiled with
+verbose mode enabled. This is not recommended in production builds due to
+performance impact.  You may need to rebuild D\-Bus if your copy was not built
+with debugging in mind.  (DBUS_VERBOSE also affects the D\-Bus library and thus
+applications using D\-Bus; it may be useful to see verbose output on both the
+client side and from the daemon.)
+</para>
+<para>
+If you want to get fancy, you can create a custom bus configuration for your
+test bus (see the <filename>session.conf</filename> and 
+<filename>system.conf</filename> files that define the two default
+configurations for example).  This would allow you to specify a different
+directory for <filename>.service</filename> files, for example.
+</para>
+</refsect2>
+</refsect1>
+<refsect1 id="dbus-daemon-1-exam"><title>&exam-tt;</title>
+<example role="example">
+<title>
+Message bus daemon
+</title>
+<para><screen>example% <userinput>&cmd; </userinput></screen></para>
+</example>
+</refsect1>
+<refsect1 id="dbus-daemon-1-envr"><title>&envr-tt;</title>
+<para>
+See
+<citerefentry><refentrytitle>environ</refentrytitle><manvolnum>5</manvolnum></ci
+terefentry>
+for descriptions of the following environment variables:
+</para>
+<variablelist termlength="wholeline">
+<varlistentry>
+<term>DBUS_SESSION_BUS_ADDRESS</term>
+<listitem><para>
+The address of the login session message bus.  If this variable is not set,
+applications may also try to read the address from the X Window System root
+window property _DBUS_SESSION_BUS_ADDRESS.  The root window property
+must have type STRING.  The environment variable should have precedence over the
+ root window property.
+</para>
+</listitem></varlistentry>
+<varlistentry>
+<term>DBUS_VERBOSE</term>
+<listitem><para>
+Set DBUS_VERSION=1 to enable debugging, if D\-Bus was compiled with verbose
+debug mode enabled.
+</para>
+</listitem></varlistentry>
+</variablelist></refsect1>
+<refsect1 id="dbus-daemon-1-exit"><title>&exit-tt;</title>
+<para>The following exit values are returned:</para>
+<variablelist termlength="xtranarrow">
+<varlistentry>
+<term><returnvalue>0</returnvalue></term>
+<listitem><para>
+Application exited successfully
+</para>
+</listitem></varlistentry>
+<varlistentry>
+<term><returnvalue>>0</returnvalue></term>
+<listitem><para>
+Application exited with failure
+</para>
+</listitem></varlistentry>
+</variablelist></refsect1>
+<refsect1 id="dbus-daemon-1-file"><title>&file-tt;</title>
+<para>The following files are used by this application:</para>
+<variablelist termlength="wholeline">
+<varlistentry>
+<term><filename>/usr/lib/&cmd;</filename></term>
+<listitem><para>
+Executable for &cmd;
+</para>
+</listitem></varlistentry>
+<varlistentry>
+<term><filename>/usr/share/dbus-1/services</filename></term>
+<listitem><para>
+Directory containing standard D\-Bus session services.
+</para>
+</listitem></varlistentry>
+<varlistentry>
+<term><filename>/usr/share/dbus-1/system-services</filename></term>
+<listitem><para>
+Directory containing standard D\-Bus systemwide services.
+</para>
+</listitem></varlistentry>
+<varlistentry>
+<term><filename>/etc/dbus-1/session.conf</filename></term>
+<listitem><para>
+Configuration file for D\-Bus session services.
+</para>
+</listitem></varlistentry>
+<varlistentry>
+<term><filename>/etc/dbus-1/system.conf</filename></term>
+<listitem><para>
+Configuration file for D\-Bus system services.
+</para>
+</listitem></varlistentry>
+</variablelist></refsect1>
+<refsect1 id="dbus-daemon-1-attr"><title>&attr-tt;</title>
+<para>See <olink targetdocent="REFMAN5" localinfo="attributes-5"><citerefentry>
+<refentrytitle>attributes</refentrytitle><manvolnum>5</manvolnum></citerefentry></olink>
+for descriptions of the following attributes:</para>
+<informaltable frame="all">
+<tgroup cols="2" colsep="1" rowsep="1"><colspec colname="COLSPEC0" colwidth="1*">
+<colspec colname="COLSPEC1" colwidth="1*">
+<thead>
+<row><entry align="center" valign="middle">ATTRIBUTE TYPE</entry><entry align="center"
+valign="middle">ATTRIBUTE VALUE</entry></row>
+</thead>
+<tbody>
+<row><entry>
+<para>Availability</para>
+</entry><entry>
+<para>SUNWdbus</para>
+</entry></row><row><entry colname="COLSPEC0">
+<para>Interface stability</para>
+</entry><entry colname="COLSPEC1">
+<para>Volatile</para>
+</entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+</refsect1>
+<refsect1 id="dbus-daemon-1-also"><title>&also-tt;</title>
+<!--Reference to another man page-->
+<!--Reference to a Help manual-->
+<!--Reference to a book.-->
+<para>
+<citerefentry><refentrytitle>dbus-cleanup-sockets</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+<citerefentry><refentrytitle>dbus-launch</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+<citerefentry><refentrytitle>dbus-monitor</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+<citerefentry><refentrytitle>dbus-send</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+<citerefentry><refentrytitle>dbus-uuidgen</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+<citerefentry><refentrytitle>libdbus-glib-1</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+<citerefentry><refentrytitle>attributes</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+<citerefentry><refentrytitle>environ</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+</para>
+</refsect1>
+<refsect1 id="dbus-daemon-1-note"><title>&note-tt;</title>
+<para>
+For authorship information refer to
+<literal>http://www.freedesktop.org/software/dbus/doc/AUTHORS</literal>.
+Updated by Brian Cameron, Sun Microsystems Inc., 2007.
+</para>
+<para>
+Please send bug reports to the D\-Bus mailing list or bug
+tracker, see
+<literal>http://www.freedesktop.org/software/dbus/</literal>
+</para>
+</refsect1>
+</refentry>
--- a/manpages/man1/dbus-launch.1	Wed Aug 20 06:41:03 2008 +0000
+++ b/manpages/man1/dbus-launch.1	Wed Aug 20 07:06:44 2008 +0000
@@ -79,7 +79,7 @@
 <command>dbus-daemon</command>.
 </para>
 </refsect1>
-<refsect1 id="dbus-daemon-3-exde"><title>&exde-tt;</title>
+<refsect1 id="dbus-launch-1-exde"><title>&exde-tt;</title>
 <refsect2>
 <title>AUTOMATIC LAUNCHING</title>
 <para>
@@ -324,10 +324,10 @@
 <!--Reference to a book.-->
 <para>
 <citerefentry><refentrytitle>dbus-cleanup-sockets</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+<citerefentry><refentrytitle>dbus-daemon</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>dbus-monitor</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>dbus-send</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>dbus-uuidgen</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-<citerefentry><refentrytitle>dbus-daemon</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>libdbus-glib-1</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>attributes</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>environ</refentrytitle><manvolnum>5</manvolnum></citerefentry>
--- a/manpages/man1/dbus-monitor.1	Wed Aug 20 06:41:03 2008 +0000
+++ b/manpages/man1/dbus-monitor.1	Wed Aug 20 07:06:44 2008 +0000
@@ -168,10 +168,10 @@
 <!--Reference to a book.-->
 <para>
 <citerefentry><refentrytitle>dbus-cleanup-sockets</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+<citerefentry><refentrytitle>dbus-daemon</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>dbus-launch</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>dbus-send</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>dbus-uuidgen</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-<citerefentry><refentrytitle>dbus-daemon</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>libdbus-glib-1</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>attributes</refentrytitle><manvolnum>5</manvolnum></citerefentry>
 </para>
--- a/manpages/man1/dbus-send.1	Wed Aug 20 06:41:03 2008 +0000
+++ b/manpages/man1/dbus-send.1	Wed Aug 20 07:06:44 2008 +0000
@@ -209,10 +209,10 @@
 <!--Reference to a book.-->
 <para>
 <citerefentry><refentrytitle>dbus-cleanup-sockets</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+<citerefentry><refentrytitle>dbus-daemon</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>dbus-launch</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>dbus-monitor</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>dbus-uuidgen</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-<citerefentry><refentrytitle>dbus-daemon</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>libdbus-glib-1</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>attributes</refentrytitle><manvolnum>5</manvolnum></citerefentry>
 </para>
--- a/manpages/man1/dbus-uuidgen.1	Wed Aug 20 06:41:03 2008 +0000
+++ b/manpages/man1/dbus-uuidgen.1	Wed Aug 20 07:06:44 2008 +0000
@@ -182,10 +182,10 @@
 <!--Reference to a book.-->
 <para>
 <citerefentry><refentrytitle>dbus-cleanup-sockets</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+<citerefentry><refentrytitle>dbus-daemon</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>dbus-launch</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>dbus-monitor</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>dbus-send</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-<citerefentry><refentrytitle>dbus-daemon</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>libdbus-glib-1</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>attributes</refentrytitle><manvolnum>5</manvolnum></citerefentry>
 </para>
--- a/manpages/man3/dbus-daemon.3	Wed Aug 20 06:41:03 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,963 +0,0 @@
-<!DOCTYPE REFENTRY PUBLIC "-//Sun Microsystems//DTD DocBook V3.0-Based SolBook Subset V2.0//EN" [
-<!--ArborText, Inc., 1988-1999, v.4002-->
-<!ENTITY cmd "dbus-daemon">
-<!ENTITY % commonents SYSTEM "smancommon.ent">
-%commonents;
-<!ENTITY % booktitles SYSTEM "booktitles.ent">
-%booktitles;
-<!ENTITY suncopy "Copyright (c) 2007 Sun Microsystems, Inc. All Rights Reserved.">
-]>
-<?Pub UDT _bookmark _target>
-<?Pub Inc>
-<refentry id="dbus-daemon-3">
-<!-- %Z%%M% %I% %E% SMI; -->
-<refmeta><refentrytitle>&cmd;</refentrytitle><manvolnum>3</manvolnum>
-<refmiscinfo class="date">19 Nov 2007</refmiscinfo>
-<refmiscinfo class="sectdesc">&man3;</refmiscinfo>
-<refmiscinfo class="software">&release;</refmiscinfo>
-<refmiscinfo class="arch">generic</refmiscinfo>
-<refmiscinfo class="copyright">&suncopy;</refmiscinfo>
-</refmeta>
-<indexterm><primary>&cmd;</primary></indexterm><indexterm><primary>
-Message bus daemon
-</primary></indexterm><refnamediv id="dbus-daemon-3-name">
-<refname>&cmd;</refname><refpurpose>
-Message bus daemon
-</refpurpose></refnamediv>
-<refsynopsisdiv id="dbus-daemon-3-synp"><title>&synp-tt;</title>
-<cmdsynopsis><command>&cmd;</command>
-<arg choice="opt"><option>-config-file=<replaceable>file</replaceable></option></arg>
-<arg choice="opt"><option>-fork</option> | <option>-nofork</option></arg>
-<arg choice="opt"><option>-introspect</option></arg>
-<arg choice="opt"><option>-print-address[=<replaceable>descriptor</replaceable>]</option></arg>
-<arg choice="opt"><option>-print-pid[=<replaceable>descriptor</replaceable>]</option></arg>
-<arg choice="opt"><option>-session</option></arg>
-<arg choice="opt"><option>-system</option></arg>
-<arg choice="opt"><option>-version</option></arg>
-</cmdsynopsis></refsynopsisdiv>
-<refsect1 id="dbus-daemon-3-desc"><title>&desc-tt;</title>
-<para>
-&cmd; is the D\-Bus message bus daemon.  See
-<literal>http://www.freedesktop.org/software/dbus/</literal>
-for more information.  D\-Bus is first a library that provides one\-to\-one
-communication between any two applications; &cmd; is an application that uses
-this library to implement a message bus daemon.  Multiple programs connect to
-the message bus daemon and can exchange messages with one another.
-</para>
-<para>
-There are two standard message bus instances.  &cmd; is used for both of these
-instances, but with a different configuration file.
-</para>
-<itemizedlist>
-<listitem><para>
-systemwide message bus - Disabled and not supported on Solaris, but installed
-on many systems as the "messagebus" init service.  Note that the
-<option>-system</option> option is equivalent to:
-</para>
-<para>
-"<option>-config\-file=/etc/dbus\-1/system.conf</option>"
-</para></listitem>
-<listitem><para>
-per-user-login-session message bus - Enabled and supported on Solaris, and
-started each time a user logs in.  Note that the 
-<option>-session</option> option is equivalent to:
-</para>
-<para>
-"<option>-config\-file=/etc/dbus\-1/session.conf</option>"
-</para></listitem>
-</itemizedlist>
-<para>
-By creating additional configuration files and using the
-<option>-config\-file</option> option, additional special-purpose message bus
-daemons could be created.
-</para>
-<para>
-On Solaris, D\-Bus is configured with the systemwide message bus disabled.
-The systemwide message bus is not used by any applications that are currently
-shipped with Solaris.
-</para>
-<para>
-The systemwide daemon is normally launched by an init script, standardly called
-simply "messagebus".
-</para>
-<para>
-The systemwide daemon is largely used for broadcasting system events, such as
-changes to the printer queue, or adding/removing devices.
-</para>
-<para>
-The per-session daemon is used for various interprocess communication among
-desktop applications (however, it is not tied to X or the GUI in any way).
-</para>
-<para>
-SIGHUP will cause the D\-Bus daemon to PARTIALLY reload its configuration file
-and to flush its user/group information caches.  Some configuration changes
-would require kicking all apps off the bus; so they will only take effect if
-you restart the daemon. Policy changes should take effect with SIGHUP.
-</para>
-</refsect1>
-<refsect1 id="dbus-daemon-3-opts"><title>&opts-tt;</title>
-<para>The following options are supported:</para>
-<variablelist termlength="wholescreen">
-<varlistentry>
-<term><option>-config-file=<replaceable>file</replaceable></option></term>
-<listitem><para>
-Use the given configuration <replaceable>file</replaceable>.
-</para>
-</listitem></varlistentry>
-<varlistentry>
-<term><option>-fork</option></term>
-<listitem><para>
-Force the message bus to fork and become a daemon, regardless of configuration
-file settings.
-</para>
-</listitem></varlistentry>
-<varlistentry>
-<term><option>-introspect</option></term>
-<listitem><para>
-Print introspect data and exit.
-</para>
-</listitem></varlistentry>
-<varlistentry>
-<term><option>-nofork</option></term>
-<listitem><para>
-Avoid running the message bus as a daemon, regardless of configuration file
-settings.
-</para>
-</listitem></varlistentry>
-<varlistentry>
-<term><option>-print-address[=<replaceable>descriptor</replaceable>]</option></term>
-<listitem><para>
-Print the address of the message bus to standard output, or to the given file
-<replaceable>descriptor</replaceable>.  This is used by programs that launch
-the message bus.
-</para>
-</listitem></varlistentry>
-<varlistentry>
-<term><option>-print-pid[=<replaceable>descriptor</replaceable>]</option></term>
-<listitem><para>
-Print the process ID of the message bus to standard output, or to the given
-file <replaceable>descriptor</replaceable>.  This is used by programs that
-launch the message bus.
-</para>
-</listitem></varlistentry>
-<varlistentry>
-<term><option>-session</option></term>
-<listitem><para>
-Use the standard configuration file for the per-login-session message bus.
-</para>
-</listitem></varlistentry>
-<varlistentry>
-<term><option>-system</option></term>
-<listitem><para>
-Use the standard configuration file for the systemwide message bus.
-</para>
-</listitem></varlistentry>
-<varlistentry>
-<term><option>-version</option></term>
-<listitem><para>
-Print the version of the daemon.
-</para>
-</listitem></varlistentry>
-</variablelist></refsect1>
-<refsect1 id="dbus-daemon-3-exde"><title>&exde-tt;</title>
-<refsect2>
-<title>CONFIGURATION FILE</title>
-<para>
-A message bus daemon has a configuration file that specializes it for a
-particular application. For example, one configuration file might set up the
-message bus to be a systemwide message bus, while another might set it
-up to be a per-user-login-session bus.
-</para>
-<para>
-The configuration file also establishes resource limits, security parameters,
-and so forth.
-</para>
-<para>
-The configuration file is not part of any interoperability specification and
-its backward compatibility is not guaranteed; this document is documentation,
-not specification.
-</para>
-<para>
-The standard systemwide and per-session message bus setups are configured in
-the files "<filename>/etc/dbus-1/system.conf</filename>" and
-"<filename>/etc/dbus-1/session.conf</filename>".  These files normally
-&lt;include&gt; a <filename>system-local.conf</filename> or
-<filename>session-local.conf</filename>; you can put local overrides in those
-files to avoid modifying the primary configuration files.
-</para>
-<para>
-The configuration file is an XML document.  It must have the following doctype
-declaration:
-</para>
-<screen>
-   &lt;!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D\-Bus Bus Configuration 1.0//EN"
-    "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"&gt;
-</screen>
-<para>
-The following elements may be present in the configuration file.
-Note that some configuration file options are only meaningful with 
-the systemwide message bus, which is disabled on Solaris.  Such options
-are only documented for reference.
-</para>
-<para>
-&lt;busconfig&gt;
-</para>
-<para>
-Root element.
-</para>
-<para>
-&lt;type&gt;
-</para>
-<para>
-The well-known type of the message bus.  Currently known values are "system"
-and "session"; if other values are set, they should be either added to the
-D\-Bus specification, or namespaced.  The last &lt;type&gt; element "wins"
-(previous values are ignored).
-</para>
-<para>
-Example: &lt;type&gt;session&lt;/type&gt;
-</para>
-<para>
-&lt;include&gt;
-</para>
-<para>
-Include a file &lt;include&gt;filename.conf&lt;/include&gt; at this point.  If
-the filename is relative, it is located relative to the configuration file
-doing the including.
-</para>
-<para>
-&lt;include&gt; has an optional attribute "ignore_missing=(yes|no)" which
-defaults to "no" if not provided.  This attribute controls whether it is a
-fatal error for the included file to be absent.
-</para>
-<para>
-&lt;includedir&gt;
-</para>
-<para>
-Include all files in &lt;includedir&gt;foo.d&lt;/includedir&gt; at this point.
-Files in the directory are included in undefined order.  Only files ending in
-".conf" are included.
-</para>
-<para>
-This is intended to allow extension of the system bus by particular packages.
-For example, if CUPS wants to be able to send out notification of printer queue
-changes, it could install a file to /etc/dbus-1/system.d that allowed all apps
-to receive this message and allowed the printer daemon user to send it.
-</para>
-<para>
-&lt;user&gt;
-</para>
-<para>
-The user account the daemon should run as, as either a username or a UID.
-If the daemon cannot change to this UID on startup, it will exit.  If this
-element is not present, the daemon will not change or care about its UID.
-</para>
-<para>
-The last &lt;user&gt; entry in the file "wins", the others are ignored.
-</para>
-<para>
-The user is changed after the bus has completed initialization.  So sockets
-etc. will be created before changing user, but no data will be read from
-clients before changing user.  This means that sockets and PID files can be
-created in a location that requires root privileges for writing.
-</para>
-<para>
-&lt;fork&gt;
-</para>
-<para>
-If present, the bus daemon becomes a real daemon (forks into the background,
-etc.).  This is generally used rather than the <option>-fork</option> command
-line option.
-</para>
-<para>
-&lt;listen&gt;
-</para>
-<para>
-Add an address that the bus should listen on. The address is in the standard
-D\-Bus format that contains a transport name plus possible parameters/options.
-</para>
-<screen>
-     Example: &lt;listen&gt;unix:path=/tmp/foo&lt;/listen&gt;
-     Example: &lt;listen&gt;tcp:host=localhost,port=1234&lt;/listen&gt;
-</screen>
-<para>
-If there are multiple &lt;listen&gt; elements, then the bus listens on multiple
-addresses.  The bus will pass its address to started services or other
-interested parties with the last address given in &lt;listen&gt; first. That
-is, apps will try to connect to the last &lt;listen&gt; address first.
-</para>
-<para>
-tcp sockets can accept IPv4 addresses, IPv6 addresses or hostnames.  If a
-hostname resolves to multiple addresses, the server will bind to all of them.
-The family=ipv4 or family=ipv6 options can be used to force it to bind to a
-subset of addresses.
-</para>
-<screen>
-     Example:
-     &lt;listen&gt;tcp:host=localhost,port=0,family=ipv4&lt;/listen&gt;
-</screen>
-<para>
-A special case is using a port number of zero (or omitting the port), which
-means to choose an available port selected by the operating system.  The port
-number chosen can be obtained with the <option>-print-address</option> command
-line parameter and will be present in other cases where the server reports its
-own address, such as when DBUS_SESSION_BUS_ADDRESS is set.
-</para>
-<screen>
-     Example: &lt;listen&gt;tcp:host=localhost,port=0&lt;/listen&gt;
-</screen>
-<para>
-tcp addresses also allow a bind=hostname option, which will override the host
-option specifying what address to bind to, without changing the address
-reported by the bus.  The bind option can also take a special name '*' to
-cause the bus to listen on all local address (INADDR_ANY). The specified host
-should be a valid name of the local machine or weird stuff will happen.
-</para>
-<screen>
-     Example: &lt;listen&gt;tcp:host=localhost,bind=*,port=0&lt;/listen&gt;
-</screen>
-<para>
-&lt;auth&gt;
-</para>
-<para>
-Lists permitted authorization mechanisms.  If this element does not exist, then
-all known mechanisms are allowed.  If there are multiple &lt;auth&gt; elements,
-all the listed mechanisms are allowed.  The order in which mechanisms are
-listed is not meaningful.
-</para>
-<screen>
-     Example: &lt;auth&gt;EXTERNAL&lt;/auth&gt;
-     Example: &lt;auth&gt;DBUS_COOKIE_SHA1&lt;/auth&gt;
-</screen>
-<para>
-&lt;servicedir&gt;
-</para>
-<para>
-Adds a directory to scan for <filename>.service</filename> files.  Directories
-are scanned starting with the last to appear in the config file (the first
-<filename>.service</filename> file found that provides a particular service
-will be used).
-</para>
-<para>
-Service files tell the bus how to automatically start a program.  They are
-primarily used with the per-user-session bus, not the systemwide bus.
-</para>
-<para>
-&lt;standard session servicedirs/&gt;
-</para>
-<para>
-&lt;standard_session_servicedirs/&gt; is equivalent to specifying a series of
-&lt;servicedir/&gt; elements for each of the data directories in the "XDG Base
-Directory Specification" with the subdirectory "dbus-1/services", so for
-example "/usr/share/dbus-1/services" would be among the directories searched.
-</para>
-<para>
-The "XDG Base Directory Specification" should be found at
-<literal>http://freedesktop.org/wiki/Standards/basedir-spec</literal>.
-</para>
-<para>
-The &lt;standard_session_servicedirs/&gt; option is only relevant to the
-per-user-session bus daemon defined in
-<filename>/etc/dbus\-1/session.conf</filename>.  Putting it in any other
-configuration file would probably be nonsense.
-</para>
-<para>
-&lt;standard system servicedirs/&gt;
-</para>
-<para>
-&lt;standard_system_servicedirs/&gt; specifies the standard systemwide
-activation directories that should be searched for service files.  This option
-defaults to <filename>/usr/share/dbus-1/system-services</filename>.
-</para>
-<para>
-The &lt;standard_system_servicedirs/&gt; option is only relevant
-to the per-system bus daemon defined in
-<filename>/etc/dbus\-1/system.conf</filename>.  Putting it in any other
-configuration file would probably be nonsense.
-</para>
-<para>
-&lt;servicehelper/&gt;
-</para>
-<para>
-&lt;servicehelper/&gt; specifies the setuid helper that is used to launch
-system daemons with an alternate user.  Typically this would be the
-<command>dbus-daemon-launch-helper</command> executable.  Because the
-systemwide message bus is disabled on Solaris, the
-<command>dbus-daemon-launch-helper</command> executable is not distributed
-with Solaris.
-</para>
-<para>
-The &lt;servicehelper/&gt; option is only relevant to the per-system bus
-daemon defined in <filename>/etc/dbus-1/system.conf</filename>.  Putting it in
-any other configuration file would probably be nonsense.
-</para>
-<para>
-&lt;limit&gt;
-</para>
-<para>
-&lt;limit&gt; establishes a resource limit. For example:
-</para>
-<screen>
-       &lt;limit name="max_message_size"&gt;64&lt;/limit&gt;
-       &lt;limit name="max_completed_connections"&gt;512&lt;/limit&gt;
-</screen>
-<para>
-The name attribute is mandatory.  Available limit names are:
-</para>
-
-<screen>
-    "max_incoming_bytes"             : total size in bytes
-                                       of messages incoming
-                                       from a single
-                                       connection
-    "max_outgoing_bytes"             : total size in bytes
-                                       of messages queued up
-                                       for a single
-                                       connection
-    "max_message_size"               : max size of a single
-                                       message in bytes
-    "service_start_timeout"          : milliseconds
-                                       (thousandths) until
-                                       a started service has
-                                       to connect
-    "auth_timeout"                   : milliseconds
-                                       (thousandths) a
-                                       connection is given
-                                       to authenticate
-    "max_completed_connections"      : max number of
-                                       authenticated
-                                       connections
-    "max_incomplete_connections"     : max number of
-                                       unauthenticated
-                                       connections
-    "max_connections_per_user"       : max number of
-                                       completed connections
-                                       from the same user
-    "max_pending_service_starts"     : max number of service
-                                       launches in progress
-                                       at the same time
-    "max_names_per_connection"       : max number of names a
-                                       single connection can
-                                       own
-    "max_match_rules_per_connection" : max number of match
-                                       rules for a single
-                                       connection
-    "max_replies_per_connection"     : max number of pending
-                                       method replies per
-                                       connection (number of
-                                       calls-in-progress)
-    "reply_timeout"                  : milliseconds
-                                       (thousandths) until a
-                                       method call times out
-</screen>
-<para>
-The max incoming/outgoing queue sizes allow a new message to be queued if one
-byte remains below the max.  So you can in fact exceed the max by
-max_message_size.
-</para>
-<para>
-max_completed_connections divided by max_connections_per_user is the number of
-users that can work together to denial-of-service all other users by using up
-all connections on the systemwide bus.
-</para>
-<para>
-Limits are normally only of interest on the systemwide bus, not the user
-session buses.
-</para>
-<para>
-&lt;policy&gt;
-</para>
-<para>
-The &lt;policy&gt; element defines a security policy to be applied to a
-particular set of connections to the bus. A policy is made up of &lt;allow&gt;
-and &lt;deny&gt; elements.  Policies are normally used with the systemwide bus;
-they are analogous to a firewall in that they allow expected traffic and
-prevent unexpected traffic.
-</para>
-<para>
-The &lt;policy&gt; element has one of three attributes:
-</para>
-<itemizedlist>
-<listitem><para>
-context="(default|mandatory)"
-</para></listitem>
-<listitem><para>
-user="username or userid"
-</para></listitem>
-<listitem><para>
-group="group name or gid"
-</para></listitem>
-</itemizedlist>
-<para>
-Policies are applied to a connection as follows:
-</para>
-<itemizedlist>
-<listitem><para>
-all context="default" policies are applied
-</para></listitem>
-<listitem><para>
-all group="connection's user's group" policies are applied
-in undefined order
-</para></listitem>
-<listitem><para>
-all user="connection's auth user" policies are applied
-in undefined order
-</para></listitem>
-<listitem><para>
-all context="mandatory" policies are applied
-</para></listitem>
-</itemizedlist>
-<para>
-Policies applied later will override those applied earlier, when the policies
-overlap.  Multiple policies with the same user/group/context are applied in the
-order they appear in the config file.
-</para>
-<para>
-&lt;deny&gt; and &lt;allow&gt;
-</para>
-<para>
-A &lt;deny&gt; element appears below a &lt;policy&gt; element and prohibits
-some action. The &lt;allow&gt; element makes an exception to previous
-&lt;deny&gt; statements, and works just like &lt;deny&gt; but with the inverse
-meaning.
-</para>
-<para>
-The possible attributes of these elements are:
-</para>
-<screen>
-        send_interface="interface_name"
-        send_member="method_or_signal_name"
-        send_error="error_name"
-        send_destination="name"
-        send_type="method_call" | "method_return" | "signal" | "error"
-        send_path="/path/name"
-</screen>
-<screen>
-        receive_interface="interface_name"
-        receive_member="method_or_signal_name"
-        receive_error="error_name"
-        receive_sender="name"
-        receive_type="method_call" | "method_return" | "signal" | "error"
-        receive_path="/path/name"
-</screen>
-<screen>
-        send_requested_reply="true" | "false"
-        receive_requested_reply="true" | "false"
-</screen>
-<screen>
-        eavesdrop="true" | "false"
-</screen>
-<screen>
-        own="name"
-        user="username"
-        group="groupname"
-</screen>
-<para>
-Examples:
-</para>
-<screen>
-        &lt;deny send_interface="org.freedesktop.System" send_member="Reboot"/&gt;
-        &lt;deny receive_interface="org.freedesktop.System" receive_member="Reboot"/&gt;
-        &lt;deny own="org.freedesktop.System"/&gt;
-        &lt;deny send_destination="org.freedesktop.System"/&gt;
-        &lt;deny receive_sender="org.freedesktop.System"/&gt;
-        &lt;deny user="john"/&gt;
-        &lt;deny group="enemies"/&gt;
-</screen>
-<para>
-The &lt;deny&gt; element's attributes determine whether the deny "matches" a
-particular action.  If it matches, the action is denied (unless later rules in
-the config file allow it).
-</para>
-<para>
-send_destination and receive_sender rules mean that messages may not be sent to
-or received from the *owner* of the given name, not that they may not be sent
-*to that name*.  That is, if a connection owns services A, B, C, and sending to
-A is denied, sending to B or C will not work either.
-</para>
-<para>
-The other send_* and receive_* attributes are purely textual/by-value matches
-against the given field in the message header.
-</para>
-<para>
-"Eavesdropping" occurs when an application receives a message that was
-explicitly addressed to a name the application does not own, or is a reply to
-such a message. Eavesdropping thus only applies to messages that are addressed
-to services and replies to such messages (i.e. it does not apply to signals).
-</para>
-<para>
-For &lt;allow&gt;, eavesdrop="true" indicates that the rule matches even when
-eavesdropping. eavesdrop="false" is the default and means that the rule only
-allows messages to go to their specified recipient.  For &lt;deny&gt;,
-eavesdrop="true" indicates that the rule matches only when eavesdropping.
-eavesdrop="false" is the default for &lt;deny&gt; also, but here it means that
-the rule applies always, even when not eavesdropping.  The eavesdrop attribute
-can only be combined with send and receive rules (with send_* and receive_*
-attributes).
-</para>
-<para>
-The [send|receive]_requested_reply attribute works similarly to the eavesdrop
-attribute. It controls whether the &lt;deny&gt; or &lt;allow&gt; matches a
-reply that is expected (corresponds to a previous method call message).  This
-attribute only makes sense for reply messages (errors and method returns), and
-is ignored for other message types.
-</para>
-<para>
-For &lt;allow&gt;, [send|receive]_requested_reply="true" is the default and
-indicates that only requested replies are allowed by the rule.
-[send|receive]_requested_reply="false" means that the rule allows any reply
-even if unexpected.
-</para>
-<para>
-For &lt;deny&gt;, [send|receive]_requested_reply="false" is the default but
-indicates that the rule matches only when the reply was not requested.
-[send|receive]_requested_reply="true" indicates that the rule applies always,
-regardless of pending reply state.
-</para>
-<para>
-user and group denials mean that the given user or group may not connect to the
-message bus.
-</para>
-<para>
-For "name", "username", "groupname", etc. the character "*" can be substituted,
-meaning "any."  Complex globs like "foo.bar.*" aren't allowed for now because
-they would be work to implement and maybe encourage sloppy security anyway.
-</para>
-<para>
-It does not make sense to deny a user or group inside a &lt;policy&gt; for
-a user or group; user/group denials can only be inside context="default" or
-context="mandatory" policies.
-</para>
-<para>
-A single &lt;deny&gt; rule may specify combinations of attributes such as
-send_destination and send_interface and send_type.  In this case, the denial
-applies only if both attributes match the message being denied. e.g. &lt;deny
-send_interface="foo.bar" send_destination="foo.blah"/&gt; would deny messages
-with the given interface AND the given bus name.  To get an OR effect you
-specify multiple &lt;deny&gt; rules.
-</para>
-<para>
-You can't include both send_ and receive_ attributes on the same rule, since
-"whether the message can be sent" and "whether it can be received" are
-evaluated separately.
-</para>
-<para>
-Be careful with send_interface/receive_interface, because the interface field
-in messages is optional.
-</para>
-<para>
-&lt;selinux&gt;
-</para>
-<para>
-The &lt;selinux&gt; element contains settings related to Security Enhanced
-Linux.  More details below.  Note, SELinux is not supported on Solaris.
-</para>
-<para>
-&lt;associate&gt;
-</para>
-<para>
-An &lt;associate&gt; element appears below an &lt;selinux&gt; element and
-creates a mapping.  Right now only one kind of association is possible:
-</para>
-<screen>
-        &lt;associate own="org.freedesktop.Foobar" context="foo_t"/&gt;
-</screen>
-<para>
-This means that if a connection asks to own the name "org.freedesktop.Foobar"
-then the source context will be the context of the connection and the target
-context will be "foo_t" - see the short discussion of SELinux below.
-</para>
-<para>
-Note, the context here is the target context when requesting a name, NOT the
-context of the connection owning the name.
-</para>
-<para>
-There is currently no way to set a default for owning any name, if we add this
-syntax it will look like:
-</para>
-<screen>
-        &lt;associate own="*" context="foo_t"/&gt;
-</screen>
-<para>
-If you find a reason this is useful, let the developers know.  Right now the
-default will be the security context of the bus itself.
-</para>
-<para>
-If two &lt;associate&gt; elements specify the same name, the element appearing
-later in the configuration file will be used.
-</para>
-</refsect2>
-<refsect2>
-<title>SELinux</title>
-<para>
-SELinux is not supported on Solaris.  It is used with the systemwide bus
-which is disabled on Solaris.
-</para>
-<para>
-See <literal>http://www.nsa.gov/selinux/</literal> for full details on SELinux.
-Some useful excerpts:
-</para>
-<variablelist termlength="xtranarrow">
-<varlistentry>
-<term></term>
-<listitem>
-<para>
-Every subject (process) and object (e.g. file, socket, IPC object, etc) in the
-system is assigned a collection of security attributes, known as a security
-context. A security context contains all of the security attributes associated
-with a particular subject or object that are relevant to the security policy.
-</para>
-</listitem></varlistentry>
-<varlistentry>
-<term></term>
-<listitem>
-<para>
-In order to better encapsulate security contexts and to provide greater
-efficiency, the policy enforcement code of SELinux typically handles security
-identifiers (SIDs) rather than security contexts. A SID is an integer that is
-mapped by the security server to a security context at runtime.
-</para>
-</listitem></varlistentry>
-<varlistentry>
-<term></term>
-<listitem>
-<para>
-When a security decision is required, the policy enforcement code passes a pair
-of SIDs (typically the SID of a subject and the SID of an object, but sometimes
-a pair of subject SIDs or a pair of object SIDs), and an object security class
-to the security server. The object security class indicates the kind of object,
-e.g. a process, a regular file, a directory, a TCP socket, etc.
-</para>
-</listitem></varlistentry>
-<varlistentry>
-<term></term>
-<listitem>
-<para>
-Access decisions specify whether or not a permission is granted for a given
-pair of SIDs and class. Each object class has a set of associated permissions
-defined to control operations on objects with that class.
-</para>
-</listitem></varlistentry>
-</variablelist>
-<para>
-D\-Bus performs SELinux security checks in two places.
-</para>
-</listitem></varlistentry>
-<para>
-First, any time a message is routed from one connection to another connection,
-the bus daemon will check permissions with the security context of the first
-connection as source, security context of the second connection as target,
-object class "dbus" and requested permission "send_msg".
-</para>
-<para>
-If a security context is not available for a connection (impossible when using
-UNIX domain sockets), then the target context used is the context of the bus
-daemon itself.  There is currently no way to change this default, because we
-are assuming that only UNIX domain sockets will be used to connect to the
-systemwide bus. If this changes, we'll probably add a way to set the default
-connection context.
-</para>
-<para>
-Second, any time a connection asks to own a name, the bus daemon will check
-permissions with the security context of the connection as source, the security
-context specified for the name in the config file as target, object class
-"dbus" and requested permission "acquire_svc".
-</para>
-<para>
-The security context for a bus name is specified with the &lt;associate&gt;
-element described earlier in this document.  If a name has no security context
-associated in the configuration file, the security context of the bus daemon
-itself will be used.
-</para>
-</refsect2>
-<refsect2>
-<title>DEBUGGING</title>
-<para>
-If you are trying to figure out where your messages are going or why you are
-not getting messages, there are several things you can try.
-</para>
-<para>
-Remember that the system bus is heavily locked down and if you have not
-installed a security policy file to allow your message through, it won't work.
-For the session bus, this is not a concern.
-</para>
-<para>
-The simplest way to figure out what's happening on the bus is to run the
-<command>dbus-monitor</command> program, which comes with the D\-Bus package.
-You can also send test messages with <command>dbus-send</command>.  These
-programs have their own man pages.
-</para>
-<para>
-If you want to know what the daemon itself is doing, you might consider running
-a separate copy of the daemon to test against. This will allow you to put the
-daemon under a debugger, or run it with verbose output, without messing up your
-real session and system daemons.
-</para>
-<para>
-To run a separate test copy of the daemon, for example you might open a
-terminal and type:
-</para>
-<screen>
-       DBUS_VERBOSE=1 &cmd; --session --print-address
-</screen>
-<para>
-The test daemon address will be printed when the daemon starts. You will need
-to copy-and-paste this address and use it as the value of the
-DBUS_SESSION_BUS_ADDRESS environment variable when you launch the applications
-you want to test.  This will cause those applications to connect to your test
-bus instead of the DBUS_SESSION_BUS_ADDRESS of your real session bus.
-</para>
-<para>
-DBUS_VERBOSE=1 will have NO EFFECT unless your copy of D\-Bus was compiled with
-verbose mode enabled. This is not recommended in production builds due to
-performance impact.  You may need to rebuild D\-Bus if your copy was not built
-with debugging in mind.  (DBUS_VERBOSE also affects the D\-Bus library and thus
-applications using D\-Bus; it may be useful to see verbose output on both the
-client side and from the daemon.)
-</para>
-<para>
-If you want to get fancy, you can create a custom bus configuration for your
-test bus (see the <filename>session.conf</filename> and 
-<filename>system.conf</filename> files that define the two default
-configurations for example).  This would allow you to specify a different
-directory for <filename>.service</filename> files, for example.
-</para>
-</refsect2>
-</refsect1>
-<refsect1 id="dbus-daemon-3-exam"><title>&exam-tt;</title>
-<example role="example">
-<title>
-Message bus daemon
-</title>
-<para><screen>example% <userinput>&cmd; </userinput></screen></para>
-</example>
-</refsect1>
-<refsect1 id="dbus-daemon-3-envr"><title>&envr-tt;</title>
-<para>
-See
-<citerefentry><refentrytitle>environ</refentrytitle><manvolnum>5</manvolnum></ci
-terefentry>
-for descriptions of the following environment variables:
-</para>
-<variablelist termlength="wholeline">
-<varlistentry>
-<term>DBUS_SESSION_BUS_ADDRESS</term>
-<listitem><para>
-The address of the login session message bus.  If this variable is not set,
-applications may also try to read the address from the X Window System root
-window property _DBUS_SESSION_BUS_ADDRESS.  The root window property
-must have type STRING.  The environment variable should have precedence over the
- root window property.
-</para>
-</listitem></varlistentry>
-<varlistentry>
-<term>DBUS_VERBOSE</term>
-<listitem><para>
-Set DBUS_VERSION=1 to enable debugging, if D\-Bus was compiled with verbose
-debug mode enabled.
-</para>
-</listitem></varlistentry>
-</variablelist></refsect1>
-<refsect1 id="dbus-daemon-3-exit"><title>&exit-tt;</title>
-<para>The following exit values are returned:</para>
-<variablelist termlength="xtranarrow">
-<varlistentry>
-<term><returnvalue>0</returnvalue></term>
-<listitem><para>
-Application exited successfully
-</para>
-</listitem></varlistentry>
-<varlistentry>
-<term><returnvalue>>0</returnvalue></term>
-<listitem><para>
-Application exited with failure
-</para>
-</listitem></varlistentry>
-</variablelist></refsect1>
-<refsect1 id="dbus-daemon-3-file"><title>&file-tt;</title>
-<para>The following files are used by this application:</para>
-<variablelist termlength="wholeline">
-<varlistentry>
-<term><filename>/usr/lib/&cmd;</filename></term>
-<listitem><para>
-Executable for &cmd;
-</para>
-</listitem></varlistentry>
-<varlistentry>
-<term><filename>/usr/share/dbus-1/services</filename></term>
-<listitem><para>
-Directory containing standard D\-Bus session services.
-</para>
-</listitem></varlistentry>
-<varlistentry>
-<term><filename>/usr/share/dbus-1/system-services</filename></term>
-<listitem><para>
-Directory containing standard D\-Bus systemwide services.
-</para>
-</listitem></varlistentry>
-<varlistentry>
-<term><filename>/etc/dbus-1/session.conf</filename></term>
-<listitem><para>
-Configuration file for D\-Bus session services.
-</para>
-</listitem></varlistentry>
-<varlistentry>
-<term><filename>/etc/dbus-1/system.conf</filename></term>
-<listitem><para>
-Configuration file for D\-Bus system services.
-</para>
-</listitem></varlistentry>
-</variablelist></refsect1>
-<refsect1 id="dbus-daemon-3-attr"><title>&attr-tt;</title>
-<para>See <olink targetdocent="REFMAN5" localinfo="attributes-5"><citerefentry>
-<refentrytitle>attributes</refentrytitle><manvolnum>5</manvolnum></citerefentry></olink>
-for descriptions of the following attributes:</para>
-<informaltable frame="all">
-<tgroup cols="2" colsep="1" rowsep="1"><colspec colname="COLSPEC0" colwidth="1*">
-<colspec colname="COLSPEC1" colwidth="1*">
-<thead>
-<row><entry align="center" valign="middle">ATTRIBUTE TYPE</entry><entry align="center"
-valign="middle">ATTRIBUTE VALUE</entry></row>
-</thead>
-<tbody>
-<row><entry>
-<para>Availability</para>
-</entry><entry>
-<para>SUNWdbus</para>
-</entry></row><row><entry colname="COLSPEC0">
-<para>Interface stability</para>
-</entry><entry colname="COLSPEC1">
-<para>Volatile</para>
-</entry></row>
-</tbody>
-</tgroup>
-</informaltable>
-</refsect1>
-<refsect1 id="dbus-daemon-3-also"><title>&also-tt;</title>
-<!--Reference to another man page-->
-<!--Reference to a Help manual-->
-<!--Reference to a book.-->
-<para>
-<citerefentry><refentrytitle>dbus-cleanup-sockets</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-<citerefentry><refentrytitle>dbus-launch</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-<citerefentry><refentrytitle>dbus-monitor</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-<citerefentry><refentrytitle>dbus-send</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-<citerefentry><refentrytitle>dbus-uuidgen</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-<citerefentry><refentrytitle>libdbus-glib-1</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-<citerefentry><refentrytitle>attributes</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-<citerefentry><refentrytitle>environ</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-</para>
-</refsect1>
-<refsect1 id="dbus-daemon-3-note"><title>&note-tt;</title>
-<para>
-For authorship information refer to
-<literal>http://www.freedesktop.org/software/dbus/doc/AUTHORS</literal>.
-Updated by Brian Cameron, Sun Microsystems Inc., 2007.
-</para>
-<para>
-Please send bug reports to the D\-Bus mailing list or bug
-tracker, see
-<literal>http://www.freedesktop.org/software/dbus/</literal>
-</para>
-</refsect1>
-</refentry>
--- a/manpages/man3/libdbus-glib-1.3	Wed Aug 20 06:41:03 2008 +0000
+++ b/manpages/man3/libdbus-glib-1.3	Wed Aug 20 07:06:44 2008 +0000
@@ -91,11 +91,11 @@
 <!--Reference to a book.-->
 <para>
 <citerefentry><refentrytitle>dbus-cleanup-sockets</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+<citerefentry><refentrytitle>dbus-daemon</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>dbus-launch</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>dbus-monitor</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>dbus-send</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>dbus-uuidgen</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-<citerefentry><refentrytitle>dbus-daemon</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>attributes</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>gnome-interfaces</refentrytitle><manvolnum>5</manvolnum></citerefentry>
 </para>
--- a/patches/libwnck-02-no-x11-dependency.diff	Wed Aug 20 06:41:03 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
---- libwnck-2.21.2.1/configure.in.orig	2007-11-14 14:16:34.636779495 +0000
-+++ libwnck-2.21.2.1/configure.in	2007-11-14 14:17:08.945826474 +0000
-@@ -91,16 +91,9 @@
- fi
- AC_SUBST(STARTUP_NOTIFICATION_PACKAGE)
- 
--PKG_CHECK_MODULES(XLIB, x11,
--    X11_PACKAGE=x11,
--    [X11_PACKAGE=
--     AC_PATH_XTRA
--     if test "x$no_x" = xyes; then
--       AC_MSG_ERROR("no (requires X development libraries)")
--     else
--       XLIB_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
--       XLIB_CFLAGS=$X_CFLAGS
--     fi])
-+XLIB_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
-+XLIB_CFLAGS=$X_CFLAGS
-+X11_PACKAGE=
- AC_SUBST(X11_PACKAGE)
- 
- AC_MSG_CHECKING([if building with X Resource Information Extension Library])
--- a/patches/pyspi-01-solaris.diff	Wed Aug 20 06:41:03 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
---- pyspi-0.6.0/setup.py-orig	2006-10-07 15:20:47.957029000 -0500
-+++ pyspi-0.6.0/setup.py	2006-10-07 15:22:18.879040000 -0500
-@@ -23,25 +23,22 @@ if os.system('pkg-config --exists cspi-1
- 	print 'Error: pkg-config could not find cspi-1.0'
- 	print 'Install "at-spi-devel" or the equivalent package for your system'
- 	sys.exit(1)
--elif os.system('pkg-config --exists x11 2> /dev/null') != 0:
--	print 'Error: pkg-config could not find x11'
--	print 'Install "libX11-devel" or the equivalent package for your system'
--	sys.exit(1)
- else:
--	pkgcfg = os.popen('pkg-config --cflags cspi-1.0 x11')
-+	pkgcfg = os.popen('pkg-config --cflags cspi-1.0')
- 	cflags = pkgcfg.readline().strip()
- 	pkgcfg.close()
--	pkgcfg = os.popen('pkg-config --libs cspi-1.0 x11')
-+	pkgcfg = os.popen('pkg-config --libs cspi-1.0')
- 	libs = pkgcfg.readline().strip()
- 	pkgcfg.close()
- 
-+libs += ' -L/usr/X11/lib -lX11'
-+
- iflags = [x[2:] for x in cflags.split() if x[0:2] == '-I']
- extra_cflags = [x for x in cflags.split() if x[0:2] != '-I']
- libdirs = [x[2:] for x in libs.split() if x[0:2] == '-L']
- libsonly = [x[2:] for x in libs.split() if x[0:2] == '-l']
- # End pkg-config magic
- 
--
- atspi = Extension(
- 	name = 'atspi', 
- 	sources = ['atspi.pyx'],