diff --git a/.gitignore b/.gitignore index 6d5d425..87c7951 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /httpuv_1.5.3.1.tar.gz /httpuv_1.5.4.tar.gz /httpuv_1.5.5.tar.gz +/httpuv_1.6.0.tar.gz diff --git a/0001-Use-unbundled-libuv.patch b/0001-Use-unbundled-libuv.patch index fd8f110..d7ef383 100644 --- a/0001-Use-unbundled-libuv.patch +++ b/0001-Use-unbundled-libuv.patch @@ -1,7 +1,7 @@ -From 0512f262c6a8ef7d06d66197c6553a10857adbff Mon Sep 17 00:00:00 2001 +From b666a857f1938d2b80b79ddc84356b5602dccdd5 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 30 Apr 2018 04:53:42 -0400 -Subject: [PATCH 1/2] Use unbundled libuv. +Subject: [PATCH] Use unbundled libuv. Signed-off-by: Elliott Sales de Andrade --- @@ -79,33 +79,33 @@ index ae8b833..f31fdf5 100644 - $(MAKE) --directory=libuv distclean +$(SHLIB): http-parser/http_parser.o sha1/sha1.o base64/base64.o diff --git a/src/callbackqueue.cpp b/src/callbackqueue.cpp -index a72fa06..220cb0b 100644 +index ffa1be0..fb976c7 100644 --- a/src/callbackqueue.cpp +++ b/src/callbackqueue.cpp @@ -2,7 +2,7 @@ + #include "callbackqueue.h" #include "tqueue.h" #include "thread.h" - #include -#include "libuv/include/uv.h" +#include // This non-class function is a plain C wrapper for CallbackQueue::flush(), and diff --git a/src/callbackqueue.h b/src/callbackqueue.h -index 27f8bf5..5d995c9 100644 +index cfd2732..9596d92 100644 --- a/src/callbackqueue.h +++ b/src/callbackqueue.h @@ -3,7 +3,7 @@ #include "tqueue.h" - #include + #include -#include "libuv/include/uv.h" +#include class CallbackQueue { public: diff --git a/src/http.h b/src/http.h -index 125bf40..cba8c82 100644 +index 5b8ec73..882bbf2 100644 --- a/src/http.h +++ b/src/http.h @@ -1,7 +1,7 @@ @@ -114,24 +114,24 @@ index 125bf40..cba8c82 100644 -#include "libuv/include/uv.h" +#include - #include - #include + #include + #include #include "webapplication.h" diff --git a/src/httprequest.h b/src/httprequest.h -index fdc505c..9448d21 100644 +index f25370b..325f473 100644 --- a/src/httprequest.h +++ b/src/httprequest.h -@@ -8,7 +8,7 @@ - #include - #include - #include +@@ -6,7 +6,7 @@ + + #include + #include -#include "libuv/include/uv.h" +#include #include "http-parser/http_parser.h" #include "socket.h" #include "webapplication.h" diff --git a/src/httpresponse.cpp b/src/httpresponse.cpp -index 6e27d91..659ec96 100644 +index 7dccc2e..9083c76 100644 --- a/src/httpresponse.cpp +++ b/src/httpresponse.cpp @@ -3,7 +3,7 @@ @@ -144,20 +144,20 @@ index 6e27d91..659ec96 100644 void on_response_written(uv_write_t* handle, int status) { diff --git a/src/httpuv.cpp b/src/httpuv.cpp -index c5ed0fb..d2cc267 100644 +index c5ecf9f..63646cf 100644 --- a/src/httpuv.cpp +++ b/src/httpuv.cpp -@@ -9,7 +9,7 @@ - #include - #include - #include +@@ -7,7 +7,7 @@ + #include + #include + #include -#include "libuv/include/uv.h" +#include #include "base64/base64.hpp" #include "uvutil.h" #include "webapplication.h" diff --git a/src/socket.cpp b/src/socket.cpp -index 678b6d0..4c6dcc3 100644 +index 16f3dbf..492388f 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -1,7 +1,7 @@ @@ -170,13 +170,13 @@ index 678b6d0..4c6dcc3 100644 void on_Socket_close(uv_handle_t* pHandle); diff --git a/src/socket.h b/src/socket.h -index c7770e2..feb2070 100644 +index 11cc840..472e917 100644 --- a/src/socket.h +++ b/src/socket.h @@ -3,7 +3,7 @@ #include "http.h" - #include + #include -#include "libuv/include/uv.h" +#include @@ -196,31 +196,31 @@ index e9066cb..80ea8b1 100644 // These must be called from the main and background thread, respectively, so // that is_main_thread() and is_background_thread() can be tested later. diff --git a/src/uvutil.h b/src/uvutil.h -index 48c849a..5d82aaf 100644 +index 7f812ce..67311d8 100644 --- a/src/uvutil.h +++ b/src/uvutil.h @@ -5,7 +5,7 @@ #include #include - #include + #include -#include "libuv/include/uv.h" +#include #include diff --git a/src/webapplication.h b/src/webapplication.h -index bc23646..f3ee5f1 100644 +index 16fcbf6..51e4f26 100644 --- a/src/webapplication.h +++ b/src/webapplication.h @@ -2,7 +2,7 @@ #define WEBAPPLICATION_HPP - #include + #include -#include "libuv/include/uv.h" +#include #include #include "websockets.h" #include "thread.h" -- -2.26.2 +2.29.2 diff --git a/R-httpuv.spec b/R-httpuv.spec index 4bc9497..22a19fe 100644 --- a/R-httpuv.spec +++ b/R-httpuv.spec @@ -1,9 +1,9 @@ %global packname httpuv -%global packver 1.5.5 +%global packver 1.6.0 %global rlibdir %{_libdir}/R/library Name: R-%{packname} -Version: 1.5.5 +Version: 1.6.0 Release: 1%{?dist} Summary: HTTP and WebSocket Server Library @@ -17,7 +17,7 @@ Patch0001: 0001-Use-unbundled-libuv.patch # Depends: # Imports: R-Rcpp >= 0.11.0, R-utils, R-R6, R-promises, R-later >= 0.8.0 # Suggests: R-testthat, R-callr, R-curl, R-websocket -# LinkingTo: +# LinkingTo: R-Rcpp, R-later # Enhances: BuildRequires: R-devel @@ -31,7 +31,6 @@ BuildRequires: R-testthat BuildRequires: R-callr BuildRequires: R-curl BuildRequires: R-websocket -BuildRequires: R-BH-devel # Hopefully will be removable in the later releases, but for now it includes # some patches: # https://github.com/rstudio/httpuv/pull/93#issuecomment-340802818 @@ -89,6 +88,9 @@ export LANG=C.UTF-8 %changelog +* Sun Apr 25 2021 Elliott Sales de Andrade - 1.6.0-1 +- Update to latest version (#1953099) + * Sun Feb 07 2021 Elliott Sales de Andrade - 1.5.5-1 - Update to latest version (#1915692) diff --git a/sources b/sources index 6c4d6de..788db51 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (httpuv_1.5.5.tar.gz) = 2de34488310a0c3ac57004199d7843c228774c67d66694654899aef54bcdca12021a36990fbede4d5e27aee8f968b9521eb1ecfbcaad51cb497912f4d826c422 +SHA512 (httpuv_1.6.0.tar.gz) = 0c546450d6118772995c68c2ac1010602d690b689cbb95cc66a5e576f8e373453879436979e790c565e767f8e90519364b92ddbee6e0f9fd65d3f9ad216958ca