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

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