From a15dd89aaabb40be70b0fcfd563e803051725376 Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Wed, 14 Oct 2020 09:33:29 +0200 Subject: [PATCH] new upstream release - 7.73.0 --- ...patch => 0104-curl-7.73.0-localhost6.patch | 20 ++++++++++++++++--- 0105-curl-7.63.0-lib1560-valgrind.patch | 2 +- curl-7.72.0.tar.xz.asc | 11 ---------- curl-7.73.0.tar.xz.asc | 11 ++++++++++ curl.spec | 18 ++++++++--------- sources | 2 +- 6 files changed, 39 insertions(+), 25 deletions(-) rename 0104-curl-7.19.7-localhost6.patch => 0104-curl-7.73.0-localhost6.patch (75%) delete mode 100644 curl-7.72.0.tar.xz.asc create mode 100644 curl-7.73.0.tar.xz.asc diff --git a/0104-curl-7.19.7-localhost6.patch b/0104-curl-7.73.0-localhost6.patch similarity index 75% rename from 0104-curl-7.19.7-localhost6.patch rename to 0104-curl-7.73.0-localhost6.patch index caa8bc2..7104dcb 100644 --- a/0104-curl-7.19.7-localhost6.patch +++ b/0104-curl-7.73.0-localhost6.patch @@ -1,3 +1,14 @@ +From 70734612c0f2f6f864e771ab4d2509c903342739 Mon Sep 17 00:00:00 2001 +From: Kamil Dudka +Date: Wed, 14 Oct 2020 09:41:28 +0200 +Subject: [PATCH] use localhost6 instead of ip6-localhost in the curl + test-suite + +--- + tests/data/test1083 | 6 +++--- + tests/data/test241 | 8 ++++---- + 2 files changed, 7 insertions(+), 7 deletions(-) + diff --git a/tests/data/test1083 b/tests/data/test1083 index e441278..b0958b6 100644 --- a/tests/data/test1083 @@ -40,12 +51,15 @@ index 46eae1f..4e1632c 100644 -@@ -48,7 +48,7 @@ HTTP-IPv6 GET (using ip6-localhost) - +@@ -45,7 +45,7 @@ HTTP-IPv6 GET (using ip6-localhost) + GET /241 HTTP/1.1 -Host: ip6-localhost:%HTTP6PORT +Host: localhost6:%HTTP6PORT + User-Agent: curl/%VERSION Accept: */* - +-- +2.25.4 + diff --git a/0105-curl-7.63.0-lib1560-valgrind.patch b/0105-curl-7.63.0-lib1560-valgrind.patch index 2f64091..c0d390b 100644 --- a/0105-curl-7.63.0-lib1560-valgrind.patch +++ b/0105-curl-7.63.0-lib1560-valgrind.patch @@ -26,7 +26,7 @@ diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc index 080421b..ea3b806 100644 --- a/tests/libtest/Makefile.inc +++ b/tests/libtest/Makefile.inc -@@ -594,6 +594,7 @@ lib1559_SOURCES = lib1559.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) +@@ -586,6 +586,7 @@ lib1559_SOURCES = lib1559.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib1559_LDADD = $(TESTUTIL_LIBS) lib1560_SOURCES = lib1560.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) diff --git a/curl-7.72.0.tar.xz.asc b/curl-7.72.0.tar.xz.asc deleted file mode 100644 index 53d5b62..0000000 --- a/curl-7.72.0.tar.xz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEEJ+3q8i86vOtQ25oSXMkI/bceEsIFAl881xgACgkQXMkI/bce -EsIjuwgAj6aeQgnWkubxxXAQ2kbckLh6QUKZWJQxPjb91kz98cGRcrdGRP292JFN -qQprls4rFTWWOIVVMP/kdheeNI9LqDvQAfZMCaLFAWUdw1L2pbId7VbV+NuTAce8 -V/ENqh+Xj2q2LsMnj02k0Uc1e6Nh1K4al2hwFiozarI/ltb3q7jZN2P2fAmDX89y -f3VsVfNZgv7VIwlX2d3b1RvMdppMFrDC3ZsAXlg2GQZ5sE7yfa2Qq+J5RzaNvEDh -p3pMbPiNgk1ZuGQrzoiYq9tqK/o7pD2t4h2GsftppALxC3SsoneNrdnly910IfKh -8qczoMpszBs8F7jts6KnfXszyhyyhQ== -=sC+U ------END PGP SIGNATURE----- diff --git a/curl-7.73.0.tar.xz.asc b/curl-7.73.0.tar.xz.asc new file mode 100644 index 0000000..41b3394 --- /dev/null +++ b/curl-7.73.0.tar.xz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEEJ+3q8i86vOtQ25oSXMkI/bceEsIFAl+GkkYACgkQXMkI/bce +EsI5vwf+NwIw3Jmn9lW7/VHNgFWB1Qa0gB4KlDISM2qG9CHzeIW8K50g2JiIAuLa +CVOfuMi/jg1r2INRLErZzdGDtD71TzjaEv6A/dxWL+k5/ieFxmH5iC80rYWi8EE9 +sv/bx8vEq8ikIqqV7KxYPlX8xMJBMfCs+TNQbzYM3WUDMLYJLpuNiWrzS6h8+mPq +4w8qYyrNI5x/J3HSJuzyoJy0ueQOQ6CaZwV/ViGBLmFkMKgsAXJu9ImRMmJXKAk5 +MLiVUKI1KpHJNHZS5pLIP5wrjIN3z7FIRxThJ6f/IqUF1mIc6MNnqcER6lBtxeq4 +SuRq9Dx5W2en/g+I5iic8GwkDD+U6A== +=W3Yh +-----END PGP SIGNATURE----- diff --git a/curl.spec b/curl.spec index d42d951..1b93fec 100644 --- a/curl.spec +++ b/curl.spec @@ -1,7 +1,7 @@ Summary: A utility for getting files from remote servers (FTP, HTTP, and others) Name: curl -Version: 7.72.0 -Release: 2%{?dist} +Version: 7.73.0 +Release: 1%{?dist} License: MIT Source: https://curl.haxx.se/download/%{name}-%{version}.tar.xz @@ -12,7 +12,7 @@ Patch101: 0101-curl-7.32.0-multilib.patch Patch102: 0102-curl-7.36.0-debug.patch # use localhost6 instead of ip6-localhost in the curl test-suite -Patch104: 0104-curl-7.19.7-localhost6.patch +Patch104: 0104-curl-7.73.0-localhost6.patch # prevent valgrind from reporting false positives on x86_64 Patch105: 0105-curl-7.63.0-lib1560-valgrind.patch @@ -188,9 +188,7 @@ autoreconf -fiv # disable test 1112 (#565305), test 1455 (occasionally fails with 'bind failed # with errno 98: Address already in use' in Koji environment), and test 1801 # -# and test 1900, which is flaky and covers a deprecated feature of libcurl -# -printf "1112\n1455\n1801\n1900\n" >> tests/data/DISABLED +printf "1112\n1455\n1801\n" >> tests/data/DISABLED # disable test 1319 on ppc64 (server times out) %ifarch ppc64 @@ -314,12 +312,11 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.la %files %doc CHANGES %doc README -%doc docs/BUGS +%doc docs/BUGS.md %doc docs/FAQ %doc docs/FEATURES -%doc docs/RESOURCES %doc docs/TODO -%doc docs/TheArtOfHttpScripting +%doc docs/TheArtOfHttpScripting.md %{_bindir}/curl %{_mandir}/man1/curl.1* %{_datadir}/zsh @@ -350,6 +347,9 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.la %{_libdir}/libcurl.so.4.[0-9].[0-9].minimal %changelog +* Wed Oct 14 2020 Kamil Dudka - 7.73.0-1 +- new upstream release + * Thu Sep 10 2020 Jinoh Kang - 7.72.0-2 - fix multiarch conflicts in libcurl-minimal (#1877671) diff --git a/sources b/sources index 153b0e1..586c3da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (curl-7.72.0.tar.xz) = e5025a32eac6108ccb13d1fcce9c2de28b3a6d6e9a258a647c4be45d71718f75653e1ccd477ef5f29242a15588255c4ef43fe47bf9908b938b6769fccfaac107 +SHA512 (curl-7.73.0.tar.xz) = 95330bac2d6bc5306d47723b3c7bdb754fabe2ba2df7b2a8027453a40286f1c7caaee69333f0715e59fbc7fdf09080968ea624398c995cabf3d57493973867bd