From 120b878c08186189847b26eae0ce8f2082c950fa Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Mon, 6 Feb 2023 17:52:19 +0100
Subject: [PATCH 1/2] freshrss: fix `passthru.tests`

(cherry picked from commit f4c1ef09d8bb2754acab930528853125832def9b)
---
 pkgs/servers/web-apps/freshrss/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/web-apps/freshrss/default.nix b/pkgs/servers/web-apps/freshrss/default.nix
index ea413c996fb5..480250900b3c 100644
--- a/pkgs/servers/web-apps/freshrss/default.nix
+++ b/pkgs/servers/web-apps/freshrss/default.nix
@@ -17,7 +17,9 @@ stdenvNoCC.mkDerivation rec {
     hash = "sha256-l1SOaQA4C8yXbrfi7pEE1PpUO4DVmLTTDUSACCSQ5LE=";
   };
 
-  passthru.tests = nixosTests.freshrss;
+  passthru.tests = {
+    inherit (nixosTests) freshrss-sqlite freshrss-pgsql;
+  };
 
   buildInputs = [ php ];
 

From e6f87c2e36e47ff9e33fc3cda61476cedf21a39c Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sun, 9 Apr 2023 13:09:18 +0100
Subject: [PATCH 2/2] freshrss: add patch for CVE-2023-22481

---
 pkgs/servers/web-apps/freshrss/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/servers/web-apps/freshrss/default.nix b/pkgs/servers/web-apps/freshrss/default.nix
index 480250900b3c..68ff21b22f84 100644
--- a/pkgs/servers/web-apps/freshrss/default.nix
+++ b/pkgs/servers/web-apps/freshrss/default.nix
@@ -1,6 +1,7 @@
 { stdenvNoCC
 , lib
 , fetchFromGitHub
+, fetchpatch
 , nixosTests
 , php
 , pkgs
@@ -17,6 +18,14 @@ stdenvNoCC.mkDerivation rec {
     hash = "sha256-l1SOaQA4C8yXbrfi7pEE1PpUO4DVmLTTDUSACCSQ5LE=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "CVE-2023-22481.patch";
+      url = "https://github.com/FreshRSS/FreshRSS/commit/075cf4c800063e3cc65c3d41a9c23222e8ebb554.patch";
+      sha256 = "sha256-1a9ZWFm6NV9PbfMSAVTDFXT4x+Pr6oTidJK2oMwHW/A=";
+    })
+  ];
+
   passthru.tests = {
     inherit (nixosTests) freshrss-sqlite freshrss-pgsql;
   };