From a98587fa5fd306477a4d1ae83ec5986795eddf7b Mon Sep 17 00:00:00 2001 From: Roger Shimizu Date: Sat, 7 Apr 2018 12:05:00 +0900 Subject: [PATCH] scripts/build_deb.sh: Update URL in script - Use https URL when possible. - Use salsa git repo instead of alioth (anonscm) for those already migrated in debian. --- scripts/build_deb.sh | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/scripts/build_deb.sh b/scripts/build_deb.sh index 126dc634..e646a97e 100755 --- a/scripts/build_deb.sh +++ b/scripts/build_deb.sh @@ -180,7 +180,7 @@ build_install_libmbedtls() { if [ $BUILD_LIB -eq 1 -o $BUILD_BIN -eq 1 ]; then BRANCH=$1 if [ $BUILD_LIB -eq 1 ]; then - gbp_build https://anonscm.debian.org/git/collab-maint/mbedtls.git $BRANCH + gbp_build https://salsa.debian.org/debian/mbedtls.git $BRANCH else ls libmbed*.deb 2>&1 > /dev/null || help_lib libmbedtls @@ -195,7 +195,7 @@ if [ $BUILD_LIB -eq 1 -o $BUILD_BIN -eq 1 ]; then if [ $BUILD_LIB -eq 1 ]; then git clone https://github.com/gcsideal/debian-libsodium.git libsodium cd libsodium; LIBSODIUM=$(dpkg-parsechangelog --show-field Version); cd - - dget -ud http://deb.debian.org/debian/pool/main/libs/libsodium/libsodium_${LIBSODIUM}.dsc + dget -ud https://deb.debian.org/debian/pool/main/libs/libsodium/libsodium_${LIBSODIUM}.dsc DHVER=$(dpkg -l debhelper|grep debhelper|awk '{print $3}'|head -n1) cd libsodium if dpkg --compare-versions $DHVER lt 10; then @@ -235,7 +235,7 @@ fi patch_sslibev_dh9() { if [ $BUILD_BIN -eq 1 ]; then BRANCH=$1 - gbp clone --pristine-tar https://anonscm.debian.org/git/collab-maint/shadowsocks-libev.git + gbp clone --pristine-tar https://salsa.debian.org/bridges-team/shadowsocks-libev.git cd shadowsocks-libev [ -n "$BRANCH" ] && git checkout $BRANCH sed -i 's/dh $@/dh $@ --with systemd,autoreconf/' debian/rules @@ -252,7 +252,7 @@ fi build_install_sslibev() { if [ $BUILD_BIN -eq 1 ]; then BRANCH=$1 - gbp_build https://anonscm.debian.org/git/collab-maint/shadowsocks-libev.git $BRANCH + gbp_build https://salsa.debian.org/bridges-team/shadowsocks-libev.git $BRANCH sudo dpkg -i shadowsocks-libev_*.deb sudo apt-get install -fy fi @@ -272,7 +272,7 @@ fi build_install_dhgolang() { if [ $BUILD_KCP -eq 1 ]; then BRANCH=$1 - gbp_build https://anonscm.debian.org/cgit/pkg-go/packages/dh-golang.git $BRANCH + gbp_build https://salsa.debian.org/go-team/packages/dh-golang.git $BRANCH sudo dpkg -i dh-golang_*.deb sudo apt-get install -fy fi @@ -282,7 +282,7 @@ fi build_install_reedsolomondev() { if [ $BUILD_KCP -eq 1 ]; then BRANCH=$1 - gbp_build https://anonscm.debian.org/git/pkg-go/packages/golang-github-klauspost-reedsolomon.git $BRANCH + gbp_build https://salsa.debian.org/go-team/packages/golang-github-klauspost-reedsolomon.git $BRANCH sudo dpkg -i golang-github-klauspost-reedsolomon-dev_*.deb sudo apt-get install -fy fi @@ -292,7 +292,7 @@ fi build_install_errorsdev() { if [ $BUILD_KCP -eq 1 ]; then BRANCH=$1 - gbp_build https://anonscm.debian.org/git/pkg-go/packages/golang-github-pkg-errors.git $BRANCH + gbp_build https://salsa.debian.org/go-team/packages/golang-github-pkg-errors.git $BRANCH sudo dpkg -i golang-github-pkg-errors-dev_*.deb sudo apt-get install -fy fi @@ -302,7 +302,7 @@ fi patch_urfaveclidev_xenial() { if [ $BUILD_KCP -eq 1 ]; then BRANCH=$1 - gbp clone --pristine-tar https://anonscm.debian.org/git/pkg-go/packages/golang-github-urfave-cli.git + gbp clone --pristine-tar https://salsa.debian.org/go-team/packages/golang-github-urfave-cli.git cd golang-github-urfave-cli [ -n "$BRANCH" ] && git checkout $BRANCH sed -i 's/golang-github-burntsushi-toml-dev/golang-toml-dev/; s/golang-gopkg-yaml.v2-dev/golang-yaml.v2-dev/' debian/control @@ -317,7 +317,7 @@ fi build_install_urfaveclidev() { if [ $BUILD_KCP -eq 1 ]; then BRANCH=$1 - gbp_build https://anonscm.debian.org/git/pkg-go/packages/golang-github-urfave-cli.git $BRANCH + gbp_build https://salsa.debian.org/go-team/packages/golang-github-urfave-cli.git $BRANCH sudo dpkg -i build-area/golang-github-urfave-cli-dev_*.deb sudo apt-get install -fy fi @@ -327,7 +327,7 @@ fi build_install_snappydev() { if [ $BUILD_KCP -eq 1 ]; then BRANCH=$1 - gbp_build https://anonscm.debian.org/git/pkg-go/packages/golang-github-golang-snappy.git $BRANCH + gbp_build https://salsa.debian.org/go-team/packages/golang-github-golang-snappy.git $BRANCH sudo dpkg -i golang-github-golang-snappy-dev_*.deb sudo apt-get install -fy fi @@ -337,7 +337,7 @@ fi build_install_kcpdev() { if [ $BUILD_KCP -eq 1 ]; then BRANCH=$1 - gbp_build https://anonscm.debian.org/git/pkg-go/packages/golang-github-xtaci-kcp.git $BRANCH + gbp_build https://salsa.debian.org/go-team/packages/golang-github-xtaci-kcp.git $BRANCH sudo dpkg -i golang-github-xtaci-kcp-dev_*.deb sudo apt-get install -fy fi @@ -347,7 +347,7 @@ fi build_install_smuxdev() { if [ $BUILD_KCP -eq 1 ]; then BRANCH=$1 - gbp_build https://anonscm.debian.org/git/pkg-go/packages/golang-github-xtaci-smux.git $BRANCH + gbp_build https://salsa.debian.org/go-team/packages/golang-github-xtaci-smux.git $BRANCH sudo dpkg -i golang-github-xtaci-smux-dev_*.deb sudo apt-get install -fy fi @@ -357,7 +357,7 @@ fi build_install_kcptun() { if [ $BUILD_KCP -eq 1 ]; then BRANCH=$1 - gbp_build https://anonscm.debian.org/git/pkg-go/packages/kcptun.git $BRANCH + gbp_build https://salsa.debian.org/go-team/packages/kcptun.git $BRANCH sudo dpkg -i kcptun_*.deb sudo apt-get install -fy fi