zammad: 6.4.1 -> 6.5.0

This commit is contained in:
Jennifer Graul
2025-04-16 20:31:27 +02:00
parent 5b729cc322
commit ec6b34809c
4 changed files with 651 additions and 335 deletions
@@ -1,12 +1,13 @@
diff --git a/app/models/channel/driver/sendmail.rb b/app/models/channel/driver/sendmail.rb
index b15ef48a6..64c120a87 100644
index 475636c013..7f3149c331 100644
--- a/app/models/channel/driver/sendmail.rb
+++ b/app/models/channel/driver/sendmail.rb
@@ -32,6 +32,6 @@ def delivery_method(mail)
return mail.delivery_method :test if Rails.env.test?
- mail.delivery_method :sendmail
+ mail.delivery_method :sendmail, :location => '/run/wrappers/bin/sendmail'
@@ -30,7 +30,7 @@ class Channel::Driver::Sendmail < Channel::Driver::BaseEmailOutbound
# test
super(attr, notification, :test)
else
- super(attr, notification, :sendmail)
+ super(attr, notification, :sendmail, { location: '/run/wrappers/bin/sendmail' })
end
end
end
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -20,7 +20,7 @@
let
pname = "zammad";
version = "6.4.1";
version = "6.5.0";
src = applyPatches {
src = fetchFromGitHub (lib.importJSON ./source.json);
@@ -81,7 +81,7 @@ stdenvNoCC.mkDerivation {
pnpmDeps = pnpm_9.fetchDeps {
inherit pname src;
hash = "sha256-bdm1nkJnXE7oZZhG2uBnk3fYhITaMROHGKPbf0G3bFs=";
hash = "sha256-mfdzb/LXQYL8kaQpWi9wD3OOroOOonDlJrhy9Dwl1no";
};
buildPhase = ''
+2 -2
View File
@@ -1,8 +1,8 @@
{
"owner": "zammad",
"repo": "zammad",
"rev": "453aeb09c1ad4584fae68b3a1c7d54b555d4384a",
"hash": "sha256-KlS9S6r787YJArhiWP0r4YsZQYEFet89MdwXGyrbe3g=",
"rev": "568ebbedd173a449eea2bd8c6f456b30ce106242",
"hash": "sha256-3EoKcAKIktdgzi2KO73YgFM1yCDhy2BYDMCS9xY6OSU=",
"fetchSubmodules": true
}