From ec27e40552cb0a16c4d791845ea1f990b76702fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?= =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= Date: Mon, 19 May 2025 13:29:29 +0700 Subject: [PATCH 1/8] =?UTF-8?q?h2o:=202.3.0.20250430=20=E2=86=92=202.3.0.2?= =?UTF-8?q?0250519?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 90d767a7a475613b0f3ebb8c95ae113ff3fcf637) --- pkgs/by-name/h2/h2o/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix index 76b485b83d57..af18aa8e9f0f 100644 --- a/pkgs/by-name/h2/h2o/package.nix +++ b/pkgs/by-name/h2/h2o/package.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "h2o"; - version = "2.3.0.20250430"; + version = "2.3.0.20250519"; src = fetchFromGitHub { owner = "h2o"; repo = "h2o"; - rev = "f1918a5b9f75f4da9db801b442886cb13b3c7bcd"; - sha256 = "sha256-sfOkyEhlLGmXjYqRoI/8pD6/NBY7q6K9y2vS7qwJmrw="; + rev = "87e2aa634f2c0d9f3d9429f7a3cf273f98db0058"; + sha256 = "sha256-/9YnaOqvYmFme4/mFq8Sx78FMDyGwnErEW45qPVELjU="; }; patches = [ From b585767ce75eefb050ca25e7cccff22ef161d4bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?= =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= Date: Sat, 12 Jul 2025 21:43:30 +0700 Subject: [PATCH 2/8] =?UTF-8?q?h2o:=202.3.0.20250519=20=E2=86=92=202.3.0.2?= =?UTF-8?q?0250716?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit f010e1d47a3123a9362f98ad19c361bfcdf71d7c) --- pkgs/by-name/h2/h2o/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix index af18aa8e9f0f..4c7a1581f687 100644 --- a/pkgs/by-name/h2/h2o/package.nix +++ b/pkgs/by-name/h2/h2o/package.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "h2o"; - version = "2.3.0.20250519"; + version = "2.3.0.20250716"; src = fetchFromGitHub { owner = "h2o"; repo = "h2o"; - rev = "87e2aa634f2c0d9f3d9429f7a3cf273f98db0058"; - sha256 = "sha256-/9YnaOqvYmFme4/mFq8Sx78FMDyGwnErEW45qPVELjU="; + rev = "a7ee72ea84815f393353e66c02181832fcd8dbb3"; + sha256 = "sha256-vym1oF/oFjrcQaKJWqwOYxNRHDsrX0vVh5Li0Zl96KY="; }; patches = [ From d8aa1c1be2caf8a99999d745cb3d3a4c1ef7779c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?= =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= Date: Thu, 17 Jul 2025 19:12:48 +0700 Subject: [PATCH 3/8] =?UTF-8?q?h2o:=202.3.0.20250716=20=E2=86=92=202.3.0.2?= =?UTF-8?q?0250717?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit eb360fbe6efdcfee8a7bcc5f3b414f2bd81db770) --- pkgs/by-name/h2/h2o/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix index 4c7a1581f687..71f7823ca670 100644 --- a/pkgs/by-name/h2/h2o/package.nix +++ b/pkgs/by-name/h2/h2o/package.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "h2o"; - version = "2.3.0.20250716"; + version = "2.3.0.20250717"; src = fetchFromGitHub { owner = "h2o"; repo = "h2o"; - rev = "a7ee72ea84815f393353e66c02181832fcd8dbb3"; - sha256 = "sha256-vym1oF/oFjrcQaKJWqwOYxNRHDsrX0vVh5Li0Zl96KY="; + rev = "db98b59ba7abfcd1dc9b43ea4b9ad1052aba775e"; + sha256 = "sha256-vBA5TWyvtaaBZV4RmfAAA7F34fXNkROS0rbZRpEJgrc="; }; patches = [ From 2d03e530e9025d8f1f3fbaa7cd6a81c29c7b1216 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?= =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= Date: Wed, 13 Aug 2025 20:32:59 +0700 Subject: [PATCH 4/8] =?UTF-8?q?h2o:=202.3.0.20250717=20=E2=86=92=202.3.0-u?= =?UTF-8?q?ntagged-2025-08-13?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit dc5539cb9f7a70ab79c2cc7eefe69fd6677ef6c0) --- pkgs/by-name/h2/h2o/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix index 71f7823ca670..587c167388ae 100644 --- a/pkgs/by-name/h2/h2o/package.nix +++ b/pkgs/by-name/h2/h2o/package.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "h2o"; - version = "2.3.0.20250717"; + version = "2.3.0-untagged-2025-08-13"; src = fetchFromGitHub { owner = "h2o"; repo = "h2o"; - rev = "db98b59ba7abfcd1dc9b43ea4b9ad1052aba775e"; - sha256 = "sha256-vBA5TWyvtaaBZV4RmfAAA7F34fXNkROS0rbZRpEJgrc="; + rev = "4729b661e3c6654198d2cc62997e1af58bef4b80"; + sha256 = "sha256-3vVe2nveWohpxtqECq/wcPupAHaRRoG54sG94J+3eyQ="; }; patches = [ From 73d8297d716412a960e7c9efe61fdf30ce04d4f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?= =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= Date: Mon, 18 Aug 2025 22:11:05 +0700 Subject: [PATCH 5/8] =?UTF-8?q?h2o:=202.3.0-untagged-2025-08-13=20?= =?UTF-8?q?=E2=86=92=202.3.0-untagged-2025-08-14?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 03e079da8e7ac9e046bb15e95b25a1e793c3598c) --- pkgs/by-name/h2/h2o/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix index 587c167388ae..9bf7a34a6109 100644 --- a/pkgs/by-name/h2/h2o/package.nix +++ b/pkgs/by-name/h2/h2o/package.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "h2o"; - version = "2.3.0-untagged-2025-08-13"; + version = "2.3.0-untagged-2025-08-14"; src = fetchFromGitHub { owner = "h2o"; repo = "h2o"; - rev = "4729b661e3c6654198d2cc62997e1af58bef4b80"; - sha256 = "sha256-3vVe2nveWohpxtqECq/wcPupAHaRRoG54sG94J+3eyQ="; + rev = "ffab9c49c33b1f0e9aec9804028156aae9db8ef0"; + sha256 = "sha256-kdU2p9oUhxGnw8JU9qGjV4mn2jMeSUL0rLgveMs6NiI="; }; patches = [ From 5d82502b721fe11c555e3ddbe6aa99effaf10a62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?= =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= Date: Sat, 16 Aug 2025 11:07:10 +0700 Subject: [PATCH 6/8] =?UTF-8?q?h2o:=20src.sha256=20=E2=86=92=20src.hash?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit b9192b4dc310aa0b8b1e6bfd88345de54e2ca964) --- pkgs/by-name/h2/h2o/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix index 9bf7a34a6109..626cd7701133 100644 --- a/pkgs/by-name/h2/h2o/package.nix +++ b/pkgs/by-name/h2/h2o/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "h2o"; repo = "h2o"; rev = "ffab9c49c33b1f0e9aec9804028156aae9db8ef0"; - sha256 = "sha256-kdU2p9oUhxGnw8JU9qGjV4mn2jMeSUL0rLgveMs6NiI="; + hash = "sha256-kdU2p9oUhxGnw8JU9qGjV4mn2jMeSUL0rLgveMs6NiI="; }; patches = [ From 9a0acc8a0560fc245c39c4c74cb748adde836025 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?= =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= Date: Sat, 30 Aug 2025 18:11:16 -0400 Subject: [PATCH 7/8] =?UTF-8?q?h2o:=202.3.0-untagged-2025-08-14=20?= =?UTF-8?q?=E2=86=92=202.3.0-rolling-2025-08-22?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 37cb69ecdcceacd8588f5085622521c90e5c9386) --- pkgs/by-name/h2/h2o/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix index 626cd7701133..9c96ac2ba420 100644 --- a/pkgs/by-name/h2/h2o/package.nix +++ b/pkgs/by-name/h2/h2o/package.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "h2o"; - version = "2.3.0-untagged-2025-08-14"; + version = "2.3.0-rolling-2025-08-22"; src = fetchFromGitHub { owner = "h2o"; repo = "h2o"; - rev = "ffab9c49c33b1f0e9aec9804028156aae9db8ef0"; - hash = "sha256-kdU2p9oUhxGnw8JU9qGjV4mn2jMeSUL0rLgveMs6NiI="; + rev = "6476496bd544c3c7f601d7ab2b07e378e8310e11"; + hash = "sha256-ZSBYg1HCuYifTyDmHyNIjEWab5N1TT+q/4m62mFFDJ0="; }; patches = [ From bf0a32da53d0325341c6f038653adcb3c5610531 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 30 Aug 2025 18:11:32 -0400 Subject: [PATCH 8/8] Revert "h2o: apply patch for CVE-2025-8671" This reverts commit b1fe6da0be086f16a130ed7fe424df9220c65d61. No longer needed: the entire upgrade has now been backported. Not-cherry-picked-because: this is a revert of a commit that isn't in master. --- pkgs/by-name/h2/h2o/package.nix | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix index 9c96ac2ba420..2f4b722984d9 100644 --- a/pkgs/by-name/h2/h2o/package.nix +++ b/pkgs/by-name/h2/h2o/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, pkg-config, cmake, makeWrapper, @@ -33,16 +32,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-ZSBYg1HCuYifTyDmHyNIjEWab5N1TT+q/4m62mFFDJ0="; }; - patches = [ - (fetchpatch { - # https://github.com/h2o/h2o/security/advisories/GHSA-mrjm-qq9m-9mjq - # https://kb.cert.org/vuls/id/767506 - name = "CVE-2025-8671.patch"; - url = "https://github.com/h2o/h2o/commit/579ecfaca155d1f9f12bfd0cff6086dcda4b9692.patch"; - hash = "sha256-bNnhx5RGBw6SmKmhlACHKPsnVUPzQUqHsunPdiayzv0="; - }) - ]; - outputs = [ "out" "man"