From 0f9a86c000df68e6a36e511283f1def4dd5cc360 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 20 Jun 2023 23:11:17 +0200
Subject: [PATCH] wallabag: 2.5.4 -> 2.6.6

https://github.com/wallabag/wallabag/releases/tag/2.6.0
https://github.com/wallabag/wallabag/releases/tag/2.6.1
https://github.com/wallabag/wallabag/releases/tag/2.6.2
https://github.com/wallabag/wallabag/releases/tag/2.6.3
https://github.com/wallabag/wallabag/releases/tag/2.6.4
https://github.com/wallabag/wallabag/releases/tag/2.6.5
https://github.com/wallabag/wallabag/releases/tag/2.6.6

Dropped the swiftmailer patch, because wallabag migrated to symfony
mailer.

https://github.com/advisories/GHSA-p8gp-899c-jvq9
https://github.com/advisories/GHSA-gjvc-55fw-v6vq
https://github.com/wallabag/wallabag/pull/6924

Fixes: CVE-2023-4454, CVE-2023-4455
---
 pkgs/servers/web-apps/wallabag/default.nix | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix
index 1e6763c39c3e..251735e0f78e 100644
--- a/pkgs/servers/web-apps/wallabag/default.nix
+++ b/pkgs/servers/web-apps/wallabag/default.nix
@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchurl
-, fetchpatch
 }:
 
 # Point the environment variable $WALLABAG_DATA to a data directory
@@ -16,30 +15,19 @@
 
 let
   pname = "wallabag";
-  version = "2.5.4";
+  version = "2.6.6";
 in
 stdenv.mkDerivation {
   inherit pname version;
 
   # Release tarball includes vendored files
   src = fetchurl {
-    urls = [
-      "https://static.wallabag.org/releases/wallabag-release-${version}.tar.gz"
-      "https://github.com/wallabag/wallabag/releases/download/${version}/wallabag-${version}.tar.gz"
-    ];
-    hash = "sha256-yVMQXjGB8Yv1klQaHEbDGMZmOtANRocFJnawKn10xhg=";
+    url = "https://github.com/wallabag/wallabag/releases/download/${version}/wallabag-${version}.tar.gz";
+    hash = "sha256-0CkJFSHPnOz333+7uMUqXI3A9dsA9FchZXXmwq7F09o=";
   };
 
   patches = [
     ./wallabag-data.patch # exposes $WALLABAG_DATA
-
-    # Use sendmail from php.ini instead of FHS path.
-    (fetchpatch {
-      url = "https://github.com/symfony/swiftmailer-bundle/commit/31a4fed8f621f141ba70cb42ffb8f73184995f4c.patch";
-      stripLen = 1;
-      extraPrefix = "vendor/symfony/swiftmailer-bundle/";
-      sha256 = "rxHiGhKFd/ZWnIfTt6omFLLoNFlyxOYNCHIv/UtxCho=";
-    })
   ];
 
   dontBuild = true;