diff --git a/SOURCES/0108-curl-7.61.1-nghttp2.patch b/SOURCES/0108-curl-7.61.1-nghttp2.patch new file mode 100644 index 0000000..c78e98f --- /dev/null +++ b/SOURCES/0108-curl-7.61.1-nghttp2.patch @@ -0,0 +1,40 @@ +diff --git a/configure b/configure +index d732ce0..31be2e5 100755 +--- a/configure ++++ b/configure +@@ -27602,7 +27602,7 @@ $as_echo_n "checking for libnghttp2 options with pkg-config... " >&6; } + PKG_CONFIG_LIBDIR="$want_h2_path" + export PKG_CONFIG_LIBDIR + fi +- $PKGCONFIG --exists libnghttp2 >/dev/null 2>&1 && echo 1` ++ $PKGCONFIG --exists httpd24-libnghttp2 >/dev/null 2>&1 && echo 1` + + if test -z "$itexists"; then + PKGCONFIG="no" +@@ -27622,7 +27622,7 @@ $as_echo "found" >&6; } + export PKG_CONFIG_LIBDIR + fi + +- $PKGCONFIG --libs-only-l libnghttp2` ++ $PKGCONFIG --libs-only-l httpd24-libnghttp2` + { $as_echo "$as_me:${as_lineno-$LINENO}: -l is $LIB_H2" >&5 + $as_echo "$as_me: -l is $LIB_H2" >&6;} + +@@ -27631,7 +27631,7 @@ $as_echo "$as_me: -l is $LIB_H2" >&6;} + PKG_CONFIG_LIBDIR="$want_h2_path" + export PKG_CONFIG_LIBDIR + fi +- $PKGCONFIG --cflags-only-I libnghttp2` ++ $PKGCONFIG --cflags-only-I httpd24-libnghttp2` + { $as_echo "$as_me:${as_lineno-$LINENO}: -I is $CPP_H2" >&5 + $as_echo "$as_me: -I is $CPP_H2" >&6;} + +@@ -27641,7 +27641,7 @@ $as_echo "$as_me: -I is $CPP_H2" >&6;} + export PKG_CONFIG_LIBDIR + fi + +- $PKGCONFIG --libs-only-L libnghttp2` ++ $PKGCONFIG --libs-only-L httpd24-libnghttp2` + { $as_echo "$as_me:${as_lineno-$LINENO}: -L is $LD_H2" >&5 + $as_echo "$as_me: -L is $LD_H2" >&6;} + diff --git a/SPECS/curl.spec b/SPECS/curl.spec index 482ee55..1d12dd4 100644 --- a/SPECS/curl.spec +++ b/SPECS/curl.spec @@ -4,7 +4,7 @@ Summary: A utility for getting files from remote servers (FTP, HTTP, and others) Name: %{?scl_prefix}curl Version: 7.61.1 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Group: Applications/Internet Source: http://curl.haxx.se/download/%{pkg_name}-%{version}.tar.gz @@ -25,6 +25,8 @@ Patch104: 0104-curl-7.19.7-localhost6.patch # work around valgrind bug (#678518) Patch107: 0107-curl-7.21.4-libidn-valgrind.patch +Patch108: 0108-curl-7.61.1-nghttp2.patch + URL: http://curl.haxx.se/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu) BuildRequires: groff @@ -130,6 +132,7 @@ documentation of the library, too. # RHSCL patches %patch103 -p1 +%patch108 -p1 # disable test 1112 (#565305) and test 1801 # @@ -244,6 +247,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/aclocal/libcurl.m4 %changelog +* Wed Nov 07 2018 Lubos Uhliarik - 7.61.1-2 +- Resolves: #1647517 - curl dropped HTTP/2 support + * Mon Oct 22 2018 Luboš Uhliarik - 7.61.1-1 - new version 7.61.1