sign modification

Update purple-signald build

.drone.yml

@@ -160,19 +160,16 @@ clone:
   disable: true
 
 steps:
-  - name: telegram
+  - name: webhook
-    image: appleboy/drone-telegram:1.3.10
+    image: plugins/webhook
     failure: ignore
     settings:
-      token:
+      urls:
-        from_secret: TT
+        from_secret: WH_URL
-      to:
+      template: |
-        from_secret: TID
+        {
-      message: |
+          "text": "**Repo:** {{repo.owner}}/{{repo.name}}\n**Branch:** [{{build.branch}}](https://github.com/{{repo.owner}}/{{repo.name}}/commits/{{build.branch}}) **Commit:** [{{build.message}}](https://github.com/{{repo.owner}}/{{repo.name}}/commit/{{build.commit}}) **Author:** [{{build.author}}](https://github.com/{{build.author}})\n**Pipeline:** [#{{build.number}}]({{build.link}}) has {{#success build.status}}passed{{else}}failed{{/success}} in {{since build.started}} {{#success build.status}}✅{{else}}❌{{/success}}"
-        *{{commit.author}} ({{commit.email}})*  
+        }
-        *{{repo.namespace}}/{{repo.name}}*  
-        [Pipeline #{{build.number}} has {{#success build.status}}passed{{else}}failed{{/success}} in {{since build.started}}]({{build.link}}) {{#success build.status}}✅{{else}}❌{{/success}}  
-        *Branch:* [{{commit.branch}}](https://github.com/{{repo.namespace}}/{{repo.name}}/commits/{{commit.branch}}) *Commit:* [{{commit.message}}]({{commit.link}})
 
 trigger:
   status:
@@ -186,6 +183,6 @@ depends_on:
 
 ---
 kind: signature
-hmac: bbb9015868c7b2e451c5f3a0b8473ea3565a5000ffd3c5d4a9914f220628e4c2
+hmac: 81dc02ecbd5e959fc39ed9c6fa941d835b66d2bcff4be0f42410b31d920511a2
 
 ...

Dockerfile

@@ -310,19 +310,19 @@ FROM bitlbee-build as signald-build
 ARG SIGNAL=1
 ARG SIGNAL_VERSION
 
-COPY signal-login.c.patch /tmp/login.c.patch
-
 RUN echo SIGNAL=${SIGNAL} > /tmp/status \
  && if [ ${SIGNAL} -eq 1 ]; \
      then cd /tmp \
-       && apk --no-cache add file-dev libmagic patch \
+       && apk --no-cache add file-dev cmake \
-       && git clone -n https://github.com/hoehermann/libpurple-signald \
+       && git clone -n https://github.com/hoehermann/purple-signald \
-       && cd libpurple-signald \
+       && cd purple-signald \
        && git checkout ${SIGNAL_VERSION} \
        && git submodule init \
        && git submodule update \
-       && patch < ../login.c.patch \
+       && mkdir -p build \
-       && make -j$(nproc --ignore 2) SUPPORT_EXTERNAL_ATTACHMENTS=1 libsignald.so \
+       && cd build \
+       && cmake .. \
+       && make -j$(nproc --ignore 2) \
        && make install \
        && strip /usr/lib/purple-2/libsignald.so; \
      else mkdir -p /usr/lib/purple-2 \
@@ -438,7 +438,7 @@ RUN addgroup -g 101 -S bitlbee \
  && if [ ${STEAM} -eq 1 ] || [ ${TELEGRAM} -eq 1 ] || [ ${MATRIX} -eq 1 ]; then PKGS="${PKGS} libgcrypt"; fi \
  && if [ ${TELEGRAM} -eq 1 ]; then PKGS="${PKGS} zlib libwebp libpng libstdc++ libgcc"; fi \
  && if [ ${HANGOUTS} -eq 1 ] || [ ${SIGNAL} -eq 1 ]; then PKGS="${PKGS} protobuf-c"; fi \
- && if [ ${SIGNAL} -eq 1 ]; then PKGS="${PKGS} libmagic"; fi \
+ && if [ ${SIGNAL} -eq 1 ]; then PKGS="${PKGS} gdk-pixbuf"; fi \
  && if [ ${SIPE} -eq 1 ]; then PKGS="${PKGS} libxml2"; fi \
  && if [ ${ROCKETCHAT} -eq 1 ]; then PKGS="${PKGS} discount"; fi \
  && if [ ${MATRIX} -eq 1 ]; then PKGS="${PKGS} sqlite http-parser olm"; fi \

Dockerfile.debian

@@ -318,13 +318,16 @@ RUN echo SIGNAL=${SIGNAL} > /tmp/status \
  && if [ ${SIGNAL} -eq 1 ]; \
      then cd /tmp \
        && apt-get update \
-       && apt-get install -y --no-install-recommends libmagic-dev \
+       && apt-get install -y --no-install-recommends libmagic-dev cmake \
-       && git clone -n https://github.com/hoehermann/libpurple-signald \
+       && git clone -n https://github.com/hoehermann/purple-signald \
-       && cd libpurple-signald \
+       && cd purple-signald \
        && git checkout ${SIGNAL_VERSION} \
        && git submodule init \
        && git submodule update \
-       && make -j$(nproc --ignore 2) SUPPORT_EXTERNAL_ATTACHMENTS=1 \
+       && mkdir -p build \
+       && cd build \
+       && cmake .. \
+       && make -j$(nproc --ignore 2) \
        && make install \
        && strip /usr/lib/purple-2/libsignald.so; \
      else mkdir -p /usr/lib/purple-2 \

plugin_versions

@@ -6,10 +6,10 @@ ICYQUE_VERSION=4fc08a0
 MASTODON_VERSION=v1.4.5
 MATRIX_VERSION=034ebf8
 ROCKETCHAT_VERSION=484e5bf
-SIGNAL_VERSION=v0.11.0
+SIGNAL_VERSION=v0.12.0
 SIPE_VERSION=3db5111
 SKYPEWEB_VERSION=8b29d7b
 SLACK_VERSION=3433ac5
 STEAM_VERSION=a6444d2
 TELEGRAM_VERSION=v0.8.1
-WHATSAPP_VERSION=v1.2.0
+WHATSAPP_VERSION=v1.9.0

signal-login.c.patch

@@ -1,10 +0,0 @@
---- login.c
-+++ login.c.new
-@@ -4,6 +4,7 @@
- #include <sys/un.h> // for sockaddr_un
- #include <sys/socket.h> // for socket and read
- #include <errno.h>
-+#include <stdint.h>
-
- /*
-  * Implements the read callback.