smeserver-fetchmail/contribs8/smeserver-fetchmail-1.4.non_standard_smtpd_TCPPort.patch

diff -Nur smeserver-fetchmail-1.4.old8796/root/etc/e-smith/templates/etc/fetchmail/90fetchmail smeserver-fetchmail-1.4.bz8796/root/etc/e-smith/templates/etc/fetchmail/90fetchmail
--- smeserver-fetchmail-1.4.old8796/root/etc/e-smith/templates/etc/fetchmail/90fetchmail        2015-01-12 17:45:34.869937632 +0100
+++ smeserver-fetchmail-1.4.bz8796/root/etc/e-smith/templates/etc/fetchmail/90fetchmail 2015-02-06 09:42:51.012772145 +0100
@@ -333,13 +333,16 @@
                         $mname =~ s/[\']/\\x27/g ;
                         $mpass =~ s/[\']/\\x27/g ;
 
+                        #find the tcp port of smtpd
+                        my $tcpport = $db->get_prop('smtpd','TCPPort')||'25';
+                        
                            $OUT .= "#\n";
                         $OUT .= "#   Mail N$FetchN Account for : $comment\n";
                         $OUT .= $staticvalue;
                         $OUT .= "poll $mserv with proto $mtype$ServOpt\n" ;
                         $OUT .= "  user '$mname' $DestSMTPServer with password '" ;
                         $OUT .= "$mpass' is $name here $keep $ssl\n" ;
-                        $OUT .= "  smtphost 127.0.0.200\n" ;
+                        $OUT .= "  smtphost 127.0.0.200" . ($tcpport ? "/$tcpport" : "") . "\n";
                        $OUT .="EOF\n";
                    }
                }
1	stephdl	1.1	diff -Nur smeserver-fetchmail-1.4.old8796/root/etc/e-smith/templates/etc/fetchmail/90fetchmail smeserver-fetchmail-1.4.bz8796/root/etc/e-smith/templates/etc/fetchmail/90fetchmail
2			--- smeserver-fetchmail-1.4.old8796/root/etc/e-smith/templates/etc/fetchmail/90fetchmail 2015-01-12 17:45:34.869937632 +0100
3	stephdl	1.2	+++ smeserver-fetchmail-1.4.bz8796/root/etc/e-smith/templates/etc/fetchmail/90fetchmail 2015-02-06 09:42:51.012772145 +0100
4			@@ -333,13 +333,16 @@
5			$mname =~ s/[\']/\\x27/g ;
6			$mpass =~ s/[\']/\\x27/g ;
7
8			+ #find the tcp port of smtpd
9			+ my $tcpport = $db->get_prop('smtpd','TCPPort')\|\|'25';
10			+
11			$OUT .= "#\n";
12			$OUT .= "# Mail N$FetchN Account for : $comment\n";
13			$OUT .= $staticvalue;
14	stephdl	1.1	$OUT .= "poll $mserv with proto $mtype$ServOpt\n" ;
15			$OUT .= " user '$mname' $DestSMTPServer with password '" ;
16			$OUT .= "$mpass' is $name here $keep $ssl\n" ;
17			- $OUT .= " smtphost 127.0.0.200\n" ;
18	stephdl	1.2	+ $OUT .= " smtphost 127.0.0.200" . ($tcpport ? "/$tcpport" : "") . "\n";
19	stephdl	1.1	$OUT .="EOF\n";
20			}
21			}