Skip to content

Commit

Permalink
opensmtpd: 6.4.2p1 -> 6.6.1p1
Browse files Browse the repository at this point in the history
The substitition in smtpd/parse.y isn't necessary anymore.
The hardcoded /usr/libexec/ has been replaced by a PATH_LIBEXEC #define,
which will be set properly by the build system.
  • Loading branch information
flokli committed Nov 8, 2019
1 parent e349b6e commit 9658850
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions pkgs/servers/mail/opensmtpd/default.nix
Expand Up @@ -4,14 +4,14 @@

stdenv.mkDerivation rec {
pname = "opensmtpd";
version = "6.4.2p1";
version = "6.6.1p1";

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 = "0pgv080ai7d98l9340jadp9wjiaqj2qvgpqhilcz0kps2mdiawbd";
sha256 = "1ngil8j13m2rq07g94j4yjr6zmaimzy8wbfr17shi7rxnazys6zb";
};

patches = [
Expand All @@ -21,8 +21,6 @@ stdenv.mkDerivation rec {
# See https://github.com/OpenSMTPD/OpenSMTPD/issues/885 for the `sh bootstrap`
# requirement
postPatch = ''
substituteInPlace smtpd/parse.y \
--replace "/usr/libexec/" "$out/libexec/opensmtpd/"
substituteInPlace mk/smtpctl/Makefile.am --replace "chgrp" "true"
substituteInPlace mk/smtpctl/Makefile.am --replace "chmod 2555" "chmod 0555"
sh bootstrap
Expand Down

0 comments on commit 9658850

Please sign in to comment.