[arch-commits] Commit in restbed/repos (10 files)
Baptiste Jonglez
zorun at archlinux.org
Tue Jun 13 22:04:01 UTC 2017
Date: Tuesday, June 13, 2017 @ 22:04:00
Author: zorun
Revision: 236708
archrelease: copy trunk to community-i686, community-x86_64
Added:
restbed/repos/community-i686/PKGBUILD
(from rev 236706, restbed/trunk/PKGBUILD)
restbed/repos/community-i686/dns-resolution-error.patch
(from rev 236706, restbed/trunk/dns-resolution-error.patch)
restbed/repos/community-i686/strand.patch
(from rev 236706, restbed/trunk/strand.patch)
restbed/repos/community-x86_64/PKGBUILD
(from rev 236706, restbed/trunk/PKGBUILD)
restbed/repos/community-x86_64/dns-resolution-error.patch
(from rev 236706, restbed/trunk/dns-resolution-error.patch)
restbed/repos/community-x86_64/strand.patch
(from rev 236706, restbed/trunk/strand.patch)
Deleted:
restbed/repos/community-i686/PKGBUILD
restbed/repos/community-i686/strand.patch
restbed/repos/community-x86_64/PKGBUILD
restbed/repos/community-x86_64/strand.patch
---------------------------------------------+
/PKGBUILD | 94 ++++++++++++++++++++++++++
/strand.patch | 16 ++++
community-i686/PKGBUILD | 43 -----------
community-i686/dns-resolution-error.patch | 31 ++++++++
community-i686/strand.patch | 8 --
community-x86_64/PKGBUILD | 43 -----------
community-x86_64/dns-resolution-error.patch | 31 ++++++++
community-x86_64/strand.patch | 8 --
8 files changed, 172 insertions(+), 102 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2017-06-13 22:03:59 UTC (rev 236707)
+++ community-i686/PKGBUILD 2017-06-13 22:04:00 UTC (rev 236708)
@@ -1,43 +0,0 @@
-# Maintainer: Baptiste Jonglez <baptiste--aur at jonglez dot org>
-# Contributor: Justin Wilcox <nat1192 at gmail dot com>
-pkgname=restbed
-pkgver=4.5
-pkgrel=2
-pkgdesc="A framework for asynchronous RESTful functionality in C++11 applications"
-arch=('i686' 'x86_64')
-url="https://github.com/Corvusoft/restbed"
-license=('AGPL3')
-depends=('openssl')
-replaces=('restbed-latest')
-conflicts=('restbed-latest')
-makedepends=('cmake' 'asio' 'kashmir')
-source=("https://github.com/Corvusoft/restbed/archive/$pkgver/$pkgname-$pkgver.tar.gz"
- "strand.patch")
-sha256sums=('dfa20b1cd68105b1f742120df4f9a3d8ffc42ba3ad56b4db7a02b209d341892b'
- '58ed74b3db6d989a871d181e6875226cef4e81f77dac6b9a45b04ae5d4e96299')
-
-prepare() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # Necessary to build against asio 1.10.X
- patch -p1 < ../strand.patch
-}
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- mkdir -p build
- cd build
- cmake .. \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DBUILD_SHARED=on
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- cd build/
- make DESTDIR="$pkgdir" install
-}
Copied: restbed/repos/community-i686/PKGBUILD (from rev 236706, restbed/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2017-06-13 22:04:00 UTC (rev 236708)
@@ -0,0 +1,47 @@
+# Maintainer: Baptiste Jonglez <baptiste--aur at jonglez dot org>
+# Contributor: Justin Wilcox <nat1192 at gmail dot com>
+pkgname=restbed
+pkgver=4.5
+pkgrel=3
+pkgdesc="A framework for asynchronous RESTful functionality in C++11 applications"
+arch=('i686' 'x86_64')
+url="https://github.com/Corvusoft/restbed"
+license=('AGPL3')
+depends=('openssl')
+replaces=('restbed-latest')
+conflicts=('restbed-latest')
+makedepends=('cmake' 'asio' 'kashmir')
+source=("https://github.com/Corvusoft/restbed/archive/$pkgver/$pkgname-$pkgver.tar.gz"
+ "strand.patch"
+ "dns-resolution-error.patch")
+sha256sums=('dfa20b1cd68105b1f742120df4f9a3d8ffc42ba3ad56b4db7a02b209d341892b'
+ '58ed74b3db6d989a871d181e6875226cef4e81f77dac6b9a45b04ae5d4e96299'
+ 'fd80b2ddf4bf62ff2234bc4d38eb583667eb8f3d71cd35d0018beca6c681ea8c')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # Necessary to build against asio 1.10.X
+ patch -p1 < "$srcdir"/strand.patch
+ # Upstream commit d81cb41aed489c59ce98c78a9ffcb130fc7337d4
+ patch -p1 < "$srcdir"/dns-resolution-error.patch
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ mkdir -p build
+ cd build
+ cmake .. \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DBUILD_SHARED=on
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ cd build/
+ make DESTDIR="$pkgdir" install
+}
Copied: restbed/repos/community-i686/dns-resolution-error.patch (from rev 236706, restbed/trunk/dns-resolution-error.patch)
===================================================================
--- community-i686/dns-resolution-error.patch (rev 0)
+++ community-i686/dns-resolution-error.patch 2017-06-13 22:04:00 UTC (rev 236708)
@@ -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
+
Deleted: community-i686/strand.patch
===================================================================
--- community-i686/strand.patch 2017-06-13 22:03:59 UTC (rev 236707)
+++ community-i686/strand.patch 2017-06-13 22:04:00 UTC (rev 236708)
@@ -1,8 +0,0 @@
---- a/source/corvusoft/restbed/detail/socket_impl.hpp 2016-09-28 12:01:30.415787179 -0400
---- a/source/corvusoft/restbed/detail/socket_impl.hpp 2016-09-28 12:01:33.329120391 -0400
-@@ -23,3 +23,3 @@
- #include <asio/io_service.hpp>
--#include <asio/io_service_strand.hpp>
-+#include <asio/strand.hpp>
-
-
Copied: restbed/repos/community-i686/strand.patch (from rev 236706, restbed/trunk/strand.patch)
===================================================================
--- community-i686/strand.patch (rev 0)
+++ community-i686/strand.patch 2017-06-13 22:04:00 UTC (rev 236708)
@@ -0,0 +1,8 @@
+--- a/source/corvusoft/restbed/detail/socket_impl.hpp 2016-09-28 12:01:30.415787179 -0400
+--- a/source/corvusoft/restbed/detail/socket_impl.hpp 2016-09-28 12:01:33.329120391 -0400
+@@ -23,3 +23,3 @@
+ #include <asio/io_service.hpp>
+-#include <asio/io_service_strand.hpp>
++#include <asio/strand.hpp>
+
+
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2017-06-13 22:03:59 UTC (rev 236707)
+++ community-x86_64/PKGBUILD 2017-06-13 22:04:00 UTC (rev 236708)
@@ -1,43 +0,0 @@
-# Maintainer: Baptiste Jonglez <baptiste--aur at jonglez dot org>
-# Contributor: Justin Wilcox <nat1192 at gmail dot com>
-pkgname=restbed
-pkgver=4.5
-pkgrel=2
-pkgdesc="A framework for asynchronous RESTful functionality in C++11 applications"
-arch=('i686' 'x86_64')
-url="https://github.com/Corvusoft/restbed"
-license=('AGPL3')
-depends=('openssl')
-replaces=('restbed-latest')
-conflicts=('restbed-latest')
-makedepends=('cmake' 'asio' 'kashmir')
-source=("https://github.com/Corvusoft/restbed/archive/$pkgver/$pkgname-$pkgver.tar.gz"
- "strand.patch")
-sha256sums=('dfa20b1cd68105b1f742120df4f9a3d8ffc42ba3ad56b4db7a02b209d341892b'
- '58ed74b3db6d989a871d181e6875226cef4e81f77dac6b9a45b04ae5d4e96299')
-
-prepare() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # Necessary to build against asio 1.10.X
- patch -p1 < ../strand.patch
-}
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- mkdir -p build
- cd build
- cmake .. \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DBUILD_SHARED=on
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- cd build/
- make DESTDIR="$pkgdir" install
-}
Copied: restbed/repos/community-x86_64/PKGBUILD (from rev 236706, restbed/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2017-06-13 22:04:00 UTC (rev 236708)
@@ -0,0 +1,47 @@
+# Maintainer: Baptiste Jonglez <baptiste--aur at jonglez dot org>
+# Contributor: Justin Wilcox <nat1192 at gmail dot com>
+pkgname=restbed
+pkgver=4.5
+pkgrel=3
+pkgdesc="A framework for asynchronous RESTful functionality in C++11 applications"
+arch=('i686' 'x86_64')
+url="https://github.com/Corvusoft/restbed"
+license=('AGPL3')
+depends=('openssl')
+replaces=('restbed-latest')
+conflicts=('restbed-latest')
+makedepends=('cmake' 'asio' 'kashmir')
+source=("https://github.com/Corvusoft/restbed/archive/$pkgver/$pkgname-$pkgver.tar.gz"
+ "strand.patch"
+ "dns-resolution-error.patch")
+sha256sums=('dfa20b1cd68105b1f742120df4f9a3d8ffc42ba3ad56b4db7a02b209d341892b'
+ '58ed74b3db6d989a871d181e6875226cef4e81f77dac6b9a45b04ae5d4e96299'
+ 'fd80b2ddf4bf62ff2234bc4d38eb583667eb8f3d71cd35d0018beca6c681ea8c')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # Necessary to build against asio 1.10.X
+ patch -p1 < "$srcdir"/strand.patch
+ # Upstream commit d81cb41aed489c59ce98c78a9ffcb130fc7337d4
+ patch -p1 < "$srcdir"/dns-resolution-error.patch
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ mkdir -p build
+ cd build
+ cmake .. \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DBUILD_SHARED=on
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ cd build/
+ make DESTDIR="$pkgdir" install
+}
Copied: restbed/repos/community-x86_64/dns-resolution-error.patch (from rev 236706, restbed/trunk/dns-resolution-error.patch)
===================================================================
--- community-x86_64/dns-resolution-error.patch (rev 0)
+++ community-x86_64/dns-resolution-error.patch 2017-06-13 22:04:00 UTC (rev 236708)
@@ -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
+
Deleted: community-x86_64/strand.patch
===================================================================
--- community-x86_64/strand.patch 2017-06-13 22:03:59 UTC (rev 236707)
+++ community-x86_64/strand.patch 2017-06-13 22:04:00 UTC (rev 236708)
@@ -1,8 +0,0 @@
---- a/source/corvusoft/restbed/detail/socket_impl.hpp 2016-09-28 12:01:30.415787179 -0400
---- a/source/corvusoft/restbed/detail/socket_impl.hpp 2016-09-28 12:01:33.329120391 -0400
-@@ -23,3 +23,3 @@
- #include <asio/io_service.hpp>
--#include <asio/io_service_strand.hpp>
-+#include <asio/strand.hpp>
-
-
Copied: restbed/repos/community-x86_64/strand.patch (from rev 236706, restbed/trunk/strand.patch)
===================================================================
--- community-x86_64/strand.patch (rev 0)
+++ community-x86_64/strand.patch 2017-06-13 22:04:00 UTC (rev 236708)
@@ -0,0 +1,8 @@
+--- a/source/corvusoft/restbed/detail/socket_impl.hpp 2016-09-28 12:01:30.415787179 -0400
+--- a/source/corvusoft/restbed/detail/socket_impl.hpp 2016-09-28 12:01:33.329120391 -0400
+@@ -23,3 +23,3 @@
+ #include <asio/io_service.hpp>
+-#include <asio/io_service_strand.hpp>
++#include <asio/strand.hpp>
+
+
More information about the arch-commits
mailing list