mirror of
https://git.jabber.space/devs/cproof.git
synced 2026-07-18 19:46:22 +00:00
jabber.developer2
4319172758
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
60 lines
1.2 KiB
Docker
60 lines
1.2 KiB
Docker
FROM ubuntu:latest
|
|
|
|
ENV DEBIAN_FRONTEND="noninteractive"
|
|
ENV TERM=xterm
|
|
ENV CC="ccache gcc"
|
|
|
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
|
autoconf \
|
|
autoconf-archive \
|
|
automake \
|
|
ca-certificates \
|
|
ccache \
|
|
gcc \
|
|
git \
|
|
lcov \
|
|
libcmocka-dev \
|
|
libcurl3-dev \
|
|
libgcrypt-dev \
|
|
libglib2.0-dev \
|
|
libgpgme11-dev \
|
|
libgtk2.0-dev \
|
|
libmicrohttpd-dev \
|
|
libncursesw5-dev \
|
|
libnotify-dev \
|
|
libotr5-dev \
|
|
libreadline-dev \
|
|
libsignal-protocol-c-dev \
|
|
libssl-dev \
|
|
libtool \
|
|
libxss-dev \
|
|
make \
|
|
pkg-config \
|
|
python3-dev \
|
|
python-dev-is-python3 \
|
|
valgrind \
|
|
libsqlite3-dev \
|
|
libgdk-pixbuf-2.0-dev \
|
|
libqrencode-dev
|
|
|
|
RUN mkdir -p /usr/src/{stabber,libstrophe,profanity}
|
|
WORKDIR /usr/src
|
|
|
|
RUN git clone --depth 1 https://git.jabber.space/devs/stabber
|
|
RUN git clone --depth 1 https://github.com/strophe/libstrophe
|
|
|
|
WORKDIR /usr/src/stabber
|
|
RUN ./bootstrap.sh
|
|
RUN ./configure --prefix=/usr --disable-dependency-tracking
|
|
RUN make -j$(nproc)
|
|
RUN make install
|
|
|
|
WORKDIR /usr/src/libstrophe
|
|
RUN ./bootstrap.sh
|
|
RUN ./configure --prefix=/usr
|
|
RUN make -j$(nproc)
|
|
RUN make install
|
|
|
|
WORKDIR /usr/src/profanity
|
|
COPY . /usr/src/profanity
|