diff options
| author | Benjamin Asbach <asbachb@users.noreply.github.com> | 2020-05-25 01:44:21 +0200 |
|---|---|---|
| committer | Benjamin Asbach <asbachb@users.noreply.github.com> | 2020-05-25 01:44:21 +0200 |
| commit | ae7b57c8cad5e7efa147eb2f1099985b49ab3e5c (patch) | |
| tree | a001b1ec4d01f0eb9f3aec503571fb8c96c829ae /pkgs/servers/mail | |
| parent | a1d501b87e4028369b0e2b5f37634dc86d1a0db0 (diff) | |
| download | nixpkgs-ae7b57c8cad5e7efa147eb2f1099985b49ab3e5c.tar nixpkgs-ae7b57c8cad5e7efa147eb2f1099985b49ab3e5c.tar.gz nixpkgs-ae7b57c8cad5e7efa147eb2f1099985b49ab3e5c.tar.bz2 nixpkgs-ae7b57c8cad5e7efa147eb2f1099985b49ab3e5c.tar.lz nixpkgs-ae7b57c8cad5e7efa147eb2f1099985b49ab3e5c.tar.xz nixpkgs-ae7b57c8cad5e7efa147eb2f1099985b49ab3e5c.tar.zst nixpkgs-ae7b57c8cad5e7efa147eb2f1099985b49ab3e5c.zip | |
postfix: 3.4.10 -> 3.4.12
`0001-Fix-build-with-glibx-2.30` was removed since the patch is already applied to upstream source.
Diffstat (limited to 'pkgs/servers/mail')
| -rw-r--r-- | pkgs/servers/mail/postfix/0001-Fix-build-with-glibc-2.30.patch | 34 | ||||
| -rw-r--r-- | pkgs/servers/mail/postfix/default.nix | 5 |
2 files changed, 2 insertions, 37 deletions
diff --git a/pkgs/servers/mail/postfix/0001-Fix-build-with-glibc-2.30.patch b/pkgs/servers/mail/postfix/0001-Fix-build-with-glibc-2.30.patch deleted file mode 100644 index 9613b8906a0..00000000000 --- a/pkgs/servers/mail/postfix/0001-Fix-build-with-glibc-2.30.patch +++ /dev/null @@ -1,34 +0,0 @@ -From a6a61d0dc018101a9a8d0a664f31140d7e38db0e Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch <maximilian@mbosch.me> -Date: Fri, 17 Jan 2020 01:42:40 +0100 -Subject: [PATCH] Fix build with glibc 2.30 - -https://bugs.launchpad.net/ubuntu/+source/postfix/+bug/1842923 ---- - src/dns/dns_str_resflags.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/dns/dns_str_resflags.c b/src/dns/dns_str_resflags.c -index 5f2cce5..df32345 100644 ---- a/src/dns/dns_str_resflags.c -+++ b/src/dns/dns_str_resflags.c -@@ -60,10 +60,16 @@ static const LONG_NAME_MASK resflag_table[] = { - "RES_DEFNAMES", RES_DEFNAMES, - "RES_STAYOPEN", RES_STAYOPEN, - "RES_DNSRCH", RES_DNSRCH, -+#ifdef RES_INSECURE1 - "RES_INSECURE1", RES_INSECURE1, -+#endif -+#ifdef RES_INSECURE2 - "RES_INSECURE2", RES_INSECURE2, -+#endif - "RES_NOALIASES", RES_NOALIASES, -+#ifdef RES_USE_INET6 - "RES_USE_INET6", RES_USE_INET6, -+#endif - #ifdef RES_ROTATE - "RES_ROTATE", RES_ROTATE, - #endif --- -2.23.1 - diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 0386bcf2394..04ad4551d5e 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -26,11 +26,11 @@ in stdenv.mkDerivation rec { pname = "postfix"; - version = "3.4.10"; + version = "3.4.12"; src = fetchurl { url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${pname}-${version}.tar.gz"; - sha256 = "0m36wn5grm4cf8nnvlgsgwsm6v09xz01n7jnx13h0yjk73y6d2lh"; + sha256 = "1v2xhnhf0bj6p3g3cf7grmq2g7vgr1wr4yb7c3ksjllbms1m2m8q"; }; nativeBuildInputs = [ makeWrapper m4 ]; @@ -48,7 +48,6 @@ in stdenv.mkDerivation rec { ./postfix-3.0-no-warnings.patch ./post-install-script.patch ./relative-symlinks.patch - ./0001-Fix-build-with-glibc-2.30.patch ]; postPatch = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' |