From b6c702b46e2ad5b0bb6963c621f380ee24bf123d Mon Sep 17 00:00:00 2001 From: Butta Date: Fri, 21 Aug 2020 15:44:38 +0530 Subject: [PATCH] protobuf: update from 3.12.4 to 3.13.0 and bump libgrpc, librotobuf-c, and mosh dependent packages parted: update from 3.2 to 3.3 rhash: update from 1.3.9 to 1.4.0 seafile-client: update from 7.0.8 to 7.0.9 sensible-utils: update from 0.0.12 to 0.0.13 util-linux: update from 2.35.2 to 2.36 --- packages/libgrpc/build.sh | 1 + packages/libprotobuf-c/build.sh | 2 +- packages/libprotobuf/build.sh | 5 ++--- packages/mosh/build.sh | 2 +- packages/parted/build.sh | 5 ++--- packages/rhash/build.sh | 5 ++--- packages/seafile-client/build.sh | 4 ++-- packages/sensible-utils/build.sh | 4 ++-- packages/util-linux/build.sh | 5 ++--- packages/util-linux/fix-paths.patch | 12 ------------ 10 files changed, 15 insertions(+), 30 deletions(-) diff --git a/packages/libgrpc/build.sh b/packages/libgrpc/build.sh index 937bf9642..ab41d4ca5 100644 --- a/packages/libgrpc/build.sh +++ b/packages/libgrpc/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="High performance, open source, general RPC framework tha TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_SRCURL=https://github.com/grpc/grpc.git TERMUX_PKG_VERSION=1.31.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_DEPENDS="libc++, openssl, protobuf, c-ares, zlib" TERMUX_PKG_BREAKS="libgrpc-dev" TERMUX_PKG_REPLACES="libgrpc-dev" diff --git a/packages/libprotobuf-c/build.sh b/packages/libprotobuf-c/build.sh index 6d22a44d7..c4c3dc100 100644 --- a/packages/libprotobuf-c/build.sh +++ b/packages/libprotobuf-c/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Protocol buffers C library" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91" TERMUX_PKG_VERSION=1.3.3 -TERMUX_PKG_REVISION=5 +TERMUX_PKG_REVISION=6 TERMUX_PKG_SRCURL=https://github.com/protobuf-c/protobuf-c/releases/download/v${TERMUX_PKG_VERSION}/protobuf-c-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=22956606ef50c60de1fabc13a78fbc50830a0447d780467d3c519f84ad527e78 TERMUX_PKG_DEPENDS="libc++, libprotobuf, protobuf" diff --git a/packages/libprotobuf/build.sh b/packages/libprotobuf/build.sh index 2c3048e87..d25fda948 100644 --- a/packages/libprotobuf/build.sh +++ b/packages/libprotobuf/build.sh @@ -3,10 +3,9 @@ TERMUX_PKG_DESCRIPTION="Protocol buffers C++ library" TERMUX_PKG_LICENSE="BSD 3-Clause" # TERMUX_PKG_SRCDIR is overriden below so we need to specify license file TERMUX_PKG_LICENSE_FILE="../LICENSE" -TERMUX_PKG_VERSION=1:3.12.4 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION=1:3.13.0 TERMUX_PKG_SRCURL=https://github.com/google/protobuf/archive/v${TERMUX_PKG_VERSION:2}.tar.gz -TERMUX_PKG_SHA256=512e5a674bf31f8b7928a64d8adf73ee67b8fe88339ad29adaa3b84dbaa570d8 +TERMUX_PKG_SHA256=9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a TERMUX_PKG_DEPENDS="libc++, zlib" TERMUX_PKG_BREAKS="libprotobuf-dev" TERMUX_PKG_REPLACES="libprotobuf-dev" diff --git a/packages/mosh/build.sh b/packages/mosh/build.sh index a08655371..5055ddaf4 100644 --- a/packages/mosh/build.sh +++ b/packages/mosh/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://mosh.org TERMUX_PKG_DESCRIPTION="Mobile shell that supports roaming and intelligent local echo" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_VERSION=1.3.2 -TERMUX_PKG_REVISION=23 +TERMUX_PKG_REVISION=24 TERMUX_PKG_SRCURL=https://github.com/mobile-shell/mosh/releases/download/mosh-${TERMUX_PKG_VERSION}/mosh-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=da600573dfa827d88ce114e0fed30210689381bbdcff543c931e4d6a2e851216 TERMUX_PKG_DEPENDS="libandroid-support, libc++, libprotobuf, ncurses, openssl, openssh" diff --git a/packages/parted/build.sh b/packages/parted/build.sh index 04ae4c079..adf9571c2 100644 --- a/packages/parted/build.sh +++ b/packages/parted/build.sh @@ -1,10 +1,9 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/parted/ TERMUX_PKG_DESCRIPTION="Versatile partition editor" TERMUX_PKG_LICENSE="GPL-3.0" -TERMUX_PKG_VERSION=3.2 -TERMUX_PKG_REVISION=5 +TERMUX_PKG_VERSION=3.3 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/parted/parted-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=858b589c22297cacdf437f3baff6f04b333087521ab274f7ab677cb8c6bb78e4 +TERMUX_PKG_SHA256=57e2b4bd87018625c515421d4524f6e3b55175b472302056391c5f7eccb83d44 TERMUX_PKG_DEPENDS="libiconv, libuuid, readline" TERMUX_PKG_BREAKS="parted-dev" TERMUX_PKG_REPLACES="parted-dev" diff --git a/packages/rhash/build.sh b/packages/rhash/build.sh index 87e5d9bad..056cef28c 100644 --- a/packages/rhash/build.sh +++ b/packages/rhash/build.sh @@ -1,10 +1,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/rhash/RHash TERMUX_PKG_DESCRIPTION="Console utility for calculation and verification of magnet links and a wide range of hash sums" TERMUX_PKG_LICENSE="MIT" -TERMUX_PKG_VERSION=1.3.9 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_VERSION=1.4.0 TERMUX_PKG_SRCURL=https://github.com/rhash/RHash/archive/v$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=42b1006f998adb189b1f316bf1a60e3171da047a85c4aaded2d0d26c1476c9f6 +TERMUX_PKG_SHA256=2ea39540f5c580da0e655f7b483c19e0d31506aed4202d88e8459fa7aeeb8861 TERMUX_PKG_DEPENDS="openssl" TERMUX_PKG_CONFLICTS="librhash, rhash-dev" TERMUX_PKG_REPLACES="librhash, rhash-dev" diff --git a/packages/seafile-client/build.sh b/packages/seafile-client/build.sh index 622cf6582..e6a045653 100644 --- a/packages/seafile-client/build.sh +++ b/packages/seafile-client/build.sh @@ -1,9 +1,9 @@ TERMUX_PKG_HOMEPAGE=http://seafile.com TERMUX_PKG_DESCRIPTION="Seafile is a file syncing and sharing software with file encryption and group sharing" TERMUX_PKG_LICENSE="Apache-2.0" -TERMUX_PKG_VERSION=7.0.8 +TERMUX_PKG_VERSION=7.0.9 TERMUX_PKG_SRCURL=https://github.com/haiwen/seafile/archive/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=d33e2b78925bf3bd5e7bfa3c78cff43a4be791bcc5686f86ee3aac245e8de825 +TERMUX_PKG_SHA256=f127b735e5d4cbd7e692d52eda54113f1a4ca31bd8328fbccf01a5462bbba5e8 TERMUX_PKG_DEPENDS="ccnet, libcurl, python" TERMUX_PKG_BREAKS="seafile-client-dev" TERMUX_PKG_REPLACES="seafile-client-dev" diff --git a/packages/sensible-utils/build.sh b/packages/sensible-utils/build.sh index f5caad995..10ae5373c 100644 --- a/packages/sensible-utils/build.sh +++ b/packages/sensible-utils/build.sh @@ -1,8 +1,8 @@ TERMUX_PKG_HOMEPAGE=https://packages.debian.org/sid/sensible-utils TERMUX_PKG_DESCRIPTION="Small utilities used by programs to sensibly select and spawn an appropriate browser, editor, or pager" TERMUX_PKG_LICENSE="GPL-2.0" -TERMUX_PKG_VERSION=0.0.12 +TERMUX_PKG_VERSION=0.0.13 TERMUX_PKG_SRCURL=http://ftp.debian.org/debian/pool/main/s/sensible-utils/sensible-utils_${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=99ba2ebf8c57447c69d426b99b84ff9dc817be0bc4988ec6890a14558c529e2e +TERMUX_PKG_SHA256=8627a530e48066282aa81384dddfb38cf53c8470ae7e633c14d2341418fa6298 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_prog_PO4A=/bin/echo" TERMUX_PKG_PLATFORM_INDEPENDENT=true diff --git a/packages/util-linux/build.sh b/packages/util-linux/build.sh index 574f3a3cb..1199592e6 100644 --- a/packages/util-linux/build.sh +++ b/packages/util-linux/build.sh @@ -1,10 +1,9 @@ TERMUX_PKG_HOMEPAGE=https://en.wikipedia.org/wiki/Util-linux TERMUX_PKG_DESCRIPTION="Miscellaneous system utilities" TERMUX_PKG_LICENSE="GPL-2.0" -TERMUX_PKG_VERSION=2.35.2 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION=2.36 TERMUX_PKG_SRCURL=https://www.kernel.org/pub/linux/utils/util-linux/v${TERMUX_PKG_VERSION:0:4}/util-linux-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=21b7431e82f6bcd9441a01beeec3d57ed33ee948f8a5b41da577073c372eb58a +TERMUX_PKG_SHA256=9e4b1c67eb13b9b67feb32ae1dc0d50e08ce9e5d82e1cccd0ee771ad2fa9e0b1 TERMUX_PKG_DEPENDS="ncurses, libcrypt, zlib" TERMUX_PKG_ESSENTIAL=true TERMUX_PKG_BREAKS="util-linux-dev" diff --git a/packages/util-linux/fix-paths.patch b/packages/util-linux/fix-paths.patch index e1bfb76b1..9b08555d1 100644 --- a/packages/util-linux/fix-paths.patch +++ b/packages/util-linux/fix-paths.patch @@ -410,18 +410,6 @@ diff -uNr util-linux-2.35.2/sys-utils/setpriv.c util-linux-2.35.2.mod/sys-utils/ static gid_t get_group(const char *s, const char *err); -diff -uNr util-linux-2.35.2/text-utils/more.c util-linux-2.35.2.mod/text-utils/more.c ---- util-linux-2.35.2/text-utils/more.c 2020-05-20 15:27:43.565012854 +0300 -+++ util-linux-2.35.2.mod/text-utils/more.c 2020-07-09 01:53:27.890946819 +0300 -@@ -1877,7 +1877,7 @@ - - } - if ((ctl->shell = getenv("SHELL")) == NULL) -- ctl->shell = "/bin/sh"; -+ ctl->shell = "@TERMUX_PREFIX@/bin/sh"; - } - ctl->no_tty_in = tcgetattr(STDIN_FILENO, &ctl->output_tty); - tcgetattr(STDERR_FILENO, &ctl->output_tty); diff -uNr util-linux-2.35.2/text-utils/pg.c util-linux-2.35.2.mod/text-utils/pg.c --- util-linux-2.35.2/text-utils/pg.c 2020-05-20 15:27:43.565012854 +0300 +++ util-linux-2.35.2.mod/text-utils/pg.c 2020-07-09 01:53:27.894946836 +0300