From 7736c471ef7108535c10f54d3d294fe4666e8ee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 19 Feb 2025 16:09:23 -0800 Subject: [PATCH 1/4] postfix: 3.9.3 -> 3.10.1 Changelog: https://www.postfix.org/announcements/postfix-3.10.0.html --- pkgs/servers/mail/postfix/default.nix | 5 +- .../postfix/postfix-3.0-no-warnings.patch | 86 ------------------- 2 files changed, 2 insertions(+), 89 deletions(-) delete mode 100644 pkgs/servers/mail/postfix/postfix-3.0-no-warnings.patch diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 6e259a473afb..0932e7adee6f 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -67,11 +67,11 @@ let in stdenv.mkDerivation rec { pname = "postfix"; - version = "3.9.3"; + version = "3.10.1"; src = fetchurl { url = "https://de.postfix.org/ftpmirror/official/postfix-${version}.tar.gz"; - hash = "sha256-Psn6zZPBi1azAY9sIUicRIdRDZiw1m/vJovaSsevPwg="; + hash = "sha256-dYaNt6jtJSzToUwTo844Pd1CVjFgwCAn0GEgLuNnmb8="; }; nativeBuildInputs = [ @@ -97,7 +97,6 @@ stdenv.mkDerivation rec { patches = [ ./postfix-script-shell.patch - ./postfix-3.0-no-warnings.patch ./post-install-script.patch ./relative-symlinks.patch diff --git a/pkgs/servers/mail/postfix/postfix-3.0-no-warnings.patch b/pkgs/servers/mail/postfix/postfix-3.0-no-warnings.patch deleted file mode 100644 index 69dcee41d418..000000000000 --- a/pkgs/servers/mail/postfix/postfix-3.0-no-warnings.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff -ru3 postfix-3.0.3/conf/postfix-script postfix-3.0.3-new/conf/postfix-script ---- postfix-3.0.3/conf/postfix-script 2014-06-27 18:05:15.000000000 +0400 -+++ postfix-3.0.3-new/conf/postfix-script 2016-01-09 17:51:38.545733631 +0300 -@@ -84,24 +84,6 @@ - exit 1 - } - --# If this is a secondary instance, don't touch shared files. -- --instances=`test ! -f $def_config_directory/main.cf || -- $command_directory/postconf -qc $def_config_directory \ -- -h multi_instance_directories | sed 's/,/ /'` || { -- $FATAL cannot execute $command_directory/postconf! -- exit 1 --} -- --check_shared_files=1 --for name in $instances --do -- case "$name" in -- "$def_config_directory") ;; -- "$config_directory") check_shared_files=; break;; -- esac --done -- - # - # Parse JCL - # -@@ -262,22 +244,6 @@ - -prune \( -perm -020 -o -perm -002 \) \ - -exec $WARN group or other writable: {} \; - -- # Check Postfix root-owned directory tree owner/permissions. -- -- todo="$config_directory/." -- test -n "$check_shared_files" && { -- todo="$daemon_directory/. $meta_directory/. $todo" -- test "$shlib_directory" = "no" || -- todo="$shlib_directory/. $todo" -- } -- todo=`echo "$todo" | tr ' ' '\12' | sort -u` -- -- find $todo ! -user root \ -- -exec $WARN not owned by root: {} \; -- -- find $todo \( -perm -020 -o -perm -002 \) \ -- -exec $WARN group or other writable: {} \; -- - # Check Postfix mail_owner-owned directory tree owner/permissions. - - find $data_directory/. ! -user $mail_owner \ -@@ -302,18 +268,11 @@ - # Check Postfix setgid_group-owned directory and file group/permissions. - - todo="$queue_directory/public $queue_directory/maildrop" -- test -n "$check_shared_files" && -- todo="$command_directory/postqueue $command_directory/postdrop $todo" - - find $todo \ - -prune ! -group $setgid_group \ - -exec $WARN not owned by group $setgid_group: {} \; - -- test -n "$check_shared_files" && -- find $command_directory/postqueue $command_directory/postdrop \ -- -prune ! -perm -02111 \ -- -exec $WARN not set-gid or not owner+group+world executable: {} \; -- - # Check non-Postfix root-owned directory tree owner/content. - - for dir in bin etc lib sbin usr -@@ -334,15 +293,6 @@ - - find corrupt -type f -exec $WARN damaged message: {} \; - -- # Check for non-Postfix MTA remnants. -- -- test -n "$check_shared_files" -a -f /usr/sbin/sendmail -a \ -- -f /usr/lib/sendmail && { -- cmp -s /usr/sbin/sendmail /usr/lib/sendmail || { -- $WARN /usr/lib/sendmail and /usr/sbin/sendmail differ -- $WARN Replace one by a symbolic link to the other -- } -- } - exit 0 - ;; - From 5d35ce9b838d88d4992215bb5f0edc071deb3749 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 19 Feb 2025 16:42:18 -0800 Subject: [PATCH 2/4] postfix: move to pkgs/by-name --- .../mail/postfix/default.nix => by-name/po/postfix/package.nix} | 0 .../mail => by-name/po}/postfix/post-install-script.patch | 0 .../mail => by-name/po}/postfix/postfix-script-shell.patch | 0 .../mail => by-name/po}/postfix/relative-symlinks.patch | 0 pkgs/{servers/mail => by-name/po}/postfix/update.sh | 0 pkgs/top-level/all-packages.nix | 2 -- 6 files changed, 2 deletions(-) rename pkgs/{servers/mail/postfix/default.nix => by-name/po/postfix/package.nix} (100%) rename pkgs/{servers/mail => by-name/po}/postfix/post-install-script.patch (100%) rename pkgs/{servers/mail => by-name/po}/postfix/postfix-script-shell.patch (100%) rename pkgs/{servers/mail => by-name/po}/postfix/relative-symlinks.patch (100%) rename pkgs/{servers/mail => by-name/po}/postfix/update.sh (100%) diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/by-name/po/postfix/package.nix similarity index 100% rename from pkgs/servers/mail/postfix/default.nix rename to pkgs/by-name/po/postfix/package.nix diff --git a/pkgs/servers/mail/postfix/post-install-script.patch b/pkgs/by-name/po/postfix/post-install-script.patch similarity index 100% rename from pkgs/servers/mail/postfix/post-install-script.patch rename to pkgs/by-name/po/postfix/post-install-script.patch diff --git a/pkgs/servers/mail/postfix/postfix-script-shell.patch b/pkgs/by-name/po/postfix/postfix-script-shell.patch similarity index 100% rename from pkgs/servers/mail/postfix/postfix-script-shell.patch rename to pkgs/by-name/po/postfix/postfix-script-shell.patch diff --git a/pkgs/servers/mail/postfix/relative-symlinks.patch b/pkgs/by-name/po/postfix/relative-symlinks.patch similarity index 100% rename from pkgs/servers/mail/postfix/relative-symlinks.patch rename to pkgs/by-name/po/postfix/relative-symlinks.patch diff --git a/pkgs/servers/mail/postfix/update.sh b/pkgs/by-name/po/postfix/update.sh similarity index 100% rename from pkgs/servers/mail/postfix/update.sh rename to pkgs/by-name/po/postfix/update.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3a53e50bc9eb..85555409a1cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11448,8 +11448,6 @@ with pkgs; tbb = tbb_2021_11; }; - postfix = callPackage ../servers/mail/postfix { }; - pfixtools = callPackage ../servers/mail/postfix/pfixtools.nix { }; pflogsumm = callPackage ../servers/mail/postfix/pflogsumm.nix { }; From f973370df243481f0052b4e8cfe8dfd6fc0f8b11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 19 Feb 2025 19:03:14 -0800 Subject: [PATCH 3/4] pfixtools: move to pkgs/by-name --- .../pf/pfixtools}/0001-Fix-build-with-unbound-1.6.1.patch | 0 .../postfix/pfixtools.nix => by-name/pf/pfixtools/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{servers/mail/postfix => by-name/pf/pfixtools}/0001-Fix-build-with-unbound-1.6.1.patch (100%) rename pkgs/{servers/mail/postfix/pfixtools.nix => by-name/pf/pfixtools/package.nix} (100%) diff --git a/pkgs/servers/mail/postfix/0001-Fix-build-with-unbound-1.6.1.patch b/pkgs/by-name/pf/pfixtools/0001-Fix-build-with-unbound-1.6.1.patch similarity index 100% rename from pkgs/servers/mail/postfix/0001-Fix-build-with-unbound-1.6.1.patch rename to pkgs/by-name/pf/pfixtools/0001-Fix-build-with-unbound-1.6.1.patch diff --git a/pkgs/servers/mail/postfix/pfixtools.nix b/pkgs/by-name/pf/pfixtools/package.nix similarity index 100% rename from pkgs/servers/mail/postfix/pfixtools.nix rename to pkgs/by-name/pf/pfixtools/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85555409a1cf..0bd2628fd7d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11448,8 +11448,6 @@ with pkgs; tbb = tbb_2021_11; }; - pfixtools = callPackage ../servers/mail/postfix/pfixtools.nix { }; - pflogsumm = callPackage ../servers/mail/postfix/pflogsumm.nix { }; system-sendmail = lowPrio (callPackage ../servers/mail/system-sendmail { }); From 8ee076f1888620d9a97c499d31d3291c83c5182b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 19 Feb 2025 19:04:53 -0800 Subject: [PATCH 4/4] pflogsumm: move to pkgs/by-name --- .../postfix/pflogsumm.nix => by-name/pf/pflogsumm/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{servers/mail/postfix/pflogsumm.nix => by-name/pf/pflogsumm/package.nix} (100%) diff --git a/pkgs/servers/mail/postfix/pflogsumm.nix b/pkgs/by-name/pf/pflogsumm/package.nix similarity index 100% rename from pkgs/servers/mail/postfix/pflogsumm.nix rename to pkgs/by-name/pf/pflogsumm/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0bd2628fd7d1..bd2907109199 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11448,8 +11448,6 @@ with pkgs; tbb = tbb_2021_11; }; - pflogsumm = callPackage ../servers/mail/postfix/pflogsumm.nix { }; - system-sendmail = lowPrio (callPackage ../servers/mail/system-sendmail { }); # PulseAudio daemons