rclone: Switch tarballs to signed (fixes #2382)

[termux-packages] / build-package.sh

diff --git a/build-package.sh b/build-package.sh
index f81ffbe..4eeeac1 100755 (executable)
--- a/build-package.sh
+++ b/build-package.sh
@@ -74,7 +74,7 @@ termux_setup_golang() {
                termux_error_exit "Unsupported arch: $TERMUX_ARCH"
        fi
 
-       local TERMUX_GO_VERSION=go1.9.4
+       local TERMUX_GO_VERSION=go1.10.1
        local TERMUX_GO_PLATFORM=linux-amd64
 
        local TERMUX_BUILDGO_FOLDER=$TERMUX_COMMON_CACHEDIR/${TERMUX_GO_VERSION}
@@ -87,7 +87,7 @@ termux_setup_golang() {
        rm -Rf "$TERMUX_COMMON_CACHEDIR/go" "$TERMUX_BUILDGO_FOLDER"
        termux_download https://storage.googleapis.com/golang/${TERMUX_GO_VERSION}.${TERMUX_GO_PLATFORM}.tar.gz \
                "$TERMUX_BUILDGO_TAR" \
-               15b0937615809f87321a457bb1265f946f9f6e736c563d6c5e0bd2c22e44f779
+               72d820dec546752e5a8303b33b009079c15c2390ce76d67cf514991646c6127b
 
        ( cd "$TERMUX_COMMON_CACHEDIR"; tar xf "$TERMUX_BUILDGO_TAR"; mv go "$TERMUX_BUILDGO_FOLDER"; rm "$TERMUX_BUILDGO_TAR" )
 }
@@ -110,7 +110,7 @@ termux_setup_ninja() {
 # Utility function to setup a current meson build system.
 termux_setup_meson() {
        termux_setup_ninja
-       local MESON_VERSION=0.44.0
+       local MESON_VERSION=0.45.1
        local MESON_FOLDER=$TERMUX_COMMON_CACHEDIR/meson-$MESON_VERSION-v1
        if [ ! -d "$MESON_FOLDER" ]; then
                local MESON_TAR_NAME=meson-$MESON_VERSION.tar.gz
@@ -119,10 +119,8 @@ termux_setup_meson() {
                termux_download \
                        https://github.com/mesonbuild/meson/releases/download/$MESON_VERSION/meson-$MESON_VERSION.tar.gz \
                        $MESON_TAR_FILE \
-                       50f9b12b77272ef6ab064d26b7e06667f07fa9f931e6a20942bba2216ba4281b
+                       4d0bb0dbb1bb556cb7a4092fdfea3d6e76606bd739a4bc97481c2d7bc6200afb
                tar xf "$MESON_TAR_FILE" -C "$TERMUX_PKG_TMPDIR"
-               cd $MESON_TMP_FOLDER
-               patch -p1 < $TERMUX_SCRIPTDIR/scripts/meson-android.patch
                mv $MESON_TMP_FOLDER $MESON_FOLDER
        fi
        TERMUX_MESON="$MESON_FOLDER/meson.py"
@@ -166,8 +164,8 @@ termux_setup_meson() {
 
 # Utility function to setup a current cmake build system
 termux_setup_cmake() {
-       local TERMUX_CMAKE_MAJORVESION=3.10
-       local TERMUX_CMAKE_MINORVERSION=2
+       local TERMUX_CMAKE_MAJORVESION=3.11
+       local TERMUX_CMAKE_MINORVERSION=1
        local TERMUX_CMAKE_VERSION=$TERMUX_CMAKE_MAJORVESION.$TERMUX_CMAKE_MINORVERSION
        local TERMUX_CMAKE_TARNAME=cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64.tar.gz
        local TERMUX_CMAKE_TARFILE=$TERMUX_PKG_TMPDIR/$TERMUX_CMAKE_TARNAME
@@ -175,7 +173,7 @@ termux_setup_cmake() {
        if [ ! -d "$TERMUX_CMAKE_FOLDER" ]; then
                termux_download https://cmake.org/files/v$TERMUX_CMAKE_MAJORVESION/$TERMUX_CMAKE_TARNAME \
                                "$TERMUX_CMAKE_TARFILE" \
-                               7a82b46c35f4e68a0807e8dc04e779dee3f36cd42c6387fd13b5c29fe62a69ea
+                               3aa8d3b53903563bdc13dfec80716c286b2228db36ef65c23bc616f9bb930367
                rm -Rf "$TERMUX_PKG_TMPDIR/cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64"
                tar xf "$TERMUX_CMAKE_TARFILE" -C "$TERMUX_PKG_TMPDIR"
                mv "$TERMUX_PKG_TMPDIR/cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64" \
@@ -261,7 +259,7 @@ termux_step_setup_variables() {
        : "${TERMUX_ANDROID_HOME:="/data/data/com.termux/files/home"}"
        : "${TERMUX_DEBUG:=""}"
        : "${TERMUX_PKG_API_LEVEL:="21"}"
-       : "${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="27.0.1"}"
+       : "${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="27.0.3"}"
        : "${TERMUX_NDK_VERSION:="16"}"
 
        if [ "x86_64" = "$TERMUX_ARCH" ] || [ "aarch64" = "$TERMUX_ARCH" ]; then
@@ -393,6 +391,12 @@ termux_step_start_build() {
                TERMUX_PKG_FULLVERSION+="-$TERMUX_PKG_REVISION"
        fi
 
+       if [ "$TERMUX_DEBUG" == "true" ]; then
+               DEBUG="-dbg"
+       else
+               DEBUG=""
+       fi
+
        if [ -z "$TERMUX_DEBUG" ] &&
           [ -z "${TERMUX_FORCE_BUILD+x}" ] &&
           [ -e "/data/data/.built-packages/$TERMUX_PKG_NAME" ]; then
@@ -775,33 +779,36 @@ termux_step_pre_configure() {
 termux_step_configure_autotools () {
        if [ ! -e "$TERMUX_PKG_SRCDIR/configure" ]; then return; fi
 
-       DISABLE_STATIC="--disable-static"
+       local DISABLE_STATIC="--disable-static"
        if [ "$TERMUX_PKG_EXTRA_CONFIGURE_ARGS" != "${TERMUX_PKG_EXTRA_CONFIGURE_ARGS/--enable-static/}" ]; then
                # Do not --disable-static if package explicitly enables it (e.g. gdb needs enable-static to build)
                DISABLE_STATIC=""
        fi
 
-       DISABLE_NLS="--disable-nls"
+       local DISABLE_NLS="--disable-nls"
        if [ "$TERMUX_PKG_EXTRA_CONFIGURE_ARGS" != "${TERMUX_PKG_EXTRA_CONFIGURE_ARGS/--enable-nls/}" ]; then
                # Do not --disable-nls if package explicitly enables it (for gettext itself)
                DISABLE_NLS=""
        fi
 
-       ENABLE_SHARED="--enable-shared"
+       local ENABLE_SHARED="--enable-shared"
        if [ "$TERMUX_PKG_EXTRA_CONFIGURE_ARGS" != "${TERMUX_PKG_EXTRA_CONFIGURE_ARGS/--disable-shared/}" ]; then
                ENABLE_SHARED=""
        fi
-       HOST_FLAG="--host=$TERMUX_HOST_PLATFORM"
+
+       local HOST_FLAG="--host=$TERMUX_HOST_PLATFORM"
        if [ "$TERMUX_PKG_EXTRA_CONFIGURE_ARGS" != "${TERMUX_PKG_EXTRA_CONFIGURE_ARGS/--host=/}" ]; then
                HOST_FLAG=""
        fi
-       LIBEXEC_FLAG="--libexecdir=$TERMUX_PREFIX/libexec"
-        if [ "$TERMUX_PKG_EXTRA_CONFIGURE_ARGS" != "${TERMUX_PKG_EXTRA_CONFIGURE_ARGS/--libexecdir=/}" ]; then
-                LIBEXEC_FLAG=""
-        fi
-       QUIET_BUILD=
+
+       local LIBEXEC_FLAG="--libexecdir=$TERMUX_PREFIX/libexec"
+       if [ "$TERMUX_PKG_EXTRA_CONFIGURE_ARGS" != "${TERMUX_PKG_EXTRA_CONFIGURE_ARGS/--libexecdir=/}" ]; then
+               LIBEXEC_FLAG=""
+       fi
+
+       local QUIET_BUILD=
        if [ ! -z ${TERMUX_QUIET_BUILD+x} ]; then
-               QUIET_BUILD="--enable-silent-rules"
+               QUIET_BUILD="--enable-silent-rules --silent --quiet"
        fi
 
        # Some packages provides a $PKG-config script which some configure scripts pickup instead of pkg-config:
@@ -939,11 +946,16 @@ termux_step_post_configure () {
 }
 
 termux_step_make() {
+       local QUIET_BUILD=
+       if [ ! -z ${TERMUX_QUIET_BUILD+x} ]; then
+               QUIET_BUILD="-s"
+       fi
+
        if ls ./*akefile &> /dev/null; then
                if [ -z "$TERMUX_PKG_EXTRA_MAKE_ARGS" ]; then
-                       make -j $TERMUX_MAKE_PROCESSES
+                       make -j $TERMUX_MAKE_PROCESSES $QUIET_BUILD
                else
-                       make -j $TERMUX_MAKE_PROCESSES ${TERMUX_PKG_EXTRA_MAKE_ARGS}
+                       make -j $TERMUX_MAKE_PROCESSES $QUIET_BUILD ${TERMUX_PKG_EXTRA_MAKE_ARGS}
                fi
        fi
 }
@@ -1095,7 +1107,7 @@ termux_step_massage() {
                mkdir -p DEBIAN
                cd DEBIAN
                cat > control <<-HERE
-                       Package: $SUB_PKG_NAME
+                       Package: $SUB_PKG_NAME$DEBUG
                        Architecture: ${SUB_PKG_ARCH}
                        Installed-Size: ${SUB_PKG_INSTALLSIZE}
                        Maintainer: $TERMUX_PKG_MAINTAINER
@@ -1111,7 +1123,7 @@ termux_step_massage() {
                for f in $TERMUX_SUBPKG_CONFFILES; do echo "$TERMUX_PREFIX/$f" >> conffiles; done
 
                # Create the actual .deb file:
-               TERMUX_SUBPKG_DEBFILE=$TERMUX_DEBDIR/${SUB_PKG_NAME}_${TERMUX_PKG_FULLVERSION}_${SUB_PKG_ARCH}.deb
+               TERMUX_SUBPKG_DEBFILE=$TERMUX_DEBDIR/${SUB_PKG_NAME}${DEBUG}_${TERMUX_PKG_FULLVERSION}_${SUB_PKG_ARCH}.deb
                test ! -f "$TERMUX_COMMON_CACHEDIR/debian-binary" && echo "2.0" > "$TERMUX_COMMON_CACHEDIR/debian-binary"
                ar cr "$TERMUX_SUBPKG_DEBFILE" \
                                   "$TERMUX_COMMON_CACHEDIR/debian-binary" \
@@ -1163,7 +1175,7 @@ termux_step_create_debfile() {
 
        mkdir -p DEBIAN
        cat > DEBIAN/control <<-HERE
-               Package: $TERMUX_PKG_NAME
+               Package: $TERMUX_PKG_NAME$DEBUG
                Architecture: ${TERMUX_ARCH}
                Installed-Size: ${TERMUX_PKG_INSTALLSIZE}
                Maintainer: $TERMUX_PKG_MAINTAINER
@@ -1190,7 +1202,7 @@ termux_step_create_debfile() {
        tar -cJf "$TERMUX_PKG_PACKAGEDIR/control.tar.xz" .
 
        test ! -f "$TERMUX_COMMON_CACHEDIR/debian-binary" && echo "2.0" > "$TERMUX_COMMON_CACHEDIR/debian-binary"
-       TERMUX_PKG_DEBFILE=$TERMUX_DEBDIR/${TERMUX_PKG_NAME}_${TERMUX_PKG_FULLVERSION}_${TERMUX_ARCH}.deb
+       TERMUX_PKG_DEBFILE=$TERMUX_DEBDIR/${TERMUX_PKG_NAME}${DEBUG}_${TERMUX_PKG_FULLVERSION}_${TERMUX_ARCH}.deb
        # Create the actual .deb file:
        ar cr "$TERMUX_PKG_DEBFILE" \
               "$TERMUX_COMMON_CACHEDIR/debian-binary" \