diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-03-05 09:48:11 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-05 09:48:11 +0000 |
| commit | c1052bf9d92e567c3afb0e53e8bf1433ab657e35 (patch) | |
| tree | c9fe8a1ea43d91b74899687e79176b85f8096c82 /pkgs/servers/mail | |
| parent | bc53cfb2d2cab6155922f7350b7f7c48eff240a1 (diff) | |
| parent | 7d62c2c7cac9b12901804f8c47878fe6b9276975 (diff) | |
| download | nixlib-c1052bf9d92e567c3afb0e53e8bf1433ab657e35.tar nixlib-c1052bf9d92e567c3afb0e53e8bf1433ab657e35.tar.gz nixlib-c1052bf9d92e567c3afb0e53e8bf1433ab657e35.tar.bz2 nixlib-c1052bf9d92e567c3afb0e53e8bf1433ab657e35.tar.lz nixlib-c1052bf9d92e567c3afb0e53e8bf1433ab657e35.tar.xz nixlib-c1052bf9d92e567c3afb0e53e8bf1433ab657e35.tar.zst nixlib-c1052bf9d92e567c3afb0e53e8bf1433ab657e35.zip | |
Merge pull request #36329 from Ekleog/fix-clamsmtp
clamsmtp: fix build after linuxHeaders update to 4.15
Diffstat (limited to 'pkgs/servers/mail')
| -rw-r--r-- | pkgs/servers/mail/clamsmtp/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/mail/clamsmtp/header-order.patch | 25 |
2 files changed, 27 insertions, 0 deletions
diff --git a/pkgs/servers/mail/clamsmtp/default.nix b/pkgs/servers/mail/clamsmtp/default.nix index 9386be321b45..7214c08d2427 100644 --- a/pkgs/servers/mail/clamsmtp/default.nix +++ b/pkgs/servers/mail/clamsmtp/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0apr1pxifw6f1rbbsdrrwzs1dnhybg4hda3qqhqcw7p14r5xnbx5"; }; + patches = [ ./header-order.patch ]; + meta = with stdenv.lib; { description = "SMTP filter that allows to check for viruses using the ClamAV anti-virus software"; diff --git a/pkgs/servers/mail/clamsmtp/header-order.patch b/pkgs/servers/mail/clamsmtp/header-order.patch new file mode 100644 index 000000000000..102ae0a471dd --- /dev/null +++ b/pkgs/servers/mail/clamsmtp/header-order.patch @@ -0,0 +1,25 @@ +diff --git a/common/smtppass.c b/common/smtppass.c +index d9be1ba..4a366f4 100644 +--- a/common/smtppass.c ++++ b/common/smtppass.c +@@ -60,15 +60,15 @@ + + #include "usuals.h" + +-#ifdef LINUX_TRANSPARENT_PROXY +-#include <linux/netfilter_ipv4.h> +-#endif +- + #include "compat.h" + #include "sock_any.h" + #include "stringx.h" + #include "sppriv.h" + ++#ifdef LINUX_TRANSPARENT_PROXY ++#include <linux/netfilter_ipv4.h> ++#endif ++ + /* ----------------------------------------------------------------------- + * STRUCTURES + */ + |