Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 84d0ecfc5fdb
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 641f22e6e4b1
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 17, 2021

  1. 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
    @LeSuisse
    LeSuisse committed Jan 17, 2021
    Copy the full SHA
    becfbfd View commit details

  2. Merge pull request #109628 from LeSuisse/opensmtpd-6.8.0p2 

    opensmtpd: 6.7.1p1 -> 6.8.0p2
    @SuperSandro2000
    SuperSandro2000 authored Jan 17, 2021
    Copy the full SHA
    641f22e View commit details
Showing with 8 additions and 8 deletions.
  1. +2 −2 pkgs/servers/mail/opensmtpd/default.nix
  2. +6 −6 pkgs/servers/mail/opensmtpd/proc_path.diff
4 changes: 2 additions & 2 deletions pkgs/servers/mail/opensmtpd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 = [
12 changes: 6 additions & 6 deletions pkgs/servers/mail/opensmtpd/proc_path.diff
View file
Original file line number Diff line number Diff line change
@@ -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];