add gating.yaml

Related: RHEL-32301
update to the latest upstream release (1.61.0)
2024-04-12 15:16:04 +02:00 · 2024-04-12 15:11:29 +02:00 · 2024-04-12 15:11:21 +02:00 · 2024-04-12 15:10:03 +02:00 · 2024-01-25 08:57:51 +00:00 · 2024-01-22 09:37:24 +01:00
7 changed files with 89 additions and 79 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,3 @@
+/nghttp2-[0-9]*
 /nghttp2-[0-9]*.tar.xz
 /nghttp2-[0-9]*.tar.xz.asc
--- a/.packit.yml
+++ b/.packit.yml
@ -23,8 +23,3 @@ jobs:
    allowed_committers: [ jamacku, msekleta, kdudka ]
    dist_git_branches:
      - fedora-rawhide
-
-  - job: bodhi_update
-    trigger: commit
-    dist_git_branches:
-      - fedora-rawhide
--- a/0001-nghttp2-1.57.0-clock-gettime.patch
+++ b/0001-nghttp2-1.57.0-clock-gettime.patch
@ -1,34 +0,0 @@
-From bf8f419ca9f2d8bce48591710aa25f08e3fc67f8 Mon Sep 17 00:00:00 2001
-From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-Date: Wed, 11 Oct 2023 17:19:05 +0900
-Subject: [PATCH] Fix build error when both clock_gettime and GetTickCount64
- are available
-
---
- lib/nghttp2_time.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/lib/nghttp2_time.c b/lib/nghttp2_time.c
-index 2a5f1a6ff5..dd5a65591f 100644
--- a/lib/nghttp2_time.c
-+++ b/lib/nghttp2_time.c
-@@ -44,7 +44,9 @@ static uint64_t time_now_sec(void) {
- }
- #endif /* HAVE_GETTICKCOUNT64 */
- 
-#ifdef HAVE_CLOCK_GETTIME
-+#ifdef HAVE_GETTICKCOUNT64
-+uint64_t nghttp2_time_now_sec(void) { return GetTickCount64() / 1000; }
-+#elif defined(HAVE_CLOCK_GETTIME)
- uint64_t nghttp2_time_now_sec(void) {
-   struct timespec tp;
-   int rv = clock_gettime(CLOCK_MONOTONIC, &tp);
-@@ -55,8 +57,6 @@ uint64_t nghttp2_time_now_sec(void) {
- 
-   return (uint64_t)tp.tv_sec;
- }
-#elif defined(HAVE_GETTICKCOUNT64)
-uint64_t nghttp2_time_now_sec(void) { return GetTickCount64() / 1000; }
- #else  /* !HAVE_CLOCK_GETTIME && !HAVE_GETTICKCOUNT64 */
- uint64_t nghttp2_time_now_sec(void) { return time_now_sec(); }
- #endif /* !HAVE_CLOCK_GETTIME && !HAVE_GETTICKCOUNT64 */
--- a/gating.yaml
+++ b/gating.yaml
@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-10
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
--- a/nghttp2.spec
+++ b/nghttp2.spec
@ -6,11 +6,11 @@

 Summary: Experimental HTTP/2 client, server and proxy
 Name: nghttp2
-Version: 1.57.0
-Release: 2%{?dist}
+Version: 1.61.0
+Release: 1%{?dist}

 # Parts of ruby bindings are additionally under GPL-2.0-or-later, MIT and
-# Kevlin Henney (this one is not recognized by Fedora!) but they are NOT shipped.
+# HPND-Kevlin-Henney but they are NOT shipped.
 License: MIT

 URL: https://nghttp2.org/
@ -18,9 +18,6 @@ Source0: https://github.com/tatsuhiro-t/nghttp2/releases/download/v%{version}/ng
 Source1: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz.asc
 Source2: tatsuhiro-t.pgp

-# Upstream patches
-Patch1:     0001-nghttp2-1.57.0-clock-gettime.patch
-
 BuildRequires: CUnit-devel
 BuildRequires: c-ares-devel
 BuildRequires: gcc-c++
@ -105,9 +102,6 @@ This is the MinGW cross-compiled Windows library.
 %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 %autosetup -p1

-# make fetch-ocsp-response use Python 3
-sed -e '1 s|^#!/.*python|&3|' -i script/fetch-ocsp-response
-
 %build
 mkdir build
 pushd build
@ -218,6 +212,29 @@ popd


 %changelog
+* Thu Apr 04 2024 Jan Macku <jamacku@redhat.com> 1.61.0-1
+- update to the latest upstream release
+- fixes CVE-2024-28182 - HTTP/2 CONTINUATION frames can be utilized for DoS attacks
+
+* Wed Mar 06 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 1.60.0-2
+- Fix shebang of fetch-ocsp-response
+
+* Mon Mar 04 2024 Jan Macku <jamacku@redhat.com> 1.60.0-1
+- update to the latest upstream release
+- update PGP key from https://keyserver.ubuntu.com/pks/lookup?op=vindex&search=0x7e8403d5d673c366
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.59.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Jan 22 2024 Jan Macku <jamacku@redhat.com> 1.59.0-1
+- update to the latest upstream release
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.58.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Oct 30 2023 Jan Macku <jamacku@redhat.com> 1.58.0-1
+- update to the latest upstream release
+
 * Wed Oct 11 2023 Jan Macku <jamacku@redhat.com> 1.57.0-2
 - fix mingw build

--- a/4
+++ b/4
@ -1,2 +1,2 @@
-SHA512 (nghttp2-1.57.0.tar.xz) = d914eb48afd1ea182c1b2a454bf5e7963a7e28165f1d6d29bb83dd61a1b611c8c469e72a7a22daf23b8037f6e5ae9d4e791150b7d135746c1a5ec71ceb777f92
-SHA512 (nghttp2-1.57.0.tar.xz.asc) = fa3eaa0af783efa76931a037516e6ddc05d82e45a378fe7f136366ea4bbf94138dfdbc40e337abe8f16a329df3f388fe9b81f148635d936d28bc70fc3f687745
+SHA512 (nghttp2-1.61.0.tar.xz) = 01e930d7caf464699505f92b76e2bc8192d168612dc564d2546812c42afea2fb81d552d70e8a5fed35e2bf5deadbec8eda095af94a2484bca41542988afce52a
+SHA512 (nghttp2-1.61.0.tar.xz.asc) = cdc6cf1e01f9020a4e0823f7e1cec70c68e1942fbdf0ffbf8493dea185472f5777032a8bffcedff77b00e0df18f3d86718b308e9732bf0ee686f07add0d37d64
--- a/tatsuhiro-t.pgp
+++ b/tatsuhiro-t.pgp
@ -1,6 +1,6 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----

-mQGiBEmgJCARBACDsyRcJt0cPqS5I3nooSD4ETmsqXSGoA1QP0NcD3mMDIxfwOk3
+xsDiBEmgJCARBACDsyRcJt0cPqS5I3nooSD4ETmsqXSGoA1QP0NcD3mMDIxfwOk3
 ZgaLAhQTpylqzYu4uQ5lDcvkpZtN8cA+R+9Bxq1VcY5Jra4t93Eyxd/14oufgg8w
 GLZ8q2otuUliL+RWPEuuBLNJFrdHeLfITBX88ZyHz8tu0kpWBBVBLb5yYwCg3OmH
 L59aPl0TIoKGIL/xYs80ixcD/3PA9z6SbChDHRKA647Smrw6QuQHl7Uubg6LYYxz
@ -8,32 +8,57 @@ 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
-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
+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
-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
-=2agh
-----END PGP PUBLIC KEY BLOCK-----
+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
+=bHHX
+-----END PGP PUBLIC KEY BLOCK-----
Author	SHA1	Message	Date
Jan Macku	d8c6375778	add gating.yaml Related: RHEL-32301	2024-04-12 15:16:04 +02:00
Jan Macku	a314e22a24	update to the latest upstream release (1.61.0) (cherry picked from commit db27141a3b6c80960a24939c8607a0ced25a3d6f) Resolves: RHEL-32301	2024-04-12 15:11:29 +02:00
Yaakov Selkowitz	3af9eeee41	Fix shebang of fetch-ocsp-response The script was fixed upstream in 1.60.0: https://github.com/nghttp2/nghttp2/pull/2054 (cherry picked from commit b25161c7176b8fed676a8f57258483dbab9c25a5) Related: RHEL-32301	2024-04-12 15:11:21 +02:00
Jan Macku	9ffbfcff0b	update to the latest upstream release (1.60.0) (cherry picked from commit d7cebcc34561ff8ec278a9e72d20f9006802e350) Related: RHEL-32301	2024-04-12 15:10:03 +02:00
Fedora Release Engineering	cac4c43392	Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild	2024-01-25 08:57:51 +00:00
Jan Macku	2572b4869b	update to the latest upstream release (1.59.0)	2024-01-22 09:37:24 +01:00
Fedora Release Engineering	2aaf593189	Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild	2024-01-21 09:41:06 +00:00
Lukáš Zaoral	1abd1877de	HPND-Kevlin-Henney is now allowed and recognised by Fedora Related: https://gitlab.com/fedora/legal/fedora-license-data/-/issues/371	2023-12-20 14:45:25 +01:00
Jan Macku	700c574337	packit: drop bodhi update job - rawhide updates are automatic	2023-10-30 12:31:09 +01:00
Jan Macku	df5827b2d5	update to the latest upstream release (1.58.0)	2023-10-30 09:56:28 +01:00