Update to latest version.

This commit is contained in:
Elliott Sales de Andrade 2018-05-11 23:23:21 -04:00
parent eebb2bb299
commit fe90dff3c0
4 changed files with 17 additions and 13 deletions

1
.gitignore vendored
View File

@ -2,3 +2,4 @@
/httpuv_1.3.6.2.tar.gz
/httpuv_1.4.1.tar.gz
/httpuv_1.4.2.tar.gz
/httpuv_1.4.3.tar.gz

View File

@ -1,4 +1,4 @@
From 928b1c2999f7214a646d4c000a0ff30a5583f7ad Mon Sep 17 00:00:00 2001
From e70bb46111996f2e7b79c6b0694d451374935a65 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Mon, 30 Apr 2018 04:53:42 -0400
Subject: [PATCH] Use unbundled libuv.
@ -20,7 +20,7 @@ Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
12 files changed, 14 insertions(+), 42 deletions(-)
diff --git a/src/Makevars b/src/Makevars
index ebfd618..78c2e93 100644
index dfb73ff..5f0d419 100644
--- a/src/Makevars
+++ b/src/Makevars
@@ -9,7 +9,7 @@ ifeq ($(UNAME), Darwin)
@ -41,8 +41,8 @@ index ebfd618..78c2e93 100644
# To avoid spurious warnings from `R CMD check --as-cran`, about compiler
# warning flags like -Werror.
@@ -33,32 +33,4 @@ CONFIGURE_FLAGS="--quiet"
# PKG_CPPFLAGS += -DDEBUG_TRACE
@@ -40,32 +40,4 @@ CONFIGURE_FLAGS="--quiet"
# PKG_CPPFLAGS += -D_GLIBCXX_ASSERTIONS
-$(SHLIB): libuv/.libs/libuv.a http-parser/http_parser.o sha1/sha1.o base64/base64.o
@ -115,7 +115,7 @@ index 06b70ff..c410712 100644
#include <boost/bind.hpp>
#include "webapplication.h"
diff --git a/src/httprequest.h b/src/httprequest.h
index 2cc62bd..08649b7 100644
index fd1bf80..1feb750 100644
--- a/src/httprequest.h
+++ b/src/httprequest.h
@@ -8,7 +8,7 @@
@ -128,7 +128,7 @@ index 2cc62bd..08649b7 100644
#include "socket.h"
#include "webapplication.h"
diff --git a/src/httpresponse.cpp b/src/httpresponse.cpp
index 3eae69a..781d75f 100644
index e41e9a3..32d9ce9 100644
--- a/src/httpresponse.cpp
+++ b/src/httpresponse.cpp
@@ -3,7 +3,7 @@
@ -141,7 +141,7 @@ index 3eae69a..781d75f 100644
void on_response_written(uv_write_t* handle, int status) {
diff --git a/src/httpuv.cpp b/src/httpuv.cpp
index e2a6579..6e37214 100644
index 93eebba..4880f81 100644
--- a/src/httpuv.cpp
+++ b/src/httpuv.cpp
@@ -7,7 +7,7 @@

View File

@ -2,7 +2,7 @@
%global rlibdir %{_libdir}/R/library
Name: R-%{packname}
Version: 1.4.2
Version: 1.4.3
Release: 1%{?dist}
Summary: HTTP and WebSocket Server Library
@ -14,7 +14,7 @@ Patch0001: 0001-Use-unbundled-libuv.patch
# Here's the R view of the dependencies world:
# Depends: R-methods
# Imports: R-Rcpp >= 0.11.0, R-utils, R-promises, R-later >= 0.7.1
# Imports: R-Rcpp >= 0.11.0, R-utils, R-promises, R-later >= 0.7.2
# Suggests: R-testthat, R-callr
# LinkingTo:
# Enhances:
@ -23,14 +23,14 @@ Requires: R-methods
Requires: R-Rcpp >= 0.11.0
Requires: R-utils
Requires: R-promises
Requires: R-later >= 0.7.1
Requires: R-later >= 0.7.2
BuildRequires: R-devel
BuildRequires: tex(latex)
BuildRequires: R-methods
BuildRequires: R-Rcpp-devel >= 0.11.0
BuildRequires: R-utils
BuildRequires: R-promises
BuildRequires: R-later-devel >= 0.7.1
BuildRequires: R-later-devel >= 0.7.2
BuildRequires: R-testthat
BuildRequires: R-callr
BuildRequires: R-BH-devel
@ -38,7 +38,7 @@ BuildRequires: R-BH-devel
# some patches:
# https://github.com/rstudio/httpuv/pull/93#issuecomment-340802818
Provides: bundled(http-parser) = 2.7.1
BuildRequires: libuv-devel >= 1.18.0
BuildRequires: libuv-devel >= 1.18.0
%description
Provides low-level socket and protocol support for handling HTTP and
@ -90,6 +90,9 @@ rm -f %{buildroot}%{rlibdir}/R.css
%changelog
* Fri May 11 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 1.4.3-1
- Update to latest version
* Mon May 07 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 1.4.2-1
- Update to latest version

View File

@ -1 +1 @@
SHA512 (httpuv_1.4.2.tar.gz) = fd34f4b8dfc534063d9a4a2e4942c2bf18bb27068ac6c0b7937615c90d48de22523ad500b8461721bf2c39ce5d7b392e58a8b4f1512db13b85061bc9726b50c0
SHA512 (httpuv_1.4.3.tar.gz) = 14c76dad89a0938e1dff644e7dbfa8f780ec3b4f582f9e75f21cde3ad29f377c75624f6ee99e0c41c593199c75e5b0562e2c67f4ac75e2b5162917528649013b