remove upstreamed patches

5 files changed, 1 insertions, 501 deletions

diff --git a/debian/changelog b/debian/changelog
index e8db398b..7d7e2149 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ dbus (1.9.12-1) UNRELEASED; urgency=medium
   * New upstream release adds AppArmor mediation support
     - enable AppArmor in the normal build, disable it in the udeb
     - disable build of ducktype docs for now, it isn't in Debian
+    - remove upstreamed patches
   * Change the check for requiring a reboot to be init-system-agnostic
     so Ubuntu can stop patching it (partially addresses #712167)
   * dbus Suggests: dbus-user-session | dbus-x11, not just dbus-x11
diff --git a/debian/patches/Add-dbus-test-tool-and-its-man-page-to-the-CMake-bui.patch b/debian/patches/Add-dbus-test-tool-and-its-man-page-to-the-CMake-bui.patch
deleted file mode 100644
index 656f9152..00000000
--- a/debian/patches/Add-dbus-test-tool-and-its-man-page-to-the-CMake-bui.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Thu, 12 Feb 2015 13:04:15 +0000
-Subject: Add dbus-test-tool and its man page to the CMake build system
-
-Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89086
-Reviewed-by: Philip Withnall <philip.withnall@collabora.co.uk>
-Applied-upstream: 1.9.12, commit:e4d03537b6411b586fead9849aa3c58ea1df8a2d
----
- cmake/doc/CMakeLists.txt   |  3 +++
- cmake/tools/CMakeLists.txt | 13 +++++++++++++
- 2 files changed, 16 insertions(+)
-
-diff --git a/cmake/doc/CMakeLists.txt b/cmake/doc/CMakeLists.txt
-index 807af60..2bb720b 100644
---- a/cmake/doc/CMakeLists.txt
-+++ b/cmake/doc/CMakeLists.txt
-@@ -137,17 +137,20 @@ configure_file(${CMAKE_SOURCE_DIR}/../doc/dbus-daemon.1.xml.in ${CMAKE_BINARY_DI
- configure_file(${CMAKE_SOURCE_DIR}/../doc/dbus-launch.1.xml.in ${CMAKE_BINARY_DIR}/doc/dbus-launch.1.xml)
- configure_file(${CMAKE_SOURCE_DIR}/../doc/dbus-monitor.1.xml.in ${CMAKE_BINARY_DIR}/doc/dbus-monitor.1.xml)
- configure_file(${CMAKE_SOURCE_DIR}/../doc/dbus-send.1.xml.in ${CMAKE_BINARY_DIR}/doc/dbus-send.1.xml)
-+configure_file(${CMAKE_SOURCE_DIR}/../doc/dbus-test-tool.1.xml.in ${CMAKE_BINARY_DIR}/doc/dbus-test-tool.1.xml)
- configure_file(${CMAKE_SOURCE_DIR}/../doc/dbus-uuidgen.1.xml.in ${CMAKE_BINARY_DIR}/doc/dbus-uuidgen.1.xml)
- DOCBOOK(${CMAKE_BINARY_DIR}/doc/dbus-cleanup-sockets.1.xml html-nochunks)
- DOCBOOK(${CMAKE_BINARY_DIR}/doc/dbus-daemon.1.xml html-nochunks)
- DOCBOOK(${CMAKE_BINARY_DIR}/doc/dbus-launch.1.xml html-nochunks)
- DOCBOOK(${CMAKE_BINARY_DIR}/doc/dbus-monitor.1.xml html-nochunks)
- DOCBOOK(${CMAKE_BINARY_DIR}/doc/dbus-send.1.xml html-nochunks)
-+DOCBOOK(${CMAKE_BINARY_DIR}/doc/dbus-test-tool.1.xml html-nochunks)
- DOCBOOK(${CMAKE_BINARY_DIR}/doc/dbus-uuidgen.1.xml html-nochunks)
- if (UNIX)
-   DOCBOOK(${CMAKE_BINARY_DIR}/doc/dbus-daemon.1.xml man)
-   DOCBOOK(${CMAKE_BINARY_DIR}/doc/dbus-monitor.1.xml man)
-   DOCBOOK(${CMAKE_BINARY_DIR}/doc/dbus-send.1.xml man)
-+  DOCBOOK(${CMAKE_BINARY_DIR}/doc/dbus-test-tool.1.xml man)
-   DOCBOOK(${CMAKE_BINARY_DIR}/doc/dbus-launch.1.xml man)
-   DOCBOOK(${CMAKE_BINARY_DIR}/doc/dbus-uuidgen.1.xml man)
-   DOCBOOK(${CMAKE_BINARY_DIR}/doc/dbus-cleanup-sockets.1.xml man)
-diff --git a/cmake/tools/CMakeLists.txt b/cmake/tools/CMakeLists.txt
-index d4eeb70..8ba3589 100644
---- a/cmake/tools/CMakeLists.txt
-+++ b/cmake/tools/CMakeLists.txt
-@@ -14,6 +14,15 @@ set (dbus_monitor_SOURCES
- 	../../tools/tool-common.h
- )
- 
-+set (dbus_test_tool_SOURCES
-+	../../tools/dbus-echo.c
-+	../../tools/dbus-spam.c
-+	../../tools/tool-common.c
-+	../../tools/tool-common.h
-+	../../tools/test-tool.c
-+	../../tools/test-tool.h
-+)
-+
- if (WIN32)
- set (dbus_launch_SOURCES
- 	../../tools/dbus-launch-win.c
-@@ -39,6 +48,10 @@ add_executable(dbus-send ${dbus_send_SOURCES})
- target_link_libraries(dbus-send ${DBUS_LIBRARIES})
- install_targets(/bin dbus-send )
- 
-+add_executable(dbus-test-tool ${dbus_test_tool_SOURCES})
-+target_link_libraries(dbus-test-tool ${DBUS_LIBRARIES})
-+install_targets(/bin dbus-test-tool )
-+
- add_executable(dbus-launch ${dbus_launch_SOURCES})
- target_link_libraries(dbus-launch )
- if (DBUS_BUILD_X11)
diff --git a/debian/patches/Document-dbus-test-tool.patch b/debian/patches/Document-dbus-test-tool.patch
deleted file mode 100644
index 98196c72..00000000
--- a/debian/patches/Document-dbus-test-tool.patch
+++ /dev/null
@@ -1,369 +0,0 @@
-From: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Wed, 11 Feb 2015 16:59:42 +0000
-Subject: Document dbus-test-tool
-
-Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89086
-Reviewed-by: Philip Withnall <philip.withnall@collabora.co.uk>
-Applied-upstream: 1.9.12, commit:15506779a70d8ac38c2bb302ab83d2c1924aea6d
----
- configure.ac                |   1 +
- doc/Makefile.am             |   1 +
- doc/dbus-test-tool.1.xml.in | 325 ++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 327 insertions(+)
- create mode 100644 doc/dbus-test-tool.1.xml.in
-
-diff --git a/configure.ac b/configure.ac
-index ee87caa..b765b72 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1789,6 +1789,7 @@ doc/dbus-launch.1.xml
- doc/dbus-monitor.1.xml
- doc/dbus-run-session.1.xml
- doc/dbus-send.1.xml
-+doc/dbus-test-tool.1.xml
- doc/dbus-uuidgen.1.xml
- dbus-1.pc
- dbus-1-uninstalled.pc
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index b9a4c10..3879a61 100644
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -7,6 +7,7 @@ man_pages = \
- 	dbus-monitor.1 \
- 	dbus-run-session.1 \
- 	dbus-send.1 \
-+	dbus-test-tool.1 \
- 	dbus-uuidgen.1 \
- 	$(NULL)
- 
-diff --git a/doc/dbus-test-tool.1.xml.in b/doc/dbus-test-tool.1.xml.in
-new file mode 100644
-index 0000000..091dee1
---- /dev/null
-+++ b/doc/dbus-test-tool.1.xml.in
-@@ -0,0 +1,325 @@
-+<?xml version="1.0" encoding="ISO-8859-1"?>
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-+<refentry id="dbus-test-tool.1">
-+  <refentryinfo>
-+    <copyright>
-+      <year>2015</year>
-+      <holder>Collabora Ltd.</holder>
-+    </copyright>
-+    <legalnotice>
-+      <para>This man page is distributed under the same terms as
-+        dbus-test-tool (GPL-2+). There is NO WARRANTY, to the extent
-+        permitted by law.</para>
-+    </legalnotice>
-+  </refentryinfo>
-+
-+  <refmeta>
-+    <refentrytitle>dbus-test-tool</refentrytitle>
-+    <manvolnum>1</manvolnum>
-+    <refmiscinfo class="manual">User Commands</refmiscinfo>
-+    <refmiscinfo class="source">D-Bus</refmiscinfo>
-+    <refmiscinfo class="version">@DBUS_VERSION@</refmiscinfo>
-+  </refmeta>
-+  <refnamediv>
-+    <refname>dbus-test-tool</refname>
-+    <refpurpose>D-Bus traffic generator and test tool</refpurpose>
-+  </refnamediv>
-+
-+  <refsynopsisdiv id="synopsis">
-+    <cmdsynopsis>
-+      <command>dbus-test-tool</command>
-+      <arg choice="plain">black-hole</arg>
-+      <group choice="opt">
-+        <arg choice="plain">--session</arg>
-+        <arg choice="plain">--system</arg>
-+      </group>
-+      <arg choice="opt">--name=<replaceable>NAME</replaceable></arg>
-+      <arg choice="opt">--no-read</arg>
-+    </cmdsynopsis>
-+
-+    <cmdsynopsis>
-+      <command>dbus-test-tool</command>
-+      <arg choice="plain">echo</arg>
-+      <group choice="opt">
-+        <arg choice="plain">--session</arg>
-+        <arg choice="plain">--system</arg>
-+      </group>
-+      <arg choice="opt">--name=<replaceable>NAME</replaceable></arg>
-+      <arg choice="opt">--sleep=<replaceable>MS</replaceable></arg>
-+    </cmdsynopsis>
-+
-+    <cmdsynopsis>
-+      <command>dbus-test-tool</command>
-+      <arg choice="plain">spam</arg>
-+      <group choice="opt">
-+        <arg choice="plain">--session</arg>
-+        <arg choice="plain">--system</arg>
-+      </group>
-+      <arg choice="opt">--dest=<replaceable>NAME</replaceable></arg>
-+      <arg choice="opt">--count=<replaceable>N</replaceable></arg>
-+      <arg choice="opt">--flood</arg>
-+      <arg choice="opt">--ignore-errors</arg>
-+      <arg choice="opt">--messages-per-conn=<replaceable>N</replaceable></arg>
-+      <arg choice="opt">--no-reply</arg>
-+      <arg choice="opt">--queue=<replaceable>N</replaceable></arg>
-+      <arg choice="opt">--seed=<replaceable>SEED</replaceable></arg>
-+      <group choice="opt">
-+        <arg choice="plain">--string</arg>
-+        <arg choice="plain">--bytes</arg>
-+        <arg choice="plain">--empty</arg>
-+      </group>
-+      <group choice="opt">
-+        <arg choice="plain">--payload=<replaceable>S</replaceable></arg>
-+        <arg choice="plain">--stdin</arg>
-+        <arg choice="plain">--message-stdin</arg>
-+        <arg choice="plain">--random-size</arg>
-+      </group>
-+    </cmdsynopsis>
-+  </refsynopsisdiv>
-+
-+  <refsect1 id="description">
-+    <title>DESCRIPTION</title>
-+    <para><command>dbus-test-tool</command> is a multi-purpose tool
-+      for debugging and profiling D-Bus.</para>
-+
-+    <para><command>dbus-test-tool black-hole</command>
-+      connects to D-Bus, optionally requests a name, then does not
-+      reply to messages. It normally reads and discards messages from
-+      its D-Bus socket, but can be configured to sleep forever without
-+      reading.</para>
-+
-+    <para><command>dbus-test-tool echo</command>
-+      connects to D-Bus, optionally requests a name, then sends back an
-+      empty reply to every method call, after an optional delay.</para>
-+
-+    <para><command>dbus-test-tool spam</command>
-+      connects to D-Bus and makes repeated method calls,
-+      normally named <literal>com.example.Spam</literal>.</para>
-+  </refsect1>
-+
-+  <refsect1 id="options">
-+    <title>OPTIONS</title>
-+    <refsect2>
-+      <title>Common options</title>
-+      <variablelist remap="TP">
-+
-+        <varlistentry>
-+          <term><option>--session</option></term>
-+          <listitem>
-+            <para>Connect to the session bus. This is the default.</para>
-+          </listitem>
-+        </varlistentry>
-+
-+        <varlistentry>
-+          <term><option>--system</option></term>
-+          <listitem>
-+            <para>Connect to the system bus.</para>
-+          </listitem>
-+        </varlistentry>
-+
-+      </variablelist>
-+    </refsect2>
-+
-+    <refsect2>
-+      <title>black-hole mode</title>
-+      <variablelist remap="TP">
-+
-+        <varlistentry>
-+          <term><option>--name=</option><replaceable>NAME</replaceable></term>
-+          <listitem>
-+            <para>Before proceeding, request ownership of the well-known
-+              bus name <replaceable>NAME</replaceable>, for example
-+              <literal>com.example.NoReply</literal>. By default,
-+              no name is requested, and the tool can only be addressed by
-+              a unique bus name such as <literal>:1.23</literal>.</para>
-+          </listitem>
-+        </varlistentry>
-+
-+        <varlistentry>
-+          <term><option>--no-read</option></term>
-+          <listitem>
-+            <para>Do not read from the D-Bus socket.</para>
-+          </listitem>
-+        </varlistentry>
-+
-+      </variablelist>
-+    </refsect2>
-+
-+    <refsect2>
-+      <title>echo mode</title>
-+      <variablelist remap="TP">
-+
-+        <varlistentry>
-+          <term><option>--name=</option><replaceable>NAME</replaceable></term>
-+          <listitem>
-+            <para>Before proceeding, request ownership of the well-known
-+              bus name <replaceable>NAME</replaceable>, for example
-+              <literal>com.example.Echo</literal>. By default,
-+              no name is requested, and the tool can only be addressed by
-+              a unique bus name such as <literal>:1.23</literal>.</para>
-+          </listitem>
-+        </varlistentry>
-+
-+        <varlistentry>
-+          <term><option>--sleep=</option><replaceable>MS</replaceable></term>
-+          <listitem>
-+            <para>Block for <replaceable>MS</replaceable> milliseconds
-+              before replying to a method call.</para>
-+          </listitem>
-+        </varlistentry>
-+
-+      </variablelist>
-+    </refsect2>
-+
-+    <refsect2>
-+      <title>spam mode</title>
-+      <variablelist remap="TP">
-+
-+        <varlistentry>
-+          <term><option>--dest=</option><replaceable>NAME</replaceable></term>
-+          <listitem>
-+            <para>Send method calls to the well-known or unique
-+              bus name <replaceable>NAME</replaceable>.
-+              The default is the dbus-daemon,
-+              <literal>org.freedesktop.DBus</literal>.</para>
-+          </listitem>
-+        </varlistentry>
-+
-+        <varlistentry>
-+          <term><option>--count=</option><replaceable>N</replaceable></term>
-+          <listitem>
-+            <para>Send <replaceable>N</replaceable> method calls in total.
-+              The default is 1.</para>
-+          </listitem>
-+        </varlistentry>
-+
-+        <varlistentry>
-+          <term><option>--queue=</option><replaceable>N</replaceable></term>
-+          <listitem>
-+            <para>Send <replaceable>N</replaceable> method calls before
-+              waiting for any replies, then send one new call per reply
-+              received, keeping <replaceable>N</replaceable> method calls
-+              "in flight" at all times until the number of messages specified
-+              with the <option>--count</option> option have been sent.
-+              The default is 1, unless <option>--flood</option>
-+              is used.</para>
-+          </listitem>
-+        </varlistentry>
-+
-+        <varlistentry>
-+          <term><option>--flood</option></term>
-+          <listitem>
-+            <para>Send all messages without waiting for a reply,
-+              equivalent to <option>--queue</option> with an arbitrarily
-+              large <replaceable>N</replaceable>.</para>
-+          </listitem>
-+        </varlistentry>
-+
-+        <varlistentry>
-+          <term><option>--no-reply</option></term>
-+          <listitem>
-+            <para>Set the "no reply desired" flag on the messages.
-+              This implies <option>--flood</option>, since it disables
-+              the replies that would be used for a finite
-+              <option>--queue</option> length.</para>
-+          </listitem>
-+        </varlistentry>
-+
-+        <varlistentry>
-+          <term><option>--messages-per-conn=</option><replaceable>N</replaceable></term>
-+          <listitem>
-+            <para>If given, send <replaceable>N</replaceable> method calls
-+              on the same connection, then disconnect and reconnect.
-+              The default is to use the same connection for all method
-+              calls.</para>
-+          </listitem>
-+        </varlistentry>
-+
-+        <varlistentry>
-+          <term><option>--string</option></term>
-+          <listitem>
-+            <para>The payload of each message is a UTF-8 string. This is the
-+              default. The actual string used is given by the
-+              <option>--payload</option> or <option>--stdin</option>
-+              option, defaulting to "hello, world!".</para>
-+          </listitem>
-+        </varlistentry>
-+
-+        <varlistentry>
-+          <term><option>--bytes</option></term>
-+          <listitem>
-+            <para>The payload of each message is a byte-array.
-+              The actual bytes used are given by the
-+              <option>--payload</option> or <option>--stdin</option>
-+              option, defaulting to the ASCII encoding of
-+              "hello, world!".</para>
-+          </listitem>
-+        </varlistentry>
-+
-+        <varlistentry>
-+          <term><option>--empty</option></term>
-+          <listitem>
-+            <para>The messages have no payload.</para>
-+          </listitem>
-+        </varlistentry>
-+
-+        <varlistentry>
-+          <term><option>--payload=</option><replaceable>S</replaceable></term>
-+          <listitem>
-+            <para>Use <replaceable>S</replaceable> as the
-+              <option>--string</option> or <option>--bytes</option>
-+              in the messages. The default is "hello, world!".</para>
-+          </listitem>
-+        </varlistentry>
-+
-+        <varlistentry>
-+          <term><option>--stdin</option></term>
-+          <listitem>
-+            <para>Read from standard input until end-of-file is reached,
-+              and use that as the <option>--string</option> or
-+              <option>--bytes</option> in the messages.</para>
-+          </listitem>
-+        </varlistentry>
-+
-+        <varlistentry>
-+          <term><option>--message-stdin</option></term>
-+          <listitem>
-+            <para>Read a complete binary D-Bus method call message from
-+              standard input, and use that for each method call.</para>
-+          </listitem>
-+        </varlistentry>
-+
-+        <varlistentry>
-+          <term><option>--random-size</option></term>
-+          <listitem>
-+            <para>Read whitespace-separated ASCII decimal numbers from
-+              standard input, choose one at random for each message,
-+              and send a message whose payload is a string of that
-+              length.</para>
-+          </listitem>
-+        </varlistentry>
-+
-+        <varlistentry>
-+          <term><option>--seed=</option><replaceable>SEED</replaceable></term>
-+          <listitem>
-+            <para>Use <replaceable>SEED</replaceable> as the seed
-+              for the pseudorandom number generator, to have somewhat
-+              repeatable sequences of random messages.</para>
-+          </listitem>
-+        </varlistentry>
-+
-+      </variablelist>
-+    </refsect2>
-+  </refsect1>
-+
-+  <refsect1 id="bugs">
-+    <title>BUGS</title>
-+      <para>Please send bug reports to the D-Bus bug tracker or mailing list.
-+        See <ulink url="http://www.freedesktop.org/software/dbus/">http://www.freedesktop.org/software/dbus/</ulink>.</para>
-+  </refsect1>
-+
-+  <refsect1 id="see_also">
-+    <title>SEE ALSO</title>
-+    <para><citerefentry><refentrytitle>dbus-send</refentrytitle><manvolnum>1</manvolnum></citerefentry></para>
-+  </refsect1>
-+</refentry>
diff --git a/debian/patches/Reduce-the-number-of-fds-the-fdpass-test-uses.patch b/debian/patches/Reduce-the-number-of-fds-the-fdpass-test-uses.patch
deleted file mode 100644
index 0a2176d6..00000000
--- a/debian/patches/Reduce-the-number-of-fds-the-fdpass-test-uses.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Wed, 11 Feb 2015 11:47:15 +0000
-Subject: Reduce the number of fds the fdpass test uses
-
-It was relying on a higher-than-default fd limit; cut it down to
-more than 256 but rather less than 1024, since the default Linux
-limit is 1024 fds per user.
-
-Also automatically skip this test if our rlimit is too small.
-
-Bug: https://bugs.freedesktop.org/show_bug.cgi?id=88998
-Reviewed-by: Philip Withnall <philip.withnall@collabora.co.uk>
-Applied-upstream: 1.9.12, commit:e38733122084655738d109228b4df271262fac42
----
- test/fdpass.c | 25 +++++++++++++++++++++++--
- 1 file changed, 23 insertions(+), 2 deletions(-)
-
-diff --git a/test/fdpass.c b/test/fdpass.c
-index fa958da..96f9427 100644
---- a/test/fdpass.c
-+++ b/test/fdpass.c
-@@ -57,9 +57,11 @@ _DBUS_STATIC_ASSERT (MAX_MESSAGE_UNIX_FDS <= 253);
- /* Arbitrary; included here to avoid relying on the default. */
- #define MAX_INCOMING_UNIX_FDS (MAX_MESSAGE_UNIX_FDS * 4)
- 
--/* Arbitrary, except that MAX_MESSAGE_UNIX_FDS * SOME_MESSAGES must be
-+/* Arbitrary, except that MAX_MESSAGE_UNIX_FDS * SOME_MESSAGES should be
-  * less than the process's file descriptor limit. */
--#define SOME_MESSAGES 50
-+#define SOME_MESSAGES 20
-+/* To cover some situations on Linux we want this to be true. */
-+_DBUS_STATIC_ASSERT (MAX_MESSAGE_UNIX_FDS * SOME_MESSAGES > 256);
- 
- /* Linux won't allow more than 253 fds per sendmsg(). */
- #define TOO_MANY_FDS 255
-@@ -809,6 +811,25 @@ main (int argc,
- {
-   test_init (&argc, &argv);
- 
-+#ifdef HAVE_GETRLIMIT
-+    {
-+      struct rlimit lim;
-+
-+      if (getrlimit (RLIMIT_NOFILE, &lim) < 0)
-+        g_error ("Failed to get RLIMIT_NOFILE limit: %s", g_strerror (errno));
-+
-+      if (lim.rlim_cur != RLIM_INFINITY &&
-+          /* only run if we have a fairly generous margin of error
-+           * for stdout, stderr, duplicates, the D-Bus connection, etc. */
-+          lim.rlim_cur < 2 * MAX_MESSAGE_UNIX_FDS * SOME_MESSAGES)
-+        {
-+          g_message ("not enough RLIMIT_NOFILE to run this test");
-+          /* Autotools exit code for "all skipped" */
-+          return 77;
-+        }
-+    }
-+#endif
-+
-   g_test_add ("/relay", Fixture, NULL, setup,
-       test_relay, teardown);
-   g_test_add ("/limit", Fixture, NULL, setup,
diff --git a/debian/patches/series b/debian/patches/series
index 0aceb571..e499da68 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,3 @@
-Document-dbus-test-tool.patch
-Add-dbus-test-tool-and-its-man-page-to-the-CMake-bui.patch
-Reduce-the-number-of-fds-the-fdpass-test-uses.patch
 Add-support-for-unix-runtime-yes-as-an-address-mode.patch
 Add-regression-test-for-unix-runtime-yes.patch
 loopback-test-cope-with-being-run-without-XDG_RUNTIM.patch