summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Goldstein <cardoe@gentoo.org>2007-04-03 16:20:44 +0000
committerDoug Goldstein <cardoe@gentoo.org>2007-04-03 16:20:44 +0000
commit5952a78206288ff8910fb88bad1b3eccbbe4571c (patch)
tree9e8db2a7e8ff4ae78e3d6806d748df54e49dd152 /sys-apps/dbus/files
parentVersion bump, see bug #173094. (diff)
downloadhistorical-5952a78206288ff8910fb88bad1b3eccbbe4571c.tar.gz
historical-5952a78206288ff8910fb88bad1b3eccbbe4571c.tar.bz2
historical-5952a78206288ff8910fb88bad1b3eccbbe4571c.zip
rev bump to add -rdynamic to get backtraces. Clean up old files and ebuilds.
Package-Manager: portage-2.1.2.3
Diffstat (limited to 'sys-apps/dbus/files')
-rw-r--r--sys-apps/dbus/files/dbus-0.60-decls-ansi-c.patch19
-rw-r--r--sys-apps/dbus/files/dbus-0.60-mono-return-null-fix.diff22
-rw-r--r--sys-apps/dbus/files/dbus-0.60-qt-pc.patch59
-rw-r--r--sys-apps/dbus/files/dbus-0.61-i-hate-qt-so-much.patch11
-rw-r--r--sys-apps/dbus/files/dbus-0.61-libxml-dep.patch20
-rw-r--r--sys-apps/dbus/files/dbus-0.61-mono-tools-update.diff103
-rw-r--r--sys-apps/dbus/files/dbus-0.61-qt-disabling.patch21
-rw-r--r--sys-apps/dbus/files/dbus-0.62-match-rule-security-fix.patch13
-rw-r--r--sys-apps/dbus/files/dbus.init-0.6153
-rw-r--r--sys-apps/dbus/files/digest-dbus-0.61-r13
-rw-r--r--sys-apps/dbus/files/digest-dbus-0.62-r23
-rw-r--r--sys-apps/dbus/files/digest-dbus-1.0.2-r2 (renamed from sys-apps/dbus/files/digest-dbus-1.0.2)0
12 files changed, 0 insertions, 327 deletions
diff --git a/sys-apps/dbus/files/dbus-0.60-decls-ansi-c.patch b/sys-apps/dbus/files/dbus-0.60-decls-ansi-c.patch
deleted file mode 100644
index 9fdb91a3327e..000000000000
--- a/sys-apps/dbus/files/dbus-0.60-decls-ansi-c.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- dbus/dbus-arch-deps.h.in.orig 2006-02-20 01:09:05.000000000 -0600
-+++ dbus/dbus-arch-deps.h.in 2006-02-20 01:09:23.000000000 -0600
-@@ -29,7 +29,7 @@
-
- #include <dbus/dbus-macros.h>
-
--DBUS_BEGIN_DECLS;
-+DBUS_BEGIN_DECLS
-
- #if @DBUS_HAVE_INT64@
- #define DBUS_HAVE_INT64 1
-@@ -51,6 +51,6 @@
- typedef @DBUS_INT16_TYPE@ dbus_int16_t;
- typedef unsigned @DBUS_INT16_TYPE@ dbus_uint16_t;
-
--DBUS_END_DECLS;
-+DBUS_END_DECLS
-
- #endif /* DBUS_ARCH_DEPS_H */
diff --git a/sys-apps/dbus/files/dbus-0.60-mono-return-null-fix.diff b/sys-apps/dbus/files/dbus-0.60-mono-return-null-fix.diff
deleted file mode 100644
index af7fed7fe6ae..000000000000
--- a/sys-apps/dbus/files/dbus-0.60-mono-return-null-fix.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- mono/Connection.cs.old 2006-02-07 18:13:30.886925672 +0100
-+++ mono/Connection.cs 2006-02-07 18:14:07.426370832 +0100
-@@ -116,7 +116,7 @@
- // Maybe we already have a Connection object associated with
- // this rawConnection then return it
- IntPtr rawThis = dbus_connection_get_data (rawConnection, slot);
-- if (rawThis != IntPtr.Zero) {
-+ if (rawThis != IntPtr.Zero && ((GCHandle)rawThis).Target == typeof(DBus.Connection)) {
- return (DBus.Connection) ((GCHandle)rawThis).Target;
- }
- }
---- mono/Message.cs.old 2006-02-07 18:11:27.917619848 +0100
-+++ mono/Message.cs 2006-02-07 18:12:36.628174256 +0100
-@@ -110,7 +110,7 @@
- if (slot > -1) {
- // If we already have a Message object associated with this rawMessage then return it
- IntPtr rawThis = dbus_message_get_data(rawMessage, slot);
-- if (rawThis != IntPtr.Zero)
-+ if (rawThis != IntPtr.Zero && ((GCHandle)rawThis).Target == typeof(DBus.Message))
- return (DBus.Message) ((GCHandle)rawThis).Target;
- }
- // If it doesn't exist then create a new Message around it
diff --git a/sys-apps/dbus/files/dbus-0.60-qt-pc.patch b/sys-apps/dbus/files/dbus-0.60-qt-pc.patch
deleted file mode 100644
index a0dcd5ecaa10..000000000000
--- a/sys-apps/dbus/files/dbus-0.60-qt-pc.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -Nur dbus-0.60/Makefile.am dbus-0.60-new/Makefile.am
---- dbus-0.60/Makefile.am 2005-09-30 11:20:08.000000000 -0400
-+++ dbus-0.60-new/Makefile.am 2006-01-02 03:15:23.000000000 -0500
-@@ -6,10 +6,12 @@
-
- if HAVE_QT
- QT_SUBDIR=qt
-+ QT_PC=dbus-qt-1.pc
- endif
-
- if HAVE_QT3
- QT3_SUBDIR=qt3
-+ QT_PC=dbus-qt-1.pc
- endif
-
- if DBUS_USE_GCJ
-@@ -36,12 +38,13 @@
- DIST_SUBDIRS=dbus bus doc glib qt qt3 gcj mono python tools test
-
- pkgconfigdir = $(libdir)/pkgconfig
--pkgconfig_DATA = dbus-1.pc $(GLIB_PC) $(MONO_PC)
-+pkgconfig_DATA = dbus-1.pc $(GLIB_PC) $(MONO_PC) $(QT_PC)
-
- DISTCLEANFILES = \
- dbus-1.pc \
- $(GLIB_PC) \
-- $(MONO_PC)
-+ $(MONO_PC) \
-+ $(QT_PC)
-
- EXTRA_DIST = \
- HACKING \
-diff -Nur dbus-0.60/configure.in dbus-0.60-new/configure.in
---- dbus-0.60/configure.in 2005-11-22 15:42:49.000000000 -0500
-+++ dbus-0.60-new/configure.in 2006-01-02 03:10:40.000000000 -0500
-@@ -1353,6 +1353,7 @@
- doc/Makefile
- dbus-1.pc
- dbus-glib-1.pc
-+dbus-qt-1.pc
- dbus-sharp.pc
- test/data/valid-config-files/debug-allow-all.conf
- test/data/valid-config-files/debug-allow-all-sha1.conf
-diff -Nur dbus-0.60/dbus-qt-1.pc.in dbus-0.60-new/dbus-qt-1.pc.in
---- dbus-0.60/dbus-qt-1.pc.in 1969-12-31 19:00:00.000000000 -0500
-+++ dbus-0.60-new/dbus-qt-1.pc.in 2006-01-02 03:10:40.000000000 -0500
-@@ -0,0 +1,12 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: dbus-qt
-+Description: QT integration for the free desktop message bus
-+Version: @VERSION@
-+Requires: dbus-1 qt-3.3
-+Libs: -L${libdir} -ldbus-qt-1
-+
-+
diff --git a/sys-apps/dbus/files/dbus-0.61-i-hate-qt-so-much.patch b/sys-apps/dbus/files/dbus-0.61-i-hate-qt-so-much.patch
deleted file mode 100644
index b22d525c8dc4..000000000000
--- a/sys-apps/dbus/files/dbus-0.61-i-hate-qt-so-much.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qt/Makefile.am 2006-02-16 19:04:38.000000000 -0500
-+++ qt/Makefile.am.new 2006-03-15 23:39:10.000000000 -0500
-@@ -62,7 +62,7 @@
- $(top_srcdir)/qt/qdbusserver.lo: qdbusserver.moc
- $(top_srcdir)/qt/qdbusconnection.lo: qdbusconnection_p.moc
-
--CLEANFILES=qdbusabstractadaptor.moc qdbusserver.moc qdbusconnection.moc
-+CLEANFILES=qdbusabstractadaptor.moc qdbusserver.moc qdbusconnection_p.moc
-
- libdbus_qt4_1_la_LIBADD= $(DBUS_QT_LIBS) $(top_builddir)/dbus/libdbus-1.la
- libdbus_qt4_1_la_LDFLAGS= -version-info 1:0 -no-undefined
diff --git a/sys-apps/dbus/files/dbus-0.61-libxml-dep.patch b/sys-apps/dbus/files/dbus-0.61-libxml-dep.patch
deleted file mode 100644
index f7e122f752bb..000000000000
--- a/sys-apps/dbus/files/dbus-0.61-libxml-dep.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.in 2006-02-24 11:36:29.000000000 -0500
-+++ configure.in.xml 2006-03-15 23:47:31.000000000 -0500
-@@ -9,6 +9,8 @@
-
- AM_CONFIG_HEADER(config.h)
-
-+LIBXML_REQUIRED=2.6.0
-+
- # Honor aclocal flags
- ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
-
-@@ -753,7 +755,7 @@
- [ AC_CHECK_HEADERS(expat.h, have_expat=true, have_expat=false) ],
- have_expat=false)
-
--PKG_CHECK_MODULES(LIBXML, libxml-2.0, have_libxml=true, have_libxml=false)
-+PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= $LIBXML_REQUIRED, have_libxml=true, have_libxml=false)
-
- # see what we want to use
- dbus_use_libxml=false
diff --git a/sys-apps/dbus/files/dbus-0.61-mono-tools-update.diff b/sys-apps/dbus/files/dbus-0.61-mono-tools-update.diff
deleted file mode 100644
index 63bfdcebe2f9..000000000000
--- a/sys-apps/dbus/files/dbus-0.61-mono-tools-update.diff
+++ /dev/null
@@ -1,103 +0,0 @@
---- configure.in 2006-03-14 00:56:19.000000000 -0500
-+++ configure.in.new 2006-03-14 01:02:24.000000000 -0500
-@@ -290,7 +290,7 @@
- AM_CONDITIONAL(DBUS_USE_CSC, test x$enable_mono = xyes)
-
- #### Look for monodoc
--MONODOC_REQUIRED_VERSION=0.16
-+MONODOC_REQUIRED_VERSION=1.1.10
- AC_SUBST(MONODOC_REQUIRED_VERSION)
- PKG_CHECK_MODULES(MONODOC_DEPENDENCY, monodoc >= $MONODOC_REQUIRED_VERSION, have_monodoc=yes, have_monodoc=no)
-
-@@ -298,8 +298,9 @@
- if test x$have_monodoc = xno ; then
- AC_MSG_ERROR([Building Mono docs explicitly required, but monodoc not found])
- else
-- AC_PATH_PROG(MONODOC, monodoc, no)
-- if test x$MONODOC = xno; then
-+ AC_PATH_PROG(MONODOCER, monodocer, no)
-+ AC_PATH_PROG(MDASSEMBLER, mdassembler, no)
-+ if test x$MONODOCER = xno -o x$MDASSEMBLER = xno; then
- AC_MSG_ERROR([Building Mono docs explicitly required, but monodoc not found])
- fi
- fi
-@@ -308,19 +309,26 @@
- if test x$enable_mono_docs = xauto ; then
- if test x$have_monodoc = xno ; then
- enable_mono_docs=no
-- MONODOC=
-+ MONODOCER=
-+ MDASSEMBLER=
- else
-- AC_PATH_PROG(MONODOC, monodoc, no)
-- if test x$MONODOC = xno; then
-+ AC_PATH_PROG(MONODOCER, monodocer, no)
-+ AC_PATH_PROG(MDASSEMBLER, mdassembler, no)
-+ if test x$MONODOCER = xno -o x$MDASSEMBLER = xno; then
- enable_mono_docs=no
-- MONODOC=
-+ MONODOCER=
-+ MDASSEMBLER=
- else
- enable_mono_docs=yes
- fi
- fi
- fi
-
--AC_SUBST(MONODOC)
-+MONODOC_SOURCESDIR=`pkg-config --variable=sourcesdir monodoc`
-+
-+AC_SUBST(MONODOCER)
-+AC_SUBST(MDASSEMBLER)
-+AC_SUBST(MONODOC_SOURCESDIR)
-
- AM_CONDITIONAL(ENABLE_MONODOC, test "x$enable_mono_docs" = "xyes")
-
---- mono/doc/Makefile.am 2006-02-10 16:47:10.000000000 -0500
-+++ mono/doc/Makefile.am.new 2006-03-14 01:08:13.000000000 -0500
-@@ -1,34 +1,30 @@
- if ENABLE_MONODOC
- TARGETS = dbus-sharp-docs.zip dbus-sharp-docs.tree dbus-sharp-docs.source
--DOCDIR = `$(MONODOC) --get-sourcesdir`
-
- install-data-local:
-- install -d -m 755 $(DESTDIR)/`monodoc --get-sourcesdir`
-- install -m 644 $(srcdir)/dbus-sharp-docs.source $(DESTDIR)/`monodoc --get-sourcesdir`
-- install -m 644 dbus-sharp-docs.tree $(DESTDIR)/`monodoc --get-sourcesdir`
-- install -m 644 dbus-sharp-docs.zip $(DESTDIR)/`monodoc --get-sourcesdir`
-+ install -d -m 755 $(DESTDIR)/$(MONODOC_SOURCESDIR)
-+ install -m 644 $(srcdir)/dbus-sharp-docs.source $(DESTDIR)/$(MONODOC_SOURCESDIR)
-+ install -m 644 dbus-sharp-docs.tree $(DESTDIR)/$(MONODOC_SOURCESDIR)
-+ install -m 644 dbus-sharp-docs.zip $(DESTDIR)/$(MONODOC_SOURCESDIR)
-
- uninstall-local:
-- rm -f $(DESTDIR)/`monodoc --get-sourcesdir`/dbus-sharp-docs.source
-- rm -f $(DESTDIR)/`monodoc --get-sourcesdir`/dbus-sharp-docs.tree
-- rm -f $(DESTDIR)/`monodoc --get-sourcesdir`/dbus-sharp-docs.zip
-+ rm -f $(DESTDIR)/$(MONODOC_SOURCESDIR)/dbus-sharp-docs.source
-+ rm -f $(DESTDIR)/$(MONODOC_SOURCESDIR)/dbus-sharp-docs.tree
-+ rm -f $(DESTDIR)/$(MONODOC_SOURCESDIR)/dbus-sharp-docs.zip
- else
- TARGETS =
--DOCDIR = $(datadir)
- endif
-
- noinst_DATA = $(TARGETS)
-
--ASSEMBLER = $(MONODOC) --assemble
--UPDATER = $(MONODOC) --update
--
- dbus-sharp-docs.zip: dbus-sharp-docs.tree
-
- dbus-sharp-docs.tree: $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml
-- $(ASSEMBLER) --ecma $(srcdir)/en -o dbus-sharp-docs
-+ $(MDASSEMBLER) --ecma $(srcdir)/en -o dbus-sharp-docs
-
--update:
-- $(UPDATER) ../dbus-sharp.dll -o ./en -f
-+update: $(top_builddir)/mono/dbus-sharp.dll
-+ $(MONODOCER) -assembly:$(top_builddir)/mono/dbus-sharp.dll \
-+ -path:en -updateto:en -delete
-
- CLEANFILES = dbus-sharp-docs.zip dbus-sharp-docs.tree
-
diff --git a/sys-apps/dbus/files/dbus-0.61-qt-disabling.patch b/sys-apps/dbus/files/dbus-0.61-qt-disabling.patch
deleted file mode 100644
index fc270baef346..000000000000
--- a/sys-apps/dbus/files/dbus-0.61-qt-disabling.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- dbus-0.61/configure.in.disableqt4 2006-02-28 13:33:47.000000000 +0100
-+++ dbus-0.61/configure.in 2006-02-28 13:33:29.000000000 +0100
-@@ -1033,6 +1033,10 @@
- fi
- have_qt=no
- else
-+ if test x$enable_qt = xno; then
-+ have_qt=no;
-+ have_qtest=no;
-+ else
- dnl Qt4 flags
- AC_SUBST(DBUS_QT_CFLAGS)
- AC_SUBST(DBUS_QT_LIBS)
-@@ -1055,6 +1059,7 @@
-
- AC_SUBST(DBUS_QTESTLIB_CFLAGS)
- AC_SUBST(DBUS_QTESTLIB_LIBS)
-+ fi
- fi
-
- AM_CONDITIONAL(HAVE_QT, test x$have_qt = xyes)
diff --git a/sys-apps/dbus/files/dbus-0.62-match-rule-security-fix.patch b/sys-apps/dbus/files/dbus-0.62-match-rule-security-fix.patch
deleted file mode 100644
index 125daab99aaf..000000000000
--- a/sys-apps/dbus/files/dbus-0.62-match-rule-security-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -pur 0.61-osso23/bus/signals.c 0.61-osso23.new/bus/signals.c
---- 0.61-osso23/bus/signals.c 2006-11-23 16:46:52.589602192 +0200
-+++ 0.61-osso23.new/bus/signals.c 2006-11-23 16:49:28.873843376 +0200
-@@ -1067,6 +1067,9 @@ match_rule_equal (BusMatchRule *a,
- if (a->flags != b->flags)
- return FALSE;
-
-+ if (a->matches_go_to != b->matches_go_to)
-+ return FALSE;
-+
- if ((a->flags & BUS_MATCH_MESSAGE_TYPE) &&
- a->message_type != b->message_type)
- return FALSE;
diff --git a/sys-apps/dbus/files/dbus.init-0.61 b/sys-apps/dbus/files/dbus.init-0.61
deleted file mode 100644
index 05ffea6c3976..000000000000
--- a/sys-apps/dbus/files/dbus.init-0.61
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/files/dbus.init-0.61,v 1.2 2006/04/21 22:02:36 steev Exp $
-
-opts="reload"
-
-depend() {
- after nscd dns
-}
-
-start() {
- ebegin "Starting D-BUS system messagebus"
-
- # We need to test if /var/run/dbus exists, since script will fail if it does not
- [[ ! -e /var/run/dbus ]] && mkdir /var/run/dbus
-
- start-stop-daemon --start --pidfile /var/run/dbus.pid --exec /usr/bin/dbus-daemon -- --system
- eend $?
-}
-
-stop() {
- local retval
-
- ebegin "Stopping D-BUS system messagebus"
-
- start-stop-daemon --stop --pidfile /var/run/dbus.pid
- retval=$?
-
- eend ${retval}
-
- # This should vanish when baselayout-1.12.0 is marked stable.
- [[ -f /var/run/dbus.pid ]] && rm -f /var/run/dbus.pid
-
- # Changes to the system dbus socket run file force us to take care of both
- [[ -S /var/lib/dbus/system_bus_socket ]] && rm -f /var/lib/dbus/system_bus_socket
- [[ -S /var/run/dbus/system_bus_socket ]] && rm -f /var/run/dbus/system_bus_socket
-
- return ${retval}
-}
-
-reload() {
- local retval
-
- ebegin "Reloading D-BUS messagebus config"
-
- dbus-send --print-reply --system --type=method_call \
- --dest=org.freedesktop.DBus \
- / org.freedesktop.DBus.ReloadConfig > /dev/null
- retval=$?
- eend ${retval}
- return ${retval}
-}
diff --git a/sys-apps/dbus/files/digest-dbus-0.61-r1 b/sys-apps/dbus/files/digest-dbus-0.61-r1
deleted file mode 100644
index 3d8e00466423..000000000000
--- a/sys-apps/dbus/files/digest-dbus-0.61-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cfd4f26004e4304e0dace4d82894e50b dbus-0.61.tar.gz 1735729
-RMD160 67306e1a632c1986460e8ead311ae642447cdcc3 dbus-0.61.tar.gz 1735729
-SHA256 45a6b655c0fdfffdabc49857cb19d1ea0c9a8923f76e5c165e01e18ce98da0ec dbus-0.61.tar.gz 1735729
diff --git a/sys-apps/dbus/files/digest-dbus-0.62-r2 b/sys-apps/dbus/files/digest-dbus-0.62-r2
deleted file mode 100644
index 34d498e01b3c..000000000000
--- a/sys-apps/dbus/files/digest-dbus-0.62-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ba7692f63d0e9f1ef06703dff56cb650 dbus-0.62.tar.gz 1737361
-RMD160 d653b25726ec96eb324761ebf9efb4a50d1590c0 dbus-0.62.tar.gz 1737361
-SHA256 884cc2083add655df57acc7bb144c61e9beeabf08ef76fa86929a58d7bc96707 dbus-0.62.tar.gz 1737361
diff --git a/sys-apps/dbus/files/digest-dbus-1.0.2 b/sys-apps/dbus/files/digest-dbus-1.0.2-r2
index 55bc8dd8333d..55bc8dd8333d 100644
--- a/sys-apps/dbus/files/digest-dbus-1.0.2
+++ b/sys-apps/dbus/files/digest-dbus-1.0.2-r2