From 998a19e8549a05f1c50f0fbc5180e5d44446cd64 Mon Sep 17 00:00:00 2001
From: Ryan Trinkle <ryan.trinkle@gmail.com>
Date: Thu, 22 Mar 2018 14:54:22 -0400
Subject: [PATCH 1/4] syslog-ng: enable SMTP destination

---
 pkgs/development/libraries/libesmtp/default.nix | 12 ++++++++++++
 pkgs/tools/system/syslog-ng/default.nix         |  6 +++++-
 pkgs/top-level/all-packages.nix                 |  2 ++
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/libesmtp/default.nix

diff --git a/pkgs/development/libraries/libesmtp/default.nix b/pkgs/development/libraries/libesmtp/default.nix
new file mode 100644
index 00000000000..0ddd7900494
--- /dev/null
+++ b/pkgs/development/libraries/libesmtp/default.nix
@@ -0,0 +1,12 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "libESMTP-${version}";
+  version = "1.0.6";
+
+  src = fetchurl {
+    url = "http://brianstafford.info/libesmtp/libesmtp-1.0.6.tar.bz2";
+    sha256 = "02zbniyz7qys1jmx3ghx21kxmns1wc3hmv80gp7ag7yra9f1m9nh";
+  };
+}
+
diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix
index a2230503551..b356cd1d484 100644
--- a/pkgs/tools/system/syslog-ng/default.nix
+++ b/pkgs/tools/system/syslog-ng/default.nix
@@ -1,7 +1,9 @@
 { stdenv, fetchurl, openssl, libcap, curl, which
 , eventlog, pkgconfig, glib, python, systemd, perl
 , riemann_c_client, protobufc, pcre, libnet
-, json_c, libuuid, libivykis, mongoc, rabbitmq-c }:
+, json_c, libuuid, libivykis, mongoc, rabbitmq-c
+, libesmtp
+}:
 
 let
   pname = "syslog-ng";
@@ -36,12 +38,14 @@ stdenv.mkDerivation rec {
     libivykis
     mongoc
     rabbitmq-c
+    libesmtp
   ];
 
   configureFlags = [
     "--enable-manpages"
     "--enable-dynamic-linking"
     "--enable-systemd"
+    "--enable-smtp"
     "--with-ivykis=system"
     "--with-librabbitmq-client=system"
     "--with-mongoc=system"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a386cf8a1c3..130686ac781 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8683,6 +8683,8 @@ with pkgs;
 
   esdl = callPackage ../development/libraries/esdl { };
 
+  libesmtp = callPackage ../development/libraries/libesmtp { };
+
   exiv2 = callPackage ../development/libraries/exiv2 { };
 
   expat = callPackage ../development/libraries/expat { };

From db5350092a1ecfd72e991ce06cc223af481069d2 Mon Sep 17 00:00:00 2001
From: dbornside <dan.bornside@obsidian.systems>
Date: Fri, 23 Mar 2018 13:45:28 -0400
Subject: [PATCH 2/4] libesmtp: add metadata

---
 pkgs/development/libraries/libesmtp/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/libesmtp/default.nix b/pkgs/development/libraries/libesmtp/default.nix
index 0ddd7900494..a5db1525137 100644
--- a/pkgs/development/libraries/libesmtp/default.nix
+++ b/pkgs/development/libraries/libesmtp/default.nix
@@ -8,5 +8,11 @@ stdenv.mkDerivation rec {
     url = "http://brianstafford.info/libesmtp/libesmtp-1.0.6.tar.bz2";
     sha256 = "02zbniyz7qys1jmx3ghx21kxmns1wc3hmv80gp7ag7yra9f1m9nh";
   };
+
+  meta = {
+    homepage = http://brianstafford.info/libesmtp/index.html;
+    description = "A Library for Posting Electronic Mail";
+    licenses = stdenv.licenses.lgpl3Plus;
+  };
 }
 

From 4dc0315259df05fd1121f37d3040a3b2a80c26fd Mon Sep 17 00:00:00 2001
From: dbornside <dan.bornside@obsidian.systems>
Date: Fri, 23 Mar 2018 14:21:36 -0400
Subject: [PATCH 3/4] libesmtp: wrong license/wrong license attribute

---
 pkgs/development/libraries/libesmtp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libesmtp/default.nix b/pkgs/development/libraries/libesmtp/default.nix
index a5db1525137..49e202f2844 100644
--- a/pkgs/development/libraries/libesmtp/default.nix
+++ b/pkgs/development/libraries/libesmtp/default.nix
@@ -9,10 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "02zbniyz7qys1jmx3ghx21kxmns1wc3hmv80gp7ag7yra9f1m9nh";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://brianstafford.info/libesmtp/index.html;
     description = "A Library for Posting Electronic Mail";
-    licenses = stdenv.licenses.lgpl3Plus;
+    license = licenses.gpl3;
   };
 }
 

From aab5e4becb4b62c0dde544a46dc02bebd3a039cd Mon Sep 17 00:00:00 2001
From: dbornside <dan.bornside@obsidian.systems>
Date: Fri, 23 Mar 2018 14:37:58 -0400
Subject: [PATCH 4/4] libesmtp: actually correct license

---
 pkgs/development/libraries/libesmtp/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libesmtp/default.nix b/pkgs/development/libraries/libesmtp/default.nix
index 49e202f2844..980cee2e687 100644
--- a/pkgs/development/libraries/libesmtp/default.nix
+++ b/pkgs/development/libraries/libesmtp/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = http://brianstafford.info/libesmtp/index.html;
     description = "A Library for Posting Electronic Mail";
-    license = licenses.gpl3;
+    license = licenses.lgpl21;
   };
 }