Merge profanity-im/profanity master (373 commits) into cproof fork.
Source changes (manual merge):
- src/command/: cmd_defs, cmd_funcs, cmd_ac — upstream g_new0, auto_gchar,
launch_editor callback; keep our XEP-0308 LMC, force-encryption, CWE-134
- src/config/: preferences, tlscerts, account — upstream UNIQUE dedup,
dynamic pad capacity; keep our db_history_result_t, scroll logic
- src/database.*: upstream g_new0 memory mgmt; keep our return types,
add null-check fix for msg->timestamp
- src/omemo/, src/pgp/: upstream _gpgme_key_get_email, g_new0;
keep our replace_id in omemo_on_message_send
- src/tools/: editor, http_upload, bookmark_ignore — upstream launch_editor
callback API
- src/ui/: console, window, chatwin, mucwin, inputwin, buffer —
upstream win_warn_needed/sent dedup, PAD_MIN_HEIGHT dynamic pads;
keep our y_start_pos scroll, _truncate_datetime_suffix
- src/xmpp/: message, stanza, presence, roster_list, iq, session —
upstream connection_get_available_resources; keep our LMC stanza logic
- src/common.c: fix format-security (cons_show)
Build system:
- Makefile.am: updated test paths to subdirectory structure, added
test_cmd_ac, test_forced_encryption
- Restored autotools files deleted by upstream meson migration:
bootstrap.sh, autogen.sh, m4/ax_valgrind_check.m4, configure-debug
Tests:
- Unit tests: upstream unittests.c base + our forced_encryption tests
(482 passed, 0 failed across all 4 configurations)
- Functional tests: kept our version (93 passed, 0 failed)
upstream version requires stbbr_for_xmlns not yet in our stabber fork
- Updated test stubs: stub_xmpp.c, stub_omemo.c from upstream
Compile fixes:
- src/common.c: cons_show(errmsg) -> cons_show("%s", errmsg)
- src/database.c: null-check before msg->timestamp access
- src/ui/console.c: size_t -> (int) cast for format width
- src/config/tlscerts.c: %d -> %zu for size_t
2.4 KiB
Release Guide
-
Release libstrophe if required
-
Set the correct release version in meson.build
-
Run Unit tests:
meson setup build_test -Dtests=true && meson test -C build_test -
Run Functional tests: same as above but needs stabber installed
-
Check copyright dates in all files
-
Create clean build folder:
meson setup build_deb --buildtype=debug -Dnotifications=enabled -Dicons-and-clipboard=enabled -Dotr=enabled -Dpgp=enabled -Domemo=enabled -Dc-plugins=enabled -Dpython-plugins=enabled -Dxscreensaver=enabled -Domemo-qrcode=enabled -Dgdk-pixbuf=enabled -
Build profanity:
meson compile -C build_deb -
Generate HTML docs (the docgen argument only works when package status is development)
./build_deb/profanity docgen -
Generate manpages (the mangen argument only works when package status is development)
./build_deb/profanity mangen -
Determine if
libprofanity's version needs to be increased -
Update plugin API docs (./apidocs/c and ./apidocs/python) need to run the
gen.shand commit the results to the website git repo -
Update CHANGELOG (Use scripts/changelog-helper.py)
-
Update profrc.example
-
Update profanity.doap (new XEPs and latest version). Look for
DEVwhich marks what is done on the development branch. -
Add new release to profanity.doap
-
Set the package status to release:
meson setup build_rel --buildtype=release -
Update date and version in man pages (profanity.1, profanity-ox-setup.1)
-
Add generated command manpages:
git add docs/profanity-*.1 -
Commit (Release 0.1.2)
-
Tag (0.1.2)
-
Generate tarballs:
meson dist -C build_rel --formats xztar,zip -
Remove generated command manpages:
git rm docs/profanity-*.1git checkout HEAD -- docs/profanity-ox-setup.1docs/profanity.1 and docs/profanity-ox-setup.1 are handwritten. -
Commit
Start new cycle -
Push
Updating website
Make changes to the git repo including uploading the new artefacts at: https://github.com/profanity-im/profanity-im.github.io
- Add .xz and .zip tarballs to
tarballsdirectory - Copy generated main_fragment.html and toc_fragment.html to
guide/latest - Copy
guide/latesttoguide/newversion - Tarball location, name, checksum in index.html will be updated automatically during
make/ GH Action - Update profanity_version.txt
- Take results from profanity.doap and put them into xeps.html