diff --git a/gcc7.patch b/gcc7.patch deleted file mode 100644 index 72dabca..0000000 --- a/gcc7.patch +++ /dev/null @@ -1,64 +0,0 @@ -When compiling with GCC 7.5, non-trivial initializers are unsupported. - -[ 9s] shrpx_http_test.cc: In function 'void shrpx::test_shrpx_http_create_altsvc_header_value()': -[ 9s] shrpx_http_test.cc:152:9: sorry, unimplemented: non-trivial designated initializers not supported -[ 9s] }, -[ 9s] ^ -[ 9s] shrpx_http_test.cc:152:9: sorry, unimplemented: non-trivial designated initializers not supported -[ 9s] shrpx_http_test.cc:153:5: error: no matching function for call to 'std::vector::vector()' -[ 9s] }; -[ 9s] ^ - -Index: nghttp2-1.60.0/src/shrpx_http_test.cc -=================================================================== ---- nghttp2-1.60.0.orig/src/shrpx_http_test.cc -+++ nghttp2-1.60.0/src/shrpx_http_test.cc -@@ -143,14 +143,12 @@ void test_shrpx_http_create_affinity_coo - void test_shrpx_http_create_altsvc_header_value(void) { - { - BlockAllocator balloc(1024, 1024); -- std::vector altsvcs{ -- AltSvc{ -- .protocol_id = StringRef::from_lit("h3"), -- .host = StringRef::from_lit("127.0.0.1"), -- .service = StringRef::from_lit("443"), -- .params = StringRef::from_lit("ma=3600"), -- }, -- }; -+ AltSvc s; -+ s.protocol_id = StringRef::from_lit("h3"); -+ s.host = StringRef::from_lit("127.0.0.1"); -+ s.service = StringRef::from_lit("443"); -+ s.params = StringRef::from_lit("ma=3600"); -+ std::vector altsvcs = {s}; - - assert_stdstring_equal( - R"(h3="127.0.0.1:443"; ma=3600)", -@@ -159,19 +157,15 @@ void test_shrpx_http_create_altsvc_heade - - { - BlockAllocator balloc(1024, 1024); -- std::vector altsvcs{ -- AltSvc{ -- .protocol_id = StringRef::from_lit("h3"), -- .service = StringRef::from_lit("443"), -- .params = StringRef::from_lit("ma=3600"), -- }, -- AltSvc{ -- .protocol_id = StringRef::from_lit("h3%"), -- .host = StringRef::from_lit("\"foo\""), -- .service = StringRef::from_lit("4433"), -- }, -- }; -+ AltSvc s1, s2; -+ s1.protocol_id = StringRef::from_lit("h3"); -+ s1.service = StringRef::from_lit("443"); -+ s1.params = StringRef::from_lit("ma=3600"); -+ s2.protocol_id = StringRef::from_lit("h3%"); -+ s2.host = StringRef::from_lit("\"foo\""); -+ s2.service = StringRef::from_lit("4433"); - -+ std::vector altsvcs = {s1, s2}; - assert_stdstring_equal( - R"(h3=":443"; ma=3600, h3%25="\"foo\":4433")", - http::create_altsvc_header_value(balloc, altsvcs).str()); diff --git a/nghttp2-1.61.0.tar.xz b/nghttp2-1.61.0.tar.xz deleted file mode 100644 index b7b5edd..0000000 --- a/nghttp2-1.61.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c0e660175b9dc429f11d25b9507a834fb752eea9135ab420bb7cb7e9dbcc9654 -size 1645808 diff --git a/nghttp2-1.61.0.tar.xz.asc b/nghttp2-1.61.0.tar.xz.asc deleted file mode 100644 index f8d8632..0000000 --- a/nghttp2-1.61.0.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEUWtiKRjRXEeKseo6UzmivoLgfewFAmYOaCgACgkQUzmivoLg -fewugg//dql7ZuvPpru1qc+A5E2da/spcMnnlcKaWgaXECJCLXysoSi3IhfNOGxr -6krf8PGagxw5+sUkr2HwLjJm+K5mbrvaDZajrwGpVFPcpg//eD4vcmFRWmEalhwJ -4kwNMn5gTdMkcWrzpz6nvSBfgB8912rBlUDEuGysGfxWYYLX6PBFqNK6Sn7QYDMw -8cmpkR8q6AcLXYOT6xtD0O2UYADDFvFtQ9TPBO2mGV/pM202QsC5NT1bvagnDB7u -OiChGvoUtbjqp9gUXx61V70vOb7v/SbwivjJlkHYj1S8/AhKNcvYhiiEcRUq2vKt -kQy++35h2r4foybBd89GbEjemJQO/Df6NhFoVoeMy6aeDZ4nTRf8ssM+z9ysNdkA -JJRRVArzQlKmgzRXRnTP2KyOnUckd4bLN709aJ8ft3Ia/ATJFlHpr8fPsLrqLjSH -oR14To1YpnVu/f42OOVgifY5xrfxMJYVCnxb5ePWoZrMU77iJi9uGsWGYN6nwoQj -DxyGJYeTyzC1CKMt/aUcQkxSmhJE9jGXYX9hWu5jVdwNdjFimfkDQQQ1uDEKKOoX -bl81MoN6k3hoyrmL4lONCFF86y/fQzi4Pnjkec6xxjxNMlNnfw8vzzoBVqf1p0g8 -MEONgarmm/7lr1GXK0VenWZv9ouO4UVd4w1t/vzr7XwvMSNkERw= -=OlZ3 ------END PGP SIGNATURE----- diff --git a/nghttp2-1.62.1.tar.xz b/nghttp2-1.62.1.tar.xz new file mode 100644 index 0000000..c6b5ba3 --- /dev/null +++ b/nghttp2-1.62.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2345d4dc136fda28ce243e0bb21f2e7e8ef6293d62c799abbf6f633a6887af72 +size 1606084 diff --git a/nghttp2-1.62.1.tar.xz.asc b/nghttp2-1.62.1.tar.xz.asc new file mode 100644 index 0000000..bbefa3f --- /dev/null +++ b/nghttp2-1.62.1.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEUWtiKRjRXEeKseo6UzmivoLgfewFAmZJm48ACgkQUzmivoLg +fezkKQ//ckpW4fclZ95IPGYWDMmzsuXpeUeY1+SqD92neSKGqMzOcIYrdObBbSO7 +DDPVl2Vi+iW1nw20jztx9HT/J8Chl9qkThj1mzowwHGS7GaNLIJBbDSnI/Rnbp9z +zDvoHrgr7vQjfIigutzTZ+k38k1phfg5mDQkIEF6/55m1/yZKycGL9RtWCUC6xVU +JCYrz4vCu1VpwzvEMa/rNp5DmQ0o9lIf/Frq6Ki6OCayGgcXBazX3qqqdlWXJswW +dMO15eCwJQGz1b0I26v1BfdIpntU87Z5NaASN/s7ONjvkbwb+7Tedh33P5PzrLik +5MaKVS5YHXWWwK8u20lu35hvv3/lor5RW0PO5p50kApxvqa3qP8r2hn/f6sbaZyS +6LQmmT6KxEgaw2tiqGSjKmnvPHwxt4SGtFc7bAtr9gOD3/HknRI3T5NidMs1HluX +CnD8G88UmgfbHfGP7GaEm9Wh/AD+G+dksixdkXyIa+btypuZpzOJcF885Sv5d0t6 +bhGoBTZyQ+k1u+LoKrtwbWS00Hn4XmFx06nMvJFeuetmuuZlBlWhTdYE22UVX8/P ++5b+sVMgPQ5MPFb0ldQfj3pyanalflZ/zUixZY/c+bGCgS0u5fre3GNcT66zuIH9 +V+rGSnN+RchVPKUoWan9BXZRyFga5Fiefu1ARP8f2vaDBRate6Q= +=dcEC +-----END PGP SIGNATURE----- diff --git a/nghttp2.changes b/nghttp2.changes index 144270f..21356d9 100644 --- a/nghttp2.changes +++ b/nghttp2.changes @@ -1,3 +1,44 @@ +------------------------------------------------------------------- +Mon Jun 17 18:02:25 UTC 2024 - Dirk Müller + +- update to 1.62.1: + * nghttpx: Fix batch UDP QUIC packet dropped on GRO read +- update to 1.62.0: + * nghttpx: Fix QUIC stateless reset stack buffer overflow + * Require c-ares >= 1.16.0 for ares_getaddrinfo + * Require C++20 compiler + * Adopt std::to_array and remove make_array + * nghttpx: Define APIEndpoints separately + * nghttpx: Do not send error/status body when method is HEAD + * nghttpx: Fix alignment issues in BlockAllocator + * nghttpx: Simplify parameter declaration for ipc_fd functions + * nghttpx: Add extent to ipc_fd explicitly + * Make make_byte_ref return std::span + * Make util::decode_hex return std::span + * Rewrite util::parse_uint + * Let base64::decode return std::span + * Refactor StringRef + * Stringref refactor c str and str + * Add StringRef literal operator and remove StringRef::from_lit + * Make StringRef(const std::string&) implicit + * Add http2::make_field family functions + * Remove std::string conversion operator from StringRef + * Optimize StringRef comparisons against c-string + * Pack more quic pkt + * nghttpx: Dynamic GSO failover + * Refactor ImmutableString + * nghttpx: Refactor QUIC data path + * nghttpx: Fix inherited TCP port comparison + * make_websocket_accept_token: Lesser conversions + * Add http3::make_field family functions + * Remove unnecessary namespace qualifications + * Refactor http utils + * Refactor streq + * Remove util::streq and let StringRef operator== deal with it + * Update the link for the Prefix.pdf document. fix #2178 + * Introduce typed nghttp2_min and nghttp2_max +- drop gcc7.patch (obsolete, we require C++20 now) + ------------------------------------------------------------------- Thu Apr 4 09:47:27 UTC 2024 - pgajdos@suse.com @@ -48,7 +89,7 @@ Wed Apr 3 10:31:13 UTC 2024 - Adam Majer ------------------------------------------------------------------- Mon Mar 18 12:59:00 UTC 2024 - Martin Pluskal -- Update keyring with current key +- Update keyring with current key ------------------------------------------------------------------- Mon Mar 18 08:35:17 UTC 2024 - pgajdos@suse.com diff --git a/nghttp2.spec b/nghttp2.spec index b3efbc9..ca85555 100644 --- a/nghttp2.spec +++ b/nghttp2.spec @@ -20,7 +20,7 @@ %global sover 14 %global flavor @BUILD_FLAVOR@%{nil} Name: nghttp2 -Version: 1.61.0 +Version: 1.62.1 Release: 0 Summary: Implementation of Hypertext Transfer Protocol version 2 in C License: MIT @@ -30,8 +30,11 @@ Source0: https://github.com/nghttp2/nghttp2/releases/download/v%{version} Source1: https://github.com/nghttp2/nghttp2/releases/download/v%{version}/nghttp2-%{version}.tar.xz.asc Source2: nghttp2.keyring Source3: baselibs.conf -Patch1: gcc7.patch +%if 0%{?suse_version} && 0%{?suse_version} == 1500 +BuildRequires: gcc13-c++ +%else BuildRequires: gcc-c++ +%endif BuildRequires: libboost_system-devel BuildRequires: libboost_thread-devel BuildRequires: pkgconfig @@ -96,6 +99,10 @@ HTTP/2 client, server and proxy. %autosetup -p1 -n nghttp2-%{version} %build +%if 0%{?suse_version} && 0%{?suse_version} == 1500 +export CC=/usr/bin/gcc-13 +export CXX=/usr/bin/g++-13 +%endif %configure \ --disable-static \ --disable-silent-rules \