sign modification

Update purple-signald build

.drone.yml

@@ -5,7 +5,7 @@ name: alpine
 
 steps:
   - name: docker
-    image: docker:stable-dind
+    image: docker:dind
     privileged: true
     detach: true
     command: [ "dockerd", "--host=tcp://0.0.0.0:2375" ]
@@ -20,10 +20,11 @@ steps:
       DOCKER_HOST: tcp://docker:2375
     commands:
     - while ! docker info; do sleep 1; done
-    - docker run --rm --privileged tonistiigi/binfmt --install all
+    - docker buildx create --use --name docker --node docker --platform linux/amd64 --driver docker-container $DOCKER_HOST
-    - docker buildx create --use --name docker --node docker --platform linux/amd64,linux/arm64,linux/armhf --driver docker-container $DOCKER_HOST
     - echo $PASSWORD | docker login --username $USER --password-stdin
-    - docker buildx build --push --cache-from ezkrg/bitlbee-libpurple:cache --cache-to ezkrg/bitlbee-libpurple:cache -t ezkrg/bitlbee-libpurple:test --platform linux/amd64,linux/arm64,linux/armhf .
+    - apk add --update --no-cache bash
+    - BUILD_ARGS=$(for BUILD_ARG in $(cat plugin_versions); do echo -n "--build-arg $BUILD_ARG "; done)
+    - docker buildx build --push --cache-from ezkrg/bitlbee-libpurple:cache --cache-to ezkrg/bitlbee-libpurple:cache --tag ezkrg/bitlbee-libpurple:test --platform linux/amd64 --build-arg ALPINE_VERSION=3.15 $BUILD_ARGS .
     when:
       event:
       - push
@@ -38,10 +39,61 @@ steps:
       DOCKER_HOST: tcp://docker:2375
     commands:
     - while ! docker info; do sleep 1; done
-    - docker run --rm --privileged tonistiigi/binfmt --install all
+    - docker buildx create --use --name docker --node docker --platform linux/amd64 --driver docker-container $DOCKER_HOST
-    - docker buildx create --use --name docker --node docker --platform linux/amd64,linux/arm64,linux/armhf --driver docker-container $DOCKER_HOST
     - echo $PASSWORD | docker login --username $USER --password-stdin
-    - docker buildx build --push --cache-from ezkrg/bitlbee-libpurple:cache --cache-to ezkrg/bitlbee-libpurple:cache -t ezkrg/bitlbee-libpurple:$DRONE_TAG -t ezkrg/bitlbee-libpurple:latest --platform linux/amd64,linux/arm64,linux/armhf .
+    - apk add --update --no-cache bash
+    - BUILD_ARGS=$(for BUILD_ARG in $(cat plugin_versions); do echo -n "--build-arg $BUILD_ARG "; done)
+    - docker buildx build --push --cache-from ezkrg/bitlbee-libpurple:cache --cache-to ezkrg/bitlbee-libpurple:cache --tag ezkrg/bitlbee-libpurple:$DRONE_TAG --tag ezkrg/bitlbee-libpurple:latest --tag ezkrg/bitlbee-libpurple:alpine --platform linux/amd64 --build-arg ALPINE_VERSION=3.15 $BUILD_ARGS .
+    when:
+      event:
+      - tag
+
+---
+kind: pipeline
+type: docker
+name: alpine3.12
+
+steps:
+  - name: docker
+    image: docker:dind
+    privileged: true
+    detach: true
+    command: [ "dockerd", "--host=tcp://0.0.0.0:2375" ]
+
+  - name: test
+    image: ezkrg/buildx:latest
+    environment:
+      USER:
+        from_secret: DHU
+      PASSWORD:
+        from_secret: DHP
+      DOCKER_HOST: tcp://docker:2375
+    commands:
+    - while ! docker info; do sleep 1; done
+    - docker buildx create --use --name docker --node docker --platform linux/amd64 --driver docker-container $DOCKER_HOST
+    - echo $PASSWORD | docker login --username $USER --password-stdin
+    - apk add --update --no-cache bash
+    - BUILD_ARGS=$(for BUILD_ARG in $(cat plugin_versions); do echo -n "--build-arg $BUILD_ARG "; done)
+    - docker buildx build --push --cache-from ezkrg/bitlbee-libpurple:alpine3.12-cache --cache-to ezkrg/bitlbee-libpurple:alpine3.12-cache --tag ezkrg/bitlbee-libpurple:alpine3.12-test --platform linux/amd64,linux/arm64,linux/armhf --build-arg ALPINE_VERSION=3.12 $BUILD_ARGS .
+    when:
+      event:
+      - push
+
+  - name: latest
+    image: ezkrg/buildx:latest
+    environment:
+      USER:
+        from_secret: DHU
+      PASSWORD:
+        from_secret: DHP
+      DOCKER_HOST: tcp://docker:2375
+    commands:
+    - while ! docker info; do sleep 1; done
+    - docker buildx create --use --name docker --node docker --platform linux/amd64 --driver docker-container $DOCKER_HOST
+    - echo $PASSWORD | docker login --username $USER --password-stdin
+    - apk add --update --no-cache bash
+    - BUILD_ARGS=$(for BUILD_ARG in $(cat plugin_versions); do echo -n "--build-arg $BUILD_ARG "; done)
+    - docker buildx build --push --cache-from ezkrg/bitlbee-libpurple:alpine3.12-cache --cache-to ezkrg/bitlbee-libpurple:alpine3.12-cache --tag ezkrg/bitlbee-libpurple:alpine3.12-$DRONE_TAG --tag ezkrg/bitlbee-libpurple:alpine3.12 --platform linux/amd64,linux/arm64,linux/armhf --build-arg ALPINE_VERSION=3.12 $BUILD_ARGS .
     when:
       event:
       - tag
@@ -53,7 +105,7 @@ name: debian
 
 steps:
   - name: docker
-    image: docker:stable-dind
+    image: docker:dind
     privileged: true
     detach: true
     command: [ "dockerd", "--host=tcp://0.0.0.0:2375" ]
@@ -72,7 +124,9 @@ steps:
     - docker run --rm --privileged tonistiigi/binfmt --install all
     - docker buildx create --use --name docker --node docker --platform linux/amd64,linux/arm64,linux/armhf --driver docker-container $DOCKER_HOST
     - echo $PASSWORD | docker login --username $USER --password-stdin
-    - docker buildx build --push --cache-from ezkrg/bitlbee-libpurple:debian-cache --cache-to ezkrg/bitlbee-libpurple:debian-cache -t ezkrg/bitlbee-libpurple:debian-test --platform linux/amd64,linux/arm64,linux/armhf -f Dockerfile.debian .
+    - apk add --update --no-cache bash
+    - BUILD_ARGS=$(for BUILD_ARG in $(cat plugin_versions); do echo -n "--build-arg $BUILD_ARG "; done)
+    - docker buildx build --push --cache-from ezkrg/bitlbee-libpurple:debian-cache --cache-to ezkrg/bitlbee-libpurple:debian-cache --tag ezkrg/bitlbee-libpurple:debian-test --platform linux/amd64,linux/arm64,linux/armhf -f Dockerfile.debian $BUILD_ARGS .
     when:
       event:
       - push
@@ -90,7 +144,9 @@ steps:
     - docker run --rm --privileged tonistiigi/binfmt --install all
     - docker buildx create --use --name docker --node docker --platform linux/amd64,linux/arm64,linux/armhf --driver docker-container $DOCKER_HOST
     - echo $PASSWORD | docker login --username $USER --password-stdin
-    - docker buildx build --push --cache-from ezkrg/bitlbee-libpurple:debian-cache --cache-to ezkrg/bitlbee-libpurple:debian-cache -t ezkrg/bitlbee-libpurple:debian-$DRONE_TAG -t ezkrg/bitlbee-libpurple:debian-latest --platform linux/amd64,linux/arm64,linux/armhf -f Dockerfile.debian .
+    - apk add --update --no-cache bash
+    - BUILD_ARGS=$(for BUILD_ARG in $(cat plugin_versions); do echo -n "--build-arg $BUILD_ARG "; done)
+    - docker buildx build --push --cache-from ezkrg/bitlbee-libpurple:debian-cache --cache-to ezkrg/bitlbee-libpurple:debian-cache --tag ezkrg/bitlbee-libpurple:debian-$DRONE_TAG --tag ezkrg/bitlbee-libpurple:debian --platform linux/amd64,linux/arm64,linux/armhf -f Dockerfile.debian $BUILD_ARGS .
     when:
       event:
       - tag
@@ -104,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:
@@ -125,10 +178,11 @@ trigger:
 
 depends_on:
   - alpine
+  - alpine3.12
   - debian
 
 ---
 kind: signature
-hmac: e51bb8ccb6f602e0f02e6bd0e9dfd8456c4655c4bb299fc64a10c8b162294544
+hmac: 81dc02ecbd5e959fc39ed9c6fa941d835b66d2bcff4be0f42410b31d920511a2
 
 ...

CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## 2022-04-08 14:37:31
+- use alpine 3.15
+- remove arm build from alpine3.15 based images
+- update whatsapp to whatsmeow
+- update telegram to tdlib
+- update skypeweb
+- update hangouts
+- update slack
+- update discord
+- update rocket.chat
+- update mastodon
+- update matrix
+- update signal
+- new alpine3.12 tag for arm build
+- other build process related changes
+
 ## 2021-09-14 22:52:43 ([markrawls](https://github.com/markrawls))
 - build for ARM platforms
 

Dockerfile

@@ -1,19 +1,20 @@
-ARG ALPINE_VERSION=3.12
+ARG ALPINE_VERSION
 
-FROM alpine:${ALPINE_VERSION} as bitlbee-build
+FROM alpine:${ALPINE_VERSION} as base-image
 
-ARG BITLBEE_VERSION=3.6
+FROM base-image as bitlbee-build
+
+ARG BITLBEE_VERSION
 
 RUN apk add --no-cache --update \
     bash shadow build-base git python2 autoconf automake libtool mercurial intltool flex \
-    glib-dev openssl-dev pidgin-dev json-glib-dev libgcrypt-dev zlib-dev libwebp-dev libpng-dev \
+    glib-dev openssl-dev pidgin-dev json-glib-dev libgcrypt-dev zlib-dev libotr-dev \
-    protobuf-c-dev libxml2-dev discount-dev sqlite-dev http-parser-dev libotr-dev olm-dev \
  && cd /tmp \
  && git clone -n https://github.com/bitlbee/bitlbee.git \
  && cd bitlbee \
  && git checkout ${BITLBEE_VERSION} \
  && ./configure --purple=1 --otr=plugin --ssl=openssl --prefix=/usr --etcdir=/etc/bitlbee \
- && make \
+ && make -j$(nproc --ignore 2) \
  && make install-bin \
  && make install-doc \
  && make install-dev \
@@ -40,7 +41,7 @@ RUN echo OTR=${OTR} > /tmp/status \
 FROM bitlbee-build as facebook-build
 
 ARG FACEBOOK=1
-ARG FACEBOOK_VERSION=v1.2.2
+ARG FACEBOOK_VERSION
 
 RUN echo FACEBOOK=${FACEBOOK} > /tmp/status \
  && if [ ${FACEBOOK} -eq 1 ]; \
@@ -49,7 +50,7 @@ RUN echo FACEBOOK=${FACEBOOK} > /tmp/status \
        && cd bitlbee-facebook \
        && git checkout ${FACEBOOK_VERSION} \
        && ./autogen.sh \
-       && make \
+       && make -j$(nproc --ignore 2) \
        && make install \
        && strip /usr/lib/bitlbee/facebook.so; \
      else mkdir -p /usr/lib/bitlbee \
@@ -62,7 +63,7 @@ RUN echo FACEBOOK=${FACEBOOK} > /tmp/status \
 FROM bitlbee-build as steam-build
 
 ARG STEAM=1
-ARG STEAM_VERSION=a6444d2
+ARG STEAM_VERSION
 
 RUN echo STEAM=${STEAM} > /tmp/status \
  && if [ ${STEAM} -eq 1 ]; \
@@ -71,7 +72,7 @@ RUN echo STEAM=${STEAM} > /tmp/status \
        && cd bitlbee-steam \
        && git checkout ${STEAM_VERSION} \
        && ./autogen.sh \
-       && make \
+       && make -j$(nproc --ignore 2) \
        && make install \
        && strip /usr/lib/bitlbee/steam.so; \
      else mkdir -p /usr/lib/bitlbee \
@@ -84,7 +85,7 @@ RUN echo STEAM=${STEAM} > /tmp/status \
 FROM bitlbee-build as skypeweb-build
 
 ARG SKYPEWEB=1
-ARG SKYPEWEB_VERSION=c4906b8
+ARG SKYPEWEB_VERSION
 
 RUN echo SKYPEWEB=${SKYPEWEB} > /tmp/status \
  && if [ ${SKYPEWEB} -eq 1 ]; \
@@ -93,7 +94,7 @@ RUN echo SKYPEWEB=${SKYPEWEB} > /tmp/status \
        && cd skype4pidgin \
        && git checkout ${SKYPEWEB_VERSION} \
        && cd skypeweb \
-       && make \
+       && make -j$(nproc --ignore 2) \
        && make install \
        && strip /usr/lib/purple-2/libskypeweb.so; \
      else mkdir -p /usr/lib/purple-2 \
@@ -105,22 +106,36 @@ RUN echo SKYPEWEB=${SKYPEWEB} > /tmp/status \
 FROM bitlbee-build as telegram-build
 
 ARG TELEGRAM=1
-ARG TELEGRAM_VERSION=v1.4.3
+ARG TELEGRAM_VERSION
 
 RUN echo TELEGRAM=${TELEGRAM} > /tmp/status \
  && if [ ${TELEGRAM} -eq 1 ]; \
      then cd /tmp \
-       && git clone -n https://github.com/majn/telegram-purple \
+       && apk add --update --no-cache cmake gperf libwebp-dev libpng-dev \
-       && cd telegram-purple \
+       && git clone -n https://github.com/ars3niy/tdlib-purple.git \
+       && cd tdlib-purple \
        && git checkout ${TELEGRAM_VERSION} \
-       && git submodule update --init --recursive \
+       && TDLIB_REQ_VERSION=$(grep -o "tdlib version.*" CMakeLists.txt| tail -1 | awk '{print $3}') \
-       && ./configure \
+       && cd /tmp \
-       && make \
+       && git clone -n https://github.com/tdlib/td.git tdlib \
+       && cd tdlib \
+       && TDLIB_VERSION=$(git log --pretty=format:"%h%x09%s" | grep "Update version to ${TDLIB_REQ_VERSION}" | awk '{print $1}') \
+       && git checkout ${TDLIB_VERSION} \
+       && mkdir build \
+       && cd build \
+       && cmake -DCMAKE_BUILD_TYPE=Release .. \
+       && make -j$(nproc --ignore 2) \
        && make install \
-       && strip /usr/lib/purple-2/telegram-purple.so; \
+       && cd /tmp/tdlib-purple \
+       && mkdir build \
+       && cd build \
+       && cmake -DTd_DIR=/usr/local/lib/cmake/Td -DNoLottie=True -DNoVoip=True .. \
+       && make -j$(nproc --ignore 2) \
+       && make install \
+       && strip /usr/lib/purple-2/libtelegram-tdlib.so; \
      else mkdir -p /usr/lib/purple-2 \
-       && ln -sf /nowhere /usr/lib/purple-2/telegram-purple.so \
+       && ln -sf /nowhere /usr/lib/purple-2/libtelegram-tdlib.so \
-       && ln -sf /nowhere /etc/telegram-purple \
+       && ln -sf /nowhere /usr/local/share/metainfo/tdlib-purple.metainfo.xml \
        && ln -sf /nowhere /usr/local/share/locale; \
     fi
 
@@ -129,15 +144,16 @@ RUN echo TELEGRAM=${TELEGRAM} > /tmp/status \
 FROM bitlbee-build as hangouts-build
 
 ARG HANGOUTS=1
-ARG HANGOUTS_VERSION=e8c8088
+ARG HANGOUTS_VERSION
 
 RUN echo HANGOUTS=${HANGOUTS} > /tmp/status \
  && if [ ${HANGOUTS} -eq 1 ]; \
      then cd /tmp \
+       && apk add --update --no-cache protobuf-c-dev \
        && git clone -n https://github.com/EionRobb/purple-hangouts.git \
        && cd purple-hangouts \
        && git checkout ${HANGOUTS_VERSION} \
-       && make \
+       && make -j$(nproc --ignore 2) \
        && make install \
        && strip /usr/lib/purple-2/libhangouts.so; \
      else mkdir -p /usr/lib/purple-2 \
@@ -149,7 +165,7 @@ RUN echo HANGOUTS=${HANGOUTS} > /tmp/status \
 FROM bitlbee-build as slack-build
 
 ARG SLACK=1
-ARG SLACK_VERSION=e0c73ae
+ARG SLACK_VERSION
 
 SHELL [ "/bin/bash", "-c" ]
 
@@ -159,7 +175,7 @@ RUN echo SLACK=${SLACK} > /tmp/status \
        && git clone -n https://github.com/dylex/slack-libpurple.git \
        && cd slack-libpurple \
        && git checkout ${SLACK_VERSION} \
-       && make \
+       && make -j$(nproc --ignore 2) \
        && install -d /usr/share/pixmaps/pidgin/protocols/{16,22,48} \
        && make install \
        && strip /usr/lib/purple-2/libslack.so; \
@@ -172,17 +188,18 @@ RUN echo SLACK=${SLACK} > /tmp/status \
 FROM bitlbee-build as sipe-build
 
 ARG SIPE=1
-ARG SIPE_VERSION=1.25.0
+ARG SIPE_VERSION
 
 RUN echo SIPE=${SIPE} > /tmp/status \
  && if [ ${SIPE} -eq 1 ]; \
      then cd /tmp \
+       && apk add --update --no-cache libxml2-dev \
        && git clone -n https://repo.or.cz/siplcs.git \
        && cd siplcs \
        && git checkout ${SIPE_VERSION} \
        && ./autogen.sh \
        && ./configure --prefix=/usr \
-       && make \
+       && make -j$(nproc --ignore 2) \
        && make install \
        && strip /usr/lib/purple-2/libsipe.so; \
      else mkdir -p /usr/lib/purple-2 \
@@ -196,7 +213,7 @@ RUN echo SIPE=${SIPE} > /tmp/status \
 FROM bitlbee-build as discord-build
 
 ARG DISCORD=1
-ARG DISCORD_VERSION=0.4.3
+ARG DISCORD_VERSION
 
 RUN echo DISCORD=${DISCORD} > /tmp/status \
  && if [ ${DISCORD} -eq 1 ]; \
@@ -206,7 +223,7 @@ RUN echo DISCORD=${DISCORD} > /tmp/status \
        && git checkout ${DISCORD_VERSION} \
        && ./autogen.sh \
        && ./configure --prefix=/usr \
-       && make \
+       && make -j$(nproc --ignore 2) \
        && make install \
        && strip /usr/lib/bitlbee/discord.so; \
      else mkdir -p /usr/lib/bitlbee \
@@ -220,15 +237,16 @@ RUN echo DISCORD=${DISCORD} > /tmp/status \
 FROM bitlbee-build as rocketchat-build
 
 ARG ROCKETCHAT=1
-ARG ROCKETCHAT_VERSION=62090bc
+ARG ROCKETCHAT_VERSION
 
 RUN echo ROCKETCHAT=${ROCKETCHAT} > /tmp/status \
  && if [ ${ROCKETCHAT} -eq 1 ]; \
      then cd /tmp \
+       && apk add --update --no-cache discount-dev \
        && git clone -n https://github.com/EionRobb/purple-rocketchat.git \
        && cd purple-rocketchat \
        && git checkout ${ROCKETCHAT_VERSION} \
-       && make \
+       && make -j$(nproc --ignore 2) \
        && make install \
        && strip /usr/lib/purple-2/librocketchat.so; \
      else mkdir -p /usr/lib/purple-2 \
@@ -240,7 +258,7 @@ RUN echo ROCKETCHAT=${ROCKETCHAT} > /tmp/status \
 FROM bitlbee-build as mastodon-build
 
 ARG MASTODON=1
-ARG MASTODON_VERSION=v1.4.4
+ARG MASTODON_VERSION
 
 RUN echo MASTODON=${MASTODON} > /tmp/status \
  && if [ ${MASTODON} -eq 1 ]; \
@@ -250,7 +268,7 @@ RUN echo MASTODON=${MASTODON} > /tmp/status \
        && git checkout ${MASTODON_VERSION} \
        && sh ./autogen.sh \
        && ./configure \
-       && make \
+       && make -j$(nproc --ignore 2) \
        && make install \
        && strip /usr/lib/bitlbee/mastodon.so; \
      else mkdir -p /usr/lib/bitlbee \
@@ -264,18 +282,21 @@ RUN echo MASTODON=${MASTODON} > /tmp/status \
 FROM bitlbee-build as matrix-build
 
 ARG MATRIX=1
-ARG MATRIX_VERSION=88f9558
+ARG MATRIX_VERSION
+
+SHELL [ "/bin/bash", "-c" ]
 
 COPY matrix-e2e.c.patch /tmp/matrix-e2e.c.patch
 
 RUN echo MATRIX=${MATRIX} > /tmp/status \
  && if [ ${MATRIX} -eq 1 ]; \
      then cd /tmp \
+       && apk add --update --no-cache sqlite-dev http-parser-dev olm-dev \
        && git clone -n https://github.com/matrix-org/purple-matrix \
        && cd purple-matrix \
        && git checkout ${MATRIX_VERSION} \
        && if [ $(uname -m) == "armv7l" ]; then patch < ../matrix-e2e.c.patch; fi \
-       && make \
+       && make -j$(nproc --ignore 2) \
        && make install \
        && strip /usr/lib/purple-2/libmatrix.so; \
      else mkdir -p /usr/lib/purple-2 \
@@ -287,18 +308,21 @@ RUN echo MATRIX=${MATRIX} > /tmp/status \
 FROM bitlbee-build as signald-build
 
 ARG SIGNAL=1
-ARG SIGNAL_VERSION=v0.8.1
+ARG SIGNAL_VERSION
 
 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 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 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 \
@@ -310,7 +334,7 @@ RUN echo SIGNAL=${SIGNAL} > /tmp/status \
 FROM bitlbee-build as icyque-build
 
 ARG ICYQUE=1
-ARG ICYQUE_VERSION=4fc08a0
+ARG ICYQUE_VERSION
 
 RUN echo ICYQUE=${ICYQUE} > /tmp/status \
  && if [ ${ICYQUE} -eq 1 ]; \
@@ -318,7 +342,7 @@ RUN echo ICYQUE=${ICYQUE} > /tmp/status \
        && git clone -n https://github.com/EionRobb/icyque.git \
        && cd icyque \
        && git checkout ${ICYQUE_VERSION} \
-       && make \
+       && make -j$(nproc --ignore 2) \
        && make install \
        && strip /usr/lib/purple-2/libicyque.so; \
      else mkdir -p /usr/lib/purple-2 \
@@ -327,7 +351,7 @@ RUN echo ICYQUE=${ICYQUE} > /tmp/status \
 
 # ---
 
-FROM alpine:${ALPINE_VERSION} as bitlbee-plugins
+FROM base-image as bitlbee-plugins
 
 COPY --from=bitlbee-build /usr/sbin/bitlbee /tmp/usr/sbin/bitlbee
 COPY --from=bitlbee-build /usr/share/man/man8/bitlbee.8 /tmp/usr/share/man/man8/bitlbee.8
@@ -350,8 +374,8 @@ COPY --from=steam-build /tmp/status /tmp/plugin/steam
 COPY --from=skypeweb-build /usr/lib/purple-2/libskypeweb.so /tmp/usr/lib/purple-2/libskypeweb.so
 COPY --from=skypeweb-build /tmp/status /tmp/plugin/skypeweb
 
-COPY --from=telegram-build /usr/lib/purple-2/telegram-purple.so /tmp/usr/lib/purple-2/telegram-purple.so
+COPY --from=telegram-build /usr/lib/purple-2/libtelegram-tdlib.so /tmp/usr/lib/purple-2/libtelegram-tdlib.so
-COPY --from=telegram-build /etc/telegram-purple /tmp/etc/telegram-purple
+COPY --from=telegram-build /usr/local/share/metainfo/tdlib-purple.metainfo.xml /tmp/usr/local/share/metainfo/tdlib-purple.metainfo.xml
 COPY --from=telegram-build /usr/local/share/locale /tmp/usr/local/share/locale
 COPY --from=telegram-build /tmp/status /tmp/plugin/telegram
 
@@ -396,12 +420,12 @@ RUN apk add --update --no-cache findutils \
 
 # ---
 
-FROM alpine:${ALPINE_VERSION} as bitlbee-libpurple
+FROM base-image as bitlbee-libpurple
 
 COPY --from=bitlbee-plugins /tmp/ /
 
-ARG PKGS="tzdata bash glib libssl1.1 libpurple libpurple-xmpp \
+ARG PKGS="tzdata bash glib libssl1.1 libpurple \
-      libpurple-oscar libpurple-bonjour"
+          libpurple-xmpp libpurple-bonjour"
 
 RUN addgroup -g 101 -S bitlbee \
  && adduser -u 101 -D -S -G bitlbee bitlbee \
@@ -412,9 +436,9 @@ RUN addgroup -g 101 -S bitlbee \
  || [ ${ROCKETCHAT} -eq 1 ] || [ ${MATRIX} -eq 1 ] || [ ${SIGNAL} -eq 1 ] \
  || [ ${ICYQUE} -eq 1 ]; then PKGS="${PKGS} json-glib"; fi \
  && 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"; 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

@@ -2,7 +2,7 @@ FROM debian:bullseye-slim as base-image
 
 FROM base-image as bitlbee-build
 
-ARG BITLBEE_VERSION=3.6
+ARG BITLBEE_VERSION
 
 RUN apt-get update \
  && apt-get install -y --no-install-recommends \
@@ -13,7 +13,7 @@ RUN apt-get update \
  && cd bitlbee \
  && git checkout ${BITLBEE_VERSION} \
  && ./configure --purple=1 --otr=plugin --ssl=openssl --prefix=/usr --etcdir=/etc/bitlbee \
- && make \
+ && make -j$(nproc --ignore 2) \
  && make install-bin \
  && make install-doc \
  && make install-dev \
@@ -40,7 +40,7 @@ RUN echo OTR=${OTR} > /tmp/status \
 FROM bitlbee-build as facebook-build
 
 ARG FACEBOOK=1
-ARG FACEBOOK_VERSION=v1.2.2
+ARG FACEBOOK_VERSION
 
 RUN echo FACEBOOK=${FACEBOOK} > /tmp/status \
  && if [ ${FACEBOOK} -eq 1 ]; \
@@ -49,7 +49,7 @@ RUN echo FACEBOOK=${FACEBOOK} > /tmp/status \
        && cd bitlbee-facebook \
        && git checkout ${FACEBOOK_VERSION} \
        && ./autogen.sh \
-       && make \
+       && make -j$(nproc --ignore 2) \
        && make install \
        && strip /usr/lib/bitlbee/facebook.so; \
      else mkdir -p /usr/lib/bitlbee \
@@ -62,7 +62,7 @@ RUN echo FACEBOOK=${FACEBOOK} > /tmp/status \
 FROM bitlbee-build as steam-build
 
 ARG STEAM=1
-ARG STEAM_VERSION=a6444d2
+ARG STEAM_VERSION
 
 RUN echo STEAM=${STEAM} > /tmp/status \
  && if [ ${STEAM} -eq 1 ]; \
@@ -71,7 +71,7 @@ RUN echo STEAM=${STEAM} > /tmp/status \
        && cd bitlbee-steam \
        && git checkout ${STEAM_VERSION} \
        && ./autogen.sh \
-       && make \
+       && make -j$(nproc --ignore 2) \
        && make install \
        && strip /usr/lib/bitlbee/steam.so; \
      else mkdir -p /usr/lib/bitlbee \
@@ -84,7 +84,7 @@ RUN echo STEAM=${STEAM} > /tmp/status \
 FROM bitlbee-build as skypeweb-build
 
 ARG SKYPEWEB=1
-ARG SKYPEWEB_VERSION=c4906b8
+ARG SKYPEWEB_VERSION
 
 RUN echo SKYPEWEB=${SKYPEWEB} > /tmp/status \
  && if [ ${SKYPEWEB} -eq 1 ]; \
@@ -93,7 +93,7 @@ RUN echo SKYPEWEB=${SKYPEWEB} > /tmp/status \
        && cd skype4pidgin \
        && git checkout ${SKYPEWEB_VERSION} \
        && cd skypeweb \
-       && make \
+       && make -j$(nproc --ignore 2) \
        && make install \
        && strip /usr/lib/purple-2/libskypeweb.so; \
      else mkdir -p /usr/lib/purple-2 \
@@ -105,24 +105,37 @@ RUN echo SKYPEWEB=${SKYPEWEB} > /tmp/status \
 FROM bitlbee-build as telegram-build
 
 ARG TELEGRAM=1
-ARG TELEGRAM_VERSION=v1.4.3
+ARG TELEGRAM_VERSION
 
 RUN echo TELEGRAM=${TELEGRAM} > /tmp/status \
  && if [ ${TELEGRAM} -eq 1 ]; \
      then cd /tmp \
        && apt-get update \
-       && apt-get install -y --no-install-recommends zlib1g-dev libwebp-dev libpng-dev \
+       && apt-get install -y --no-install-recommends cmake gperf libwebp-dev libpng-dev \
-       && git clone -n https://github.com/majn/telegram-purple \
+       && git clone -n https://github.com/ars3niy/tdlib-purple.git \
-       && cd telegram-purple \
+       && cd tdlib-purple \
        && git checkout ${TELEGRAM_VERSION} \
-       && git submodule update --init --recursive \
+       && TDLIB_REQ_VERSION=$(grep -o "tdlib version.*" CMakeLists.txt| tail -1 | awk '{print $3}') \
-       && ./configure \
+       && cd /tmp \
-       && make \
+       && git clone -n https://github.com/tdlib/td.git tdlib \
+       && cd tdlib \
+       && TDLIB_VERSION=$(git log --pretty=format:"%h%x09%s" | grep "Update version to ${TDLIB_REQ_VERSION}" | awk '{print $1}') \
+       && git checkout ${TDLIB_VERSION} \
+       && mkdir build \
+       && cd build \
+       && cmake -DCMAKE_BUILD_TYPE=Release .. \
+       && make -j$(nproc --ignore 2) \
        && make install \
-       && strip /usr/lib/purple-2/telegram-purple.so; \
+       && cd /tmp/tdlib-purple \
+       && mkdir build \
+       && cd build \
+       && cmake -DTd_DIR=/usr/local/lib/cmake/Td -DNoLottie=True -DNoVoip=True .. \
+       && make -j$(nproc --ignore 2)\
+       && make install \
+       && strip /usr/lib/purple-2/libtelegram-tdlib.so; \
      else mkdir -p /usr/lib/purple-2 \
-       && ln -sf /nowhere /usr/lib/purple-2/telegram-purple.so \
+       && ln -sf /nowhere /usr/lib/purple-2/libtelegram-tdlib.so \
-       && ln -sf /nowhere /etc/telegram-purple \
+       && ln -sf /nowhere /usr/local/share/metainfo/tdlib-purple.metainfo.xml \
        && ln -sf /nowhere /usr/local/share/locale; \
     fi
 
@@ -131,7 +144,7 @@ RUN echo TELEGRAM=${TELEGRAM} > /tmp/status \
 FROM bitlbee-build as hangouts-build
 
 ARG HANGOUTS=1
-ARG HANGOUTS_VERSION=e8c8088
+ARG HANGOUTS_VERSION
 
 RUN echo HANGOUTS=${HANGOUTS} > /tmp/status \
  && if [ ${HANGOUTS} -eq 1 ]; \
@@ -141,7 +154,7 @@ RUN echo HANGOUTS=${HANGOUTS} > /tmp/status \
        && git clone -n https://github.com/EionRobb/purple-hangouts.git \
        && cd purple-hangouts \
        && git checkout ${HANGOUTS_VERSION} \
-       && make \
+       && make -j$(nproc --ignore 2) \
        && make install \
        && strip /usr/lib/purple-2/libhangouts.so; \
      else mkdir -p /usr/lib/purple-2 \
@@ -153,7 +166,7 @@ RUN echo HANGOUTS=${HANGOUTS} > /tmp/status \
 FROM bitlbee-build as slack-build
 
 ARG SLACK=1
-ARG SLACK_VERSION=e0c73ae
+ARG SLACK_VERSION
 
 SHELL [ "/bin/bash", "-c" ]
 
@@ -163,7 +176,7 @@ RUN echo SLACK=${SLACK} > /tmp/status \
        && git clone -n https://github.com/dylex/slack-libpurple.git \
        && cd slack-libpurple \
        && git checkout ${SLACK_VERSION} \
-       && make \
+       && make -j$(nproc --ignore 2) \
        && install -d /usr/share/pixmaps/pidgin/protocols/{16,22,48} \
        && make install \
        && strip /usr/lib/purple-2/libslack.so; \
@@ -176,7 +189,7 @@ RUN echo SLACK=${SLACK} > /tmp/status \
 FROM bitlbee-build as sipe-build
 
 ARG SIPE=1
-ARG SIPE_VERSION=1.25.0
+ARG SIPE_VERSION
 
 RUN echo SIPE=${SIPE} > /tmp/status \
  && if [ ${SIPE} -eq 1 ]; \
@@ -188,7 +201,7 @@ RUN echo SIPE=${SIPE} > /tmp/status \
        && git checkout ${SIPE_VERSION} \
        && ./autogen.sh \
        && ./configure --prefix=/usr \
-       && make \
+       && make -j$(nproc --ignore 2) \
        && make install \
        && strip /usr/lib/purple-2/libsipe.so; \
      else mkdir -p /usr/lib/purple-2 \
@@ -202,7 +215,7 @@ RUN echo SIPE=${SIPE} > /tmp/status \
 FROM bitlbee-build as discord-build
 
 ARG DISCORD=1
-ARG DISCORD_VERSION=0.4.3
+ARG DISCORD_VERSION
 
 RUN echo DISCORD=${DISCORD} > /tmp/status \
  && if [ ${DISCORD} -eq 1 ]; \
@@ -212,7 +225,7 @@ RUN echo DISCORD=${DISCORD} > /tmp/status \
        && git checkout ${DISCORD_VERSION} \
        && ./autogen.sh \
        && ./configure --prefix=/usr \
-       && make \
+       && make -j$(nproc --ignore 2) \
        && make install \
        && strip /usr/lib/bitlbee/discord.so; \
      else mkdir -p /usr/lib/bitlbee \
@@ -226,7 +239,7 @@ RUN echo DISCORD=${DISCORD} > /tmp/status \
 FROM bitlbee-build as rocketchat-build
 
 ARG ROCKETCHAT=1
-ARG ROCKETCHAT_VERSION=62090bc
+ARG ROCKETCHAT_VERSION
 
 RUN echo ROCKETCHAT=${ROCKETCHAT} > /tmp/status \
  && if [ ${ROCKETCHAT} -eq 1 ]; \
@@ -236,7 +249,7 @@ RUN echo ROCKETCHAT=${ROCKETCHAT} > /tmp/status \
        && git clone -n https://github.com/EionRobb/purple-rocketchat.git \
        && cd purple-rocketchat \
        && git checkout ${ROCKETCHAT_VERSION} \
-       && make \
+       && make -j$(nproc --ignore 2) \
        && make install \
        && strip /usr/lib/purple-2/librocketchat.so; \
      else mkdir -p /usr/lib/purple-2 \
@@ -248,7 +261,7 @@ RUN echo ROCKETCHAT=${ROCKETCHAT} > /tmp/status \
 FROM bitlbee-build as mastodon-build
 
 ARG MASTODON=1
-ARG MASTODON_VERSION=v1.4.4
+ARG MASTODON_VERSION
 
 RUN echo MASTODON=${MASTODON} > /tmp/status \
  && if [ ${MASTODON} -eq 1 ]; \
@@ -258,7 +271,7 @@ RUN echo MASTODON=${MASTODON} > /tmp/status \
        && git checkout ${MASTODON_VERSION} \
        && sh ./autogen.sh \
        && ./configure \
-       && make \
+       && make -j$(nproc --ignore 2) \
        && make install \
        && strip /usr/lib/bitlbee/mastodon.so; \
      else mkdir -p /usr/lib/bitlbee \
@@ -272,7 +285,7 @@ RUN echo MASTODON=${MASTODON} > /tmp/status \
 FROM bitlbee-build as matrix-build
 
 ARG MATRIX=1
-ARG MATRIX_VERSION=88f9558
+ARG MATRIX_VERSION
 
 SHELL [ "/bin/bash", "-c" ]
 
@@ -287,7 +300,7 @@ RUN echo MATRIX=${MATRIX} > /tmp/status \
        && cd purple-matrix \
        && git checkout ${MATRIX_VERSION} \
        && if [ $(uname -m) == "armv7l" ]; then patch < ../matrix-e2e.c.patch; fi \
-       && make \
+       && make -j$(nproc --ignore 2) \
        && make install \
        && strip /usr/lib/purple-2/libmatrix.so; \
      else mkdir -p /usr/lib/purple-2 \
@@ -299,19 +312,22 @@ RUN echo MATRIX=${MATRIX} > /tmp/status \
 FROM bitlbee-build as signald-build
 
 ARG SIGNAL=1
-ARG SIGNAL_VERSION=v0.8.1
+ARG SIGNAL_VERSION
 
 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 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 \
@@ -323,7 +339,7 @@ RUN echo SIGNAL=${SIGNAL} > /tmp/status \
 FROM bitlbee-build as icyque-build
 
 ARG ICYQUE=1
-ARG ICYQUE_VERSION=4fc08a0
+ARG ICYQUE_VERSION
 
 RUN echo ICYQUE=${ICYQUE} > /tmp/status \
  && if [ ${ICYQUE} -eq 1 ]; \
@@ -331,7 +347,7 @@ RUN echo ICYQUE=${ICYQUE} > /tmp/status \
        && git clone -n https://github.com/EionRobb/icyque.git \
        && cd icyque \
        && git checkout ${ICYQUE_VERSION} \
-       && make \
+       && make -j$(nproc --ignore 2) \
        && make install \
        && strip /usr/lib/purple-2/libicyque.so; \
      else mkdir -p /usr/lib/purple-2 \
@@ -343,21 +359,26 @@ RUN echo ICYQUE=${ICYQUE} > /tmp/status \
 FROM bitlbee-build as whatsapp-build
 
 ARG WHATSAPP=1
-ARG WHATSAPP_VERSION=438fae6
+ARG WHATSAPP_VERSION
 
 RUN echo WHATSAPP=${WHATSAPP} > /tmp/status \
  && if [ ${WHATSAPP} -eq 1 ]; \
      then cd /tmp \
+       && echo "deb http://deb.debian.org/debian bullseye-backports main" | tee -a /etc/apt/sources.list \
        && apt-get update \
-       && apt-get install -y --no-install-recommends golang-go \
+       && apt-get install -y --no-install-recommends -t bullseye-backports golang-go \
+       && apt-get install -y --no-install-recommends cmake pkg-config \
        && git clone -n https://github.com/hoehermann/purple-gowhatsapp.git \
        && cd purple-gowhatsapp \
        && git checkout ${WHATSAPP_VERSION} \
-       && make \
+       && mkdir build \
-       && make install \
+       && cd build \
-       && strip /usr/lib/purple-2/libgowhatsapp.so; \
+       && cmake .. \
+       && make -j$(nproc --ignore 2) \
+       && make install/strip \
+       && strip /usr/lib/purple-2/libwhatsmeow.so; \
      else mkdir -p /usr/lib/purple-2 \
-       && ln -sf /nowhere /usr/lib/purple-2/libgowhatsapp.so; \
+       && ln -sf /nowhere /usr/lib/purple-2/libwhatsmeow.so; \
     fi
 
 # ---
@@ -385,8 +406,8 @@ COPY --from=steam-build /tmp/status /tmp/plugin/steam
 COPY --from=skypeweb-build /usr/lib/purple-2/libskypeweb.so /tmp/usr/lib/purple-2/libskypeweb.so
 COPY --from=skypeweb-build /tmp/status /tmp/plugin/skypeweb
 
-COPY --from=telegram-build /usr/lib/purple-2/telegram-purple.so /tmp/usr/lib/purple-2/telegram-purple.so
+COPY --from=telegram-build /usr/lib/purple-2/libtelegram-tdlib.so /tmp/usr/lib/purple-2/libtelegram-tdlib.so
-COPY --from=telegram-build /etc/telegram-purple /tmp/etc/telegram-purple
+COPY --from=telegram-build /usr/local/share/metainfo/tdlib-purple.metainfo.xml /tmp/usr/local/share/metainfo/tdlib-purple.metainfo.xml
 COPY --from=telegram-build /usr/local/share/locale /tmp/usr/local/share/locale
 COPY --from=telegram-build /tmp/status /tmp/plugin/telegram
 
@@ -423,7 +444,7 @@ COPY --from=signald-build /tmp/status /tmp/plugin/signald
 COPY --from=icyque-build /usr/lib/purple-2/libicyque.so /tmp/usr/lib/purple-2/libicyque.so
 COPY --from=icyque-build /tmp/status /tmp/plugin/icyque
 
-COPY --from=whatsapp-build /usr/lib/purple-2/libgowhatsapp.so /tmp/usr/lib/purple-2/libgowhatsapp.so
+COPY --from=whatsapp-build /usr/lib/purple-2/libwhatsmeow.so /tmp/usr/lib/purple-2/libwhatsmeow.so
 COPY --from=whatsapp-build /tmp/status /tmp/plugin/whatsapp
 
 RUN apt-get update \
@@ -452,7 +473,7 @@ RUN groupadd -g 101 -r bitlbee \
  || [ ${ROCKETCHAT} -eq 1 ] || [ ${MATRIX} -eq 1 ] || [ ${SIGNAL} -eq 1 ] \
  || [ ${ICYQUE} -eq 1 ]; then PKGS="${PKGS} libjson-glib-1.0-0"; fi \
  && if [ ${STEAM} -eq 1 ] || [ ${TELEGRAM} -eq 1 ] || [ ${MATRIX} -eq 1 ]; then PKGS="${PKGS} libgcrypt20"; fi \
- && if [ ${TELEGRAM} -eq 1 ]; then PKGS="${PKGS} zlib1g libwebp6 libpng16-16"; fi \
+ && if [ ${TELEGRAM} -eq 1 ]; then PKGS="${PKGS} zlib1g libwebp6 libpng16-16 libstdc++6"; fi \
  && if [ ${HANGOUTS} -eq 1 ] || [ ${SIGNAL} -eq 1 ]; then PKGS="${PKGS} libprotobuf-c1"; fi \
  && if [ ${SIGNAL} -eq 1 ]; then PKGS="${PKGS} libmagic1"; fi \
  && if [ ${SIPE} -eq 1 ]; then PKGS="${PKGS} libxml2"; fi \

matrix-e2e.c.patch

@@ -17,4 +17,4 @@
 +        purple_debug_info("matrixprpl", "%s: Type %lld olm\n", __func__, type);
      }
      if (plaintext) {
-         clear_mem(plaintext, max_plaintext_len);
+         clear_mem(plaintext, max_plaintext_len);

plugin_versions

@@ -0,0 +1,15 @@
+BITLBEE_VERSION=3.6
+DISCORD_VERSION=607f988
+FACEBOOK_VERSION=v1.2.2
+HANGOUTS_VERSION=55b9f01
+ICYQUE_VERSION=4fc08a0
+MASTODON_VERSION=v1.4.5
+MATRIX_VERSION=034ebf8
+ROCKETCHAT_VERSION=484e5bf
+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.9.0