smeserver-fetchmail/contribs7/smeserver-fetchmail-1.3.6-domainlength.patch

--- smeserver-fetchmail-1.3.6/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/fetchmail.pm.domainlength    2008-04-20 06:27:24.000000000 -0600
+++ smeserver-fetchmail-1.3.6/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/fetchmail.pm 2009-03-05 08:43:34.000000000 -0700
@@ -468,7 +468,7 @@
     # starting with version 1.3.4-01, it's allowed to have more than one
     # external mail redirection. Simply give all mail addresses, separated by ','
     $mail =~ s/\s//g ;
-    my $mailpattern = '(\w+[\-\.])*\w+\@([a-z0-9\-]+\.){1,4}[a-z]{2,5}' ;
+    my $mailpattern = '(\w+[\-\.])*\w+\@([a-z0-9\-]+\.){1,4}[a-z]{2,7}' ;
     if ( ! ( $mail =~ /^$mailpattern(:$mailpattern)*$/i ) && $mail ne '' ) {
     # A valid e-mail address contains lettters, digit and underscores, and optionally 
     # '-' and or '.' as field separator, then one @ then a valid domain name :
@@ -510,7 +510,7 @@
         if ( $Tst eq 'Server' ) { 
             $self->debug_msg("'Server' test begins.");
             my $IPPattern = "(([01]?[0-9]{1,2}|2([0-4][0-9]|5[0-5]))\.){3}([01]?[0-9]{1,2}|2([0-4][0-9]|5[0-5]))" ;
-            if ( $server !~ /^([a-z0-9\-]+\.){1,4}[a-z]{2,5}$/i and $server !~ /^$IPPattern$/ ) {
+            if ( $server !~ /^([a-z0-9\-]+\.){1,4}[a-z]{2,7}$/i and $server !~ /^$IPPattern$/ ) {
                 # A server name is considered as valid if if contains betweens 2 an 5
                 # sections, separated by dots '.'
                 # For all sections but the last, characters alloweds are letters, 
--- smeserver-fetchmail-1.3.6/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/fetchmail.domainlength    2009-03-05 08:38:41.000000000 -0700
+++ smeserver-fetchmail-1.3.6/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/fetchmail 2009-03-05 08:41:30.000000000 -0700
@@ -273,7 +273,7 @@
                For all parts but the last, characters allowed are letters, numbers and '-'.
                The parts can be of any size.<br>
                For the last part (also named tld), only letters are allowed, and the part
-               must contain between two and five characters.<br>
+               must contain between two and seven characters.<br>
                A valid IP address is made with four decimal integers, each between 0 and 255. The four
                numbers are put together, separated by one dot.
                ]]>
@@ -405,7 +405,7 @@
            lowercase letters, numbers and the '-' character.  The domain name normally contains 
            between 1 and 4 dot (.) characters.
            The last word (the tld) can only contains letters and
-           it should have a least 2 characters, but not more than 5.<br>
+           it should have a least 2 characters, but not more than 7.<br>
                You can set more than one external mailbox. In this case, just separate each
                e-mail address with a colon ':'
            ]]>
1	slords	1.1	--- smeserver-fetchmail-1.3.6/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/fetchmail.pm.domainlength 2008-04-20 06:27:24.000000000 -0600
2			+++ smeserver-fetchmail-1.3.6/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/fetchmail.pm 2009-03-05 08:43:34.000000000 -0700
3			@@ -468,7 +468,7 @@
4			# starting with version 1.3.4-01, it's allowed to have more than one
5			# external mail redirection. Simply give all mail addresses, separated by ','
6			$mail =~ s/\s//g ;
7			- my $mailpattern = '(\w+[\-\.])*\w+\@([a-z0-9\-]+\.){1,4}[a-z]{2,5}' ;
8			+ my $mailpattern = '(\w+[\-\.])*\w+\@([a-z0-9\-]+\.){1,4}[a-z]{2,7}' ;
9			if ( ! ( $mail =~ /^$mailpattern(:$mailpattern)*$/i ) && $mail ne '' ) {
10			# A valid e-mail address contains lettters, digit and underscores, and optionally
11			# '-' and or '.' as field separator, then one @ then a valid domain name :
12			@@ -510,7 +510,7 @@
13			if ( $Tst eq 'Server' ) {
14			$self->debug_msg("'Server' test begins.");
15			my $IPPattern = "(([01]?[0-9]{1,2}\|2([0-4][0-9]\|5[0-5]))\.){3}([01]?[0-9]{1,2}\|2([0-4][0-9]\|5[0-5]))" ;
16			- if ( $server !~ /^([a-z0-9\-]+\.){1,4}[a-z]{2,5}$/i and $server !~ /^$IPPattern$/ ) {
17			+ if ( $server !~ /^([a-z0-9\-]+\.){1,4}[a-z]{2,7}$/i and $server !~ /^$IPPattern$/ ) {
18			# A server name is considered as valid if if contains betweens 2 an 5
19			# sections, separated by dots '.'
20			# For all sections but the last, characters alloweds are letters,
21			--- smeserver-fetchmail-1.3.6/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/fetchmail.domainlength 2009-03-05 08:38:41.000000000 -0700
22			+++ smeserver-fetchmail-1.3.6/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/fetchmail 2009-03-05 08:41:30.000000000 -0700
23			@@ -273,7 +273,7 @@
24			For all parts but the last, characters allowed are letters, numbers and '-'.
25			The parts can be of any size.<br>
26			For the last part (also named tld), only letters are allowed, and the part
27			- must contain between two and five characters.<br>
28			+ must contain between two and seven characters.<br>
29			A valid IP address is made with four decimal integers, each between 0 and 255. The four
30			numbers are put together, separated by one dot.
31			]]>
32			@@ -405,7 +405,7 @@
33			lowercase letters, numbers and the '-' character. The domain name normally contains
34			between 1 and 4 dot (.) characters.
35			The last word (the tld) can only contains letters and
36			- it should have a least 2 characters, but not more than 5.<br>
37			+ it should have a least 2 characters, but not more than 7.<br>
38			You can set more than one external mailbox. In this case, just separate each
39			e-mail address with a colon ':'
40			]]>