From e9c1116f0f9e5a1876df32a9cad83d9b65475339 Mon Sep 17 00:00:00 2001 From: Roger Shimizu Date: Mon, 27 Feb 2017 01:59:48 +0900 Subject: [PATCH] Add simple-obfs support to build_deb.sh script --- scripts/build_deb.sh | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/scripts/build_deb.sh b/scripts/build_deb.sh index 46f902bf..8209bb23 100755 --- a/scripts/build_deb.sh +++ b/scripts/build_deb.sh @@ -40,11 +40,13 @@ apt_init() { # Cleanup apt_clean() { - sudo apt-get purge -y $DEPS $DEPS_BPO shadowsocks-libev-build-deps \ - libcork-dev libcorkipset-dev debhelper + sudo apt-get purge -y $DEPS $DEPS_BPO debhelper \ + libbloom-dev libcork-dev libcorkipset-dev libmbedtls-dev \ + libsodium-dev libbloom-build-deps simple-obfs-build-deps \ + shadowsocks-libev-build-deps sudo apt-get purge -y libcork-build-deps libcorkipset-build-deps - sudo apt-get purge -y mbedtls-build-deps libmbedtls-dev - sudo apt-get purge -y libsodium-build-deps libsodium-dev + sudo apt-get purge -y libsodium-build-deps + sudo apt-get purge -y mbedtls-build-deps sudo apt-get autoremove -y } @@ -63,6 +65,21 @@ gbp_build() { cd - } +git_build() { + REPO=$1 + BRANCH=$2 + PROJECT_NAME=$(basename $1|sed s/\.git$//) + git clone $REPO + cd $PROJECT_NAME + git checkout $BRANCH + mk-build-deps --root-cmd sudo --install --tool "apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -y" + rm ${PROJECT_NAME}-build-deps_*.deb + gbp buildpackage -us -uc --git-ignore-branch + git clean -fdx + git reset --hard HEAD + cd - +} + dsc_build() { DSC=$1 DSC_FILE=$(basename $1) @@ -129,6 +146,14 @@ build_install_sslibev() { sudo apt-get install -fy } +# Build and install simple-obfs +build_install_simpleobfs() { + BRANCH=$1 + git_build https://github.com/rogers0/simple-obfs $BRANCH + sudo dpkg -i simple-obfs_*.deb + sudo apt-get install -fy +} + OSID=$(grep ^ID= /etc/os-release|cut -d= -f2) case "$OSID" in debian) @@ -150,12 +175,14 @@ jessie) apt_init "git-buildpackage equivs" "debhelper libsodium-dev" build_install_libbloom exp1 build_install_sslibev exp1 + build_install_simpleobfs exp1 apt_clean ;; stretch|unstable|sid) apt_init "git-buildpackage equivs" build_install_libbloom exp1 build_install_sslibev exp1 + build_install_simpleobfs exp1 apt_clean ;; trusty) @@ -167,6 +194,7 @@ trusty) build_install_libbloom exp1_trusty patch_sslibev_dh9 build_install_sslibev exp1 + build_install_simpleobfs exp1_trusty apt_clean ;; xenial) @@ -175,6 +203,7 @@ xenial) build_install_libcorkipset debian build_install_libbloom exp1 build_install_sslibev exp1 + build_install_simpleobfs exp1 apt_clean ;; yakkety) @@ -183,6 +212,7 @@ yakkety) build_install_libcorkipset debian build_install_libbloom exp1 build_install_sslibev exp1 + build_install_simpleobfs exp1 apt_clean ;; *)