rubymta 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b111a36b3145f824bf81193bb2814bea8ec8e96
-  data.tar.gz: 981638f013c0d26b0cc09316041cfdc4e35c3334
+  metadata.gz: 21e90301e71f47d7688639e2274a3de5e48b6bfb
+  data.tar.gz: 0ebd722efb5d5d729171802dbd25cdfca218500b
 SHA512:
-  metadata.gz: 11b8812e113d116da43c3778f72b655ac0e731fdcb98d147c6e3d352524d61dadb480447594748bec0bb38ba59733f2803941e3224abdf142bf295d6c3d12209
-  data.tar.gz: f19e0dff3bc40cf2ccc26d92a4588a7057abcffb167bd4820ee9276e67c551b8be2f65558281431314c4c4456a572bfbe661c01629cdd73ba1622c1220eff071
+  metadata.gz: bc03e6ed1b3c8e8303173fe480be8962ba0f244d673d32a49b565025c9f96a35d566d5132e72f8c8b26f21e76cb0d77c20b8c8f4a13a9eceaacff913c3b0a702
+  data.tar.gz: 639f09f898661a3dffff2be7bffdb83f927df4e18f5e9402d5fdca79763b46af7ba7ef1cc91722d677793aacbc0ac483e1f9652637693a428710d0e75f8beaa8

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# v0.0.16
+
+* Removed the SpamAssassin check from the ItemOfMail class because I suspect Microsoft Outlook doesn't like the headers added by it.
+* Added the SpamAssassin check into QueueRunner class just before local delivery only.
+
+
 # v0.0.15
 
 * Added a rescue for `Server::listening_thread`, at `getnameinfo` to catch errors where the IP address doesn't point to any DNS records. This error is ignored and `hostname` is set to `(none)`. No harm is done because the `hostname` is only used for log messages.

data/lib/rubymta/item_of_mail.rb

@@ -99,7 +99,6 @@ class ItemOfMail < Hash
         f.write(tmp)
         f.write("\n")
         text_out = text_in = text.join("\n")
-        text_out, e, s = Open3.capture3("spamc", :stdin_data=>text_in) if defined?(SpamAssassinInstalled)
         f.write(text_out.utf8)
       end
       self[:saved] = true

data/lib/rubymta/queue_runner.rb

@@ -124,6 +124,11 @@ class QueueRunner
         begin
           ssl_socket = TCPSocket.open('localhost',LocalLMTPPort)
           @connection = OpenSSL::SSL::SSLSocket.new(ssl_socket, $ctx);
+          if defined?(SpamAssassinInstalled) && SpamAssassinInstalled
+            text = mail[:data][:text].join(CRLF)
+            text, e, s = Open3.capture3("spamc", :stdin_data=>text)
+            mail[:data][:text] = text.split(CRLF)
+          end
           lmtp_delivery('localhost',LocalLMTPPort,mail,domain,parcels)
           mail.update_parcels(parcels)
         rescue Errno::ECONNREFUSED => e

data/lib/rubymta/version.rb

@@ -1,5 +1,5 @@
 module Version
-  VERSION = "0.0.15"
-  MODIFIED = "2017-11-11"
+  VERSION = "0.0.16"
+  MODIFIED = "2017-11-13"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubymta
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Michael J. Welch, Ph.D.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-11 00:00:00.000000000 Z
+date: 2017-11-13 00:00:00.000000000 Z
 dependencies: []
 description: RubyMta is an experimental mail transport agent written in Ruby. See
   the README.