Merge branch 'master' into libcyrus-imap-sieve-dependency

.github/workflows/main.yml

@@ -1,6 +1,7 @@
 name: Cyrus IMAP CI
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - master
@@ -15,18 +16,15 @@ jobs:
   build:
     runs-on: ubuntu-latest
     container:
-        image: cyrusimapdocker/cyrus-buster:latest
-        options: --sysctl net.ipv6.conf.all.disable_ipv6=0 --init
+        image: ghcr.io/cyrusimap/cyrus-docker:bookworm
+        options: --init
     steps:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
     - name: install missing or frequently-updated deps
       shell: bash
       run: |
-        cpanm IO::File::fcntl
-        cpanm Digest::CRC
-        cpanm XML::Simple # XXX could be grabbed from apt by docker image
         cpanm Mail::IMAPTalk # in image, but fetch latest!
     - name: setup git safe directory
       shell: bash
@@ -52,14 +50,6 @@ jobs:
         echo "Mail::IMAPTalk" $(cpanm --info Mail::IMAPTalk)
         /usr/cyrus/libexec/master -V
         /usr/cyrus/sbin/cyr_buildinfo
-    - name: update jmap test suite
-      working-directory: /srv/JMAP-TestSuite.git
-      shell: bash
-      run: |
-        git fetch
-        git checkout origin/master
-        git clean -f -x -d
-        cpanm --installdeps .
     - name: set up cassandane
       working-directory: cassandane
       shell: bash

.gitignore

@@ -29,10 +29,6 @@ Makefile.bak
 Makefile.old
 aclocal.m4
 autom4te.cache/
-backup/backupd
-backup/ctl_backups
-backup/cyr_backup
-backup/restore
 bench/cyrdbbench
 cmulocal/libtool.m4
 cmulocal/ltoptions.m4
@@ -61,6 +57,7 @@ cunit/unit
 debian/
 depcomp
 doc/examples/imapd_conf/imapd.conf.sample
+doc/examples/libcyrus/example_libcyrus_min
 doc/html/
 doc/legacy/murder.png
 doc/legacy/netnews.png
@@ -100,8 +97,7 @@ imap/dav_reconstruct
 imap/deliver
 imap/fetchnews
 imap/fud
-imap/http_caldav_js.h
-imap/http_carddav_js.h
+imap/http_cal_abook_admin_js.h
 imap/http_err.c
 imap/http_err.h
 imap/httpd