sup 1.1 → 1.3

data/contrib/nix/ruby3.0-gemset.nix

@@ -0,0 +1,359 @@
+{
+  ast = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y";
+      type = "gem";
+    };
+    version = "2.4.2";
+  };
+  benchmark = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0jl71qcgamm96dzyqk695j24qszhcc7liw74qc83fpjljp2gh4hg";
+      type = "gem";
+    };
+    version = "0.4.0";
+  };
+  chronic = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn";
+      type = "gem";
+    };
+    version = "0.10.2";
+  };
+  coderay = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0jvxqxzply1lwp7ysn94zjhh57vc14mcshw1ygw14ib8lhc00lyw";
+      type = "gem";
+    };
+    version = "1.1.3";
+  };
+  fiddle = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1as92bp6pgkab73kj3mh5d1idjr9wykczz7r9i1pkn82wq4xks3r";
+      type = "gem";
+    };
+    version = "1.1.6";
+  };
+  gpgme = {
+    dependencies = ["mini_portile2"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0r1vmql7w7ka5xzj1aqf8pk2a4sv0znwj2zkg1fgvd5b89qcvv2k";
+      type = "gem";
+    };
+    version = "2.0.24";
+  };
+  highline = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "02ghhvigqbq4252gsi4w8a9klkdkybmbz29ghfp1y6sqzlcb466a";
+      type = "gem";
+    };
+    version = "3.0.1";
+  };
+  json = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0b4qsi8gay7ncmigr0pnbxyb17y3h8kavdyhsh7nrlqwr35vb60q";
+      type = "gem";
+    };
+    version = "2.7.2";
+  };
+  language_server-protocol = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0gvb1j8xsqxms9mww01rmdl78zkd72zgxaap56bhv8j45z05hp1x";
+      type = "gem";
+    };
+    version = "3.17.0.3";
+  };
+  locale = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "107pm4ccmla23z963kyjldgngfigvchnv85wr6m69viyxxrrjbsj";
+      type = "gem";
+    };
+    version = "2.1.4";
+  };
+  lockfile = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0dij3ijywylvfgrpi2i0k17f6w0wjhnjjw0k9030f54z56cz7jrr";
+      type = "gem";
+    };
+    version = "2.1.3";
+  };
+  method_source = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1igmc3sq9ay90f8xjvfnswd1dybj1s3fi0dwd53inwsvqk4h24qq";
+      type = "gem";
+    };
+    version = "1.1.0";
+  };
+  mime-types = {
+    dependencies = ["mime-types-data"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1r64z0m5zrn4k37wabfnv43wa6yivgdfk6cf2rpmmirlz889yaf1";
+      type = "gem";
+    };
+    version = "3.5.2";
+  };
+  mime-types-data = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "00x7w5xqsj9m33v3vkmy23wipkkysafksib53ypzn27p5g81w455";
+      type = "gem";
+    };
+    version = "3.2024.0305";
+  };
+  mini_portile2 = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "149r94xi6b3jbp6bv72f8383b95ndn0p5sxnq11gs1j9jadv0ajf";
+      type = "gem";
+    };
+    version = "2.8.6";
+  };
+  minitest = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "07lq26b86giy3ha3fhrywk9r1ajhc2pm2mzj657jnpnbj1i6g17a";
+      type = "gem";
+    };
+    version = "5.22.3";
+  };
+  ncursesw = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qlfhp9b445g0qp9kkdiylfjlpfzrv6nqvry4ar6y0yacn0zr5y8";
+      type = "gem";
+    };
+    version = "1.4.11";
+  };
+  optimist = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0q4jqq3v1bxlfr9jgqmahnygkvl81lr6s1rhm8qg66c9xr9nz241";
+      type = "gem";
+    };
+    version = "3.1.0";
+  };
+  parallel = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15wkxrg1sj3n1h2g8jcrn7gcapwcgxr659ypjf75z1ipkgxqxwsv";
+      type = "gem";
+    };
+    version = "1.24.0";
+  };
+  parser = {
+    dependencies = ["ast" "racc"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "11r6kp8wam0nkfvnwyc1fmvky102r1vcfr84vi2p1a2wa0z32j3p";
+      type = "gem";
+    };
+    version = "3.3.0.5";
+  };
+  pry = {
+    dependencies = ["coderay" "method_source"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0k9kqkd9nps1w1r1rb7wjr31hqzkka2bhi8b518x78dcxppm9zn4";
+      type = "gem";
+    };
+    version = "0.14.2";
+  };
+  racc = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp";
+      type = "gem";
+    };
+    version = "1.7.3";
+  };
+  rainbow = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503";
+      type = "gem";
+    };
+    version = "3.1.1";
+  };
+  rake = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6";
+      type = "gem";
+    };
+    version = "13.2.1";
+  };
+  regexp_parser = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ndxm0xnv27p4gv6xynk6q41irckj76q1jsqpysd9h6f86hhp841";
+      type = "gem";
+    };
+    version = "2.9.0";
+  };
+  rexml = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0";
+      type = "gem";
+    };
+    version = "3.2.6";
+  };
+  rmail = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0m5npkmv764m725wzjzasgf3k8q5anf3vfr6k2cac1xj6jc8lcqi";
+      type = "gem";
+    };
+    version = "1.1.4";
+  };
+  rr = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1n9g78ba4c2zzmz8cdb97c38h1xm0clircag00vbcxwqs4dq0ymp";
+      type = "gem";
+    };
+    version = "1.2.1";
+  };
+  rubocop = {
+    dependencies = ["json" "language_server-protocol" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1dmj955zbvhlrzzag6hc77xdyyzn8ihvffpjalnzn5asxhz7jcdl";
+      type = "gem";
+    };
+    version = "1.63.2";
+  };
+  rubocop-ast = {
+    dependencies = ["parser"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1v3q8n48w8h809rqbgzihkikr4g3xk72m1na7s97jdsmjjq6y83w";
+      type = "gem";
+    };
+    version = "1.31.2";
+  };
+  rubocop-packaging = {
+    dependencies = ["rubocop"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1iqgsbpj7y8ksddbb9gj5vpzs2y8202khyk2mcc165kkfmvm6rx3";
+      type = "gem";
+    };
+    version = "0.5.2";
+  };
+  ruby-progressbar = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0cwvyb7j47m7wihpfaq7rc47zwwx9k4v7iqd9s1xch5nm53rrz40";
+      type = "gem";
+    };
+    version = "1.13.0";
+  };
+  unicode = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1mx9lwzy021lpcqql5kn4yi20njhf5h7c7wxm2fx51p1r2zr9wj2";
+      type = "gem";
+    };
+    version = "0.4.4.5";
+  };
+  unicode-display_width = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1d0azx233nags5jx3fqyr23qa2rhgzbhv8pxp46dgbg1mpf82xky";
+      type = "gem";
+    };
+    version = "2.5.0";
+  };
+  xapian-ruby = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xlzgk2sis7nnasiplpg6x7mdvqa17ahq2d27i8fd5hs8dmqcsh2";
+      type = "gem";
+    };
+    version = "1.4.22";
+  };
+}

data/contrib/nix/ruby3.0-shell.nix

@@ -0,0 +1,14 @@
+let
+  pkgs = import (builtins.fetchGit {
+    url = "https://github.com/NixOS/nixpkgs";
+    ref = "refs/heads/master";
+    rev = "402cc3633cc60dfc50378197305c984518b30773";
+  }) {};
+  gems = pkgs.bundlerEnv {
+    name = "ruby3.0-gems-for-sup";
+    ruby = pkgs.ruby_3_0;
+    gemfile = ./Gemfile;
+    lockfile = ./ruby3.0-Gemfile.lock;
+    gemset = ./ruby3.0-gemset.nix;
+  };
+in pkgs.mkShell { packages = [ gems gems.wrappedRuby pkgs.pandoc ]; }

data/contrib/nix/ruby3.1-shell.nix

@@ -0,0 +1,25 @@
+let
+  pkgs = import (builtins.fetchGit {
+    url = "https://github.com/NixOS/nixpkgs";
+    ref = "refs/heads/master";
+    rev = "5d0ebea1934d80948ff7b84f3b06e4ec9d99ee49";
+  }) {};
+  gems = pkgs.bundlerEnv {
+    name = "ruby3.1-gems-for-sup";
+    ruby = pkgs.ruby_3_1;
+    gemfile = ./Gemfile;
+    lockfile = ./Gemfile.lock;
+    gemset = ./gemset.nix;
+    gemConfig = pkgs.defaultGemConfig // {
+      # Workaround for Sup issue #623
+      ncursesw = attrs: pkgs.defaultGemConfig.ncursesw attrs // {
+        src = pkgs.fetchFromGitHub {
+          owner = "danc86";
+          repo = "ncursesw-ruby";
+          rev = "43cfa21f781e9412dc73d0d4a44b3ec0bf4a3c8d";
+          hash = "sha256-MkXFwhbtL9aJOMqn1IR5DKMXcnKHzICjb/rVhDDLL94=";
+        };
+      };
+    };
+  };
+in pkgs.mkShell { packages = [ gems gems.wrappedRuby pkgs.pandoc ]; }

data/contrib/nix/ruby3.2-shell.nix

@@ -0,0 +1,25 @@
+let
+  pkgs = import (builtins.fetchGit {
+    url = "https://github.com/NixOS/nixpkgs";
+    ref = "refs/heads/master";
+    rev = "5d0ebea1934d80948ff7b84f3b06e4ec9d99ee49";
+  }) {};
+  gems = pkgs.bundlerEnv {
+    name = "ruby3.2-gems-for-sup";
+    ruby = pkgs.ruby_3_2;
+    gemfile = ./Gemfile;
+    lockfile = ./Gemfile.lock;
+    gemset = ./gemset.nix;
+    gemConfig = pkgs.defaultGemConfig // {
+      # Workaround for Sup issue #623
+      ncursesw = attrs: pkgs.defaultGemConfig.ncursesw attrs // {
+        src = pkgs.fetchFromGitHub {
+          owner = "danc86";
+          repo = "ncursesw-ruby";
+          rev = "43cfa21f781e9412dc73d0d4a44b3ec0bf4a3c8d";
+          hash = "sha256-MkXFwhbtL9aJOMqn1IR5DKMXcnKHzICjb/rVhDDLL94=";
+        };
+      };
+    };
+  };
+in pkgs.mkShell { packages = [ gems gems.wrappedRuby pkgs.pandoc ]; }

data/contrib/nix/ruby3.3-shell.nix

@@ -0,0 +1,25 @@
+let
+  pkgs = import (builtins.fetchGit {
+    url = "https://github.com/NixOS/nixpkgs";
+    ref = "refs/heads/master";
+    rev = "5d0ebea1934d80948ff7b84f3b06e4ec9d99ee49";
+  }) {};
+  gems = pkgs.bundlerEnv {
+    name = "ruby3.3-gems-for-sup";
+    ruby = pkgs.ruby_3_3;
+    gemfile = ./Gemfile;
+    lockfile = ./Gemfile.lock;
+    gemset = ./gemset.nix;
+    gemConfig = pkgs.defaultGemConfig // {
+      # Workaround for Sup issue #623
+      ncursesw = attrs: pkgs.defaultGemConfig.ncursesw attrs // {
+        src = pkgs.fetchFromGitHub {
+          owner = "danc86";
+          repo = "ncursesw-ruby";
+          rev = "43cfa21f781e9412dc73d0d4a44b3ec0bf4a3c8d";
+          hash = "sha256-MkXFwhbtL9aJOMqn1IR5DKMXcnKHzICjb/rVhDDLL94=";
+        };
+      };
+    };
+  };
+in pkgs.mkShell { packages = [ gems gems.wrappedRuby pkgs.pandoc ]; }

data/contrib/nix/ruby3.4-shell.nix

@@ -0,0 +1,36 @@
+let
+  pkgs = import (builtins.fetchGit {
+    url = "https://github.com/NixOS/nixpkgs";
+    ref = "refs/heads/master";
+    rev = "5d0ebea1934d80948ff7b84f3b06e4ec9d99ee49";
+  }) {};
+  gems = pkgs.bundlerEnv {
+    name = "ruby3.4-gems-for-sup";
+    ruby = pkgs.ruby_3_4;
+    gemfile = ./Gemfile;
+    lockfile = ./Gemfile.lock;
+    gemset = ./gemset.nix;
+    gemConfig = pkgs.defaultGemConfig // {
+      rmail = attrs: {
+        dontBuild = false;
+        patches = [
+          # Frozen string literals: https://github.com/terceiro/rmail/pull/13
+          (pkgs.fetchpatch2 {
+            name = "rmail-frozen-string-literals.patch";
+            url = "https://github.com/terceiro/rmail/pull/13/commits/27f455af1fea0be0aa09959cc2237cbdf68de2a1.patch";
+            hash = "sha256-N5X9zix+WPoEugp2DBTu7dRDmesrF5pT/8Td2wraYoA=";
+          })
+        ];
+      };
+      # Workaround for Sup issue #623
+      ncursesw = attrs: pkgs.defaultGemConfig.ncursesw attrs // {
+        src = pkgs.fetchFromGitHub {
+          owner = "danc86";
+          repo = "ncursesw-ruby";
+          rev = "43cfa21f781e9412dc73d0d4a44b3ec0bf4a3c8d";
+          hash = "sha256-MkXFwhbtL9aJOMqn1IR5DKMXcnKHzICjb/rVhDDLL94=";
+        };
+      };
+    };
+  };
+in pkgs.mkShell { packages = [ gems gems.wrappedRuby pkgs.pandoc ]; }

data/contrib/nix/test-all-rubies.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+set -e
+cd "$(dirname "$0")/../.."
+for rubyversion in 2.4 2.5 2.6 2.7 3.0 3.1 3.2 3.3 3.4 ; do
+    nix-shell contrib/nix/ruby$rubyversion-shell.nix --run 'rake ci'
+done

data/doc/Hooks.txt

@@ -69,7 +69,7 @@ startup:
     set 'bgtask_pid' @bgtask_pid
     Process.detach(@bgtask_pid) # so we don't have to wait on it when we go to kill it
   else
-    exec "background-task args 2&>1 >> /tmp/logfile"
+    exec "background-task args 2>&1 >> /tmp/logfile"
   end
 
 after-poll:

data/ext/mkrf_conf_xapian.rb

@@ -14,7 +14,7 @@ destination = File.writable?(Gem.dir) ? Gem.dir : Gem.user_dir
 inst = Gem::DependencyInstaller.new(:install_dir => destination)
 begin
 
-  if !RbConfig::CONFIG['arch'].include?('openbsd')
+  if not ENV.include? "SUP_SKIP_XAPIAN_GEM_INSTALL"
     # update version in Gemfile as well
     name    = "xapian-ruby"
     version =
@@ -37,7 +37,7 @@ begin
 
     end
   else
-    STDERR.puts "xapian: openbsd: you have to install xapian-core and xapian-bindings manually, have a look at: https://github.com/sup-heliotrope/sup/wiki/Installation%3A-OpenBSD"
+    STDERR.puts "xapian: you have to install xapian-core and xapian-bindings manually"
   end
 
 rescue StandardError => e

data/lib/sup/crypto.rb

@@ -177,6 +177,8 @@ EOS
     end
     gpg_opts = HookManager.run("gpg-options",
                                {:operation => "encrypt", :options => gpg_opts}) || gpg_opts
+    ## On the sup side we use :signer for backwards compatibility, but GPGME wants :signers.
+    gpg_opts[:signers] = gpg_opts[:signer]
     recipients = to + [from]
     recipients = HookManager.run("gpg-expand-keys", { :recipients => recipients }) || recipients
     begin
@@ -198,17 +200,17 @@ EOS
     end
 
     encrypted_payload = RMail::Message.new
-    encrypted_payload.header["Content-Type"] = "application/octet-stream"
-    encrypted_payload.header["Content-Disposition"] = 'inline; filename="msg.asc"'
+    encrypted_payload.header["Content-Type"] = +"application/octet-stream"
+    encrypted_payload.header["Content-Disposition"] = +'inline; filename="msg.asc"'
     encrypted_payload.body = cipher
 
     control = RMail::Message.new
-    control.header["Content-Type"] = "application/pgp-encrypted"
-    control.header["Content-Disposition"] = "attachment"
+    control.header["Content-Type"] = +"application/pgp-encrypted"
+    control.header["Content-Disposition"] = +"attachment"
     control.body = "Version: 1\n"
 
     envelope = RMail::Message.new
-    envelope.header["Content-Type"] = 'multipart/encrypted; protocol=application/pgp-encrypted'
+    envelope.header["Content-Type"] = +"multipart/encrypted; protocol=application/pgp-encrypted"
 
     envelope.add_part control
     envelope.add_part encrypted_payload
@@ -369,7 +371,7 @@ EOS
   def retrieve fingerprint
     require 'net/http'
     uri = URI($config[:keyserver_url] || KEYSERVER_URL)
-    unless uri.scheme == "http" and not uri.host.nil?
+    unless uri.scheme == "http" and not uri.host.nil? and not uri.host.empty?
       return "Invalid url: #{uri}"
     end
 

data/lib/sup/index.rb

@@ -99,14 +99,14 @@ EOS
   end
 
   def load failsafe=false
-    SourceManager.load_sources
+    SourceManager.load_sources File.join(@dir, "sources.yaml")
     load_index failsafe
   end
 
   def save
     debug "saving index and sources..."
     FileUtils.mkdir_p @dir unless File.exist? @dir
-    SourceManager.save_sources
+    SourceManager.save_sources File.join(@dir, "sources.yaml")
     save_index
   end
 

data/lib/sup/maildir.rb

@@ -23,7 +23,7 @@ class Maildir < Source
     end
 
     raise ArgumentError, "not a maildir URI" unless uri.scheme == "maildir"
-    raise ArgumentError, "maildir URI cannot have a host: #{uri.host}" if uri.host
+    raise ArgumentError, "maildir URI cannot have a host: #{uri.host}" unless uri.host.nil? || uri.host.empty?
     raise ArgumentError, "maildir URI must have a path component" unless uri.path
 
     @sync_back = sync_back
@@ -114,6 +114,10 @@ class Maildir < Source
     with_file_for(id) { |f| f.read }
   end
 
+  def fallback_date_for_message id
+    File.mtime File.join(@dir, id)
+  end
+
   ## XXX use less memory
   def poll
     added = []

data/lib/sup/mbox.rb

@@ -1,5 +1,6 @@
 require 'uri'
 require 'set'
+require 'time'
 
 module Redwood
 
@@ -30,7 +31,7 @@ class MBox < Source
       end
 
       raise ArgumentError, "not an mbox uri" unless uri.scheme == "mbox"
-      raise ArgumentError, "mbox URI ('#{uri}') cannot have a host: #{uri.host}" if uri.host
+      raise ArgumentError, "mbox URI ('#{uri}') cannot have a host: #{uri.host}" unless uri.host.nil? || uri.host.empty?
       raise ArgumentError, "mbox URI must have a path component" unless uri.path
       @f = nil
     else
@@ -85,7 +86,7 @@ class MBox < Source
       begin
         ## don't use RMail::Mailbox::MBoxReader because it doesn't properly ignore
         ## "From" at the start of a message body line.
-        string = ""
+        string = +""
         until @f.eof? || MBox::is_break_line?(l = @f.gets)
           string << l
         end
@@ -97,7 +98,7 @@ class MBox < Source
   end
 
   def raw_header offset
-    ret = ""
+    ret = +""
     @mutex.synchronize do
       ensure_open
       @f.seek offset
@@ -109,9 +110,7 @@ class MBox < Source
   end
 
   def raw_message offset
-    ret = ""
-    each_raw_message_line(offset) { |l| ret << l }
-    ret
+    enum_for(:each_raw_message_line, offset).reduce(:+)
   end
 
   def store_message date, from_email, &block
@@ -137,6 +136,26 @@ class MBox < Source
     end
   end
 
+  def fallback_date_for_message offset
+    ## This is a bit awkward... We treat the From line as a delimiter,
+    ## not part of the message. So the offset is pointing *after* the
+    ## From line for the desired message. With a bit of effort we can
+    ## scan backwards to find its From line and extract a date from it.
+    buf = @mutex.synchronize do
+      ensure_open
+      start = offset
+      loop do
+        start = (start - 200).clamp 0, 2**64
+        @f.seek start
+        buf = @f.read (offset - start)
+        break buf if buf.include? ?\n or start == 0
+      end
+    end
+    BREAK_RE.match buf.lines.last do |m|
+      Time.strptime m[1], "%a %b %d %H:%M:%S %Y"
+    end
+  end
+
   def default_labels
     [:inbox, :unread]
   end
@@ -179,8 +198,7 @@ class MBox < Source
     l =~ BREAK_RE or return false
     time = $1
     begin
-      ## hack -- make Time.parse fail when trying to substitute values from Time.now
-      Time.parse time, Time.at(0)
+      Time.strptime time, "%a %b %d %H:%M:%S %Y"
       true
     rescue NoMethodError, ArgumentError
       warn "found invalid date in potential mbox split line, not splitting: #{l.inspect}"