--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Exim/Plugin/CheckDisclaimer.pm	Tue Jul 07 23:29:16 2015 +0200
@@ -0,0 +1,112 @@
+package Exim::Plugin::CheckDisclaimer;
+
+# For detailed information see the end of this
+# file.
+# Source: https://ssl.schlittermann.de/hg/exim-check-message-conformance
+# (c) 2015 Heiko Schlittermann
+
+use Fcntl qw/:seek/;
+use base 'Exporter';
+our @EXPORT  = qw(check_disclaimer);
+our $Verbose = 0;
+my $pattern;
+
+# Lets search for the disclaimer.
+# Usage: ${perl{check_disclaimer}{<disclaimer>}}
+#        ${perl{check_disclaimer}{<disclaimer>}{<file>}}
+#
+# The content of the <disclaimer> file is used as a regexp to be found
+# near the end of the <file>. If <file> is not specified, we use the
+# default file location:
+# $spool_directory/scan/$message_exim_id/$message_exim_id.eml
+
+sub check_disclaimer {
+    my $pattern_file = shift;
+    my $file = shift // Exim::expand_string(
+        '$spool_directory/scan/$message_exim_id/$message_exim_id.eml');
+
+    if (not defined $pattern) {
+        open(my $fh, $pattern_file) or die "Can't open $pattern_file: $!\n";
+        $_ = join '', <$fh>;
+        $pattern = qr/$_/;
+    }
+
+    open(my $fh, $file) or die "Can't open $file: $!\n";
+    seek($fh, -1024, SEEK_END)
+      or die "Can't seek to -1024: $!\n"
+      if -s $fh > 1024;
+
+    $_ = join '', <$fh>;
+
+    if (/$pattern/) {
+        warn __PACKAGE__
+          . ": signature pattern from $pattern_file matched in $file\n"
+          if $Verbose;
+        return 1;
+    }
+
+    warn __PACKAGE__
+      . ": signature pattern from $pattern_file NOT matched in $file\n"
+      if $Verbose;
+    return 0;
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+ check_disclaimer - check for an disclaimer pattern
+
+=head1 SYNOPSIS
+
+ use Exim::Plugin::CheckDisclaimer;
+ ${perl{check_disclaimer}{/etc/exim4/disclaimer}}
+ ${perl{check_disclaimer}{/etc/exim4/disclaimer}{$mime_decoded_filename}
+
+=head1 DESCRIPTION
+
+This Plugin checks for the existence of a Message Disclaimer
+To use it, add the following line to your Exim configuration:
+
+    perl_startup = 
+        use lib '/etc/exim4'; \
+        use Exim::Plugin::CheckDisclaimer; \
+        $Exim::Plugin::CheckDisclaimer::Verbose = 1
+
+The disclaimer may be part of the MIME coverletter or 
+at the end of the old school message body.
+
+Now you get a callable `check_disclaimer()` function.
+Your MIME ACL needs about the following code:
+
+    acl_check_mime:
+
+      accept condition = $acl_m_sig_found
+
+      warn
+        condition           = $mime_is_coverletter
+        !condition          = $mime_is_rfc822
+        decode              = default
+        set acl_m_sig_found = ${perl{check_disclaimer}{/etc/exim4/disclaimer}{$mime_decoded_filename}}
+
+    accept
+
+
+    acl_check_data:
+
+      warn 
+        !condition          = $acl_m_sig_found
+        # temporary workaround to get the mail spooled to the .eml file
+        # this is NOT necessary if some malware or spam acl condition
+        # was processed already
+        regex               = ^
+        set acl_m_sig_found = \
+                ${perl{check_disclaimer}{/etc/exim4/disclaimer}}
+
+      deny !condition = $acl_m_sig_found
+            message   = no signature/disclaimer found
+=cut
+
+// vim:sts=2 sw=2 aw ai et

--- a/README	Tue Jul 07 07:18:20 2015 +0200
+++ b/README	Tue Jul 07 23:29:16 2015 +0200
@@ -1,41 +1,4 @@
-# include at the beginning
-
- perl_startup = do '…/check-message-conformance.pm'
-
-# ----
-
-# scan mime
- acl_smtp_mime = acl_check_mime
-
-# scan data
- acl_smtp_data = acl_check_mime
-
-# -----
-
-acl_check_mime:
-
-  accept condition = $acl_m_sig_found
-
-  warn
-    condition  = $mime_is_coverletter
-    !condition = $mime_is_rfc822
-    decode = default
-    set acl_m_sig_found = ${perl{check_sig}{$mime_decoded_filename}}
-
-  accept
-
-
-acl_check_data:
-
-  warn 
-    !condition = $acl_m_sig_found
-    set acl_m_sig_found = \
-        ${perl{check_sig}\
-              {$spool_directory/scan/$message_exim_id/$message_exim_id.eml}}
-
-  require 
-    message = no signature/disclaimer found
-    condition = $acl_m_sig_found
-
-
-    …
+For detailed information see the Exim/Plugin/CheckDisclaimer.pm
+file. You may run
+  
+  perldoc Exim/Plugin/CheckDisclaimer.pm

--- a/check-message-conformance.pm	Tue Jul 07 07:18:20 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-use Fcntl qw/:seek/;
-
-my $sig_pattern = qr/
-	^--\x20\s+	# signature delimiter dash-dash-space
-	^Heiko\s+	# signature text
-	\Z		# hard end of the signature
-/mix;
-
-sub check_sig {
-	my ($file, $sender) = @_;
-	
-	open(my $fh, $file) or die "Can't open $file: $!\n";
-	seek($fh, -1024, SEEK_END) or die "Can't seek to -1024: $!\n"
-		if -s $fh > 1024;
-
-	$_ = join '', <$fh>;
-
-	return /$sig_pattern/;
-}