rpms/R-httpuv
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to latest version.

Browse Source
This commit is contained in:
Elliott Sales de Andrade 2021-04-25 05:29:37 -04:00
parent 88150e8d30
commit 97ad2adc4d
4 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -12,3 +12,4 @@
/httpuv_1.5.3.1.tar.gz /httpuv_1.5.3.1.tar.gz
/httpuv_1.5.4.tar.gz /httpuv_1.5.4.tar.gz
/httpuv_1.5.5.tar.gz /httpuv_1.5.5.tar.gz
/httpuv_1.6.0.tar.gz

56
0001-Use-unbundled-libuv.patch
View File

@ -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 <quantum.analyst@gmail.com> From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Mon, 30 Apr 2018 04:53:42 -0400 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 <quantum.analyst@gmail.com> Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
--- ---
@ -79,33 +79,33 @@ index ae8b833..f31fdf5 100644
- $(MAKE) --directory=libuv distclean - $(MAKE) --directory=libuv distclean
+$(SHLIB): http-parser/http_parser.o sha1/sha1.o base64/base64.o +$(SHLIB): http-parser/http_parser.o sha1/sha1.o base64/base64.o
diff --git a/src/callbackqueue.cpp b/src/callbackqueue.cpp diff --git a/src/callbackqueue.cpp b/src/callbackqueue.cpp
index a72fa06..220cb0b 100644 index ffa1be0..fb976c7 100644
--- a/src/callbackqueue.cpp --- a/src/callbackqueue.cpp
+++ b/src/callbackqueue.cpp +++ b/src/callbackqueue.cpp
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
#include "callbackqueue.h"
#include "tqueue.h" #include "tqueue.h"
#include "thread.h" #include "thread.h"
#include <boost/function.hpp>
-#include "libuv/include/uv.h" -#include "libuv/include/uv.h"
+#include <uv.h> +#include <uv.h>
// This non-class function is a plain C wrapper for CallbackQueue::flush(), and // This non-class function is a plain C wrapper for CallbackQueue::flush(), and
diff --git a/src/callbackqueue.h b/src/callbackqueue.h diff --git a/src/callbackqueue.h b/src/callbackqueue.h
index 27f8bf5..5d995c9 100644 index cfd2732..9596d92 100644
--- a/src/callbackqueue.h --- a/src/callbackqueue.h
+++ b/src/callbackqueue.h +++ b/src/callbackqueue.h
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
#include "tqueue.h" #include "tqueue.h"
#include <boost/function.hpp> #include <functional>
-#include "libuv/include/uv.h" -#include "libuv/include/uv.h"
+#include <uv.h> +#include <uv.h>
class CallbackQueue { class CallbackQueue {
public: public:
diff --git a/src/http.h b/src/http.h diff --git a/src/http.h b/src/http.h
index 125bf40..cba8c82 100644 index 5b8ec73..882bbf2 100644
--- a/src/http.h --- a/src/http.h
+++ b/src/http.h +++ b/src/http.h
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
@ -114,24 +114,24 @@ index 125bf40..cba8c82 100644
-#include "libuv/include/uv.h" -#include "libuv/include/uv.h"
+#include <uv.h> +#include <uv.h>
#include <boost/shared_ptr.hpp> #include <memory>
#include <boost/bind.hpp> #include <functional>
#include "webapplication.h" #include "webapplication.h"
diff --git a/src/httprequest.h b/src/httprequest.h diff --git a/src/httprequest.h b/src/httprequest.h
index fdc505c..9448d21 100644 index f25370b..325f473 100644
--- a/src/httprequest.h --- a/src/httprequest.h
+++ b/src/httprequest.h +++ b/src/httprequest.h
@@ -8,7 +8,7 @@ @@ -6,7 +6,7 @@
#include <boost/bind.hpp>
#include <boost/enable_shared_from_this.hpp> #include <functional>
#include <boost/shared_ptr.hpp> #include <memory>
-#include "libuv/include/uv.h" -#include "libuv/include/uv.h"
+#include <uv.h> +#include <uv.h>
#include "http-parser/http_parser.h" #include "http-parser/http_parser.h"
#include "socket.h" #include "socket.h"
#include "webapplication.h" #include "webapplication.h"
diff --git a/src/httpresponse.cpp b/src/httpresponse.cpp diff --git a/src/httpresponse.cpp b/src/httpresponse.cpp
index 6e27d91..659ec96 100644 index 7dccc2e..9083c76 100644
--- a/src/httpresponse.cpp --- a/src/httpresponse.cpp
+++ b/src/httpresponse.cpp +++ b/src/httpresponse.cpp
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
@ -144,20 +144,20 @@ index 6e27d91..659ec96 100644
void on_response_written(uv_write_t* handle, int status) { void on_response_written(uv_write_t* handle, int status) {
diff --git a/src/httpuv.cpp b/src/httpuv.cpp diff --git a/src/httpuv.cpp b/src/httpuv.cpp
index c5ed0fb..d2cc267 100644 index c5ecf9f..63646cf 100644
--- a/src/httpuv.cpp --- a/src/httpuv.cpp
+++ b/src/httpuv.cpp +++ b/src/httpuv.cpp
@@ -9,7 +9,7 @@ @@ -7,7 +7,7 @@
#include <boost/bind.hpp> #include <errno.h>
#include <boost/shared_ptr.hpp> #include <functional>
#include <boost/make_shared.hpp> #include <memory>
-#include "libuv/include/uv.h" -#include "libuv/include/uv.h"
+#include <uv.h> +#include <uv.h>
#include "base64/base64.hpp" #include "base64/base64.hpp"
#include "uvutil.h" #include "uvutil.h"
#include "webapplication.h" #include "webapplication.h"
diff --git a/src/socket.cpp b/src/socket.cpp diff --git a/src/socket.cpp b/src/socket.cpp
index 678b6d0..4c6dcc3 100644 index 16f3dbf..492388f 100644
--- a/src/socket.cpp --- a/src/socket.cpp
+++ b/src/socket.cpp +++ b/src/socket.cpp
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
@ -170,13 +170,13 @@ index 678b6d0..4c6dcc3 100644
void on_Socket_close(uv_handle_t* pHandle); void on_Socket_close(uv_handle_t* pHandle);
diff --git a/src/socket.h b/src/socket.h diff --git a/src/socket.h b/src/socket.h
index c7770e2..feb2070 100644 index 11cc840..472e917 100644
--- a/src/socket.h --- a/src/socket.h
+++ b/src/socket.h +++ b/src/socket.h
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
#include "http.h" #include "http.h"
#include <boost/shared_ptr.hpp> #include <memory>
-#include "libuv/include/uv.h" -#include "libuv/include/uv.h"
+#include <uv.h> +#include <uv.h>
@ -196,31 +196,31 @@ index e9066cb..80ea8b1 100644
// These must be called from the main and background thread, respectively, so // These must be called from the main and background thread, respectively, so
// that is_main_thread() and is_background_thread() can be tested later. // that is_main_thread() and is_background_thread() can be tested later.
diff --git a/src/uvutil.h b/src/uvutil.h diff --git a/src/uvutil.h b/src/uvutil.h
index 48c849a..5d82aaf 100644 index 7f812ce..67311d8 100644
--- a/src/uvutil.h --- a/src/uvutil.h
+++ b/src/uvutil.h +++ b/src/uvutil.h
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <boost/shared_ptr.hpp> #include <memory>
-#include "libuv/include/uv.h" -#include "libuv/include/uv.h"
+#include <uv.h> +#include <uv.h>
#include <Rcpp.h> #include <Rcpp.h>
diff --git a/src/webapplication.h b/src/webapplication.h diff --git a/src/webapplication.h b/src/webapplication.h
index bc23646..f3ee5f1 100644 index 16fcbf6..51e4f26 100644
--- a/src/webapplication.h --- a/src/webapplication.h
+++ b/src/webapplication.h +++ b/src/webapplication.h
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
#define WEBAPPLICATION_HPP #define WEBAPPLICATION_HPP
#include <boost/function.hpp> #include <functional>
-#include "libuv/include/uv.h" -#include "libuv/include/uv.h"
+#include <uv.h> +#include <uv.h>
#include <Rcpp.h> #include <Rcpp.h>
#include "websockets.h" #include "websockets.h"
#include "thread.h" #include "thread.h"
-- --
2.26.2 2.29.2

10
R-httpuv.spec
View File

@ -1,9 +1,9 @@
%global packname httpuv %global packname httpuv
%global packver 1.5.5 %global packver 1.6.0
%global rlibdir %{_libdir}/R/library %global rlibdir %{_libdir}/R/library
Name: R-%{packname} Name: R-%{packname}
Version: 1.5.5 Version: 1.6.0
Release: 1%{?dist} Release: 1%{?dist}
Summary: HTTP and WebSocket Server Library Summary: HTTP and WebSocket Server Library
@ -17,7 +17,7 @@ Patch0001: 0001-Use-unbundled-libuv.patch
# Depends: # Depends:
# Imports: R-Rcpp >= 0.11.0, R-utils, R-R6, R-promises, R-later >= 0.8.0 # 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 # Suggests: R-testthat, R-callr, R-curl, R-websocket
# LinkingTo: # LinkingTo: R-Rcpp, R-later
# Enhances: # Enhances:
BuildRequires: R-devel BuildRequires: R-devel
@ -31,7 +31,6 @@ BuildRequires: R-testthat
BuildRequires: R-callr BuildRequires: R-callr
BuildRequires: R-curl BuildRequires: R-curl
BuildRequires: R-websocket BuildRequires: R-websocket
BuildRequires: R-BH-devel
# Hopefully will be removable in the later releases, but for now it includes # Hopefully will be removable in the later releases, but for now it includes
# some patches: # some patches:
# https://github.com/rstudio/httpuv/pull/93#issuecomment-340802818 # https://github.com/rstudio/httpuv/pull/93#issuecomment-340802818
@ -89,6 +88,9 @@ export LANG=C.UTF-8
%changelog %changelog
* Sun Apr 25 2021 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 1.6.0-1
- Update to latest version (#1953099)
* Sun Feb 07 2021 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 1.5.5-1 * Sun Feb 07 2021 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 1.5.5-1
- Update to latest version (#1915692) - Update to latest version (#1915692)

2
sources
View File

@ -1 +1 @@
SHA512 (httpuv_1.5.5.tar.gz) = 2de34488310a0c3ac57004199d7843c228774c67d66694654899aef54bcdca12021a36990fbede4d5e27aee8f968b9521eb1ecfbcaad51cb497912f4d826c422 SHA512 (httpuv_1.6.0.tar.gz) = 0c546450d6118772995c68c2ac1010602d690b689cbb95cc66a5e576f8e373453879436979e790c565e767f8e90519364b92ddbee6e0f9fd65d3f9ad216958ca