diff --git a/.gitignore b/.gitignore index a6ee320..4cce1e6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/curl-7.47.1.tar.lzma +SOURCES/curl-7.61.1.tar.gz diff --git a/.httpd24-curl.metadata b/.httpd24-curl.metadata index 7efa764..89c12e5 100644 --- a/.httpd24-curl.metadata +++ b/.httpd24-curl.metadata @@ -1 +1 @@ -07d8f7a4c7c9ad3293ee3d87f5c2683dd6cc1ca4 SOURCES/curl-7.47.1.tar.lzma +1f0732185e13d71d35a700f8314c3d5790968bb3 SOURCES/curl-7.61.1.tar.gz diff --git a/SOURCES/0101-curl-7.32.0-multilib.patch b/SOURCES/0101-curl-7.32.0-multilib.patch index e077492..532980e 100644 --- a/SOURCES/0101-curl-7.32.0-multilib.patch +++ b/SOURCES/0101-curl-7.32.0-multilib.patch @@ -13,7 +13,7 @@ diff --git a/curl-config.in b/curl-config.in index 150004d..95d0759 100644 --- a/curl-config.in +++ b/curl-config.in -@@ -75,7 +75,7 @@ while test $# -gt 0; do +@@ -76,7 +76,7 @@ while test $# -gt 0; do ;; --cc) @@ -22,7 +22,7 @@ index 150004d..95d0759 100644 ;; --prefix) -@@ -142,29 +142,14 @@ while test $# -gt 0; do +@@ -143,32 +143,17 @@ while test $# -gt 0; do ;; --libs) @@ -38,6 +38,9 @@ index 150004d..95d0759 100644 - fi + echo -lcurl ;; + --ssl-backends) + echo "@SSL_BACKENDS@" + ;; --static-libs) - if test "X@ENABLE_STATIC@" != "Xno" ; then @@ -58,8 +61,8 @@ diff --git a/docs/curl-config.1 b/docs/curl-config.1 index 14a9d2b..ffcc004 100644 --- a/docs/curl-config.1 +++ b/docs/curl-config.1 -@@ -65,7 +65,9 @@ be listed using uppercase and are separated by newlines. There may be none, - one, or several protocols in the list. (Added in 7.13.0) +@@ -70,7 +70,9 @@ no, one or several names. If more than one name, they will appear + comma-separated. (Added in 7.58.0) .IP "--static-libs" Shows the complete set of libs and other linker options you will need in order -to link your application with libcurl statically. (Added in 7.17.1) diff --git a/SOURCES/0102-curl-7.36.0-debug.patch b/SOURCES/0102-curl-7.36.0-debug.patch index 7ce75e2..bbb253f 100644 --- a/SOURCES/0102-curl-7.36.0-debug.patch +++ b/SOURCES/0102-curl-7.36.0-debug.patch @@ -12,7 +12,7 @@ diff --git a/configure b/configure index 8f079a3..53b4774 100755 --- a/configure +++ b/configure -@@ -16017,18 +16017,11 @@ $as_echo "yes" >&6; } +@@ -16414,18 +16414,11 @@ $as_echo "yes" >&6; } gccvhi=`echo $gccver | cut -d . -f1` gccvlo=`echo $gccver | cut -d . -f2` compiler_num=`(expr $gccvhi "*" 100 + $gccvlo) 2>/dev/null` @@ -27,18 +27,18 @@ index 8f079a3..53b4774 100755 + flags_dbg_all="" flags_dbg_yes="-g" flags_dbg_off="" -- flags_opt_all="-O -O0 -O1 -O2 -O3 -Os" +- flags_opt_all="-O -O0 -O1 -O2 -O3 -Os -Og -Ofast" - flags_opt_yes="-O2" + flags_opt_all="" + flags_opt_yes="" flags_opt_off="-O0" - if test -z "$SED"; then + OLDCPPFLAGS=$CPPFLAGS diff --git a/m4/curl-compilers.m4 b/m4/curl-compilers.m4 index 0cbba7a..9175b5b 100644 --- a/m4/curl-compilers.m4 +++ b/m4/curl-compilers.m4 -@@ -148,18 +148,11 @@ AC_DEFUN([CURL_CHECK_COMPILER_GNU_C], [ +@@ -157,18 +157,11 @@ AC_DEFUN([CURL_CHECK_COMPILER_GNU_C], [ gccvhi=`echo $gccver | cut -d . -f1` gccvlo=`echo $gccver | cut -d . -f2` compiler_num=`(expr $gccvhi "*" 100 + $gccvlo) 2>/dev/null` @@ -53,7 +53,7 @@ index 0cbba7a..9175b5b 100644 + flags_dbg_all="" flags_dbg_yes="-g" flags_dbg_off="" -- flags_opt_all="-O -O0 -O1 -O2 -O3 -Os" +- flags_opt_all="-O -O0 -O1 -O2 -O3 -Os -Og -Ofast" - flags_opt_yes="-O2" + flags_opt_all="" + flags_opt_yes="" diff --git a/SOURCES/0103-curl-7.47.1-httpd24.patch b/SOURCES/0103-curl-7.47.1-httpd24.patch index 9bc642c..a84e4ab 100644 --- a/SOURCES/0103-curl-7.47.1-httpd24.patch +++ b/SOURCES/0103-curl-7.47.1-httpd24.patch @@ -9,10 +9,10 @@ Subject: [PATCH] use the httpd24 tag for libcurl.so 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Makefile.am b/lib/Makefile.am -index 6f5317a..aac224e 100644 +index 7e82d46..51ea373 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am -@@ -103,7 +103,7 @@ AM_LDFLAGS = +@@ -85,7 +85,7 @@ AM_LDFLAGS = AM_CFLAGS = libcurl_la_CPPFLAGS_EXTRA = @@ -20,20 +20,17 @@ index 6f5317a..aac224e 100644 +libcurl_la_LDFLAGS_EXTRA = -release httpd24 libcurl_la_CFLAGS_EXTRA = - if CURL_LT_SHLIB_USE_VERSION_INFO + @CODE_COVERAGE_RULES@ diff --git a/lib/Makefile.in b/lib/Makefile.in -index 4478d64..f00262d 100644 +index 0fe599a..5971dde 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in -@@ -647,7 +647,7 @@ AM_CPPFLAGS = -I$(top_builddir)/include/curl -I$(top_builddir)/include \ +@@ -939,7 +939,7 @@ VERSIONINFO = -version-info 9:0:5 AM_LDFLAGS = AM_CFLAGS = - libcurl_la_CPPFLAGS_EXTRA = $(am__append_6) $(am__append_7) --libcurl_la_LDFLAGS_EXTRA = $(am__append_2) $(am__append_3) \ -+libcurl_la_LDFLAGS_EXTRA = -release httpd24 $(am__append_2) $(am__append_3) \ - $(am__append_4) $(am__append_5) - libcurl_la_CFLAGS_EXTRA = $(am__append_8) - libcurl_la_CPPFLAGS = $(AM_CPPFLAGS) $(libcurl_la_CPPFLAGS_EXTRA) --- -2.5.0 - + libcurl_la_CPPFLAGS_EXTRA = $(am__append_7) $(am__append_8) +-libcurl_la_LDFLAGS_EXTRA = $(CODE_COVERAGE_LDFLAGS) $(am__append_2) \ ++libcurl_la_LDFLAGS_EXTRA = -release httpd24 $(CODE_COVERAGE_LDFLAGS) $(am__append_2) \ + $(am__append_3) $(am__append_4) $(am__append_5) \ + $(am__append_6) + libcurl_la_CFLAGS_EXTRA = $(CODE_COVERAGE_CFLAGS) $(am__append_9) diff --git a/SPECS/curl.spec b/SPECS/curl.spec index 694f851..482ee55 100644 --- a/SPECS/curl.spec +++ b/SPECS/curl.spec @@ -3,11 +3,11 @@ Summary: A utility for getting files from remote servers (FTP, HTTP, and others) Name: %{?scl_prefix}curl -Version: 7.47.1 -Release: 4%{?dist} +Version: 7.61.1 +Release: 1%{?dist} License: MIT Group: Applications/Internet -Source: http://curl.haxx.se/download/%{pkg_name}-%{version}.tar.lzma +Source: http://curl.haxx.se/download/%{pkg_name}-%{version}.tar.gz Source2: curlbuild.h # patch making libcurl multilib ready @@ -188,6 +188,10 @@ rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install +LD_LIBRARY_PATH="$RPM_BUILD_ROOT%{_libdir}:$LD_LIBRARY_PATH" \ + make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install -C scripts + + rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.la install -d $RPM_BUILD_ROOT%{_datadir}/aclocal @@ -203,6 +207,8 @@ mv $RPM_BUILD_ROOT%{_includedir}/curl/curlbuild.h \ $RPM_BUILD_ROOT%{_includedir}/curl/%{_curlbuild_h} install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_includedir}/curl/curlbuild.h + +mv %{buildroot}%{_libdir}/pkgconfig/libcurl.pc %{buildroot}%{_libdir}/pkgconfig/%{scl_prefix}libcurl.pc %{?scl:EOF} %clean @@ -227,8 +233,8 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libcurl*.so.* %files -n %{?scl_prefix}libcurl-devel -%doc docs/examples/*.c docs/examples/Makefile.example docs/INTERNALS -%doc docs/CONTRIBUTE docs/libcurl/ABI +%doc docs/examples/*.c docs/examples/Makefile.example docs/INTERNALS.md +%doc docs/CONTRIBUTE.md docs/libcurl/ABI %{_bindir}/curl-config* %{_includedir}/curl %{_libdir}/*.so @@ -238,6 +244,12 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/aclocal/libcurl.m4 %changelog +* Mon Oct 22 2018 Luboš Uhliarik - 7.61.1-1 +- new version 7.61.1 + +* Thu Sep 13 2018 Luboš Uhliarik - 7.47.1-5 +- Resolves: #1540167 - provides without httpd24 pre/in-fix + * Wed May 24 2017 Luboš Uhliarik - 7.47.1-4 - rebuild