diff --git a/.travis.yml b/.travis.yml index 8821697a..5096787d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,15 @@ addons: - aria2 - tree - python-requests + - libreadline-dev + - libconfig-dev + - lua5.2 + - liblua5.2-dev + - libevent-dev + - libpython-dev + - libjansson-dev + - libssl1.0-dev + - libgcrypt20-dev script: mkdir images && sudo PATH=./node_modules/.bin:$PATH ./builder --noninteractive diff --git a/scripts.d/16_pkg_install.sh b/scripts.d/16_pkg_install.sh index 454f5c00..0a98c676 100755 --- a/scripts.d/16_pkg_install.sh +++ b/scripts.d/16_pkg_install.sh @@ -19,7 +19,6 @@ INSTALL_PACKAGES=( rng-tools # for ap bridge tor=0.3.5.10-1 #TODO bring back to upstream openvpn - libreadline-dev libconfig-dev lua5.2 liblua5.2-dev libevent-dev libjansson-dev libpython-dev libssl-dev libgcrypt20-dev # telegram-cli shadowsocks-libev proxychains4 # socks5 proxy libpam-google-authenticator # two factor authentication jq # for parsing json / treehouses command diff --git a/scripts.d/20_telegram_cli.sh b/scripts.d/20_telegram_cli.sh index 02776a88..16ea25e2 100755 --- a/scripts.d/20_telegram_cli.sh +++ b/scripts.d/20_telegram_cli.sh @@ -1,13 +1,17 @@ #! /bin/bash git clone https://github.com/vysheng/tg --recursive -cd tg -sed -i '116d' ./tgl/mtproto-utils.c -sed -i '105d' ./tgl/mtproto-utils.c + +cd tg || exit 1 +sed -i '107d' ./tgl/mtproto-utils.c +sed -i '101d' ./tgl/mtproto-utils.c +sed -i "s/\-rdynamic //" Makefile.in +sed -i "s/\-fPIC//" Makefile.in +sed -i "s/\-Werror //" Makefile.in ./configure -make +CXX=arm-linux-gnueabihf-g++ make cp ./bin/telegram-cli /mnt/img_root/usr/local/bin/telegram-cli mkdir -p /mnt/img_root/etc/telegram-cli cp ./server.pub /mnt/img_root/etc/telegram-cli/server.pub cd ../ -rm -rf tg +rm -rf tg \ No newline at end of file