Attachment #254095 for bug #281941

View | Details | Raw Unified | Return to bug 281941
Collapse All | Expand All

Lines 1-6 Link Here

(-)b/mail/p5-Mail-Milter-Authentication/Makefile (-2 / +1 lines)
1	PORTNAME= Mail-Milter-Authentication	1	PORTNAME= Mail-Milter-Authentication
2	PORTVERSION= 3.20240205	2	PORTVERSION= 3.20240827
3	PORTREVISION= 1
4	CATEGORIES= mail perl5	3	CATEGORIES= mail perl5
5	MASTER_SITES= CPAN	4	MASTER_SITES= CPAN
6	PKGNAMEPREFIX= p5-	5	PKGNAMEPREFIX= p5-

Lines 1-3 Link Here

(-)b/mail/p5-Mail-Milter-Authentication/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1708613768	1	TIMESTAMP = 1727302937
2	SHA256 (Mail-Milter-Authentication-3.20240205.tar.gz) = 88a04406509c2f6a2b1b718b1ca250dc4e86f783343ceeb6cd6eac00ed4d0d7e	2	SHA256 (Mail-Milter-Authentication-3.20240827.tar.gz) = b38cdd8e694ac8689f6893997a40f70ace182a04314baef416b3aec8867ba3b0
3	SIZE (Mail-Milter-Authentication-3.20240205.tar.gz) = 249101	3	SIZE (Mail-Milter-Authentication-3.20240827.tar.gz) = 251966




--- lib/Mail/Milter/Authentication.pm.orig	2024-02-05 02:41:57 UTC
+++ lib/Mail/Milter/Authentication.pm
@@ -32,11 +32,14 @@ use vars qw(@ISA);
         my $MYARGS = {
             'ident' => $Mail::Milter::Authentication::Config::IDENT,
             'to_stderr' => 0, # handled elsewhere
+            'to_stdout' => 0, # handled elsewhere
             'log_pid' => 1,
             'facility' => LOG_MAIL,
         };
         if ( exists $config->{ 'log_dispatchouli' } ) {
-            $MYARGS = $config->{ 'log_dispatchouli' };
+            foreach my $k (keys %{$config->{ 'log_dispatchouli' }}) {
+                $MYARGS->{$k} = $config->{ 'log_dispatchouli' }->{$k};
+            }
         }
 
         $LOGGER = Log::Dispatchouli->new( $MYARGS );

Lines 53-60 Link Here

(-)b/mail/p5-Mail-Milter-Authentication/files/patch-lib_Mail_Milter_Authentication_Config.pm (-2 / +2 lines)
53		53
54	@@ -104,7 +104,7 @@ sub setup_config {	54	@@ -104,7 +104,7 @@ sub setup_config {
55	else {	55	else {
56	if ( $EUID == 0 ) {	56	if ( $EUID == 0 && -d "/var/$type" && -w "/var/$type" ) {
57	# We are root, create in global space	57	# We are root, create in global space if it exists and is writable
58	- $dir = '/var/'.$type.'/authentication_milter';	58	- $dir = '/var/'.$type.'/authentication_milter';
59	+ $dir = '/var/'.$type.'/auth_milter';	59	+ $dir = '/var/'.$type.'/auth_milter';
60	mkdir $dir if ! -e $dir;	60	mkdir $dir if ! -e $dir;

Lines 65-76 Link Here

(-)b/mail/p5-Mail-Milter-Authentication/files/patch-share_authentication__milter.json (-9 lines)
65	"PTR" : {},	65	"PTR" : {},
66		66
67	"SenderID" : {	67	"SenderID" : {
68	@@ -63,7 +74,7 @@
69	"100.200.100.2",
70	"2001:44c2:3881:aa00::/56",
71	"2001:44b8:3021:123:dead:beef:abcd:1234"
72	- ],
73	+ ]
74	},
75
76	"!AddID" : {},

Return to bug 281941

Removed Link Here

(-)a/mail/p5-Mail-Milter-Authentication/files/patch-lib_Mail_Milter_Authentication.pm (-18 lines)
1	--- lib/Mail/Milter/Authentication.pm.orig 2024-02-05 02:41:57 UTC
2	+++ lib/Mail/Milter/Authentication.pm
3	@@ -32,11 +32,14 @@ use vars qw(@ISA);
4	my $MYARGS = {
5	'ident' => $Mail::Milter::Authentication::Config::IDENT,
6	'to_stderr' => 0, # handled elsewhere
7	+ 'to_stdout' => 0, # handled elsewhere
8	'log_pid' => 1,
9	'facility' => LOG_MAIL,
10	};
11	if ( exists $config->{ 'log_dispatchouli' } ) {
12	- $MYARGS = $config->{ 'log_dispatchouli' };
13	+ foreach my $k (keys %{$config->{ 'log_dispatchouli' }}) {
14	+ $MYARGS->{$k} = $config->{ 'log_dispatchouli' }->{$k};
15	+ }
16	}
17
18	$LOGGER = Log::Dispatchouli->new( $MYARGS );