sup 1.1 → 1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93d027a0f383edb73d1a2900ca991d8d8d8daca922f0088c18f5281ca04daeb4
-  data.tar.gz: 31b25e512227252a498baa651ea9b026ba452274dd5c67c99412dc2ef54f3e7a
+  metadata.gz: 3a01c7e42026b08f66082ec94ced164f0be41c86e9a5cc01a4894b61f712efb9
+  data.tar.gz: dfd7da5b3742dac1e07d2c55530cb539f543a26a48f716e1ee878474d43a1671
 SHA512:
-  metadata.gz: 06211d3a91b76d20396afe9323bdf62d14acf61d13688333ae8f6409b55ff2120037df11e0a5e62e869e476868307a42216ee34e28f3621a05da0f9953a6cda3
-  data.tar.gz: f17bac030201cdabd4c6e3313a4178fb03f65f70992dcd4364cde425d1fd658408973b1758c7d45b13140dddde0e92f34006d6085140bbbb76164081083e9006
+  metadata.gz: e4b15c43896ff49fe700c1aa4c63f85cf7dc3241f1bdc258e34e8053dddcaff733b951b5f2883cfde05b73c001f94c1bb8102b4e0413eab1a3de99a4aad8a263
+  data.tar.gz: 4c3834600e0eb738500029b797076c6f0a7d52d29609b4ef7168d0ff56a9b34b902ee7c647afccc7c9fa0cd6962116df3fe6e3c5a943f257a8bd46b7b96e2a28

data/.github/workflows/checks.yml

@@ -15,56 +15,58 @@ jobs:
       matrix:
         os:
         - ubuntu-latest
-        - macos-latest
+        - macos-14
         ruby-version:
-        - '2.0'
-        - '2.1'
-        # Ruby 2.2 fails installing sup gem with a nonsensical error:
-        #   Could not find 'xapian-ruby' (~> 1.2) among 21 total gem(s)
-        #- '2.2'
-        - '2.3'
         - '2.4'
         - '2.5'
         - '2.6'
         - '2.7'
         - '3.0'
         - '3.1'
+        - '3.2'
+        - '3.3'
+        - '3.4'
         exclude:
-        # xapian-bindings 1.2.2 fails to build on MacOS:
-        #   clang: warning: include path for libstdc++ headers not found; pass
-        #   '-stdlib=libc++' on the command line to use the libc++ standard
-        #   library instead [-Wstdlibcxx-not-found]
-        #   xapian_wrap.cc:1836:10: fatal error: 'string' file not found
-        # Probably just wrong compiler command or some mess that I can't be
-        # bothered to figure out.
-        - os: macos-latest
-          ruby-version: '2.0'
-        # xapian-bindings 1.4.18 fails to build with Ruby 3.0+ on MacOS:
-        #   error: '__declspec' attributes are not enabled; use '-fdeclspec' or
-        #   '-fms-extensions' to enable support for __declspec attributes
-        # Needs this fix:
-        # https://github.com/xapian/xapian/commit/63a06768a250b0bb4821b835f011e8214d560f8e
-        - os: macos-latest
+        # We use xapian-bindings 1.4.22 for Ruby < 3.1, but it does not link on MacOS 14:
+        # https://github.com/Garaio-REM/xapian-ruby/issues/10
+        - os: macos-14
+          ruby-version: '2.4'
+        - os: macos-14
+          ruby-version: '2.5'
+        - os: macos-14
+          ruby-version: '2.6'
+        - os: macos-14
+          ruby-version: '2.7'
+        - os: macos-14
           ruby-version: '3.0'
-        - os: macos-latest
-          ruby-version: '3.1'
     runs-on: ${{ matrix.os }}
+    env:
+      nixfile: "contrib/nix/ruby${{ matrix.ruby-version }}-shell.nix"
     steps:
-    - name: Install pandoc
-      run: sudo apt-get install -y pandoc
-      if: runner.os == 'Linux'
-    - name: Install pandoc
-      run: brew install pandoc
-      if: runner.os == 'macOS'
-    - uses: actions/checkout@v3
+    - name: Check out source
+      uses: actions/checkout@v3
       with:
         submodules: recursive
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
+    - name: Cache nix store
+      uses: actions/cache@v3
+      id: nix-cache
       with:
-        ruby-version: ${{ matrix.ruby-version }}
-        bundler-cache: true
+        path: /tmp/nixcache
+        key: nix-store-${{ matrix.os }}-ruby${{ matrix.ruby-version }}-${{ hashFiles('contrib/nix/**') }}
+        restore-keys: |
+          nix-store-${{ matrix.os }}-ruby${{ matrix.ruby-version }}-
+          nix-store-
+    - name: Install bash on MacOS
+      run: brew install bash
+      if: runner.os == 'macOS'
+    - name: Install nix
+      uses: nixbuild/nix-quick-install-action@v30
+    - name: Import nix cache
+      run: |
+        if [ -f /tmp/nixcache ] ; then
+          nix-store --import </tmp/nixcache
+        fi
     - name: Run Rake ci task
-      run: bundle exec rake ci
-    - name: Test gem installation
-      run: gem install pkg/sup-*.gem
+      run: nix-shell "$nixfile" --run 'rake ci'
+    - name: Export nix cache
+      run: nix-store --export $(nix-store -qR $(nix-build --no-out-link "$nixfile" -A inputDerivation | tail -n1)) >/tmp/nixcache

data/.gitmodules

@@ -1,3 +1,4 @@
 [submodule "doc/wiki"]
 	path = doc/wiki
 	url = https://github.com/sup-heliotrope/sup.wiki.git
+	branch = master

data/CONTRIBUTORS

@@ -1,8 +1,8 @@
 William Morgan <william at the twitter dot coms>
 Rich Lane <rlane at the club.cc.cmu dot edus>
 Gaute Hope <eg at the gaute.vetsj dot coms>
-Whyme Lyu <callme5long at the gmail dot coms>
 Dan Callaghan <djc at the djc.id dot aus>
+Whyme Lyu <callme5long at the gmail dot coms>
 Hamish Downer <dmishd at the gmail dot coms>
 Zeger-Jan van de Weg <mail at the zjvandeweg dot nls>
 Damien Leone <damien.leone at the fensalir dot frs>
@@ -87,6 +87,8 @@ Todd Eisenberger <teisenbe at the andrew.cmu dot edus>
 Johannes Larsen <mail at the johslarsen dot nets>
 Steven Schmeiser <steven at the schmeiser dot orgs>
 Steven Walter <swalter at the monarch.(none)>
+Patrice Duroux <patrice.duroux at the gmail dot coms>
+gclv <gh at the sg.ggoncalves dot mes>
 Utkarsh Gupta <utkarsh at the debian dot orgs>
 Michael Dwyer <mdwyer at the michaelmdwyer dot coms>
 Kyle Hunt <Kyle_Hunt at the ymail dot coms>

data/History.txt

@@ -1,6 +1,35 @@
+== 1.3 / 2025-04-21
+
+* #596: If a message lacks a Date header, or the Date header is not in valid
+  RFC2822 format, the local delivery timestamp of the message will now be used
+  instead. Fixes a bug where such messages would constantly jump to the top of
+  the thread list.
+* #502: Fixed incorrect Content-Transfer-Encoding headers when sending GPG
+  signed or encrypted messages with attachments.
+* #522: Sup now uses the configured signing key when sending a message that is
+  both signed and encrypted. Previously it would ignore the configured key and
+  use the GPG default signing key.
+* #489: Attachments are now encoded if they have lines longer than 998
+  characters.
+* #602: The message/global MIME type is now recognised as an embedded message.
+* Sup is now tested on Ruby 3.4.
+
+== 1.2 / 2024-04-21
+
+* #619: Sup is now compatible with and tested on Ruby 3.2 and Ruby 3.3.
+  (Dan Callaghan)
+* #603: Fixed deprecated usage of Enumerator.new, which caused a crash on
+  Ruby 3+. (Gui Goncalves)
+* OutOfSyncSourceErrors now show an error message in the thread view in place
+  of the out-of-sync message body, instead of crashing. (Dan Callaghan)
+* #613: When installing Sup as a gem, the dependency on xapian-ruby is now
+  skipped if the SUP_SKIP_XAPIAN_GEM_INSTALL environment variable is set.
+  Previously it was skipped unconditionally on OpenBSD only. (Dan Callaghan)
+
 == 1.1 / 2022-05-23
 
 * #588, #577: Sup is now compatible with and tested on Ruby 3.0 and Ruby 3.1.
+  (Dan Callaghan)
 * When the Sup gem installs xapian-ruby, it will install to the user gem
   directory if the system gem directory is not writable. (Iain Parris)
 * #571: To and From addresses of enclosed messages are now displayed normally,
@@ -8,15 +37,15 @@
 * #570: Fixed wording when displaying enclosed messages without Date header.
   (Iain Parris)
 * #205, #602: UTF-8 header values are now accepted and handled correctly, as
-  per RFC6532.
+  per RFC6532. (Dan Callaghan)
 * #585: Text/plain attachments with invalid charset are now displayed as
-  US-ASCII (with high bytes replaced) instead of crashing.
+  US-ASCII (with high bytes replaced) instead of crashing. (Dan Callaghan)
 * #424: Spaces are now accepted in RFC2047-encoded header words, even though
   the RFC forbids them. (Dan Callaghan)
 * Invalid RFC2047-encoded header words are now displayed in their raw form,
   rather than trying to forcibly transcode them to UTF-8, as per the RFC's
   recommendation. (Dan Callaghan)
-* Sup now decodes UTF-7 correctly instead of crashing.
+* Sup now decodes UTF-7 correctly instead of crashing. (Dan Callaghan)
 
 == 1.0 / 2020-07-12
 

data/Manifest.txt

@@ -23,6 +23,31 @@ bin/sup-tweak-labels
 contrib/colorpicker.rb
 contrib/completion/_sup.bash
 contrib/completion/_sup.zsh
+contrib/nix/Gemfile
+contrib/nix/Gemfile.lock
+contrib/nix/README
+contrib/nix/gem-install-shell.nix
+contrib/nix/gemset.nix
+contrib/nix/ruby2.4-Gemfile.lock
+contrib/nix/ruby2.4-gemset.nix
+contrib/nix/ruby2.4-shell.nix
+contrib/nix/ruby2.5-Gemfile.lock
+contrib/nix/ruby2.5-gemset.nix
+contrib/nix/ruby2.5-shell.nix
+contrib/nix/ruby2.6-Gemfile.lock
+contrib/nix/ruby2.6-gemset.nix
+contrib/nix/ruby2.6-shell.nix
+contrib/nix/ruby2.7-Gemfile.lock
+contrib/nix/ruby2.7-gemset.nix
+contrib/nix/ruby2.7-shell.nix
+contrib/nix/ruby3.0-Gemfile.lock
+contrib/nix/ruby3.0-gemset.nix
+contrib/nix/ruby3.0-shell.nix
+contrib/nix/ruby3.1-shell.nix
+contrib/nix/ruby3.2-shell.nix
+contrib/nix/ruby3.3-shell.nix
+contrib/nix/ruby3.4-shell.nix
+contrib/nix/test-all-rubies.sh
 devel/console.sh
 devel/count-loc.sh
 devel/load-index.rb
@@ -100,13 +125,16 @@ lib/sup/util/path.rb
 lib/sup/util/query.rb
 lib/sup/util/uri.rb
 lib/sup/version.rb
+shell.nix
 sup.gemspec
 test/dummy_source.rb
 test/fixtures/bad-content-transfer-encoding-1.eml
 test/fixtures/binary-content-transfer-encoding-2.eml
 test/fixtures/blank-header-fields.eml
 test/fixtures/contacts.txt
+test/fixtures/embedded-message-rfc6532.eml
 test/fixtures/embedded-message.eml
+test/fixtures/invalid-date.eml
 test/fixtures/mailing-list-header.eml
 test/fixtures/malicious-attachment-names.eml
 test/fixtures/missing-from-to.eml
@@ -123,7 +151,9 @@ test/fixtures/utf8-header.eml
 test/fixtures/zimbra-quote-with-bottom-post.eml
 test/gnupg_test_home/.gpg-v21-migrated
 test/gnupg_test_home/gpg.conf
-test/gnupg_test_home/private-keys-v1.d/306D2EE90FF0014B5B9FD07E265C751791674140.key
+test/gnupg_test_home/private-keys-v1.d/26C05E44706A8E230B3255BB9532B34DC9420232.key
+test/gnupg_test_home/private-keys-v1.d/D187ADC90EC4DEB7047678EAA37E33A53A465D47.key
+test/gnupg_test_home/private-keys-v1.d/FB2D9BD3B1BE90B5BCF697781F8404224B0FCF5B.key
 test/gnupg_test_home/pubring.gpg
 test/gnupg_test_home/receiver_pubring.gpg
 test/gnupg_test_home/receiver_secring.gpg
@@ -133,6 +163,7 @@ test/gnupg_test_home/sup-test-2@foo.bar.asc
 test/integration/test_maildir.rb
 test/integration/test_mbox.rb
 test/integration/test_sup-add.rb
+test/integration/test_sup-sync-back-maildir.rb
 test/test_crypto.rb
 test/test_header_parsing.rb
 test/test_helper.rb
@@ -141,9 +172,11 @@ test/test_messages_dir.rb
 test/test_yaml_regressions.rb
 test/unit/service/test_label_service.rb
 test/unit/test_contact.rb
+test/unit/test_edit_message_mode.rb
 test/unit/test_horizontal_selector.rb
 test/unit/test_locale_fiddler.rb
 test/unit/test_person.rb
+test/unit/test_rmail_message.rb
 test/unit/util/test_query.rb
 test/unit/util/test_string.rb
 test/unit/util/test_uri.rb

data/README.md

@@ -38,7 +38,6 @@ Please report bugs to the [GitHub issue tracker](https://github.com/sup-heliotro
 * [Homepage](https://sup-heliotrope.github.io/)
 * [Code repository](https://github.com/sup-heliotrope/sup)
 * [Wiki](https://github.com/sup-heliotrope/sup/wiki)
-* IRC: [#sup @ freenode.net](http://webchat.freenode.net/?channels=#sup)
 * Mailing list: supmua@googlegroups.com (subscribe: supmua+subscribe@googlegroups.com, archive: https://groups.google.com/d/forum/supmua )
 
 ## Maintenance status

data/bin/sup-sync-back-maildir

@@ -94,7 +94,7 @@ begin
         next if STDIN.gets.chomp.downcase == 'n'
       end
 
-      infos = Enumerator.new(index, :each_source_info, s.id).to_a
+      infos = index.enum_for(:each_source_info, s.id).to_a
       counter = 0
       infos.each do |info|
         print "\rSynchronizing '#{s.uri}'... #{((counter += 1)/infos.size.to_f*100).to_i}%"

data/contrib/nix/Gemfile

@@ -0,0 +1,24 @@
+source "https://rubygems.org/"
+
+gem "xapian-ruby", "~> 1.2"
+gem "ncursesw", "~> 1.4.0"
+gem "rmail", ">= 1.1.2", "< 2"
+gem "highline"
+gem "optimist"
+gem "lockfile"
+gem "mime-types", "> 2.0"
+gem "locale", "~> 2.0"
+gem "chronic"
+gem "unicode", "~> 0.4.4"
+gem "unicode-display_width"
+gem "string-scrub" if /^2\.0\./ =~ RUBY_VERSION
+gem "benchmark"
+gem "fiddle"
+
+gem "bundler", ">= 1.3", "< 3"
+gem "rake"
+gem "minitest", "~> 5.5"
+gem "rr", "~> 1.1"
+gem "gpgme", ">= 2.0.2"
+gem "pry"
+gem "rubocop-packaging" unless /^2\.[012]\./ =~ RUBY_VERSION

data/contrib/nix/Gemfile.lock

@@ -0,0 +1,101 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.4.3)
+    benchmark (0.4.0)
+    chronic (0.10.2)
+    coderay (1.1.3)
+    fiddle (1.1.6)
+    gpgme (2.0.24)
+      mini_portile2 (~> 2.7)
+    highline (3.1.2)
+      reline
+    io-console (0.8.0)
+    json (2.10.2)
+    language_server-protocol (3.17.0.4)
+    locale (2.1.4)
+    lockfile (2.1.3)
+    logger (1.7.0)
+    method_source (1.1.0)
+    mime-types (3.6.2)
+      logger
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2025.0402)
+    mini_portile2 (2.8.8)
+    minitest (5.25.5)
+    ncursesw (1.4.11)
+    optimist (3.2.1)
+    parallel (1.26.3)
+    parser (3.3.7.4)
+      ast (~> 2.4.1)
+      racc
+    pry (0.15.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    racc (1.8.1)
+    rainbow (3.1.1)
+    rake (13.2.1)
+    regexp_parser (2.9.0)
+    reline (0.6.1)
+      io-console (~> 0.5)
+    rexml (3.2.6)
+    rmail (1.1.4)
+    rr (1.2.1)
+    rubocop (1.63.2)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
+      parallel (~> 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.31.2)
+      parser (>= 3.3.0.4)
+    rubocop-packaging (0.5.2)
+      rubocop (>= 1.33, < 2.0)
+    ruby-progressbar (1.13.0)
+    unicode (0.4.4.5)
+    unicode-display_width (2.5.0)
+    xapian-ruby (1.4.27)
+
+PLATFORMS
+  aarch64-linux
+  arm64-darwin-24
+  ruby
+  x86_64-darwin-17
+  x86_64-darwin-18
+  x86_64-darwin-19
+  x86_64-darwin-20
+  x86_64-darwin-21
+  x86_64-darwin-22
+  x86_64-darwin-23
+  x86_64-darwin-24
+  x86_64-linux
+
+DEPENDENCIES
+  benchmark
+  bundler (>= 1.3, < 3)
+  chronic
+  fiddle
+  gpgme (>= 2.0.2)
+  highline
+  locale (~> 2.0)
+  lockfile
+  mime-types (> 2.0)
+  minitest (~> 5.5)
+  ncursesw (~> 1.4.0)
+  optimist
+  pry
+  rake
+  rmail (>= 1.1.2, < 2)
+  rr (~> 1.1)
+  rubocop-packaging
+  unicode (~> 0.4.4)
+  unicode-display_width
+  xapian-ruby (~> 1.2)
+
+BUNDLED WITH
+   2.5.22

data/contrib/nix/README

@@ -0,0 +1,7 @@
+After updating Gemfile, regenerate Gemfile.lock and gemset.nix:
+
+    nix-shell -p bundix --run 'bundix --gemfile=contrib/nix/Gemfile --lockfile=contrib/nix/Gemfile.lock --gemset=contrib/nix/gemset.nix -l'
+
+Test gem installation:
+
+    nix-shell contrib/nix/gem-install-shell.nix --run 'gem install --verbose -i ./asdf ./pkg/sup-999.gem'

data/contrib/nix/gem-install-shell.nix

@@ -0,0 +1,14 @@
+{ pkgs ? import <nixpkgs> {} }:
+pkgs.mkShell {
+  packages = with pkgs; [
+    ncurses
+    ncurses.dev
+    libffi
+    libffi.dev
+    libuuid
+    libuuid.dev
+    ruby_3_2
+    zlib
+    zlib.dev
+  ];
+}