summary refs log tree commit diff
path: root/pkgs/servers
diff options
context:
space:
mode:
authorLéo Gaspard <leo@gaspard.io>2018-03-05 10:27:43 +0100
committerLéo Gaspard <leo@gaspard.io>2018-03-05 10:27:43 +0100
commit7d62c2c7cac9b12901804f8c47878fe6b9276975 (patch)
tree6ed0c1f882c590fefe49c44df772bad0fcb716e2 /pkgs/servers
parentfd0f15f11c0d2bc84d1c364f438f6301b452551c (diff)
downloadnixpkgs-7d62c2c7cac9b12901804f8c47878fe6b9276975.tar
nixpkgs-7d62c2c7cac9b12901804f8c47878fe6b9276975.tar.gz
nixpkgs-7d62c2c7cac9b12901804f8c47878fe6b9276975.tar.bz2
nixpkgs-7d62c2c7cac9b12901804f8c47878fe6b9276975.tar.lz
nixpkgs-7d62c2c7cac9b12901804f8c47878fe6b9276975.tar.xz
nixpkgs-7d62c2c7cac9b12901804f8c47878fe6b9276975.tar.zst
nixpkgs-7d62c2c7cac9b12901804f8c47878fe6b9276975.zip
clamsmtp: fix build after linuxHeaders update to 4.15
Diffstat (limited to 'pkgs/servers')
-rw-r--r--pkgs/servers/mail/clamsmtp/default.nix2
-rw-r--r--pkgs/servers/mail/clamsmtp/header-order.patch25
2 files changed, 27 insertions, 0 deletions
diff --git a/pkgs/servers/mail/clamsmtp/default.nix b/pkgs/servers/mail/clamsmtp/default.nix
index 9386be321b4..7214c08d242 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 00000000000..102ae0a471d
--- /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
+  */
+