From 7736c471ef7108535c10f54d3d294fe4666e8ee9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 19 Feb 2025 16:09:23 -0800
Subject: [PATCH] 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
- 	;;
-