ports/161482: upgrade mail/exim to 4.77

[dawnshade]

>Number:         161482
>Category:       ports
>Synopsis:       upgrade mail/exim to 4.77
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 11 09:20:04 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     dawnshade
>Release:        8.2-RELEASE-p1
>Organization:
-
>Environment:
FreeBSD serv.*.ru 8.2-RELEASE-p1 FreeBSD 8.2-RELEASE-p1 #5: Sat May  7 18:45:29 MSD 2011     root at serv.*.ru:/usr/obj/usr/src/sys/3  amd64

>Description:
upgrade mail/exim to 4.77, due changes into match_* function this upgrade maybe unsafe on some installations, maybe this fact should be noted on UPDATING document and/or into pkg-install file.
ftp://ftp.exim.org/pub/exim/ChangeLogs/ChangeLog-4.77
Added option LISTMATCH_RHS for old compatibility and turned off by default due security reason.
Removed src/exiqgrep.src patch, since it was builtin into 4.77
>How-To-Repeat:
-
>Fix:
 diff -ruN exim.orig exim
diff -ruN exim.orig/Makefile exim/Makefile
--- exim.orig/Makefile  2011-05-11 15:30:17.000000000 +0400
+++ exim/Makefile       2011-10-11 12:57:37.000000000 +0400
@@ -77,7 +77,7 @@
 PLIST_SUB+=    SO_1024="@comment "
 .endif
 
-EXIM_VERSION=  4.76
+EXIM_VERSION=  4.77
 SA_EXIM_VERSION=4.2
 SO_1024_VERSION=3.2
 
@@ -170,6 +170,10 @@
 SEDLIST+=      -e 's,^\# (EXPERIMENTAL_DCC=),\1,'
 .endif
 
+.if defined(LISTMATCH_RHS)
+SEDLIST+=       -e 's,^\# (EXPAND_LISTMATCH_RHS=),\1,'
+.endif
+
 .if defined(WITH_XCLIENT)
 EXTRA_PATCHES+=        ${FILESDIR}/extra-patch-xclient
 .endif
diff -ruN exim.orig/Makefile.options exim/Makefile.options
--- exim.orig/Makefile.options  2011-01-09 14:19:24.000000000 +0300
+++ exim/Makefile.options       2011-10-11 12:56:25.000000000 +0400
@@ -34,6 +34,7 @@
 PASSWD         = "Enable /etc/passwd lookups"
 SUID           = "Install the exim binary suid root"
 TLS            = "Link against OpenSSL"
+LISTMATCH_RHS  = "Enable old behavior match_*"
 
 ALT_CONFIG_PREFIX      = "Restrict the set of configuration files"
 AUTH_RADIUS    = "Enable radius (RFC 2865) authentication"
@@ -106,7 +107,8 @@
                SRS_ALT \
                TCP_WRAPPERS \
                WISHLIST \
-               XCLIENT
+               XCLIENT \
+               LISTMATCH_RHS
 
 ALL_OPTIONS=   ${ENABLED_OPTIONS} \
                ${DISABLED_OPTIONS}
diff -ruN exim.orig/distinfo exim/distinfo
--- exim.orig/distinfo  2011-05-11 15:30:17.000000000 +0400
+++ exim/distinfo       2011-10-11 12:59:03.000000000 +0400
@@ -1,5 +1,5 @@
-SHA256 (exim/exim-4.76.tar.bz2) = 4625b0fb916835ae60a73311a8956267fa1248e888f584c337a5b7df20174e95
-SIZE (exim/exim-4.76.tar.bz2) = 1605832
+SHA256 (exim/exim-4.77.tar.bz2) = 0ccc13cf2f052b1163fcdf71c55a3578765050848ba413a6473d3ab5d20b1475
+SIZE (exim/exim-4.77.tar.bz2) = 1576148
 SHA256 (exim/sa-exim-4.2.tar.gz) = 72e0a735547f18b05785e6c58a71d24623858f0f5234a5dc0e24cb453999e99a
 SIZE (exim/sa-exim-4.2.tar.gz) = 66575
 SHA256 (exim/spamooborona1024-src-3.2.tar.gz) = ab22a430f3860460045f6b213c68c89700a0cd10cbb6c7a808ece326c53787ee
diff -ruN exim.orig/files/patch-exiqgrep.src exim/files/patch-exiqgrep.src
--- exim.orig/files/patch-exiqgrep.src  2011-05-11 15:30:17.000000000 +0400
+++ exim/files/patch-exiqgrep.src       1970-01-01 03:00:00.000000000 +0300
@@ -1,15 +0,0 @@
-Should be removed once it will get into the mainline release.
-
-Taken-from: http://bugs.exim.org/show_bug.cgi?id=1103
-Reported-by: Oliver Brandmueller <ob at e-gitt.net>
---- src/exiqgrep.src.orig      2011-05-10 10:29:50.000000000 +0400
-+++ src/exiqgrep.src   2011-05-10 10:31:13.000000000 +0400
-@@ -88,7 +88,7 @@
-               chomp();
-               my $line = $_;
-               #Should be 1st line of record, if not error.
--              if ($line =~ /^\s*(\w+)\s+((?:\d+(?:\.\d+)?[A-Z])?)\s*(\w{6}-\w{6}-\w{2})\s+(<.*?>)/) {
-+              if ($line =~ /^\s*(\w+)\s+((?:\d+(?:\.\d+)?[A-Z]?)?)\s*(\w{6}-\w{6}-\w{2})\s+(<.*?>)/) {
-                       my $msg = $3;
-                       $id{$msg}{age} = $1;
-                       $id{$msg}{size} = $2;
diff -ruN exim.orig/options exim/options
--- exim.orig/options   2011-01-09 14:19:24.000000000 +0300
+++ exim/options        2011-10-11 13:09:27.000000000 +0400
@@ -44,3 +44,4 @@
         TLS "Link against OpenSSL" on \
         WISHLIST "Include the unsupported patches" off \
         XCLIENT "Enable XCLIENT command in exim" off \
+        LISTMATCH_RHS "Enable old behavior match_*" off \


>Release-Note:
>Audit-Trail:
>Unformatted: