From becfbfde75fb56b0127702a37afd6cc0a93216a7 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sun, 17 Jan 2021 13:36:34 +0100
Subject: [PATCH] opensmtpd: 6.7.1p1 -> 6.8.0p2

The 6.8.0p2 release includes the fixes for CVE-2020-35679 and
CVE-2020-35680 [0].

[0] https://www.mail-archive.com/misc@opensmtpd.org/msg05188.html
---
 pkgs/servers/mail/opensmtpd/default.nix    |  4 ++--
 pkgs/servers/mail/opensmtpd/proc_path.diff | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix
index cd6a760b9e2..ab2bdae0add 100644
--- a/pkgs/servers/mail/opensmtpd/default.nix
+++ b/pkgs/servers/mail/opensmtpd/default.nix
@@ -4,14 +4,14 @@
 
 stdenv.mkDerivation rec {
   pname = "opensmtpd";
-  version = "6.7.1p1";
+  version = "6.8.0p2";
 
   nativeBuildInputs = [ autoconf automake libtool bison ];
   buildInputs = [ libasr libevent zlib libressl db pam ];
 
   src = fetchurl {
     url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz";
-    sha256 = "1jh8vxfajm1mvp1v5yh6llrhjzv0n9fgab88mlwllwqynhcfjy3l";
+    sha256 = "05sd7bmq29ibnqbl2z53hiyprfxzf0qydfdaixs68rz55wqhbgsi";
   };
 
   patches = [
diff --git a/pkgs/servers/mail/opensmtpd/proc_path.diff b/pkgs/servers/mail/opensmtpd/proc_path.diff
index 5e1cfd00429..a60bb603aac 100644
--- a/pkgs/servers/mail/opensmtpd/proc_path.diff
+++ b/pkgs/servers/mail/opensmtpd/proc_path.diff
@@ -1,7 +1,7 @@
-diff --git a/smtpd/smtpd.c b/smtpd/smtpd.c
+diff --git a/usr.sbin/smtpd/smtpd.c b/usr.sbin/smtpd/smtpd.c
 index e049f07c..a1bd03a0 100644
---- a/smtpd/smtpd.c
-+++ b/smtpd/smtpd.c
+--- a/usr.sbin/smtpd/smtpd.c
++++ b/usr.sbin/smtpd/smtpd.c
 @@ -1157,6 +1157,7 @@ fork_proc_backend(const char *key, const char *conf, const char *procname)
  	char		path[PATH_MAX];
  	char		name[PATH_MAX];
@@ -24,10 +24,10 @@ index e049f07c..a1bd03a0 100644
  	    (ssize_t)sizeof(path)) {
  		log_warn("warn: %s-proc: exec path too long", key);
  		return (-1);
-diff --git a/smtpd/table.c b/smtpd/table.c
+diff --git a/usr.sbin/smtpd/table.c b/usr.sbin/smtpd/table.c
 index 9cfdfb99..24dfcca4 100644
---- a/smtpd/table.c
-+++ b/smtpd/table.c
+--- a/usr.sbin/smtpd/table.c
++++ b/usr.sbin/smtpd/table.c
 @@ -201,6 +201,7 @@ table_create(const char *backend, const char *name, const char *tag,
  	struct table_backend	*tb;
  	char			 buf[LINE_MAX];