Merge pull request #472 from dlobo/CRM-12373

CRM-12373

CRM/Upgrade/Incremental/sql/4.3.1.mysql.tpl

 -- CRM-12351
-UPDATE civicrm_dedupe_rule_group SET title = name WHERE title IS NULL; 
\ No newline at end of file
+UPDATE civicrm_dedupe_rule_group SET title = name WHERE title IS NULL;
+
+-- CRM-12373
+
+SELECT @bounceTypeID := max(id) FROM civicrm_mailing_bounce_type WHERE name = 'Dns';
+INSERT INTO civicrm_mailing_bounce_pattern (bounce_type_id, pattern)
+    VALUES
+      (@bounceTypeID, 'Host or domain name not found');
+
+SELECT @bounceTypeID := max(id) FROM civicrm_mailing_bounce_type WHERE name = 'Host';
+INSERT INTO civicrm_mailing_bounce_pattern (bounce_type_id, pattern)
+    VALUES
+      (@bounceTypeID, 'lost connection'),
+      (@bounceTypeID, 'conversation with [^ ]* timed out while');
+
+SELECT @bounceTypeID := max(id) FROM civicrm_mailing_bounce_type WHERE name = 'Relay';
+INSERT INTO civicrm_mailing_bounce_pattern (bounce_type_id, pattern)
+    VALUES
+      (@bounceTypeID, 'No route to host'),
+      (@bounceTypeID, 'Network is unreachable');

xml/templates/civicrm_data.tpl

@@ -1098,7 +1098,8 @@ INSERT INTO civicrm_mailing_bounce_pattern
         VALUES
     (@bounceTypeID, 'name(server entry| lookup failure)'),
     (@bounceTypeID, 'no (mail server|matches to nameserver query|dns entries)'),
-    (@bounceTypeID, 'reverse dns entry');
+    (@bounceTypeID, 'reverse dns entry'),
+    (@bounceTypeID, 'Host or domain name not found');
 
 INSERT INTO civicrm_mailing_bounce_type
         (name, description, hold_threshold)
@@ -1122,7 +1123,9 @@ INSERT INTO civicrm_mailing_bounce_pattern
     (@bounceTypeID, 'not a gateway'),
     (@bounceTypeID, 'server is down or unreachable'),
     (@bounceTypeID, 'too many connections'),
-    (@bounceTypeID, 'unable to connect');
+    (@bounceTypeID, 'unable to connect'),
+    (@bounceTypeID, 'lost connection'),
+    (@bounceTypeID, 'conversation with [^ ]* timed out while');
 
 INSERT INTO civicrm_mailing_bounce_type
         (name, description, hold_threshold)
@@ -1250,7 +1253,9 @@ INSERT INTO civicrm_mailing_bounce_pattern
     (@bounceTypeID, 'relay (not permitted|access denied)'),
     (@bounceTypeID, 'relayed mail to .+? not allowed'),
     (@bounceTypeID, 'sender ip must resolve'),
-    (@bounceTypeID, 'unable to relay');
+    (@bounceTypeID, 'unable to relay'),
+    (@bounceTypeID, 'No route to host'),
+    (@bounceTypeID, 'Network is unreachable');
 
 INSERT INTO civicrm_mailing_bounce_type
         (name, description, hold_threshold)