[arch-commits] Commit in restbed/trunk (PKGBUILD)
Date: Monday, February 4, 2019 @ 14:38:47 Author: archange Revision: 429571 upgpkg: restbed 4.6+89+ga1e9c97-1 Update to more recent version in order to build opendht Modified: restbed/trunk/PKGBUILD --+ PKGBUILD | 40 +++- 1 file changed, 19 insertions(+), 21 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-02-04 14:28:22 UTC (rev 429570) +++ PKGBUILD2019-02-04 14:38:47 UTC (rev 429571) @@ -1,5 +1,7 @@ # Maintainer: Baptiste Jonglez +# Maintainer: Bruno Pagani # Contributor: Justin Wilcox + pkgname=restbed pkgver=4.6+89+ga1e9c97 pkgrel=1 @@ -8,15 +10,13 @@ url="https://github.com/Corvusoft/restbed; license=('AGPL3') depends=('openssl') -replaces=('restbed-latest') -conflicts=('restbed-latest') makedepends=('cmake' 'asio') checkdepends=('catch2') _commit=a1e9c970cf0886ab9e115f776f7d3c5dab52b964 -source=("https://github.com/Corvusoft/restbed/archive/${_commit}/$pkgname-$pkgver.tar.gz; -"0001-build-Only-run-tests-if-catch2-is-installed.patch" -"0002-build-make-static-shared-builds-optional.patch" -"0003-build-allow-only-static-or-shared-crypto-lib.patch") +source=("${url}/archive/${_commit}/${pkgname}-${pkgver}.tar.gz" +'0001-build-Only-run-tests-if-catch2-is-installed.patch' +'0002-build-make-static-shared-builds-optional.patch' +'0003-build-allow-only-static-or-shared-crypto-lib.patch') sha256sums=('65c0bd66073b2646bd42b7b254820f55f8ac2ae0d1298fa64f59e104e503196e' '6ec39ca415b7f09246238fb9c43664caeec71601d55545f529401e7fcedc175c' 'aaf94a7c0ceb94b1dbd3cd7dfe4541a99c107af5a528353615ff792b1f591673' @@ -23,11 +23,12 @@ 'ca6ddb1bc8a8a623d37351b418a8c897046cfb915f7760060f1f0cfe12a2c92f') prepare() { - cd "$srcdir/$pkgname-$_commit" + mkdir -p build + cd ${pkgname}-${_commit} # Allows to disable static builds - patch -p1 < "$srcdir/0001-build-Only-run-tests-if-catch2-is-installed.patch" - patch -p1 < "$srcdir/0002-build-make-static-shared-builds-optional.patch" - patch -p1 < "$srcdir/0003-build-allow-only-static-or-shared-crypto-lib.patch" + patch -p1 -i ../0001-build-Only-run-tests-if-catch2-is-installed.patch + patch -p1 -i ../0002-build-make-static-shared-builds-optional.patch + patch -p1 -i ../0003-build-allow-only-static-or-shared-crypto-lib.patch # Add missing include directory for tests sed -i -e 's/include_directories( SYSTEM /include_directories( ${INCLUDE_DIR} SYSTEM /' test/{integration,unit,regression,feature}/CMakeLists.txt # Force tests to use shared library, for correct dependencies and linking @@ -35,27 +36,24 @@ } build() { - cd "$srcdir/$pkgname-$_commit" - - mkdir -p build cd build - cmake .. \ + cmake ../${pkgname}-${_commit} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ -DBUILD_STATIC=OFF \ -DBUILD_SHARED=ON \ --DBUILD_SSL=on +-DBUILD_SSL=ON make } check() { - cd "$srcdir/$pkgname-$_commit/build" - make test + cd build + # Currently http_integration_test_suite is failing while running the wrong + # part of a ifdef BUILD_SSL guarded codeā¦ + make test || warning "Tests failed" } package() { - cd "$srcdir/$pkgname-$_commit" - - cd build/ - make DESTDIR="$pkgdir" install + cd build + make DESTDIR="${pkgdir}" install }
[arch-commits] Commit in restbed/trunk (PKGBUILD fix-cmake-catch-include.patch)
Date: Saturday, March 31, 2018 @ 20:46:44 Author: zorun Revision: 313632 upgpkg: restbed 4.6+24+gb1f0182-2 restbed: enable unit tests Added: restbed/trunk/fix-cmake-catch-include.patch Modified: restbed/trunk/PKGBUILD ---+ PKGBUILD | 22 ++ fix-cmake-catch-include.patch | 12 2 files changed, 30 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-03-31 20:25:27 UTC (rev 313631) +++ PKGBUILD2018-03-31 20:46:44 UTC (rev 313632) @@ -2,7 +2,7 @@ # Contributor: Justin Wilcox pkgname=restbed pkgver=4.6+24+gb1f0182 -pkgrel=1 +pkgrel=2 pkgdesc="A framework for asynchronous RESTful functionality in C++11 applications" arch=('x86_64') url="https://github.com/Corvusoft/restbed; @@ -11,10 +11,18 @@ replaces=('restbed-latest') conflicts=('restbed-latest') makedepends=('cmake' 'asio' 'kashmir') +checkdepends=('catch2') _commit=b1f0182c0ea74ea5e6dc08fd540462422fd0dc7f -source=("https://github.com/Corvusoft/restbed/archive/${_commit}/$pkgname-$pkgver.tar.gz;) -sha256sums=('fb7ee67eb36eb1297e18f6ada4ba3a6fa255a6c64ff4e70a1efef5ef76c484c9') +source=("https://github.com/Corvusoft/restbed/archive/${_commit}/$pkgname-$pkgver.tar.gz; +"fix-cmake-catch-include.patch") +sha256sums=('fb7ee67eb36eb1297e18f6ada4ba3a6fa255a6c64ff4e70a1efef5ef76c484c9' +'9f0de7baf90cb00c02ba27fff893a4d343c46a729f85817871b71cc8f3533790') +prepare() { + cd "$srcdir/$pkgname-$_commit" + patch -p1 < "$srcdir/fix-cmake-catch-include.patch" +} + build() { cd "$srcdir/$pkgname-$_commit" @@ -24,10 +32,16 @@ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ -DBUILD_SHARED=on \ --DBUILD_SSL=on +-DBUILD_SSL=on \ +-DBUILD_TESTS=on make } +check() { + cd "$srcdir/$pkgname-$_commit/build" + make test +} + package() { cd "$srcdir/$pkgname-$_commit" Added: fix-cmake-catch-include.patch === --- fix-cmake-catch-include.patch (rev 0) +++ fix-cmake-catch-include.patch 2018-03-31 20:46:44 UTC (rev 313632) @@ -0,0 +1,12 @@ +diff --git a/cmake/modules/Findcatch.cmake b/cmake/modules/Findcatch.cmake +index eff91fe..15c7f87 100644 +--- a/cmake/modules/Findcatch.cmake b/cmake/modules/Findcatch.cmake +@@ -1,6 +1,6 @@ + # Copyright 2013-2017, Corvusoft Ltd, All Rights Reserved. + +-find_path( catch_INCLUDE catch.hpp HINTS "${PROJECT_SOURCE_DIR}/dependency/catch/include" "/usr/include" "/usr/local/include" "/opt/local/include" ) ++find_path( catch_INCLUDE catch.hpp HINTS "${PROJECT_SOURCE_DIR}/dependency/catch/include" "/usr/include" "/usr/include/catch" "/usr/local/include" "/opt/local/include" ) + + if ( catch_INCLUDE ) + set( CATCH_FOUND TRUE )
[arch-commits] Commit in restbed/trunk (PKGBUILD async_read_until.patch strand.patch)
Date: Saturday, March 31, 2018 @ 19:14:51 Author: zorun Revision: 313619 upgpkg: restbed 4.6+24+gb1f0182-1 patch "async_read_until.patch" merged upstream patch "strand.patch" no longer needed with asio 1.12.0 Modified: restbed/trunk/PKGBUILD Deleted: restbed/trunk/async_read_until.patch restbed/trunk/strand.patch + PKGBUILD | 24 ++--- async_read_until.patch | 123 --- strand.patch | 24 - 3 files changed, 6 insertions(+), 165 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-03-31 19:04:56 UTC (rev 313618) +++ PKGBUILD2018-03-31 19:14:51 UTC (rev 313619) @@ -1,7 +1,7 @@ # Maintainer: Baptiste Jonglez # Contributor: Justin Wilcox pkgname=restbed -pkgver=4.6+17+gdf867a8 +pkgver=4.6+24+gb1f0182 pkgrel=1 pkgdesc="A framework for asynchronous RESTful functionality in C++11 applications" arch=('x86_64') @@ -11,23 +11,10 @@ replaces=('restbed-latest') conflicts=('restbed-latest') makedepends=('cmake' 'asio' 'kashmir') -_commit=df867a858dddc4cf6ca8642da02720bd65ba239a -source=("https://github.com/Corvusoft/restbed/archive/${_commit}/$pkgname-$pkgver.tar.gz; -"strand.patch" -"async_read_until.patch") -sha256sums=('0b752078d75e4d7f1e896bb208186bb65e2e558ea531c6a05a086c7e7504e060' -'a67baa5ffce44a851ba6bd47cbd04089665e52abc154b73063f51515e2094a51' -'9ba679d22448bb567766dccf58f98744cc90e0a851a5ccd37596bb4790396049') +_commit=b1f0182c0ea74ea5e6dc08fd540462422fd0dc7f +source=("https://github.com/Corvusoft/restbed/archive/${_commit}/$pkgname-$pkgver.tar.gz;) +sha256sums=('fb7ee67eb36eb1297e18f6ada4ba3a6fa255a6c64ff4e70a1efef5ef76c484c9') -prepare() { - cd "$srcdir/$pkgname-$_commit" - - # Necessary to build against asio 1.10.X - patch -p1 < "$srcdir"/strand.patch - # https://github.com/Corvusoft/restbed/pull/273 - patch -p1 < "$srcdir"/async_read_until.patch -} - build() { cd "$srcdir/$pkgname-$_commit" @@ -36,7 +23,8 @@ cmake .. \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ --DBUILD_SHARED=on +-DBUILD_SHARED=on \ +-DBUILD_SSL=on make } Deleted: async_read_until.patch === --- async_read_until.patch 2018-03-31 19:04:56 UTC (rev 313618) +++ async_read_until.patch 2018-03-31 19:14:51 UTC (rev 313619) @@ -1,123 +0,0 @@ -From 09b542eea3fb3038d02ff056d41dea16bfe889bd Mon Sep 17 00:00:00 2001 -From: AmarOk-Date: Tue, 5 Dec 2017 10:45:53 -0600 -Subject: [PATCH]socket_impl: replace read_until by async_read_until - - source/corvusoft/restbed/detail/socket_impl.cpp | 62 +++-- - 1 file changed, 49 insertions(+), 13 deletions(-) - -diff --git a/source/corvusoft/restbed/detail/socket_impl.cpp b/source/corvusoft/restbed/detail/socket_impl.cpp -index 90e8b04..379f1c7 100644 a/source/corvusoft/restbed/detail/socket_impl.cpp -+++ b/source/corvusoft/restbed/detail/socket_impl.cpp -@@ -417,28 +417,47 @@ namespace restbed - m_timer->expires_from_now( m_timeout ); - m_timer->async_wait( bind( ::connection_timeout_handler, this, shared_from_this( ), _1 ) ); - -+ - size_t size = 0; -+auto finished = std::make_shared(false); -+auto sharedError = std::make_shared(); -+auto sharedSize = std::make_shared(0); -+ - #ifdef BUILD_SSL -- -+ - if ( m_socket not_eq nullptr ) - { - #endif --size = asio::read( *m_socket, *data, asio::transfer_at_least( length ), error ); -+asio::async_read( *m_socket, *data, asio::transfer_at_least( length ), -+[ this, finished, sharedSize, sharedError ]( const error_code & error, size_t size ) { -+*sharedError = error; -+*sharedSize = size; -+*finished = true; -+}); - #ifdef BUILD_SSL - } - else - { --size = asio::read( *m_ssl_socket, *data, asio::transfer_at_least( length ), error ); -+asio::async_read( *m_ssl_socket, *data, asio::transfer_at_least( length ), -+[ this, finished, sharedSize, sharedError ]( const error_code & error, size_t size ) { -+*sharedError = error; -+*sharedSize = size; -+*finished = true; -+}); - } -- - #endif -+auto& io_service = m_socket->get_io_service( ); -+while (!*finished) -+io_service.run_one(); -+error = *sharedError; -+size = *sharedSize; - m_timer->cancel( ); -- -+ - if ( error ) - { -
[arch-commits] Commit in restbed/trunk (PKGBUILD async_read_until.patch strand.patch)
Date: Friday, February 2, 2018 @ 07:44:48 Author: zorun Revision: 288532 restbed: update to 4.6+17+gdf867a8 for opendht Added: restbed/trunk/async_read_until.patch Modified: restbed/trunk/PKGBUILD restbed/trunk/strand.patch + PKGBUILD | 21 async_read_until.patch | 123 +++ strand.patch | 24 +++-- 3 files changed, 156 insertions(+), 12 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-02-02 06:11:37 UTC (rev 288531) +++ PKGBUILD2018-02-02 07:44:48 UTC (rev 288532) @@ -1,7 +1,7 @@ # Maintainer: Baptiste Jonglez # Contributor: Justin Wilcox pkgname=restbed -pkgver=4.6 +pkgver=4.6+17+gdf867a8 pkgrel=1 pkgdesc="A framework for asynchronous RESTful functionality in C++11 applications" arch=('x86_64') @@ -11,20 +11,25 @@ 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=('36854390562c404ca5ac4f3be88ad2cf98b329e46c9a4286370990339d7eef2b' -'58ed74b3db6d989a871d181e6875226cef4e81f77dac6b9a45b04ae5d4e96299') +_commit=df867a858dddc4cf6ca8642da02720bd65ba239a +source=("https://github.com/Corvusoft/restbed/archive/${_commit}/$pkgname-$pkgver.tar.gz; +"strand.patch" +"async_read_until.patch") +sha256sums=('0b752078d75e4d7f1e896bb208186bb65e2e558ea531c6a05a086c7e7504e060' +'a67baa5ffce44a851ba6bd47cbd04089665e52abc154b73063f51515e2094a51' +'9ba679d22448bb567766dccf58f98744cc90e0a851a5ccd37596bb4790396049') prepare() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname-$_commit" # Necessary to build against asio 1.10.X patch -p1 < "$srcdir"/strand.patch + # https://github.com/Corvusoft/restbed/pull/273 + patch -p1 < "$srcdir"/async_read_until.patch } build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname-$_commit" mkdir -p build cd build @@ -36,7 +41,7 @@ } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname-$_commit" cd build/ make DESTDIR="$pkgdir" install Added: async_read_until.patch === --- async_read_until.patch (rev 0) +++ async_read_until.patch 2018-02-02 07:44:48 UTC (rev 288532) @@ -0,0 +1,123 @@ +From 09b542eea3fb3038d02ff056d41dea16bfe889bd Mon Sep 17 00:00:00 2001 +From: AmarOk+Date: Tue, 5 Dec 2017 10:45:53 -0600 +Subject: [PATCH]socket_impl: replace read_until by async_read_until + +--- + source/corvusoft/restbed/detail/socket_impl.cpp | 62 +++-- + 1 file changed, 49 insertions(+), 13 deletions(-) + +diff --git a/source/corvusoft/restbed/detail/socket_impl.cpp b/source/corvusoft/restbed/detail/socket_impl.cpp +index 90e8b04..379f1c7 100644 +--- a/source/corvusoft/restbed/detail/socket_impl.cpp b/source/corvusoft/restbed/detail/socket_impl.cpp +@@ -417,28 +417,47 @@ namespace restbed + m_timer->expires_from_now( m_timeout ); + m_timer->async_wait( bind( ::connection_timeout_handler, this, shared_from_this( ), _1 ) ); + ++ + size_t size = 0; ++auto finished = std::make_shared(false); ++auto sharedError = std::make_shared(); ++auto sharedSize = std::make_shared(0); ++ + #ifdef BUILD_SSL +- ++ + if ( m_socket not_eq nullptr ) + { + #endif +-size = asio::read( *m_socket, *data, asio::transfer_at_least( length ), error ); ++asio::async_read( *m_socket, *data, asio::transfer_at_least( length ), ++[ this, finished, sharedSize, sharedError ]( const error_code & error, size_t size ) { ++*sharedError = error; ++*sharedSize = size; ++*finished = true; ++}); + #ifdef BUILD_SSL + } + else + { +-size = asio::read( *m_ssl_socket, *data, asio::transfer_at_least( length ), error ); ++asio::async_read( *m_ssl_socket, *data, asio::transfer_at_least( length ), ++[ this, finished, sharedSize, sharedError ]( const error_code & error, size_t size ) { ++*sharedError = error; ++*sharedSize = size; ++*finished = true; ++}); + } +- + #endif ++auto& io_service = m_socket->get_io_service( ); ++while (!*finished) ++io_service.run_one(); ++error = *sharedError; ++size = *sharedSize; + m_timer->cancel( ); +- ++ + if ( error ) +
[arch-commits] Commit in restbed/trunk (PKGBUILD)
Date: Monday, July 17, 2017 @ 07:29:22 Author: zorun Revision: 245461 upgpkg: restbed 4.6-1 Modified: restbed/trunk/PKGBUILD --+ PKGBUILD | 14 +- 1 file changed, 5 insertions(+), 9 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-07-17 07:24:52 UTC (rev 245460) +++ PKGBUILD2017-07-17 07:29:22 UTC (rev 245461) @@ -1,8 +1,8 @@ # Maintainer: Baptiste Jonglez # Contributor: Justin Wilcox pkgname=restbed -pkgver=4.5 -pkgrel=3 +pkgver=4.6 +pkgrel=1 pkgdesc="A framework for asynchronous RESTful functionality in C++11 applications" arch=('i686' 'x86_64') url="https://github.com/Corvusoft/restbed; @@ -12,11 +12,9 @@ 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') +"strand.patch") +sha256sums=('36854390562c404ca5ac4f3be88ad2cf98b329e46c9a4286370990339d7eef2b' +'58ed74b3db6d989a871d181e6875226cef4e81f77dac6b9a45b04ae5d4e96299') prepare() { cd "$srcdir/$pkgname-$pkgver" @@ -23,8 +21,6 @@ # Necessary to build against asio 1.10.X patch -p1 < "$srcdir"/strand.patch - # Upstream commit d81cb41aed489c59ce98c78a9ffcb130fc7337d4 - patch -p1 < "$srcdir"/dns-resolution-error.patch } build() {
[arch-commits] Commit in restbed/trunk (PKGBUILD dns-resolution-error.patch)
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 === --- PKGBUILD2017-06-13 21:48:23 UTC (rev 236705) +++ PKGBUILD2017-06-13 22:03:35 UTC (rev 236706) @@ -2,7 +2,7 @@ # Contributor: Justin Wilcox 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+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 +
[arch-commits] Commit in restbed/trunk (PKGBUILD)
Date: Thursday, May 25, 2017 @ 17:22:07 Author: zorun Revision: 230157 upgpkg: restbed 4.5-2 Conflicts with and replace restbed-latest from AUR Modified: restbed/trunk/PKGBUILD --+ PKGBUILD |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2017-05-25 17:21:51 UTC (rev 230156) +++ PKGBUILD2017-05-25 17:22:07 UTC (rev 230157) @@ -2,12 +2,14 @@ # Contributor: Justin Wilcox pkgname=restbed pkgver=4.5 -pkgrel=1 +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")