diff options
Diffstat (limited to 'nixpkgs/pkgs/servers/mail/opensmtpd')
| -rw-r--r-- | nixpkgs/pkgs/servers/mail/opensmtpd/default.nix | 8 | ||||
| -rw-r--r-- | nixpkgs/pkgs/servers/mail/opensmtpd/extras.nix | 28 | ||||
| -rw-r--r-- | nixpkgs/pkgs/servers/mail/opensmtpd/proc_path.diff | 12 |
3 files changed, 24 insertions, 24 deletions
diff --git a/nixpkgs/pkgs/servers/mail/opensmtpd/default.nix b/nixpkgs/pkgs/servers/mail/opensmtpd/default.nix index a59e18837d7d..ab2bdae0add7 100644 --- a/nixpkgs/pkgs/servers/mail/opensmtpd/default.nix +++ b/nixpkgs/pkgs/servers/mail/opensmtpd/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, bison +{ lib, stdenv, fetchurl, autoconf, automake, libtool, bison , libasr, libevent, zlib, libressl, db, pam, nixosTests }: 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 = [ @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { "localstatedir=\${TMPDIR}" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.opensmtpd.org/"; description = '' A free implementation of the server-side SMTP protocol as defined by diff --git a/nixpkgs/pkgs/servers/mail/opensmtpd/extras.nix b/nixpkgs/pkgs/servers/mail/opensmtpd/extras.nix index 6c29de8cddbc..65ff08b45396 100644 --- a/nixpkgs/pkgs/servers/mail/opensmtpd/extras.nix +++ b/nixpkgs/pkgs/servers/mail/opensmtpd/extras.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, openssl, libevent, libasr, - python2, pkgconfig, lua5, perl, libmysqlclient, postgresql, sqlite, hiredis, +{ lib, stdenv, fetchurl, openssl, libevent, libasr, + python2, pkg-config, lua5, perl, libmysqlclient, postgresql, sqlite, hiredis, enablePython ? true, enableLua ? true, enablePerl ? true, @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "1b1mx71bvmv92lbm08wr2p60g3qhikvv3n15zsr6dcwbk9aqahzq"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl libevent libasr python2 lua5 perl libmysqlclient postgresql sqlite hiredis ]; @@ -48,40 +48,40 @@ stdenv.mkDerivation rec { "--with-scheduler-ram" "--with-scheduler-stub" - ] ++ stdenv.lib.optionals enablePython [ + ] ++ lib.optionals enablePython [ "--with-python=${python2}" "--with-filter-python" "--with-queue-python" "--with-table-python" "--with-scheduler-python" - ] ++ stdenv.lib.optionals enableLua [ - "--with-lua=${pkgconfig}" + ] ++ lib.optionals enableLua [ + "--with-lua=${pkg-config}" "--with-filter-lua" - ] ++ stdenv.lib.optionals enablePerl [ + ] ++ lib.optionals enablePerl [ "--with-perl=${perl}" "--with-filter-perl" - ] ++ stdenv.lib.optionals enableMysql [ + ] ++ lib.optionals enableMysql [ "--with-table-mysql" - ] ++ stdenv.lib.optionals enablePostgres [ + ] ++ lib.optionals enablePostgres [ "--with-table-postgres" - ] ++ stdenv.lib.optionals enableSqlite [ + ] ++ lib.optionals enableSqlite [ "--with-table-sqlite" - ] ++ stdenv.lib.optionals enableRedis [ + ] ++ lib.optionals enableRedis [ "--with-table-redis" ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString enableRedis + NIX_CFLAGS_COMPILE = lib.optionalString enableRedis "-I${hiredis}/include/hiredis -lhiredis" - + stdenv.lib.optionalString enableMysql + + lib.optionalString enableMysql " -L${libmysqlclient}/lib/mysql"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.opensmtpd.org/"; description = "Extra plugins for the OpenSMTPD mail server"; license = licenses.isc; diff --git a/nixpkgs/pkgs/servers/mail/opensmtpd/proc_path.diff b/nixpkgs/pkgs/servers/mail/opensmtpd/proc_path.diff index 5e1cfd004299..a60bb603aacf 100644 --- a/nixpkgs/pkgs/servers/mail/opensmtpd/proc_path.diff +++ b/nixpkgs/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]; |