updated for deb12

1 files changed, 64 insertions, 63 deletions

diff --git a/Dockerfile.debian b/Dockerfile.debian
index b03ce3f..1615e14 100644
--- a/Dockerfile.debian
+++ b/Dockerfile.debian
@@ -1,12 +1,14 @@
-FROM debian:bullseye-slim as base-image
+FROM debian:bookworm-slim as base-image
 
 FROM base-image as bitlbee-build
 
 ARG BITLBEE_VERSION=3.6-1
 
+ENV PYTHON=/usr/bin/python3
+
 RUN apt-get update \
  && apt-get install -y --no-install-recommends \
-    build-essential git python autoconf automake libtool intltool flex libglib2.0-dev \
+    build-essential git python3 autoconf automake libtool intltool flex libglib2.0-dev \
     libssl-dev libpurple-dev libjson-glib-dev libgcrypt20-dev libotr5-dev \
  && cd /tmp \
  && git clone -n https://github.com/bitlbee/bitlbee.git \
@@ -95,9 +97,9 @@ RUN echo SKYPEWEB=${SKYPEWEB} > /tmp/status \
        && cd skypeweb \
        && make -j$(nproc --ignore 2) \
        && make install \
-       && strip /usr/lib/purple-2/libskypeweb.so; \
-     else mkdir -p /usr/lib/purple-2 \
-       && ln -sf /nowhere /usr/lib/purple-2/libskypeweb.so; \
+       && strip /usr/lib/x86_64-linux-gnu/purple-2/libskypeweb.so; \
+     else mkdir -p /usr/lib/x86_64-linux-gnu/purple-2 \
+       && ln -sf /nowhere /usr/lib/x86_64-linux-gnu/purple-2/libskypeweb.so; \
     fi
 
 # ---
@@ -134,9 +136,9 @@ RUN echo TELEGRAM=${TELEGRAM} > /tmp/status \
        # && 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/libtelegram-tdlib.so \
+       && strip /usr/lib/x86_64-linux-gnu/purple-2/libtelegram-tdlib.so; \
+     else mkdir -p /usr/lib/x86_64-linux-gnu/purple-2 \
+       && ln -sf /nowhere /usr/lib/x86_64-linux-gnu/purple-2/libtelegram-tdlib.so \
        && ln -sf /nowhere /usr/local/share/metainfo/tdlib-purple.metainfo.xml \
        && ln -sf /nowhere /usr/local/share/locale; \
     fi
@@ -158,9 +160,9 @@ RUN echo HANGOUTS=${HANGOUTS} > /tmp/status \
        && git checkout ${HANGOUTS_VERSION} \
        && make -j$(nproc --ignore 2) \
        && make install \
-       && strip /usr/lib/purple-2/libhangouts.so; \
-     else mkdir -p /usr/lib/purple-2 \
-       && ln -sf /nowhere /usr/lib/purple-2/libhangouts.so; \
+       && strip /usr/lib/x86_64-linux-gnu/purple-2/libhangouts.so; \
+     else mkdir -p /usr/lib/x86_64-linux-gnu/purple-2 \
+       && ln -sf /nowhere /usr/lib/x86_64-linux-gnu/purple-2/libhangouts.so; \
     fi
 
 # ---
@@ -182,9 +184,9 @@ RUN echo SLACK=${SLACK} > /tmp/status \
        && make -j$(nproc --ignore 2) \
        && install -d /usr/share/pixmaps/pidgin/protocols/{16,22,48} \
        && make install \
-       && strip /usr/lib/purple-2/libslack.so; \
-     else mkdir -p /usr/lib/purple-2 \
-       && ln -sf /nowhere /usr/lib/purple-2/libslack.so; \
+       && strip /usr/lib/x86_64-linux-gnu/purple-2/libslack.so; \
+     else mkdir -p /usr/lib/x86_64-linux-gnu/purple-2 \
+       && ln -sf /nowhere /usr/lib/x86_64-linux-gnu/purple-2/libslack.so; \
     fi
 
 # ---
@@ -206,10 +208,10 @@ RUN echo SIPE=${SIPE} > /tmp/status \
        && ./configure --prefix=/usr \
        && make -j$(nproc --ignore 2) \
        && make install \
-       && strip /usr/lib/purple-2/libsipe.so; \
-     else mkdir -p /usr/lib/purple-2 \
-       && ln -sf /nowhere /usr/lib/purple-2/libsipe.so \
-       && ln -sf /nowhere /usr/lib/purple-2/libsipe.la \
+       && strip /usr/lib/x86_64-linux-gnu/purple-2/libsipe.so; \
+     else mkdir -p /usr/lib/x86_64-linux-gnu/purple-2 \
+       && ln -sf /nowhere /usr/lib/x86_64-linux-gnu/purple-2/libsipe.so \
+       && ln -sf /nowhere /usr/lib/x86_64-linux-gnu/purple-2/libsipe.la \
        && ln -sf /nowhere /usr/share/locale; \
     fi
 
@@ -254,9 +256,9 @@ RUN echo ROCKETCHAT=${ROCKETCHAT} > /tmp/status \
        && git checkout ${ROCKETCHAT_VERSION} \
        && make -j$(nproc --ignore 2) \
        && make install \
-       && strip /usr/lib/purple-2/librocketchat.so; \
-     else mkdir -p /usr/lib/purple-2 \
-       && ln -sf /nowhere /usr/lib/purple-2/librocketchat.so; \
+       && strip /usr/lib/x86_64-linux-gnu/purple-2/librocketchat.so; \
+     else mkdir -p /usr/lib/x86_64-linux-gnu/purple-2 \
+       && ln -sf /nowhere /usr/lib/x86_64-linux-gnu/purple-2/librocketchat.so; \
     fi
 
 # ---
@@ -305,9 +307,9 @@ RUN echo MATRIX=${MATRIX} > /tmp/status \
        && if [ $(uname -m) == "armv7l" ]; then patch < ../matrix-e2e.c.patch; fi \
        && make -j$(nproc --ignore 2) \
        && make install \
-       && strip /usr/lib/purple-2/libmatrix.so; \
-     else mkdir -p /usr/lib/purple-2 \
-       && ln -sf /nowhere /usr/lib/purple-2/libmatrix.so; \
+       && strip /usr/lib/x86_64-linux-gnu/purple-2/libmatrix.so; \
+     else mkdir -p /usr/lib/x86_64-linux-gnu/purple-2 \
+       && ln -sf /nowhere /usr/lib/x86_64-linux-gnu/purple-2/libmatrix.so; \
     fi
 
 # ---
@@ -332,9 +334,9 @@ RUN echo SIGNAL=${SIGNAL} > /tmp/status \
        && cmake .. \
        && make -j$(nproc --ignore 2) \
        && make install \
-       && strip /usr/lib/purple-2/libsignald.so; \
-     else mkdir -p /usr/lib/purple-2 \
-       && ln -sf /nowhere /usr/lib/purple-2/libsignald.so; \
+       && strip /usr/lib/x86_64-linux-gnu/purple-2/libsignald.so; \
+     else mkdir -p /usr/lib/x86_64-linux-gnu/purple-2 \
+       && ln -sf /nowhere /usr/lib/x86_64-linux-gnu/purple-2/libsignald.so; \
     fi
 
 # ---
@@ -354,9 +356,9 @@ RUN echo MATTERMOST=${MATTERMOST} > /tmp/status \
        && git checkout ${MATTERMOST_VERSION} \
        && make -j$(nproc --ignore 2) \
        && make install \
-       && strip /usr/lib/purple-2/libmattermost.so; \
-     else mkdir -p /usr/lib/purple-2 \
-       && ln -sf /nowhere /usr/lib/purple-2/libmattermost.so; \
+       && strip /usr/lib/x86_64-linux-gnu/purple-2/libmattermost.so; \
+     else mkdir -p /usr/lib/x86_64-linux-gnu/purple-2 \
+       && ln -sf /nowhere /usr/lib/x86_64-linux-gnu/purple-2/libmattermost.so; \
     fi
 
 # ---
@@ -374,9 +376,9 @@ RUN echo ICYQUE=${ICYQUE} > /tmp/status \
        && git checkout ${ICYQUE_VERSION} \
        && make -j$(nproc --ignore 2) \
        && make install \
-       && strip /usr/lib/purple-2/libicyque.so; \
-     else mkdir -p /usr/lib/purple-2 \
-       && ln -sf /nowhere /usr/lib/purple-2/libicyque.so; \
+       && strip /usr/lib/x86_64-linux-gnu/purple-2/libicyque.so; \
+     else mkdir -p /usr/lib/x86_64-linux-gnu/purple-2 \
+       && ln -sf /nowhere /usr/lib/x86_64-linux-gnu/purple-2/libicyque.so; \
     fi
 
 # ---
@@ -384,33 +386,32 @@ RUN echo ICYQUE=${ICYQUE} > /tmp/status \
 FROM bitlbee-build as whatsapp-build
 
 ARG WHATSAPP=1
-ARG WHATSAPP_VERSION=v1.12.0
+ARG WHATSAPP_VERSION=v1.15.0
 
 RUN echo WHATSAPP=${WHATSAPP} > /tmp/status \
  && if [ ${WHATSAPP} -eq 1 ]; \
      then cd /tmp \
       && apt-get install -y wget \
-      && wget https://go.dev/dl/go1.21.10.linux-amd64.tar.gz \
-      && tar -C /usr/local -xzf go1.21.10.linux-amd64.tar.gz \
-       && echo "deb http://deb.debian.org/debian bullseye-backports main" | tee -a /etc/apt/sources.list \
+      && wget -q https://go.dev/dl/go1.22.4.linux-amd64.tar.gz \
+      && tar -C /usr/local -xzf go1.22.4.linux-amd64.tar.gz \
+       && echo "deb http://deb.debian.org/debian bookworm-backports main" | tee -a /etc/apt/sources.list \
        && apt-get update \
-       # && apt-get install -y -t bullseye-backports golang-1.19 \
-      && apt-get install -y -t bullseye-backports \
+      && apt-get install -y -t bookworm-backports \
        && apt-get install -y --no-install-recommends cmake pkg-config libgdk-pixbuf2.0-dev libopusfile-dev \
        && git clone -n https://github.com/hoehermann/purple-gowhatsapp.git \
        && cd purple-gowhatsapp \
        && git checkout ${WHATSAPP_VERSION} \
-       # && export PATH=$PATH:/usr/lib/go-1.19/bin \
        && export PATH=$PATH:/usr/local/go/bin \
        && git submodule update --init \
        && mkdir build \
        && cd build \
        && cmake .. \
-       && cmake -DCMAKE_Go_COMPILER=/usr/lib/go-1.19/bin/go -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON --build . \
+       && cmake --build . \
+      # && cmake -DCMAKE_Go_COMPILER=/usr/lib/go-1.22/bin/go -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON --build \
        && make install/strip \
-       && strip /usr/lib/purple-2/libwhatsmeow.so; \
-     else mkdir -p /usr/lib/purple-2 \
-       && ln -sf /nowhere /usr/lib/purple-2/libwhatsmeow.so; \
+       && strip /usr/lib/x86_64-linux-gnu/purple-2/libwhatsmeow.so; \
+     else mkdir -p /usr/lib/x86_64-linux-gnu/purple-2 \
+       && ln -sf /nowhere /usr/lib/x86_64-linux-gnu/purple-2/libwhatsmeow.so; \
     fi
 
 # ---
@@ -423,7 +424,7 @@ ARG LURCH_VERSION=master
 RUN echo LURCH=${LURCH} > /tmp/status \
  && if [ ${LURCH} -eq 1 ]; \
      then cd /tmp \
-       && echo "deb http://deb.debian.org/debian bullseye-backports main" | tee -a /etc/apt/sources.list \
+       && echo "deb http://deb.debian.org/debian bookworm-backports main" | tee -a /etc/apt/sources.list \
        && apt-get update \
        && apt-get install -y git cmake libpurple-dev libmxml-dev libxml2-dev libsqlite3-dev libgcrypt20-dev build-essential \
        && git clone -n https://github.com/gkdr/lurch \
@@ -431,9 +432,9 @@ RUN echo LURCH=${LURCH} > /tmp/status \
        && git checkout ${LURCH_VERSION} \
        && git submodule update --init --recursive \
        && make \
-       && cp /tmp/lurch/build/lurch.so /usr/lib/purple-2/lurch.so ; \
-     else mkdir -p /usr/lib/purple-2 \
-       && ln -sf /nowhere /usr/lib/purple-2/liblurch.so; \
+       && cp /tmp/lurch/build/lurch.so /usr/lib/x86_64-linux-gnu/purple-2/lurch.so ; \
+     else mkdir -p /usr/lib/x86_64-linux-gnu/purple-2 \
+       && ln -sf /nowhere /usr/lib/x86_64-linux-gnu/purple-2/liblurch.so; \
     fi
 
 # ---
@@ -458,22 +459,22 @@ COPY --from=otr-install /tmp/status /tmp/plugin/otr
 # COPY --from=steam-build /usr/lib/bitlbee/steam.la /tmp/usr/lib/bitlbee/steam.la
 # 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 /usr/lib/x86_64-linux-gnu/purple-2/libskypeweb.so /tmp/usr/lib/x86_64-linux-gnu/purple-2/libskypeweb.so
 COPY --from=skypeweb-build /tmp/status /tmp/plugin/skypeweb
 
-COPY --from=telegram-build /usr/lib/purple-2/libtelegram-tdlib.so /tmp/usr/lib/purple-2/libtelegram-tdlib.so
+COPY --from=telegram-build /usr/lib/x86_64-linux-gnu/purple-2/libtelegram-tdlib.so /tmp/usr/lib/x86_64-linux-gnu/purple-2/libtelegram-tdlib.so
 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
 
-# COPY --from=hangouts-build /usr/lib/purple-2/libhangouts.so /tmp/usr/lib/purple-2/libhangouts.so
+# COPY --from=hangouts-build /usr/lib/x86_64-linux-gnu/purple-2/libhangouts.so /tmp/usr/lib/x86_64-linux-gnu/purple-2/libhangouts.so
 # COPY --from=hangouts-build /tmp/status /tmp/plugin/hangouts
 
-COPY --from=slack-build /usr/lib/purple-2/libslack.so /tmp/usr/lib/purple-2/libslack.so
+COPY --from=slack-build /usr/lib/x86_64-linux-gnu/purple-2/libslack.so /tmp/usr/lib/x86_64-linux-gnu/purple-2/libslack.so
 COPY --from=slack-build /tmp/status /tmp/plugin/slack
 
-# COPY --from=sipe-build /usr/lib/purple-2/libsipe.so /tmp/usr/lib/purple-2/libsipe.so
-# COPY --from=sipe-build /usr/lib/purple-2/libsipe.la /tmp/usr/lib/purple-2/libsipe.la
+# COPY --from=sipe-build /usr/lib/x86_64-linux-gnu/purple-2/libsipe.so /tmp/usr/lib/x86_64-linux-gnu/purple-2/libsipe.so
+# COPY --from=sipe-build /usr/lib/x86_64-linux-gnu/purple-2/libsipe.la /tmp/usr/lib/x86_64-linux-gnu/purple-2/libsipe.la
 # COPY --from=sipe-build /usr/share/locale /tmp/usr/share/locale
 # COPY --from=sipe-build /tmp/status /tmp/plugin/sipe
 
@@ -482,7 +483,7 @@ COPY --from=discord-build /usr/lib/bitlbee/discord.la /tmp/usr/lib/bitlbee/disco
 COPY --from=discord-build /usr/share/bitlbee/discord-help.txt /tmp/usr/share/bitlbee/discord-help.txt
 COPY --from=discord-build /tmp/status /tmp/plugin/discord
 
-# COPY --from=rocketchat-build /usr/lib/purple-2/librocketchat.so /tmp/usr/lib/purple-2/librocketchat.so
+# COPY --from=rocketchat-build /usr/lib/x86_64-linux-gnu/purple-2/librocketchat.so /tmp/usr/lib/x86_64-linux-gnu/purple-2/librocketchat.so
 # COPY --from=rocketchat-build /tmp/status /tmp/plugin/rocketchat
 
 COPY --from=mastodon-build /usr/lib/bitlbee/mastodon.so /tmp/usr/lib/bitlbee/mastodon.so
@@ -490,22 +491,22 @@ COPY --from=mastodon-build /usr/lib/bitlbee/mastodon.la /tmp/usr/lib/bitlbee/mas
 COPY --from=mastodon-build /usr/share/bitlbee/mastodon-help.txt /tmp/usr/share/bitlbee/mastodon-help.txt
 COPY --from=mastodon-build /tmp/status /tmp/plugin/mastodon
 
-# COPY --from=matrix-build /usr/lib/purple-2/libmatrix.so /tmp/usr/lib/purple-2/libmatrix.so
+# COPY --from=matrix-build /usr/lib/x86_64-linux-gnu/purple-2/libmatrix.so /tmp/usr/lib/x86_64-linux-gnu/purple-2/libmatrix.so
 # COPY --from=matrix-build /tmp/status /tmp/plugin/matrix
 
-# COPY --from=signald-build /usr/lib/purple-2/libsignald.so /tmp/usr/lib/purple-2/libsignald.so
+# COPY --from=signald-build /usr/lib/x86_64-linux-gnu/purple-2/libsignald.so /tmp/usr/lib/x86_64-linux-gnu/purple-2/libsignald.so
 # 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 /usr/lib/x86_64-linux-gnu/purple-2/libicyque.so /tmp/usr/lib/x86_64-linux-gnu/purple-2/libicyque.so
 # COPY --from=icyque-build /tmp/status /tmp/plugin/icyque
 
-COPY --from=whatsapp-build /usr/lib/purple-2/libwhatsmeow.so /tmp/usr/lib/purple-2/libwhatsmeow.so
+COPY --from=whatsapp-build /usr/lib/x86_64-linux-gnu/purple-2/libwhatsmeow.so /tmp/usr/lib/x86_64-linux-gnu/purple-2/libwhatsmeow.so
 COPY --from=whatsapp-build /tmp/status /tmp/plugin/whatsapp
 
-# COPY --from=lurch-build /usr/lib/purple-2/lurch.so /tmp/usr/lib/purple-2/lurch.so
+# COPY --from=lurch-build /usr/lib/x86_64-linux-gnu/purple-2/lurch.so /tmp/usr/lib/x86_64-linux-gnu/purple-2/lurch.so
 # COPY --from=lurch-build /tmp/status /tmp/plugin/lurch
 
-COPY --from=mattermost-build /usr/lib/purple-2/libmattermost.so /tmp/usr/lib/purple-2/libmattermost.so
+COPY --from=mattermost-build /usr/lib/x86_64-linux-gnu/purple-2/libmattermost.so /tmp/usr/lib/x86_64-linux-gnu/purple-2/libmattermost.so
 COPY --from=mattermost-build /tmp/status /tmp/plugin/mattermost
 
 RUN apt-get update \
@@ -521,7 +522,7 @@ FROM base-image as bitlbee-libpurple
 
 COPY --from=bitlbee-plugins /tmp/ /
 
-ARG PKGS="tzdata libglib2.0-0 libssl1.1 libpurple0 libtcl8.6 libtk8.6"
+ARG PKGS="tzdata libglib2.0-0 libssl3 libpurple0 libtcl8.6 libtk8.6"
 
 SHELL [ "/bin/bash", "-c" ]
 
@@ -536,7 +537,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 libstdc++6"; fi \
+ && if [ ${TELEGRAM} -eq 1 ]; then PKGS="${PKGS} zlib1g libwebp7 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 [ ${WHATSAPP} -eq 1 ]; then PKGS="${PKGS} libopusfile-dev libgdk-pixbuf2.0-dev"; fi \