diff --git a/.gitignore b/.gitignore index 75ac67e..a26fdc3 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /httpuv_1.6.0.tar.gz /httpuv_1.6.1.tar.gz /httpuv_1.6.5.tar.gz +/httpuv_1.6.6.tar.gz diff --git a/0001-Use-unbundled-libuv-new.patch b/0001-Use-unbundled-libuv-new.patch index b4af18b..ccd0275 100644 --- a/0001-Use-unbundled-libuv-new.patch +++ b/0001-Use-unbundled-libuv-new.patch @@ -1,12 +1,6 @@ -diff -up httpuv/src/callbackqueue.cpp.system httpuv/src/callbackqueue.cpp -diff -up httpuv/src/callbackqueue.h.system httpuv/src/callbackqueue.h -diff -up httpuv/src/http.h.system httpuv/src/http.h -diff -up httpuv/src/httprequest.h.system httpuv/src/httprequest.h -diff -up httpuv/src/httpresponse.cpp.system httpuv/src/httpresponse.cpp -diff -up httpuv/src/httpuv.cpp.system httpuv/src/httpuv.cpp diff -up httpuv/src/Makevars.system httpuv/src/Makevars ---- httpuv/src/Makevars.system 2021-12-13 14:41:14.000000000 -0500 -+++ httpuv/src/Makevars 2022-09-01 21:19:46.407616592 -0400 +--- httpuv/src/Makevars.system 2022-09-08 12:53:08.000000000 -0400 ++++ httpuv/src/Makevars 2022-09-08 22:46:51.777128485 -0400 @@ -5,7 +5,7 @@ CXX_STD=CXX11 UNAME := $(shell uname) @@ -25,7 +19,7 @@ diff -up httpuv/src/Makevars.system httpuv/src/Makevars # To avoid spurious warnings from `R CMD check --as-cran`, about compiler # warning flags like -Werror. -@@ -43,49 +43,4 @@ CONFIGURE_FLAGS="--quiet" +@@ -43,50 +43,4 @@ CONFIGURE_FLAGS="--quiet" # PKG_CPPFLAGS += -D_GLIBCXX_ASSERTIONS @@ -63,7 +57,8 @@ diff -up httpuv/src/Makevars.system httpuv/src/Makevars - touch aclocal.m4; \ - touch -r aclocal.m4 configure Makefile.in; \ - else \ -- echo "automake found. Running autogen.sh."; \ +- echo "automake found. Running autoupdate and autogen.sh."; \ +- autoupdate; \ - sh autogen.sh; \ - fi; \ - chmod +x configure; \ @@ -76,8 +71,3 @@ diff -up httpuv/src/Makevars.system httpuv/src/Makevars -clean: - $(MAKE) --directory=libuv distclean +$(SHLIB): http-parser/http_parser.o sha1/sha1.o base64/base64.o -diff -up httpuv/src/socket.cpp.system httpuv/src/socket.cpp -diff -up httpuv/src/socket.h.system httpuv/src/socket.h -diff -up httpuv/src/thread.h.system httpuv/src/thread.h -diff -up httpuv/src/uvutil.h.system httpuv/src/uvutil.h -diff -up httpuv/src/webapplication.h.system httpuv/src/webapplication.h diff --git a/R-httpuv.spec b/R-httpuv.spec index 8bd32e0..e335206 100644 --- a/R-httpuv.spec +++ b/R-httpuv.spec @@ -1,7 +1,7 @@ %bcond_with bootstrap %global packname httpuv -%global packver 1.6.5 +%global packver 1.6.6 %global rlibdir %{_libdir}/R/library Name: R-%{packname} @@ -94,6 +94,9 @@ export LANG=C.UTF-8 %changelog +* Thu Sep 8 2022 Tom Callaway - 1.6.6-1 +- update to 1.6.6 + * Thu Sep 1 2022 Tom Callaway - 1.6.5-1 - update to 1.6.5 - rebuild for R 4.2.1 diff --git a/sources b/sources index 925f59b..e950ecf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (httpuv_1.6.5.tar.gz) = aaa3d6551d37b955b68072dc8e61a23d8c1c0b288dc5249aa46ab242682aef278e9f3a42e84809c68b4b6136f846171d8e4134eeb6b08749ed3758ef3752b79e +SHA512 (httpuv_1.6.6.tar.gz) = 3e8fb4f2a7f5cb2d2c0b6500f47d4374182b2c6a108c93ddcadf7cd6a5f5ca94efd76f6049b6a5de9c5365c471e50e42a545e16d6b661ed1f4fb48dd425e147c