aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Dockerfile7
-rw-r--r--plugin_versions2
-rw-r--r--signal-login.c.patch10
3 files changed, 16 insertions, 3 deletions
diff --git a/Dockerfile b/Dockerfile
index 5dcc717..9e7fa5f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -300,16 +300,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 \
+ && apk --no-cache add file-dev libmagic patch \
&& git clone -n https://github.com/hoehermann/libpurple-signald \
&& cd libpurple-signald \
&& git checkout ${SIGNAL_VERSION} \
&& git submodule init \
&& git submodule update \
- && make -j$(nproc --ignore 2) SUPPORT_EXTERNAL_ATTACHMENTS=1 \
+ && patch < ../login.c.patch \
+ && make -j$(nproc --ignore 2) SUPPORT_EXTERNAL_ATTACHMENTS=1 libsignald.so \
&& make install \
&& strip /usr/lib/purple-2/libsignald.so; \
else mkdir -p /usr/lib/purple-2 \
diff --git a/plugin_versions b/plugin_versions
index 5f873f8..1e1227f 100644
--- a/plugin_versions
+++ b/plugin_versions
@@ -6,7 +6,7 @@ ICYQUE_VERSION=4fc08a0
MASTODON_VERSION=v1.4.5
MATRIX_VERSION=034ebf8
ROCKETCHAT_VERSION=484e5bf
-SIGNAL_VERSION=v0.8.1
+SIGNAL_VERSION=v0.11.0
SIPE_VERSION=3db5111
SKYPEWEB_VERSION=8b29d7b
SLACK_VERSION=3433ac5
diff --git a/signal-login.c.patch b/signal-login.c.patch
new file mode 100644
index 0000000..5336347
--- /dev/null
+++ b/signal-login.c.patch
@@ -0,0 +1,10 @@
+--- 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. \ No newline at end of file