[arch-commits] Commit in restbed/trunk (PKGBUILD dns-resolution-error.patch)

[Baptiste Jonglez]

    Date: Tuesday, June 13, 2017 @ 22:03:35
  Author: zorun
Revision: 236706

upgpkg: restbed 4.5-3

Add upstream patch to fix DNS hanging issue

Added:
  restbed/trunk/dns-resolution-error.patch
Modified:
  restbed/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |   12 ++++++++----
 dns-resolution-error.patch |   31 +++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-06-13 21:48:23 UTC (rev 236705)
+++ PKGBUILD	2017-06-13 22:03:35 UTC (rev 236706)
@@ -2,7 +2,7 @@
 # Contributor: Justin Wilcox <nat1192 at gmail dot com>
 pkgname=restbed
 pkgver=4.5
-pkgrel=2
+pkgrel=3
 pkgdesc="A framework for asynchronous RESTful functionality in C++11 applications"
 arch=('i686' 'x86_64')
 url="https://github.com/Corvusoft/restbed"
@@ -12,15 +12,19 @@
 conflicts=('restbed-latest')
 makedepends=('cmake' 'asio' 'kashmir')
 source=("https://github.com/Corvusoft/restbed/archive/$pkgver/$pkgname-$pkgver.tar.gz"
-        "strand.patch")
+        "strand.patch"
+        "dns-resolution-error.patch")
 sha256sums=('dfa20b1cd68105b1f742120df4f9a3d8ffc42ba3ad56b4db7a02b209d341892b'
-            '58ed74b3db6d989a871d181e6875226cef4e81f77dac6b9a45b04ae5d4e96299')
+            '58ed74b3db6d989a871d181e6875226cef4e81f77dac6b9a45b04ae5d4e96299'
+            'fd80b2ddf4bf62ff2234bc4d38eb583667eb8f3d71cd35d0018beca6c681ea8c')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
   # Necessary to build against asio 1.10.X
-  patch -p1 < ../strand.patch
+  patch -p1 < "$srcdir"/strand.patch
+  # Upstream commit d81cb41aed489c59ce98c78a9ffcb130fc7337d4
+  patch -p1 < "$srcdir"/dns-resolution-error.patch
 }
 
 build() {

Added: dns-resolution-error.patch
===================================================================
--- dns-resolution-error.patch	                        (rev 0)
+++ dns-resolution-error.patch	2017-06-13 22:03:35 UTC (rev 236706)
@@ -0,0 +1,31 @@
+From: Adrien Beraud <adrien.beraud at savoirfairelinux.com>
+Date: Fri, 2 Jun 2017 11:24:12 +0200
+Subject: [PATCH] Handle DNS resolution error
+
+DNS resolution error currently causes
+indefinite hangup as the callback is
+not called and higher-level layers
+are not informed.
+
+This commit bubbles up the error,
+allowing the request to fail.
+---
+ source/corvusoft/restbed/detail/socket_impl.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/source/corvusoft/restbed/detail/socket_impl.cpp b/source/corvusoft/restbed/detail/socket_impl.cpp
+index 313a421..665cfe7 100644
+--- a/source/corvusoft/restbed/detail/socket_impl.cpp
++++ b/source/corvusoft/restbed/detail/socket_impl.cpp
+@@ -145,6 +145,8 @@ namespace restbed
+                         m_is_open = true;
+                         callback( error );
+                     } );
++                } else {
++                    callback( error );
+                 }
+             } );
+         }
+-- 
+2.11.0
+