Update to latest version.

This commit is contained in:
Elliott Sales de Andrade 2020-05-31 03:42:26 -04:00
parent 4df710490f
commit c1a549c700
4 changed files with 29 additions and 24 deletions

1
.gitignore vendored
View File

@ -9,3 +9,4 @@
/httpuv_1.5.0.tar.gz
/httpuv_1.5.1.tar.gz
/httpuv_1.5.2.tar.gz
/httpuv_1.5.3.1.tar.gz

View File

@ -1,4 +1,4 @@
From aa2bee1f32fd2bd249849bb2edf7b2dc5be1f7c1 Mon Sep 17 00:00:00 2001
From 8a2ee63187456e3b19f2f7dac02687723784b9d9 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,19 +20,19 @@ Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
12 files changed, 14 insertions(+), 45 deletions(-)
diff --git a/src/Makevars b/src/Makevars
index 275a1b7..f940ce9 100644
index ae8b833..f31fdf5 100644
--- a/src/Makevars
+++ b/src/Makevars
@@ -9,7 +9,7 @@ ifeq ($(UNAME), Darwin)
FRAMEWORK = -framework CoreServices
endif
@@ -5,7 +5,7 @@ CXX_STD=CXX11
-PKG_LIBS = ./libuv/.libs/libuv.a ./http-parser/http_parser.o ./sha1/sha1.o ./base64/base64.o $(FRAMEWORK) -pthread
+PKG_LIBS = $(shell pkgconf --libs libuv) ./http-parser/http_parser.o ./sha1/sha1.o ./base64/base64.o $(FRAMEWORK) -pthread
ifeq ($(UNAME), SunOS)
PKG_LIBS += -lkstat -lsendfile -lsocket -lxnet
endif
@@ -22,7 +22,7 @@ endif
UNAME := $(shell uname)
-PKG_LIBS = ./libuv/.libs/libuv.a ./http-parser/http_parser.o ./sha1/sha1.o ./base64/base64.o -pthread
+PKG_LIBS = $(shell pkgconf --libs libuv) ./http-parser/http_parser.o ./sha1/sha1.o ./base64/base64.o -pthread
ifeq ($(UNAME), Darwin)
PKG_LIBS += -framework CoreServices
@@ -23,7 +23,7 @@ endif
PKG_CFLAGS = $(C_VISIBILITY) -DSTRICT_R_HEADERS
PKG_CXXFLAGS = $(CXX_VISIBILITY) -DSTRICT_R_HEADERS
@ -41,7 +41,7 @@ index 275a1b7..f940ce9 100644
# To avoid spurious warnings from `R CMD check --as-cran`, about compiler
# warning flags like -Werror.
@@ -44,35 +44,4 @@ CONFIGURE_FLAGS="--quiet"
@@ -43,35 +43,4 @@ CONFIGURE_FLAGS="--quiet"
# PKG_CPPFLAGS += -D_GLIBCXX_ASSERTIONS
@ -105,7 +105,7 @@ index 27f8bf5..5d995c9 100644
class CallbackQueue {
public:
diff --git a/src/http.h b/src/http.h
index 7da6b53..830a37f 100644
index 125bf40..cba8c82 100644
--- a/src/http.h
+++ b/src/http.h
@@ -1,7 +1,7 @@
@ -118,7 +118,7 @@ index 7da6b53..830a37f 100644
#include <boost/bind.hpp>
#include "webapplication.h"
diff --git a/src/httprequest.h b/src/httprequest.h
index 6865373..fb9a041 100644
index 8de50fc..97da8f5 100644
--- a/src/httprequest.h
+++ b/src/httprequest.h
@@ -8,7 +8,7 @@
@ -131,7 +131,7 @@ index 6865373..fb9a041 100644
#include "socket.h"
#include "webapplication.h"
diff --git a/src/httpresponse.cpp b/src/httpresponse.cpp
index be807c7..0f7ce1a 100644
index 6e27d91..659ec96 100644
--- a/src/httpresponse.cpp
+++ b/src/httpresponse.cpp
@@ -3,7 +3,7 @@
@ -144,7 +144,7 @@ index be807c7..0f7ce1a 100644
void on_response_written(uv_write_t* handle, int status) {
diff --git a/src/httpuv.cpp b/src/httpuv.cpp
index 37d6a6d..2936d3c 100644
index c5ed0fb..d2cc267 100644
--- a/src/httpuv.cpp
+++ b/src/httpuv.cpp
@@ -9,7 +9,7 @@
@ -157,7 +157,7 @@ index 37d6a6d..2936d3c 100644
#include "uvutil.h"
#include "webapplication.h"
diff --git a/src/socket.cpp b/src/socket.cpp
index de5d6c1..f1ca52b 100644
index 678b6d0..4c6dcc3 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -1,7 +1,7 @@
@ -222,5 +222,5 @@ index bc23646..f3ee5f1 100644
#include "websockets.h"
#include "thread.h"
--
2.20.1
2.25.4

View File

@ -1,15 +1,16 @@
%global packname httpuv
%global packname httpuv
%global packver 1.5.3.1
%global rlibdir %{_libdir}/R/library
Name: R-%{packname}
Version: 1.5.2
Release: 2%{?dist}
Version: 1.5.3.1
Release: 1%{?dist}
Summary: HTTP and WebSocket Server Library
# Main: GPLv2+; http-parser: MIT; sha1: Public Domain
License: GPLv2+ and MIT and Public Domain
URL: https://CRAN.R-project.org/package=%{packname}
Source0: https://cran.r-project.org/src/contrib/%{packname}_%{version}.tar.gz
Source0: https://cran.r-project.org/src/contrib/%{packname}_%{packver}.tar.gz
Patch0001: 0001-Use-unbundled-libuv.patch
# Here's the R view of the dependencies world:
@ -35,7 +36,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.37.0
%description
Provides low-level socket and protocol support for handling HTTP and
@ -88,6 +89,9 @@ export LANG=C.UTF-8
%changelog
* Sun May 31 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 1.5.3.1-1
- Update to latest version
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (httpuv_1.5.2.tar.gz) = c3617f3cfb12e1fb72f44ca61457f6cdebeba981c3fc4aed901d9ef4e8e0d53060aec19231d939fc23d22e535628a36f8f52977ea67256b179060b27384b86a8
SHA512 (httpuv_1.5.3.1.tar.gz) = 4f3418cf780b6ace5e58e9955261da62fd4b6c0aa28dd2a47818f509ddbfeba4f9f36a1c5783735ce5b65edb5efb5f2d59847908bf2f9ef72160bc5148e0b912