Commit 0614eb25 authored by Simon McVittie's avatar Simon McVittie

* Sync unstable into experimental

* debian/dbus.postrm
  - Add missing whitespace before ']'.
* New upstream release.
* Switch patch management system to quilt.
* Refresh and update patches.
* Remove debian/patches/20-dbus-alpha-unaligned.patch, fixed upstream.
* debian/control
  - Drop dependency on debianutils as we no longer require run-parts.
  - Demote dbus-x11 from Recommends to Suggests. (Closes: #479341)
* debian/libdbus-1-3.symbols
  - Update for API additions.
* debian/rules
  - Bump shlibs to 1.2.14.
  - Add "-Wl,--as-needed" to LDFLAGS. This way we don't pick up any spurious
    X11 dependencies. (Closes: #499650)
* debian/dbus.postinst
  - Remove chown call for /var/run/dbus as the init script will take care of
    setting the right permissions anyway. This also ensures that we don't
    fail if /var/run is on tmpfs. (Closes: #508931)
* Bump Standards-Version to 3.8.1. No longer ship /var/run/dbus in the
  package but let the init script create it.
* debian/dbus.install
  - Remove /var/run/dbus directory.
* debian/dbus.postrm
  - Remove /var/run/dbus on purge.
* New upstream release
* Merge experimental into unstable
  - Changes in packaging relative to experimental: add myself to
    Uploaders, and suggest libdbus-1-dev instead of nonexistent dbus-1-dev
* Drop support for /etc/dbus-1/event.d. This interface has long been
  deprecated and all affected Debian packages have been fixed for lenny.
  If your (custom) service needs to be restarted on a dbus restart, add a
  regular sysv init script and "Required-Start: dbus" to the LSB header.
* debian/control
  - Drop ancient Conflicts/Replaces which are from pre-oldstable (sarge).
  - Bump debhelper Build-Depends to (>= 7).
* debian/compat
  - Bump to debhelper v7 compat mode.
* debian/copyright
  - Update AFL license to version 2.1.
  - Make it clear that dbus is released under version 2 of the GPL and refer
    to the versioned GPL-2 file in /usr/share/common-licenses.
* debian/patches/CVE-2008-4311.patch:
  + Added, Fixes CVE-2008-4311. A mistake in the default configuration for
    the system bus (system.conf) which made the default policy for both sent
    and received messages effectively *allow*, and not deny as intended. This
    patch fixes the send side permissions (Closes: #503532, #508032)
* Urgency high for the security fix
* Rename CVE-*.patch to prefix them with a sequence number so it's clear
  what order they should apply in
* Add 51-CVE-2008-4311-but-allow-signals.patch, cherry-picked from upstream
  git commit d8997344: after fixing CVE-2008-4311, re-allow emitting
  signals
* debian/patches/3[0-4]*.patch, cherry-picked from upstream git (see patches
  for commit IDs): add logging when permission to send a message is denied
* debian/patches/35-syslog-h.patch: #include <syslog.h> to fix compilation
  with the logging patches applied
* Add myself to Uploaders

git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/dbus@3126 ceb527fc-18e6-0310-9fe2-813c157c29e7
parent 8e2d5dab
dbus (1.2.14-3~exp1) UNRELEASED; urgency=low
* Sync unstable into experimental
-- Simon McVittie <smcv@debian.org> Wed, 27 May 2009 10:30:25 +0100
dbus (1.2.14-2) unstable; urgency=low
* debian/dbus.postrm
- Add missing whitespace before ']'.
-- Michael Biebl <biebl@debian.org> Fri, 08 May 2009 23:30:35 +0200
dbus (1.2.14-1) unstable; urgency=low
* New upstream release.
* Switch patch management system to quilt.
* Refresh and update patches.
* Remove debian/patches/20-dbus-alpha-unaligned.patch, fixed upstream.
* debian/control
- Drop dependency on debianutils as we no longer require run-parts.
- Demote dbus-x11 from Recommends to Suggests. (Closes: #479341)
* debian/libdbus-1-3.symbols
- Update for API additions.
* debian/rules
- Bump shlibs to 1.2.14.
- Add "-Wl,--as-needed" to LDFLAGS. This way we don't pick up any spurious
X11 dependencies. (Closes: #499650)
* debian/dbus.postinst
- Remove chown call for /var/run/dbus as the init script will take care of
setting the right permissions anyway. This also ensures that we don't
fail if /var/run is on tmpfs. (Closes: #508931)
* Bump Standards-Version to 3.8.1. No longer ship /var/run/dbus in the
package but let the init script create it.
* debian/dbus.install
- Remove /var/run/dbus directory.
* debian/dbus.postrm
- Remove /var/run/dbus on purge.
-- Michael Biebl <biebl@debian.org> Fri, 08 May 2009 14:31:33 +0200
dbus (1.2.12-1) unstable; urgency=low
[ Simon McVittie ]
* New upstream release
* Merge experimental into unstable
- Changes in packaging relative to experimental: add myself to
Uploaders, and suggest libdbus-1-dev instead of nonexistent dbus-1-dev
[ Michael Biebl ]
* Drop support for /etc/dbus-1/event.d. This interface has long been
deprecated and all affected Debian packages have been fixed for lenny.
If your (custom) service needs to be restarted on a dbus restart, add a
regular sysv init script and "Required-Start: dbus" to the LSB header.
* debian/control
- Drop ancient Conflicts/Replaces which are from pre-oldstable (sarge).
- Bump debhelper Build-Depends to (>= 7).
* debian/compat
- Bump to debhelper v7 compat mode.
* debian/copyright
- Update AFL license to version 2.1.
- Make it clear that dbus is released under version 2 of the GPL and refer
to the versioned GPL-2 file in /usr/share/common-licenses.
-- Michael Biebl <biebl@debian.org> Mon, 16 Feb 2009 15:07:46 +0100
dbus (1.2.8-1) experimental; urgency=low
[ Sjoerd Simons ]
......@@ -23,6 +89,30 @@ dbus (1.2.4-1) experimental; urgency=low
-- Sjoerd Simons <sjoerd@debian.org> Sat, 29 Nov 2008 19:16:05 +0100
dbus (1.2.1-5) unstable; urgency=high
[ Sjoerd Simons ]
* debian/patches/CVE-2008-4311.patch:
+ Added, Fixes CVE-2008-4311. A mistake in the default configuration for
the system bus (system.conf) which made the default policy for both sent
and received messages effectively *allow*, and not deny as intended. This
patch fixes the send side permissions (Closes: #503532, #508032)
* Urgency high for the security fix
[ Simon McVittie ]
* Rename CVE-*.patch to prefix them with a sequence number so it's clear
what order they should apply in
* Add 51-CVE-2008-4311-but-allow-signals.patch, cherry-picked from upstream
git commit d899734475: after fixing CVE-2008-4311, re-allow emitting
signals
* debian/patches/3[0-4]*.patch, cherry-picked from upstream git (see patches
for commit IDs): add logging when permission to send a message is denied
* debian/patches/35-syslog-h.patch: #include <syslog.h> to fix compilation
with the logging patches applied
* Add myself to Uploaders
-- Simon McVittie <smcv@debian.org> Sat, 10 Jan 2009 21:43:16 +0000
dbus (1.2.1-4) unstable; urgency=high
* debian/patches/CVE-2008-3834.patch
......
......@@ -5,9 +5,10 @@ Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.
Uploaders: Sjoerd Simons <sjoerd@debian.org>,
Sebastian Dröge <slomo@debian.org>,
Michael Biebl <biebl@debian.org>,
Loic Minier <lool@dooz.org>
Loic Minier <lool@dooz.org>,
Simon McVittie <smcv@debian.org>
Build-Depends: cdbs (>= 0.4.43),
debhelper (>= 5.0.37.2),
debhelper (>= 7),
autotools-dev,
libexpat-dev,
doxygen,
......@@ -15,8 +16,9 @@ Build-Depends: cdbs (>= 0.4.43),
xmlto,
xsltproc,
libx11-dev,
libselinux1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
Standards-Version: 3.8.0
libselinux1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
quilt
Standards-Version: 3.8.1
Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/dbus
Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus
Homepage: http://dbus.freedesktop.org/
......@@ -26,17 +28,11 @@ Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
adduser,
debianutils (>= 1.22.0),
lsb-base (>= 3.2-14)
Conflicts: libdbus0,
dbus-1,
dbus-1-utils (<< 1.0.2-5),
libdbus-1-1
Replaces: libdbus0,
dbus-1,
dbus-1-utils (<< 1.0.2-5)
Conflicts: dbus-1-utils (<< 1.0.2-5)
Replaces: dbus-1-utils (<< 1.0.2-5)
Provides: dbus-1-utils
Recommends: dbus-x11
Suggests: dbus-x11
Description: simple interprocess messaging system
D-Bus is a message bus, used for sending messages between applications.
Conceptually, it fits somewhere in between raw sockets and CORBA in
......@@ -99,9 +95,7 @@ Package: dbus-1-doc
Section: doc
Architecture: all
Depends: ${misc:Depends}
Suggests: dbus-1-dev
Conflicts: libdbus0-doc
Replaces: libdbus0-doc
Suggests: libdbus-1-dev
Description: simple interprocess messaging system (documentation)
D-Bus is a message bus, used for sending messages between applications.
Conceptually, it fits somewhere in between raw sockets and CORBA in
......@@ -119,9 +113,6 @@ Depends: libdbus-1-3 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
pkg-config
Conflicts: dbus-1-dev
Replaces: libdbus0-dev,
dbus-1-dev
Description: simple interprocess messaging system (development headers)
D-Bus is a message bus, used for sending messages between applications.
Conceptually, it fits somewhere in between raw sockets and CORBA in
......
This diff is collapsed.
/var/lib/dbus
/etc/dbus-1/event.d
......@@ -24,7 +24,6 @@ DAEMONUSER=messagebus
PIDDIR=/var/run/dbus
PIDFILE=$PIDDIR/pid
DESC="system message bus"
EVENTDIR=/etc/dbus-1/event.d
test -x $DAEMON || exit 0
......@@ -36,12 +35,6 @@ if [ -e /etc/default/dbus ]; then
. /etc/default/dbus
fi
if [ -n "$ENABLED" ]; then
log_warning_msg "The ENABLED option in /etc/default/$NAME has been deprecated."
log_warning_msg "Please remove this setting from the configuration file."
log_warning_msg "To disable the service use a runlevel editor like sysv-rc-conf or bum instead."
fi
create_machineid() {
# Create machine-id file
if [ -x $UUIDGEN ]; then
......@@ -122,18 +115,12 @@ start_it_up()
start-stop-daemon --start --quiet --pidfile $PIDFILE \
--user $DAEMONUSER --exec $DAEMON -- --system $PARAMS
log_end_msg $?
if [ -d $EVENTDIR ]; then
run-parts --arg=start $EVENTDIR || true
fi
dependent_services start
}
shut_it_down()
{
dependent_services stop
if [ -d $EVENTDIR ]; then
run-parts --reverse --arg=stop $EVENTDIR || true
fi
log_daemon_msg "Stopping $DESC" "$NAME"
start-stop-daemon --stop --retry 5 --quiet --oknodo --pidfile $PIDFILE \
--user $DAEMONUSER
......
debian/tmp/var/run/dbus
debian/tmp/etc/dbus-1/
debian/tmp/usr/bin/dbus-daemon
debian/tmp/usr/bin/dbus-cleanup-sockets
......
......@@ -15,8 +15,6 @@ if [ "$1" = configure ]; then
--disabled-password \
--group "$MESSAGEUSER"
chown "$MESSAGEUSER":"$MESSAGEUSER" "$MESSAGEHOME"
if ! dpkg-statoverride --list "$LAUNCHER" >/dev/null 2>&1; then
chown root:"$MESSAGEUSER" "$LAUNCHER"
chmod 4754 "$LAUNCHER"
......
......@@ -93,6 +93,7 @@ libdbus-1.so.3 libdbus-1-3 #MINVER#
dbus_message_append_args_valist@Base 1.0.2
dbus_message_copy@Base 1.0.2
dbus_message_demarshal@Base 1.1.1
dbus_message_demarshal_bytes_needed@Base 1.2.14
dbus_message_free_data_slot@Base 1.0.2
dbus_message_get_args@Base 1.0.2
dbus_message_get_args_valist@Base 1.0.2
......@@ -134,6 +135,7 @@ libdbus-1.so.3 libdbus-1-3 #MINVER#
dbus_message_iter_next@Base 1.0.2
dbus_message_iter_open_container@Base 1.0.2
dbus_message_iter_recurse@Base 1.0.2
dbus_message_lock@Base 1.2.14
dbus_message_marshal@Base 1.1.1
dbus_message_new@Base 1.0.2
dbus_message_new_error@Base 1.0.2
......@@ -152,6 +154,7 @@ libdbus-1.so.3 libdbus-1-3 #MINVER#
dbus_message_set_path@Base 1.0.2
dbus_message_set_reply_serial@Base 1.0.2
dbus_message_set_sender@Base 1.0.2
dbus_message_set_serial@Base 1.2.14
dbus_message_type_from_string@Base 1.0.2
dbus_message_type_to_string@Base 1.0.2
dbus_message_unref@Base 1.0.2
......
--- dbus-0.20-virgin-patches/bus/config-parser.c 2003-10-14 21:30:21.000000000 +0100
+++ dbus-0.20/bus/config-parser.c 2004-02-10 00:40:05.000000000 +0000
@@ -1710,8 +1710,18 @@
Index: dbus-1.2.14/bus/config-parser.c
===================================================================
--- dbus-1.2.14.orig/bus/config-parser.c 2009-05-05 22:51:37.000000000 +0200
+++ dbus-1.2.14/bus/config-parser.c 2009-05-07 00:16:25.000000000 +0200
@@ -2193,8 +2193,18 @@
{
if (!include_file (parser, &full_path, TRUE, error))
{
......
--- dbus/dbus-internals.c.old 2006-11-10 01:02:50.997690889 +0100
+++ dbus/dbus-internals.c 2006-11-10 01:03:05.662526590 +0100
@@ -192,7 +192,7 @@
Index: dbus-1.2.14/dbus/dbus-internals.c
===================================================================
--- dbus-1.2.14.orig/dbus/dbus-internals.c 2009-04-17 21:45:29.000000000 +0200
+++ dbus-1.2.14/dbus/dbus-internals.c 2009-05-07 00:16:33.000000000 +0200
@@ -193,7 +193,7 @@
static dbus_bool_t warn_initted = FALSE;
static dbus_bool_t fatal_warnings = FALSE;
......
diff --git a/tools/dbus-monitor.c b/tools/dbus-monitor.c
index 9f7da5b..c66186f 100644
--- a/tools/dbus-monitor.c
+++ b/tools/dbus-monitor.c
Index: dbus-1.2.14/tools/dbus-monitor.c
===================================================================
--- dbus-1.2.14.orig/tools/dbus-monitor.c 2009-05-06 18:51:18.000000000 +0200
+++ dbus-1.2.14/tools/dbus-monitor.c 2009-05-07 00:19:51.000000000 +0200
@@ -33,8 +33,6 @@
#include <time.h>
......@@ -11,11 +11,11 @@ index 9f7da5b..c66186f 100644
#include "dbus-print-message.h"
#ifdef DBUS_WIN
@@ -195,14 +193,6 @@ usage (char *name, int ecode)
@@ -195,14 +193,6 @@
exit (ecode);
}
-dbus_bool_t sigint_received = FALSE;
-static dbus_bool_t sigint_received = FALSE;
-
-static void
-sigint_handler (int signum)
......@@ -26,7 +26,7 @@ index 9f7da5b..c66186f 100644
int
main (int argc, char *argv[])
{
@@ -294,11 +284,7 @@ main (int argc, char *argv[])
@@ -294,11 +284,7 @@
fprintf (stderr, "Couldn't add filter!\n");
exit (1);
}
......
--- dbus-1.0.1/Doxyfile.in.generate-xml-docs 2006-11-25 23:42:59.000000000 -0500
+++ dbus-1.0.1/Doxyfile.in 2006-11-25 23:43:12.000000000 -0500
Index: dbus-1.2.14/Doxyfile.in
===================================================================
--- dbus-1.2.14.orig/Doxyfile.in 2009-04-17 21:45:29.000000000 +0200
+++ dbus-1.2.14/Doxyfile.in 2009-05-07 00:19:57.000000000 +0200
@@ -133,7 +133,7 @@
#---------------------------------------------------------------------------
# configuration options related to the XML output
......
......@@ -3,14 +3,16 @@
# Copyright 2003 Daniel Stone <daniels@debian.org>
# Copyright 2006 Sjoerd Simons <sjoerd@debian.org>
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
libdbusN := $(shell sed -rn 's/Package:[[:space:]]*(libdbus-[0-9-]+)[[:space:]]*$$/\1/p' debian/control | head -n 1)
DEB_DH_MAKESHLIBS_ARGS_ALL = -V '$(libdbusN) (>= 1.2.4)'
DEB_DH_MAKESHLIBS_ARGS_ALL = -V '$(libdbusN) (>= 1.2.14)'
LDFLAGS += -Wl,--as-needed
# List any files which are not installed
common-binary-post-install-arch:: list-missing
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment