From 2113bc4a7ad73b441855716cabfd0f613389d11a Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Sat, 17 Jul 2021 00:15:04 +0300 Subject: [PATCH 1/8] libmosquitto: update to 2.0.11 --- packages/libmosquitto/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/libmosquitto/build.sh b/packages/libmosquitto/build.sh index d16885c98..74f7e27a8 100644 --- a/packages/libmosquitto/build.sh +++ b/packages/libmosquitto/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://mosquitto.org/ TERMUX_PKG_DESCRIPTION="MQTT library" TERMUX_PKG_LICENSE="EPL-1.0" TERMUX_PKG_MAINTAINER="Nathaniel Wesley Filardo @nwf" -TERMUX_PKG_VERSION=2.0.10 +TERMUX_PKG_VERSION=2.0.11 TERMUX_PKG_SRCURL=https://mosquitto.org/files/source/mosquitto-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=0188f7b21b91d6d80e992b8d6116ba851468b3bd154030e8a003ed28fb6f4a44 +TERMUX_PKG_SHA256=7b36a7198bce85cf31b132f5c6ee36dcf5dadf86fb768501eb1e11ce95d4f78a TERMUX_PKG_DEPENDS="c-ares, libc++, libwebsockets, openssl" TERMUX_PKG_BREAKS="libmosquitto-dev" TERMUX_PKG_REPLACES="libmosquitto-dev" From d2f280eb864fcbf790fa3b59cc54a35cf8f013a2 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Sat, 17 Jul 2021 00:17:35 +0300 Subject: [PATCH 2/8] libuv: update to 1.41.1 --- packages/libuv/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/libuv/build.sh b/packages/libuv/build.sh index 21e2fab47..eeac39b46 100644 --- a/packages/libuv/build.sh +++ b/packages/libuv/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://libuv.org TERMUX_PKG_DESCRIPTION="Support library with a focus on asynchronous I/O" TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1.41.0 +TERMUX_PKG_VERSION=1.41.1 TERMUX_PKG_SRCURL=https://dist.libuv.org/dist/v${TERMUX_PKG_VERSION}/libuv-v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=1184533907e1ddad9c0dcd30a5abb0fe25288c287ff7fee303fff7b9b2d6eb6e +TERMUX_PKG_SHA256=65db0c7f2438bc8cd48865de282bf6670027f3557d6e3cb62fb65b2e350a687d TERMUX_PKG_BREAKS="libuv-dev" TERMUX_PKG_REPLACES="libuv-dev" From e9b8d7759260e0f43adc1fea96d257b2d9d9df78 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Sat, 17 Jul 2021 00:17:39 +0300 Subject: [PATCH 3/8] libwebsockets: update to 4.2.1 --- packages/libwebsockets/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/libwebsockets/build.sh b/packages/libwebsockets/build.sh index ad5c47cf5..8c5256b44 100644 --- a/packages/libwebsockets/build.sh +++ b/packages/libwebsockets/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://libwebsockets.org TERMUX_PKG_DESCRIPTION="Lightweight C websockets library" TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=4.2.0 +TERMUX_PKG_VERSION=4.2.1 TERMUX_PKG_SRCURL=https://github.com/warmcat/libwebsockets/archive/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=a57e9a4765dbcd4d880feba8089b43ed69995eaf10d5d61a07981d9ddd975f40 +TERMUX_PKG_SHA256=842da21f73ccba2be59e680de10a8cce7928313048750eb6ad73b6fa50763c51 TERMUX_PKG_DEPENDS="openssl, libuv, zlib" TERMUX_PKG_BREAKS="libwebsockets-dev" TERMUX_PKG_REPLACES="libwebsockets-dev" From 9cc0fc33480cdddeedeb7999df142557e8d20aa7 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Sat, 17 Jul 2021 00:17:54 +0300 Subject: [PATCH 4/8] libx11: update to 1.7.2 --- packages/libx11/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/libx11/build.sh b/packages/libx11/build.sh index 41cbd2422..e972e9b50 100644 --- a/packages/libx11/build.sh +++ b/packages/libx11/build.sh @@ -3,9 +3,9 @@ TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/ TERMUX_PKG_DESCRIPTION="X11 client-side library" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="Leonid Pliushch " -TERMUX_PKG_VERSION=1.7.0 +TERMUX_PKG_VERSION=1.7.2 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/lib/libX11-${TERMUX_PKG_VERSION}.tar.bz2 -TERMUX_PKG_SHA256=36c8f93b6595437c8cfbc9f08618bcb3041cbd303e140a0013f88e4c2977cb54 +TERMUX_PKG_SHA256=1cfa35e37aaabbe4792e9bb690468efefbfbf6b147d9c69d6f90d13c3092ea6c TERMUX_PKG_DEPENDS="libandroid-support, libxcb" TERMUX_PKG_BUILD_DEPENDS="xorgproto, xorg-util-macros, xtrans" TERMUX_PKG_RECOMMENDS="xorg-xauth" From c4ff20ccf48915cbecad4301350bbb9fb980eefe Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Sat, 17 Jul 2021 00:17:57 +0300 Subject: [PATCH 5/8] links: update to 2.23 --- packages/links/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/links/build.sh b/packages/links/build.sh index 3ff19e5c7..23dc6fea7 100644 --- a/packages/links/build.sh +++ b/packages/links/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=http://links.twibright.com TERMUX_PKG_DESCRIPTION="Links is a text and graphics mode WWW browser" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=2.22 +TERMUX_PKG_VERSION=2.23 TERMUX_PKG_SRCURL=http://links.twibright.com/download/links-$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=991d77cf352238479ffbc36e03a37e8230c5757163350e05ba988a28939e284b +TERMUX_PKG_SHA256=d7118bd9781608129f4ab5e56fcac1fdeeacfa5c2f404d29cbf89daab85b951d TERMUX_PKG_DEPENDS="brotli, libbz2, libevent, liblzma, libpng, librsvg, libtiff, libx11, openssl, zlib, zstd" TERMUX_PKG_BUILD_DEPENDS="libxt" From cb60b77a33dd5596f6caefa03fb9f270cdfa4824 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Sat, 17 Jul 2021 00:31:42 +0300 Subject: [PATCH 6/8] libmosquitto: depend on libcap --- packages/libmosquitto/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/libmosquitto/build.sh b/packages/libmosquitto/build.sh index 74f7e27a8..7a71bc5ce 100644 --- a/packages/libmosquitto/build.sh +++ b/packages/libmosquitto/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_MAINTAINER="Nathaniel Wesley Filardo @nwf" TERMUX_PKG_VERSION=2.0.11 TERMUX_PKG_SRCURL=https://mosquitto.org/files/source/mosquitto-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=7b36a7198bce85cf31b132f5c6ee36dcf5dadf86fb768501eb1e11ce95d4f78a -TERMUX_PKG_DEPENDS="c-ares, libc++, libwebsockets, openssl" +TERMUX_PKG_DEPENDS="c-ares, libc++, libcap, libwebsockets, openssl" TERMUX_PKG_BREAKS="libmosquitto-dev" TERMUX_PKG_REPLACES="libmosquitto-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" From e991c3f994586799c513ccbb54f7f75abc50a855 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Sat, 17 Jul 2021 01:22:38 +0300 Subject: [PATCH 7/8] libwebsockets: remove unneeded patch --- packages/libwebsockets/compilation-fix.patch | 48 -------------------- 1 file changed, 48 deletions(-) delete mode 100644 packages/libwebsockets/compilation-fix.patch diff --git a/packages/libwebsockets/compilation-fix.patch b/packages/libwebsockets/compilation-fix.patch deleted file mode 100644 index f2f501e87..000000000 --- a/packages/libwebsockets/compilation-fix.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -uNr libwebsockets-4.2.0/lib/core-net/client/conmon.c libwebsockets-4.2.0.mod/lib/core-net/client/conmon.c ---- libwebsockets-4.2.0/lib/core-net/client/conmon.c 2021-04-15 16:44:02.000000000 +0000 -+++ libwebsockets-4.2.0.mod/lib/core-net/client/conmon.c 2021-05-04 22:56:10.375662322 +0000 -@@ -91,7 +91,7 @@ - * No we don't already have a copy of this one, let's - * allocate and append it then - */ -- size_t al = sizeof(struct addrinfo) + cai->ai_addrlen; -+ size_t al = sizeof(struct addrinfo) + (unsigned int) cai->ai_addrlen; - size_t cl = cai->ai_canonname ? - strlen(cai->ai_canonname) + 1 : 0; - -@@ -102,7 +102,7 @@ - } - *ai = *cai; - ai->ai_addr = (struct sockaddr *)&ai[1]; -- memcpy(ai->ai_addr, cai->ai_addr, cai->ai_addrlen); -+ memcpy(ai->ai_addr, cai->ai_addr, (unsigned int) cai->ai_addrlen); - - if (cl) { - ai->ai_canonname = ((char *)ai->ai_addr) + -diff -uNr libwebsockets-4.2.0/lib/core-net/client/connect3.c libwebsockets-4.2.0.mod/lib/core-net/client/connect3.c ---- libwebsockets-4.2.0/lib/core-net/client/connect3.c 2021-04-15 16:44:02.000000000 +0000 -+++ libwebsockets-4.2.0.mod/lib/core-net/client/connect3.c 2021-05-04 23:01:59.235665609 +0000 -@@ -452,7 +452,11 @@ - else - #endif - m = connect(wsi->desc.sockfd, (const struct sockaddr *)psa, -+#if defined(__arm__) || defined(__i686__) -+ (int)n); -+#else - (unsigned int)n); -+#endif - - #if defined(LWS_WITH_CONMON) - wsi->conmon_datum = lws_now_usecs(); -diff -uNr libwebsockets-4.2.0/lib/core-net/client/sort-dns.c libwebsockets-4.2.0.mod/lib/core-net/client/sort-dns.c ---- libwebsockets-4.2.0/lib/core-net/client/sort-dns.c 2021-04-15 16:44:02.000000000 +0000 -+++ libwebsockets-4.2.0.mod/lib/core-net/client/sort-dns.c 2021-05-04 22:57:25.443663023 +0000 -@@ -634,7 +634,7 @@ - if (!ds) - return 1; - -- memcpy(&ds->dest, ai->ai_addr, ai->ai_addrlen); -+ memcpy(&ds->dest, ai->ai_addr, (unsigned int) ai->ai_addrlen); - ds->dest.sa4.sin_family = (sa_family_t)ai->ai_family; - - lws_sa46_write_numeric_address(&ds->dest, afip, sizeof(afip)); From e14a2dab6e62971c21520cdffef0867e762fef15 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Sat, 17 Jul 2021 02:19:34 +0300 Subject: [PATCH 8/8] libx11: update patch --- packages/libx11/configure.patch | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/packages/libx11/configure.patch b/packages/libx11/configure.patch index 4ddfec979..c3103af0f 100644 --- a/packages/libx11/configure.patch +++ b/packages/libx11/configure.patch @@ -1,19 +1,18 @@ -diff -uNr libX11-1.7.0/configure libX11-1.7.0.mod/configure ---- libX11-1.7.0/configure 2020-11-20 19:08:19.000000000 +0000 -+++ libX11-1.7.0.mod/configure 2020-12-07 23:41:45.588377415 +0000 -@@ -19609,6 +19609,7 @@ +diff -uNr libX11-1.7.2/configure libX11-1.7.2.mod/configure +--- libX11-1.7.2/configure 2021-06-06 19:49:01.000000000 +0300 ++++ libX11-1.7.2.mod/configure 2021-07-17 02:12:57.003231884 +0300 +@@ -20605,6 +20605,7 @@ + fi + + ++if false; then # Check for flag to avoid builtin definitions - assumes unix is predefined, # which is not the best choice for supporting other OS'es, but covers most # of the ones we need for now. -+if false; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $RAWCPP requires -undef" >&5 - $as_echo_n "checking if $RAWCPP requires -undef... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -19654,7 +19655,7 @@ +@@ -20653,6 +20654,7 @@ fi fi rm -f conftest.$ac_ext -- +fi