Bug#771551: unblock: asio/1:1.10.2-2

[Markus Wanner <markus@bluegap.ch>]

Package: release.debian.org
User: release.debian.org@packages.debian.org
Usertags: unblock
Severity: normal

Please unblock package asio

The recent upload to unstable fixes bug #769306 (severity: important -
FTBFS under pbuilder: Failure in unit/ip/multicast) with a single
additional patch.

asio (1:1.10.2-2) unstable; urgency=medium

  * Allow tests to pass under restricted environments, like pbuilder,
    by adding patch relax-ip-multicast-tests.diff. Closes: #769306.

 -- Markus Wanner <markus@bluegap.ch>  Fri, 28 Nov 2014 14:31:56 +0100

unblock asio/1:1.10.2-2

Thanks

Markus Wanner

diff -Nru asio-1.10.2/debian/changelog asio-1.10.2/debian/changelog
--- asio-1.10.2/debian/changelog	2014-05-12 15:09:24.000000000 +0200
+++ asio-1.10.2/debian/changelog	2014-11-28 14:55:57.000000000 +0100
@@ -1,3 +1,10 @@
+asio (1:1.10.2-2) unstable; urgency=medium
+
+  * Allow tests to pass under restricted environments, like pbuilder,
+    by adding patch relax-ip-multicast-tests.diff. Closes: #769306.
+
+ -- Markus Wanner <markus@bluegap.ch>  Fri, 28 Nov 2014 14:31:56 +0100
+
 asio (1:1.10.2-1) unstable; urgency=low
 
   * New upstream release. (Closes: #718478)
diff -Nru asio-1.10.2/debian/patches/relax-ip-multicast-tests.diff asio-1.10.2/debian/patches/relax-ip-multicast-tests.diff
--- asio-1.10.2/debian/patches/relax-ip-multicast-tests.diff	1970-01-01 01:00:00.000000000 +0100
+++ asio-1.10.2/debian/patches/relax-ip-multicast-tests.diff	2014-11-28 14:49:29.000000000 +0100
@@ -0,0 +1,61 @@
+Description: Allow multicast tests to pass in case ENODEV
+ IP Multicast tests used to fail on restricted environments such as pbuilder,
+ where joining a multicast address may fail with ENODEV. Don't count this as
+ a test failure and make the leave_group tests dependent on success of the
+ former join call.
+Author: Markus Wanner <markus@bluegap.ch>
+Last-Update: 2014-11-28
+Forwarded: https://github.com/chriskohlhoff/asio/issues/38
+
+--- a/src/tests/unit/ip/multicast.cpp
++++ b/src/tests/unit/ip/multicast.cpp
+@@ -169,30 +169,32 @@
+   {
+     ip::multicast::join_group join_group(multicast_address_v4);
+     sock_v4.set_option(join_group, ec);
+-    ASIO_CHECK_MESSAGE(!ec, ec.value() << ", " << ec.message());
++    ASIO_CHECK_MESSAGE(!ec || ec.value() == ENODEV,
++                       ec.value() << ", " << ec.message());
++
++    if (!ec)
++    {
++      // leave_group class.
++      ip::multicast::leave_group leave_group(multicast_address_v4);
++      sock_v4.set_option(leave_group, ec);
++      ASIO_CHECK_MESSAGE(!ec, ec.value() << ", " << ec.message());
++    }
+   }
+ 
+   if (have_v6)
+   {
+     ip::multicast::join_group join_group(multicast_address_v6);
+     sock_v6.set_option(join_group, ec);
+-    ASIO_CHECK_MESSAGE(!ec, ec.value() << ", " << ec.message());
+-  }
+-
+-  // leave_group class.
+-
+-  if (have_v4)
+-  {
+-    ip::multicast::leave_group leave_group(multicast_address_v4);
+-    sock_v4.set_option(leave_group, ec);
+-    ASIO_CHECK_MESSAGE(!ec, ec.value() << ", " << ec.message());
+-  }
++    ASIO_CHECK_MESSAGE(!ec || ec.value() == ENODEV,
++                       ec.value() << ", " << ec.message());
+ 
+-  if (have_v6)
+-  {
+-    ip::multicast::leave_group leave_group(multicast_address_v6);
+-    sock_v6.set_option(leave_group, ec);
+-    ASIO_CHECK_MESSAGE(!ec, ec.value() << ", " << ec.message());
++    if (!ec)
++    {
++      // leave_group class.
++      ip::multicast::leave_group leave_group(multicast_address_v6);
++      sock_v6.set_option(leave_group, ec);
++      ASIO_CHECK_MESSAGE(!ec, ec.value() << ", " << ec.message());
++    }
+   }
+ 
+   // outbound_interface class.
diff -Nru asio-1.10.2/debian/patches/series asio-1.10.2/debian/patches/series
--- asio-1.10.2/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ asio-1.10.2/debian/patches/series	2014-11-28 14:49:29.000000000 +0100
@@ -0,0 +1 @@
+relax-ip-multicast-tests.diff

Attachment: signature.asc
Description: OpenPGP digital signature