opensmtpd: 6.4.2p1 -> 6.6.1p1

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.
This commit is contained in:
Florian Klink 2019-11-08 15:08:17 +01:00
parent e349b6e0fe
commit 96588508bb

View File

@ -4,14 +4,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "opensmtpd"; pname = "opensmtpd";
version = "6.4.2p1"; version = "6.6.1p1";
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 = "0pgv080ai7d98l9340jadp9wjiaqj2qvgpqhilcz0kps2mdiawbd"; sha256 = "1ngil8j13m2rq07g94j4yjr6zmaimzy8wbfr17shi7rxnazys6zb";
}; };
patches = [ patches = [
@ -21,8 +21,6 @@ stdenv.mkDerivation rec {
# See https://github.com/OpenSMTPD/OpenSMTPD/issues/885 for the `sh bootstrap` # See https://github.com/OpenSMTPD/OpenSMTPD/issues/885 for the `sh bootstrap`
# requirement # requirement
postPatch = '' 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 "chgrp" "true"
substituteInPlace mk/smtpctl/Makefile.am --replace "chmod 2555" "chmod 0555" substituteInPlace mk/smtpctl/Makefile.am --replace "chmod 2555" "chmod 0555"
sh bootstrap sh bootstrap