public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

opensmtpd: 6.7.1p1 -> 6.8.0p2
This commit is contained in:
Sandro 2021-01-17 14:41:51 +01:00 committed by GitHub
parent 84d0ecfc5f becfbfde75
commit 641f22e6e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/servers/mail/opensmtpd/default.nix
View File

@ -4,14 +4,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "opensmtpd"; pname = "opensmtpd";
version = "6.7.1p1"; version = "6.8.0p2";
nativeBuildInputs = [ autoconf automake libtool bison ]; nativeBuildInputs = [ autoconf automake libtool bison ];
buildInputs = [ libasr libevent zlib libressl db pam ]; buildInputs = [ libasr libevent zlib libressl db pam ];
src = fetchurl { src = fetchurl {
url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz"; url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz";
sha256 = "1jh8vxfajm1mvp1v5yh6llrhjzv0n9fgab88mlwllwqynhcfjy3l"; sha256 = "05sd7bmq29ibnqbl2z53hiyprfxzf0qydfdaixs68rz55wqhbgsi";
}; };
patches = [ patches = [

12
pkgs/servers/mail/opensmtpd/proc_path.diff
View File

@ -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 index e049f07c..a1bd03a0 100644
--- a/smtpd/smtpd.c --- a/usr.sbin/smtpd/smtpd.c
+++ b/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) @@ -1157,6 +1157,7 @@ fork_proc_backend(const char *key, const char *conf, const char *procname)
char path[PATH_MAX]; char path[PATH_MAX];
char name[PATH_MAX]; char name[PATH_MAX];
@ -24,10 +24,10 @@ index e049f07c..a1bd03a0 100644
(ssize_t)sizeof(path)) { (ssize_t)sizeof(path)) {
log_warn("warn: %s-proc: exec path too long", key); log_warn("warn: %s-proc: exec path too long", key);
return (-1); 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 index 9cfdfb99..24dfcca4 100644
--- a/smtpd/table.c --- a/usr.sbin/smtpd/table.c
+++ b/smtpd/table.c +++ b/usr.sbin/smtpd/table.c
@@ -201,6 +201,7 @@ table_create(const char *backend, const char *name, const char *tag, @@ -201,6 +201,7 @@ table_create(const char *backend, const char *name, const char *tag,
struct table_backend *tb; struct table_backend *tb;
char buf[LINE_MAX]; char buf[LINE_MAX];