From 2e501491d67897b6b03cbe4189cba747208ea9cb Mon Sep 17 00:00:00 2001
From: Kerstin Humm <kerstin@erictapen.name>
Date: Fri, 6 Jun 2025 12:14:22 +0200
Subject: [PATCH] mobilizon: 5.1.2 -> 5.1.4

Changelog: https://framagit.org/kaihuri/mobilizon/-/releases/5.1.4
---
 pkgs/servers/mobilizon/0001-fix-version.patch | 13 -------------
 .../mobilizon/0002-fix-media-proxy.patch      | 19 -------------------
 pkgs/servers/mobilizon/common.nix             |  6 +++---
 pkgs/servers/mobilizon/default.nix            | 13 -------------
 pkgs/servers/mobilizon/frontend.nix           |  2 +-
 5 files changed, 4 insertions(+), 49 deletions(-)
 delete mode 100644 pkgs/servers/mobilizon/0001-fix-version.patch
 delete mode 100644 pkgs/servers/mobilizon/0002-fix-media-proxy.patch

diff --git a/pkgs/servers/mobilizon/0001-fix-version.patch b/pkgs/servers/mobilizon/0001-fix-version.patch
deleted file mode 100644
index 8bf6b2dcda86..000000000000
--- a/pkgs/servers/mobilizon/0001-fix-version.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mix.exs b/mix.exs
-index 8338abf8..883e6987 100644
---- a/mix.exs
-+++ b/mix.exs
-@@ -1,7 +1,7 @@
- defmodule Mobilizon.Mixfile do
-   use Mix.Project
- 
--  @version "5.1.0"
-+  @version "5.1.2"
- 
-   def project do
-     [
diff --git a/pkgs/servers/mobilizon/0002-fix-media-proxy.patch b/pkgs/servers/mobilizon/0002-fix-media-proxy.patch
deleted file mode 100644
index 9641dd3d60ac..000000000000
--- a/pkgs/servers/mobilizon/0002-fix-media-proxy.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/lib/web/proxy/reverse_proxy.ex b/lib/web/proxy/reverse_proxy.ex
-index 8a78ef27..788ccc30 100644
---- a/lib/web/proxy/reverse_proxy.ex
-+++ b/lib/web/proxy/reverse_proxy.ex
-@@ -187,9 +187,13 @@ defmodule Mobilizon.Web.ReverseProxy do
-   @spec response(Plug.Conn.t(), any(), String.t(), pos_integer(), list(tuple()), Keyword.t()) ::
-           Plug.Conn.t()
-   defp response(conn, client, url, status, headers, opts) do
-+    headers = build_resp_headers(headers, opts)
-+    # Fix HTTP/1.1 protocol violation: content-length can't be combined with chunked encoding
-+    headers = Enum.reject(headers, fn {k, _} -> k == "content-length" end)
-+
-     result =
-       conn
--      |> put_resp_headers(build_resp_headers(headers, opts))
-+      |> put_resp_headers(headers)
-       |> send_chunked(status)
-       |> chunk_reply(client, opts)
- 
\ No newline at end of file
diff --git a/pkgs/servers/mobilizon/common.nix b/pkgs/servers/mobilizon/common.nix
index 1bf19e3245d4..813dcb1da927 100644
--- a/pkgs/servers/mobilizon/common.nix
+++ b/pkgs/servers/mobilizon/common.nix
@@ -2,13 +2,13 @@
 rec {
 
   pname = "mobilizon";
-  version = "5.1.2";
+  version = "5.1.4";
 
   src = fetchFromGitLab {
     domain = "framagit.org";
-    owner = "framasoft";
+    owner = "kaihuri";
     repo = pname;
     tag = version;
-    sha256 = "sha256-5xHLk5/ogtRN3mfJPP1/gIVlALerT9KEUHjLA2Ou3aM=";
+    sha256 = "sha256-rtYb9wptP1wAaQrK60apjjSCqtfolXag6QgRYf6pwzQ=";
   };
 }
diff --git a/pkgs/servers/mobilizon/default.nix b/pkgs/servers/mobilizon/default.nix
index db729c9d6ee8..61dd5c7f8dfa 100644
--- a/pkgs/servers/mobilizon/default.nix
+++ b/pkgs/servers/mobilizon/default.nix
@@ -20,19 +20,6 @@ in
 mixRelease rec {
   inherit (common) pname version src;
 
-  patches = [
-    # Version 5.1.2 failed to bump their internal package version,
-    # which causes issues with static file serving in the NixOS module.
-    ./0001-fix-version.patch
-    # Mobilizon uses chunked Transfer-Encoding for the media proxy but also
-    # sets the Content-Length header. This is a HTTP/1.1 protocol violation
-    # and results in nginx >=1.24 rejecting the response with this error:
-    # 'upstream sent "Content-Length" and "Transfer-Encoding" headers at the same
-    # time while reading response header from upstream'
-    # Upstream PR: https://framagit.org/framasoft/mobilizon/-/merge_requests/1604
-    ./0002-fix-media-proxy.patch
-  ];
-
   nativeBuildInputs = [
     git
     cmake
diff --git a/pkgs/servers/mobilizon/frontend.nix b/pkgs/servers/mobilizon/frontend.nix
index c08bf51ece9e..23b83bc16d7f 100644
--- a/pkgs/servers/mobilizon/frontend.nix
+++ b/pkgs/servers/mobilizon/frontend.nix
@@ -11,7 +11,7 @@ in
 buildNpmPackage {
   inherit (common) pname version src;
 
-  npmDepsHash = "sha256-oOV4clyUzKTdAMCKghWS10X9Nug9j8mil/vXcFhZ6Z0=";
+  npmDepsHash = "sha256-vf8qEXMZ+TGqKjDN7LjUyOm98EQqweW6NKdJuNoMuVc=";
 
   nativeBuildInputs = [ imagemagick ];