merge: sync upstream profanity-im/profanity
All checks were successful
CI Code / Check spelling (push) Successful in 18s
CI Code / Check coding style (push) Successful in 34s
CI Code / Code Coverage (push) Successful in 2m36s
CI Code / Linux (debian) (push) Successful in 4m41s
CI Code / Linux (ubuntu) (push) Successful in 4m52s
CI Code / Linux (arch) (push) Successful in 5m40s
All checks were successful
CI Code / Check spelling (push) Successful in 18s
CI Code / Check coding style (push) Successful in 34s
CI Code / Code Coverage (push) Successful in 2m36s
CI Code / Linux (debian) (push) Successful in 4m41s
CI Code / Linux (ubuntu) (push) Successful in 4m52s
CI Code / Linux (arch) (push) Successful in 5m40s
Sync with upstream profanity-im/profanity.
Major upstream changes incorporated:
Memory management
- Replace malloc+memset with g_new0 throughout codebase
- Adopt auto_gchar / auto_gcharv / auto_gerror / auto_jid cleanup macros
- Replace free() with g_free() for GAlloc'd memory
Editor rewrite
- Remove pthread-based async editor; use GChildWatch callback API
- New launch_editor(initial_content, callback, user_data) interface
- Proper signal handling (SIGINT, SIGTSTP, SIGPIPE reset in child)
- ui_suspend()/ui_resume() integration for TTY management
OMEMO improvements
- Dual backend support: libsignal-protocol-c and libomemo-c
- Proper pre-key removal after use (XEP-0384 compliance)
- Automatic pre-key regeneration when store drops below threshold
- New functions: omemo_is_device_active(), omemo_is_jid_trusted()
- omemo_get_jid_untrusted_fingerprints() for better error messages
- Fingerprint notifications on new device identity discovery
- Deterministic pre-key ID generation tracking max_pre_key_id
- omemo_trust_changed() UI updates on trust state changes
JID validation
- RFC 6122-compliant validation in jid_is_valid()
- Character-level checks (RFC 6122 forbidden chars: & ' / : < > @)
- Length limits: 1023 per component, 3071 total
- New jid_is_valid_user_jid() for user vs. service JID distinction
Database
- Schema migration v3: UNIQUE constraint on archive_id for deduplication
- Triggers for corrected message tracking (replaces_db_id / replaced_by_db_id)
- db_history_result_t return type, _truncate_datetime_suffix()
UI / console
- win_warn_needed() / win_warn_sent() warning deduplication hash table
- PAD_MIN_HEIGHT dynamic pad sizing with PAD_THRESHOLD auto-cleanup
- Spellcheck integration in input field with Unicode word detection
- cons_spellcheck_setting() for /settings ui output
- /[command]? shortcut for command help
Account config
- Account name sanitization for GKeyFile special chars ([ ] = # \n \r)
- Replace popen() with g_spawn_sync() for eval_password
- TLS policy: add "direct" option alongside legacy
Connection
- Port validation with g_assert (0–65535)
- SHA-256 certificate fingerprint support (XMPP_CERT_PUBKEY_FINGERPRINT_SHA256)
- "direct" TLS policy alias for legacy SSL
Common utilities
- str_xml_sanitize() for XML 1.0 illegal character removal
- string_matches_one_of() with formatted error messages
- valid_tls_policy_option() helper
- prof_date_time_format_iso8601() utility
- Improved strip_arg_quotes() with backslash unescaping
- prof_occurrences() uses g_slist_prepend + reverse for performance
PGP / OX
- Proper GPGME resource cleanup with goto-cleanup pattern
- g_string_free(xmppuri) leak fix in _ox_key_lookup
CSV export
- Use GString + g_file_set_contents instead of raw write() syscalls
Tests
- Restructured into subdirectories: command/, config/, xmpp/, ui/, omemo/, otr/, pgp/
- New test_cmd_ac.c for autocompleter unit tests
- Updated stubs for new UI suspend/resume functions
License headers
- Migrate to SPDX-3.0 identifiers (GPL-3.0-or-later WITH OpenSSL-exception)
────────────────────────────────────────────────────
cproof-specific preservations:
- XEP-0308 LMC: replace_id ?: id logic in message/stanza/omemo
- Force encryption: cmd_force_encryption, test_forced_encryption
- CWE-134: format string protection (cons_show("%s", ...))
- y_start_pos-based paging in window.c
- db_history_result_t return type, _truncate_datetime_suffix()
Merge-time fixes:
- common.c: format-security (-Werror) — cons_show(errmsg) → cons_show("%s", errmsg)
- database.c: null-deref guard — !msg->timestamp → msg && !msg->timestamp
- console.c: implicit size_t → int cast — (int)(maxlen + 1)
- tlscerts.c: %d for size_t — %zu
Build system:
- Kept autotools (Makefile.am, configure.ac); upstream uses Meson
- Restored deleted files: bootstrap.sh, autogen.sh, ax_valgrind_check.m4, configure-debug
- Updated Makefile.am test paths for subdirectory structure
- Added test_cmd_ac, test_forced_encryption to test sources
Functional tests:
- Use cproof version; upstream requires stbbr_for_xmlns from updated stabber
- Not yet available in devs/stabber fork
Closes #64
Merge author: jabber.developer2
Commits authors:
Michael Vetter <jubalh@iodoru.org>
& Steffen Jaeckel <s@jaeckel.eu>
This commit is contained in:
@@ -2,67 +2,40 @@
|
||||
|
||||
* Release libstrophe if required
|
||||
|
||||
* Run Unit tests: `make check-unit`
|
||||
* Run Functional tests - Currently disabled
|
||||
* Run manual valgrind tests for new features
|
||||
* Build and simple tests in Virtual machines ideally all dists including OSX and Windows (Cygwin)
|
||||
* 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
|
||||
|
||||
* Update Inline command help (./src/command/cmd_defs.c)
|
||||
* 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)
|
||||
`./profanity docgen`
|
||||
`./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](https://github.com/profanity-im/profanity/issues/973)
|
||||
* Update plugin API docs (./apidocs/c and ./apidocs/python) need to run the `gen.sh` and commit the results to the website git repo
|
||||
* Update CHANGELOG
|
||||
* Update CHANGELOG (Use scripts/changelog-helper.py)
|
||||
* Update profrc.example
|
||||
* Update profanity.doap (new XEPs and latest version). Look for `DEV` which marks what is done on the development branch.
|
||||
* Add new release to profanity.doap
|
||||
|
||||
## Creating artefacts
|
||||
* Set the correct release version in configure.ac:
|
||||
|
||||
```
|
||||
AC_INIT([profanity], [0.6.0], [boothj5web@gmail.com])
|
||||
```
|
||||
|
||||
* Set the package status in configure.ac:
|
||||
```
|
||||
PACKAGE_STATUS="release"
|
||||
```
|
||||
* 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)
|
||||
* Generate manpages for profanity commands (the mangen argument only works when package status is development)
|
||||
`./profanity mangen`
|
||||
These files should be added to the docs subfolder and added to git whenever a command changes.
|
||||
|
||||
* Add generated command manpages: `git add docs/profanity-*.1`
|
||||
|
||||
* Commit
|
||||
* Commit (Release 0.1.2)
|
||||
* Tag (0.1.2)
|
||||
* Push
|
||||
|
||||
* Configure to generate fresh Makefile:
|
||||
|
||||
```
|
||||
./bootstrap.sh && ./configure
|
||||
```
|
||||
|
||||
* Generate tarballs:
|
||||
|
||||
```
|
||||
make dist
|
||||
make dist-bzip2
|
||||
make dist-xz
|
||||
make dist-zip
|
||||
```
|
||||
|
||||
* Set the package status back to dev:
|
||||
|
||||
```
|
||||
PACKAGE_STATUS="development"
|
||||
```
|
||||
* Generate tarballs: `meson dist -C build_rel --formats xztar,zip`
|
||||
|
||||
* Remove generated command manpages:
|
||||
`git rm docs/profanity-*.1`
|
||||
@@ -71,13 +44,3 @@ PACKAGE_STATUS="development"
|
||||
|
||||
* 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 `tarballs` directory
|
||||
* Copy `guide/latest` to `guide/newversion`
|
||||
* Update tarball location and name in index.html
|
||||
* Update checksums in index.html
|
||||
* Update profanity_version.txt
|
||||
* Take results from profanity.doap and put them into xeps.html
|
||||
|
||||
Reference in New Issue
Block a user