Bump Dockerfile to prosody-13.0.6; all 8 patches re-ported against 13.0.6.
Re-ported patches (3 changed, 5 applied with offset):
- hidden.lib.patch: 13.0 uses module:may() instead of um_is_admin; changed
to 'if restrict_public then' (same intent: hide option for everyone)
- mod_muc.patch: 13.0 added restrict_pm between register and
presence_broadcast; updated hunk 1 context
- mod_muc_unique.patch: 13.0 uses 'require "prosody.util.stanza"'
(namespaced); updated context
- muc.lib, mod_carbons, mod_mam, mod_muc_mam, register.lib: applied
with line offsets, no re-port needed
Config changes:
- Remove mod_posix from modules_enabled (13.0 absorbed signal handling,
pidfile, and run_as_root check into core util/startup.lua)
- Move pubsub from modules_enabled to Component (13.0 requires pubsub
to be loaded as a component, not a module)
Test fix:
- test_muc_fcm_push_to_offline_member: wait for count=2 captures instead
of 1 — mod_vnc_muc_fcm pushes to ALL affiliated members (including
sender, because it can't see main-host sessions from the MUC
component); the test was racing on which push arrived first
Verified: prosodyctl check config passes; compose-harness testsuite
green (80 passed, 6 skipped, 0 failed).
Part-of: <http://gitlab.vnc.biz/uxf/vnctalk-prosody/-/merge_requests/3>
Update M2 status to reflect both compose-harness (80 passed, 6 skipped,
0 failed) and external testsuite results (48 passed, 30 skipped — all
skips are infrastructure prerequisites). test_vcard_fallback now skipped
pending mod_vnc_vcard_fallback enablement.
Part-of: <http://gitlab.vnc.biz/uxf/vnctalk-prosody/-/merge_requests/3>
Swap all lua5.2-* Alpine packages to lua5.4-* in both Dockerfile stages
and add --lua-version=5.4 to ./configure.
Dropped packages:
- lua5.2-bitop: Prosody's util.bitcompat uses util.bit53 (native Lua
5.3/5.4 bitwise operators) when bit32 is unavailable
- lua5.2-lpeg_patterns, lua5.2-rapidjson, lua5.2-redis: not required by
any require in Prosody 0.12.6 or any vnctalk module
- luarocks5.2: installed but never used
- Duplicate lua5.2-socket entry: removed
Code audit for 5.2→5.4 breakage: clean.
- No bit32/bitop usage in vnctalk modules
- Every Prosody file using unpack has 'local unpack = table.unpack or
unpack' (resolves to table.unpack on 5.4)
- No string.format('%d', float) patterns in vnctalk modules
Verified: image builds, prosodyctl check config passes, compose-harness
testsuite green (80 passed, 5 skipped — identical to M1).
Part-of: <http://gitlab.vnc.biz/uxf/vnctalk-prosody/-/merge_requests/3>
Three changes to complete the repo-level work for Milestone 1 (0.11.6 →
0.12.6) plus a howto for the remaining manual/external tasks:
1. config/prosody.cfg.lua.template: re-add run_as_root = true. Production
and the compose harness run as root (startup.sh writes into root-owned
/etc/prosody/). Without it, mod_posix calls prosody.shutdown() during
startup, which deactivates c2s (port 5222) before the shutdown itself
errors out (prosody.main_thread is nil during module init), leaving
Prosody running without c2s.
2. tests/test_08_image_patches.py: replace 3 stale patch-marker entries
that checked for patches M1 intentionally dropped (moduleapi,
mod_admin_telnet, muc.lib dumpTable) with markers that verify their
config-based replacements (console_interfaces, http_interfaces) and
the storagemanager.open() rewrite in mod_vnc_muc_fcm.lua.
3. upgrade-plan.md: update M1 status to reflect the post-M1 fixes
(run_as_root, default_storage, stale tests), mark manual steps (DB
migration, telnet console regression, external testsuite) with
cross-references to m1-manual-tasks.md, and correct 0.12.5 → 0.12.6
throughout.
4. m1-manual-tasks.md: new file documenting the three manual tasks that
require external infrastructure — DB schema migration (one-way, with
rehearse-on-copy procedure), telnet console regression test (0.12
reimplemented the console on mod_admin_shell), and external testsuite
run against a dev deployment.
Verified: compose-harness testsuite — 80 passed, 5 skipped, 1 pre-existing
failure (test_vcard_fallback: mod_vnc_vcard_fallback not enabled in config,
unrelated to M1).
Part-of: <http://gitlab.vnc.biz/uxf/vnctalk-prosody/-/merge_requests/3>
Re-port all source patches onto 0.12.6; three are gone entirely:
moduleapi (the two vnc_muc_fcm modules call core.storagemanager
directly now), mod_admin_telnet and portmanager (replaced by
console_interfaces/http_interfaces config). The muc.lib fork keeps its
four functional changes including the externally consumed
muc-config-sub-mitted event; the operator-precedence hunk was fixed
upstream. mod_muc_mam shrinks to keep-archive-on-room-destroy since
muc_log_expires_after="never" disables cleanup upstream in 0.12.
Delete the bundled mod_smacks fork and the no-op mod_smacks_offline;
core 0.12 smacks supersedes them (options audited, dead smacks_max_old
corrected to smacks_max_old_sessions).
Config/startup: drop legacyauth, run_as_root, daemonize; bosh_ports ->
http_ports; cross_domain_* -> http_cors_override; randomize
component_secret at startup (env-overridable); export
log_slow_events_threshold fallback (latent render bug).
Found while smoke-testing: pin --idn-library=idn (0.12's ICU default
segfaults without ICU data in the image); http became a private
service in 0.12 so 5280 needs http_interfaces to stay public; the
telnet console now depends on mod_admin_socket, whose socket moves to
/var/log/prosody.
Verified: prosodyctl check config clean; boots against Postgres with
empty error log and same port bindings as 0.11; healthcheck green;
telnet console and SQL storage round-trip; 0.11->0.12 schema upgrade
rehearsed on a 0.11-created database with data intact.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Part-of: <http://gitlab.vnc.biz/uxf/vnctalk-prosody/-/merge_requests/3>
Phase 0 of upgrade-plan.md. The 11 forked copies of 0.11.6 files in
patches/ are replaced by unified .patch files applied in the Dockerfile
builder stage with patch -p1 --fuzz=0 before make install, so upstream
drift fails the build instead of silently shipping stale forks. The
cp-over-installed-files block in the final stage is gone and /vnc/patches
no longer ships in the image. Stale patches.list replaced by a README
documenting each patch's intent.
Verified: installed prosody tree (269 files) is byte-identical to the
image built from the previous mechanism.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Part-of: <http://gitlab.vnc.biz/uxf/vnctalk-prosody/-/merge_requests/3>
Stefan-Sanger
