[packages/exim-surbl] Up to 2.4

[arekm]

commit 40f18909743c1cf743e4492755a3ee81fa6bce64
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Thu Oct 5 11:52:00 2023 +0200

    Up to 2.4

 config.patch     | 26 ++++++++++++++------------
 exim-surbl.spec  |  6 +++---
 ip-meaning.patch | 10 +++++-----
 3 files changed, 22 insertions(+), 20 deletions(-)
---
diff --git a/exim-surbl.spec b/exim-surbl.spec
index 114d41e..25f8115 100644
--- a/exim-surbl.spec
+++ b/exim-surbl.spec
@@ -1,11 +1,11 @@
 Summary:	Blocking Spam in Exim with URI Block Lists
 Name:		exim-surbl
-Version:	2.3
-Release:	5
+Version:	2.4
+Release:	1
 License:	GPL
 Group:		Networking/Daemons/SMTP
 Source0:	https://www.teuton.org/~ejm/exim_surbl/exim_surbl-%{version}.tar.gz
-# Source0-md5:	fe23aad8d686ef9c48f9e82461a2f1bc
+# Source0-md5:	8aefd22e5c19207b0452e75aa016020f
 Patch0:		path.patch
 Patch1:		config.patch
 Patch2:		public_resolvers.patch
diff --git a/config.patch b/config.patch
index e682cc9..3a661d6 100644
--- a/config.patch
+++ b/config.patch
@@ -10,7 +10,7 @@ diff -urN exim_surbl-2.3.org/config.ini exim_surbl-2.3/config.ini
 diff -urN exim_surbl-2.3.org/exim_surbl.pl exim_surbl-2.3/exim_surbl.pl
 --- exim_surbl-2.3.org/exim_surbl.pl	2019-05-13 13:28:21.937931916 +0200
 +++ exim_surbl-2.3/exim_surbl.pl	2019-05-13 13:28:43.838583229 +0200
-@@ -20,9 +20,13 @@
+@@ -20,6 +20,8 @@
  # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
@@ -19,28 +19,30 @@ diff -urN exim_surbl-2.3.org/exim_surbl.pl exim_surbl-2.3/exim_surbl.pl
  sub surblspamcheck
  {
  
+@@ -29,6 +31,8 @@
+ # Please see the following website for details on usage of
+ # this script:  http://www.teuton.org/~ejm/exim_surbl
+ 
 +    my $cfg = new Config::IniFiles -file => '/etc/exim-surbl/config.ini';
 +
- # Designed and written by Erik Mugele, 2004-2010,1http://www.teuton.org/~ejm
- # Version 2.3-beta
- #
-@@ -56,14 +60,14 @@
+     # The following variable is the full path to the file containing the 
+     # two-level top level domains (TLD).
+     # ---------------------------------------------------------------------
+@@ -56,13 +60,13 @@
      # This variable defines the maximum MIME file size that will be checked
      # if this script is called by the MIME ACL.  This is primarily to
      # keep the load down on the server.  Size is in bytes.
 -    my $max_file_size = 50000;
 +    my $max_file_size = $cfg->val('config', 'max_file_size', 50000);
      
-     # The following ariables enable or disable the SURBL, URIBL and DBL
+     # The following variables enable or disable the SURBL, URIBL and DBL
      # lookups.  Set to 1 to enable and 0 to disable.
 -    my $surbl_enable = 1;
--    my $uribl_enable = 1;
+-    my $uribl_enable = 0;
 -    my $dbl_enable = 1;
--    
 +    my $surbl_enable = $cfg->val('config', 'surbl_enable', 1);
-+    my $uribl_enable = $cfg->val('config', 'uribl_enable', 1);
-+    my $dbl_enable = $cfg->val('config', 'dbl_enable', 1);;
-+
++    my $uribl_enable = $cfg->val('config', 'uribl_enable', 0);
++    my $dbl_enable = $cfg->val('config', 'dbl_enable', 1);
+     
      # Check to see if a decode MIME attachment is being checked or 
      # just a plain old text message with no attachments
-     my $exim_body = "";
diff --git a/ip-meaning.patch b/ip-meaning.patch
index 4b57b47..49d3c6d 100644
--- a/ip-meaning.patch
+++ b/ip-meaning.patch
@@ -1,7 +1,7 @@
 diff -urN exim_surbl-2.3.org/exim_surbl.pl exim_surbl-2.3/exim_surbl.pl
 --- exim_surbl-2.3.org/exim_surbl.pl	2021-04-29 14:20:06.491533142 +0200
 +++ exim_surbl-2.3/exim_surbl.pl	2021-04-29 14:29:08.875363883 +0200
-@@ -116,6 +116,10 @@
+@@ -120,6 +120,10 @@
          # If gethostbyname() returned anything, build a return message.
          $return_string = "";
          if (scalar(@dnsbladdr) != 0) {
@@ -11,8 +11,8 @@ diff -urN exim_surbl-2.3.org/exim_surbl.pl exim_surbl-2.3/exim_surbl.pl
 +            }
              $return_string = "Blacklisted URL in message. (".$params[0].") in";
              @surblipaddr = unpack('C4',($dnsbladdr[4])[0]);
-             if ($surblipaddr[3] & 64) {
-@@ -152,6 +156,10 @@
+             if ($surblipaddr[3] & 128) {
+@@ -150,6 +154,10 @@
          if (scalar(@dnsbladdr) != 0) {
              $return_string = "Blacklisted URL in message. (".$params[0].") in";
              @ipaddr = unpack('C4',($dnsbladdr[0])[0]);
@@ -23,7 +23,7 @@ diff -urN exim_surbl-2.3.org/exim_surbl.pl exim_surbl-2.3/exim_surbl.pl
              if ($ipaddr[3] & 8) {
                  $return_string .= " [red]";
              }
-@@ -175,6 +183,15 @@
+@@ -173,6 +181,15 @@
          # If gethostbyname() returned anything, build a return message.
          $return_string = "";
          if (scalar(@dnsbladdr) != 0) {
@@ -37,5 +37,5 @@ diff -urN exim_surbl-2.3.org/exim_surbl.pl exim_surbl-2.3/exim_surbl.pl
 +                return "";
 +            }
              $return_string = "Blacklisted URL in message: ".$params[0];
-             $return_string .= ". See http://www.spamhaus.org/lookup.lasso?dnsbl=domain.";
+             $return_string .= ". See https://www.spamhaus.org/query/domain/".$params[0];
          }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/exim-surbl.git/commitdiff/40f18909743c1cf743e4492755a3ee81fa6bce64