diff --git a/Dockerfile b/Dockerfile index 855f82d..4066459 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM buildpack-deps:stable-scm LABEL maintainer="Michele Bologna " LABEL name="BitlBee Docker container by Michele Bologna" -LABEL version="mb-3.6-20230403" +LABEL version="mb-3.6-20232412" ENV BITLBEE_VERSION=3.6 diff --git a/build.sh b/build.sh index 079da06..54665be 100755 --- a/build.sh +++ b/build.sh @@ -1,20 +1,22 @@ #!/bin/bash apt update -apt install -y --no-install-recommends autoconf automake build-essential gettext gcc libtool make \ -libglib2.0-dev libhttp-parser-dev libotr5-dev libpurple-dev libgnutls28-dev \ -libjson-glib-dev libpng-dev libolm-dev libprotobuf-c-dev protobuf-c-compiler \ -libgcrypt20-dev libmarkdown2-dev libpurple-dev libsqlite3-dev libwebp-dev libtool-bin \ -software-properties-common +apt install -y --no-install-recommends autoconf automake build-essential \ +cmake g++ gettext gcc git gperf libtool make libglib2.0-dev libhttp-parser-dev \ +libotr5-dev libpurple-dev libgnutls28-dev libjson-glib-dev libpng-dev \ +libolm-dev libprotobuf-c-dev libssl-dev protobuf-c-compiler libgcrypt20-dev \ +libmarkdown2-dev libpng-dev libpurple-dev libsqlite3-dev libwebp-dev \ +libtool-bin pkg-config software-properties-common sudo cd curl -LO# https://get.bitlbee.org/src/bitlbee-$BITLBEE_VERSION.tar.gz curl -LO# https://github.com/EionRobb/skype4pidgin/archive/1.7.tar.gz +git clone https://github.com/BenWiederhake/tdlib-purple.git curl -LO# https://github.com/bitlbee/bitlbee-facebook/archive/v1.2.2.tar.gz git clone https://github.com/EionRobb/purple-hangouts.git git clone https://alexschroeder.ch/cgit/bitlbee-mastodon git clone https://github.com/EionRobb/purple-rocketchat.git -curl -LO# https://github.com/sm00th/bitlbee-discord/archive/0.4.3.tar.gz +git clone https://github.com/sm00th/bitlbee-discord git clone https://github.com/dylex/slack-libpurple.git git clone https://github.com/jgeboski/bitlbee-steam.git git clone https://github.com/matrix-org/purple-matrix.git @@ -37,10 +39,9 @@ make make install # tdlib-purple -curl -fsSL https://download.opensuse.org/repositories/home:ars3n1y/Debian_11/Release.key | apt-key add - -apt-add-repository 'deb http://download.opensuse.org/repositories/home:/ars3n1y/Debian_11/ /' -apt update -apt install -y --no-install-recommends libpurple-telegram-tdlib +cd +cd tdlib-purple +./build_and_install.sh # bitlbee-facebook cd @@ -72,8 +73,7 @@ make install # bitlbee-discord cd -tar zxvf 0.4.3.tar.gz -cd bitlbee-discord-0.4.3/ +cd bitlbee-discord ./autogen.sh ./configure make @@ -115,7 +115,7 @@ libtool --finish /usr/local/lib/bitlbee # cleanup apt autoremove --purge -y apt remove -y --purge autoconf automake autotools-dev binutils binutils-common binutils-x86-64-linux-gnu build-essential \ -bzip2 cpp* dpkg-dev gettext gettext-base libbinutils libgcc-*-dev libsqlite3-dev libstdc++-*-dev \ +bzip2 cmake cpp* dpkg-dev gettext gettext-base libbinutils libgcc-*-dev libsqlite3-dev libstdc++-*-dev \ libtasn1-*-dev libtool libtool-bin m4 make nettle-dev patch xz-utils apt clean rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /tmp/* @@ -123,11 +123,12 @@ cd rm -fr /root/build.sh rm -fr $BITLBEE_VERSION* rm -fr 1.7.tar.gz skype4pidgin-* +rm -fr tdlib-purple* rm -fr v1.2.1.tar.gz bitlbee-facebook-* rm -fr purple-hangouts rm -rf bitlbee-mastodon rm -rf purple-rocketchat -rm -fr bitlbee-discord-0.4.3/ 0.4.3.tar.gz +rm -fr bitlbee-discord* rm -fr slack-libpurple rm -fr bitlbee-steam rm -fr purple-matrix