diff options
author | Yaya <github@uwu.is> | 2023-08-08 00:41:47 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-08 00:41:47 +0200 |
commit | e06fbb9606ee9bc3a285f2a362c8f01b661a1c92 (patch) | |
tree | 2cd6c1b685458349789661d405aa370cfd327542 /pkgs/servers/pleroma | |
parent | 97aecb6967ae3be6496a039e0ccc29b18a4eebbc (diff) |
pleroma: 2.5.2 -> 2.5.4 (#247422)
https://git.pleroma.social/pleroma/pleroma/-/blob/v2.5.4/CHANGELOG.md
Diffstat (limited to 'pkgs/servers/pleroma')
-rw-r--r-- | pkgs/servers/pleroma/Revert-Config-Restrict-permissions-of-OTP-config.patch | 40 | ||||
-rw-r--r-- | pkgs/servers/pleroma/default.nix | 8 |
2 files changed, 46 insertions, 2 deletions
diff --git a/pkgs/servers/pleroma/Revert-Config-Restrict-permissions-of-OTP-config.patch b/pkgs/servers/pleroma/Revert-Config-Restrict-permissions-of-OTP-config.patch new file mode 100644 index 0000000000000..48aa60d4f0d10 --- /dev/null +++ b/pkgs/servers/pleroma/Revert-Config-Restrict-permissions-of-OTP-config.patch @@ -0,0 +1,40 @@ +From 29af78b112f7956ac1211fbfec2eadbf4caca40f Mon Sep 17 00:00:00 2001 +From: Yaya <yaya@uwu.is> +Date: Sun, 6 Aug 2023 00:02:40 +0000 +Subject: [PATCH] Revert "Config: Restrict permissions of OTP config file" + +This reverts commit 4befb3b1d02f32eb2c56f12e4684a7bb3167b0ee. + +The Nix store is world readable by design. +--- + lib/pleroma/config/release_runtime_provider.ex | 14 -------------- + 1 file changed, 14 deletions(-) + +diff --git a/lib/pleroma/config/release_runtime_provider.ex b/lib/pleroma/config/release_runtime_provider.ex +index 9ec0f975e..91e5f1a54 100644 +--- a/lib/pleroma/config/release_runtime_provider.ex ++++ b/lib/pleroma/config/release_runtime_provider.ex +@@ -20,20 +20,6 @@ def load(config, opts) do + + with_runtime_config = + if File.exists?(config_path) do +- # <https://git.pleroma.social/pleroma/pleroma/-/issues/3135> +- %File.Stat{mode: mode} = File.lstat!(config_path) +- +- if Bitwise.band(mode, 0o007) > 0 do +- raise "Configuration at #{config_path} has world-permissions, execute the following: chmod o= #{config_path}" +- end +- +- if Bitwise.band(mode, 0o020) > 0 do +- raise "Configuration at #{config_path} has group-wise write permissions, execute the following: chmod g-w #{config_path}" +- end +- +- # Note: Elixir doesn't provides a getuid(2) +- # so cannot forbid group-read only when config is owned by us +- + runtime_config = Config.Reader.read!(config_path) + + with_defaults +-- +2.40.1 + diff --git a/pkgs/servers/pleroma/default.nix b/pkgs/servers/pleroma/default.nix index f423ca9c52ed5..3d6ce5840a86c 100644 --- a/pkgs/servers/pleroma/default.nix +++ b/pkgs/servers/pleroma/default.nix @@ -7,16 +7,20 @@ beamPackages.mixRelease rec { pname = "pleroma"; - version = "2.5.2"; + version = "2.5.4"; src = fetchFromGitLab { domain = "git.pleroma.social"; owner = "pleroma"; repo = "pleroma"; rev = "v${version}"; - sha256 = "sha256-5qxop/hJj1hIsEcK6vJnI2RnAcLf3tO43B0e0FcNZcA="; + sha256 = "sha256-V/q6qpQkdrtMLzihV/0d3B+QUWwG4cYy8c2jNd5npww="; }; + patches = [ + ./Revert-Config-Restrict-permissions-of-OTP-config.patch + ]; + mixNixDeps = import ./mix.nix { inherit beamPackages lib; overrides = final: prev: { |