From 38227f42d63bc0d6fbeb365a0669a55f351d0550 Mon Sep 17 00:00:00 2001
From: Henrik Grimler <henrik@grimler.se>
Date: Sat, 4 Apr 2020 03:49:59 +0200
Subject: [PATCH] Update various packages (#5114)

* cpio: update to 2.13

* gmic: update to 2.9.0

* ffsend: update to 0.2.59

* libgrpc: update to 1.28.0

* librsvg: update to 2.48.2

* perl: update to 5.30.2

* ruby: update to 2.7.1

* ripgrep: update to 12.0.1

* repology/excluded_packages: ignore aircrack-ng and guile18

* mpd: update to 0.21.22
---
 packages/cpio/build.sh                        |  4 +--
 packages/cpio/gnu-xalloc-oversized.h.patch    | 29 +++++++++++++++++++
 packages/ffsend/build.sh                      |  4 +--
 packages/gmic/Makefile.patch                  | 17 +++++------
 packages/gmic/build.sh                        |  4 +--
 packages/libgrpc/build.sh                     |  3 +-
 packages/librsvg/build.sh                     |  4 +--
 packages/mpd/build.sh                         |  4 +--
 ...ut-plugins-sles-SlesOutputPlugin.cxx.patch | 19 ++++++++++++
 packages/perl/build.sh                        |  9 +++---
 packages/ripgrep/build.sh                     |  4 +--
 packages/ruby/build.sh                        | 11 ++++---
 scripts/repology/excluded_packages.txt        |  4 +++
 13 files changed, 82 insertions(+), 34 deletions(-)
 create mode 100644 packages/cpio/gnu-xalloc-oversized.h.patch
 create mode 100644 packages/mpd/src-output-plugins-sles-SlesOutputPlugin.cxx.patch

diff --git a/packages/cpio/build.sh b/packages/cpio/build.sh
index c111aed222..9353920d00 100644
--- a/packages/cpio/build.sh
+++ b/packages/cpio/build.sh
@@ -1,9 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/cpio/
 TERMUX_PKG_DESCRIPTION="CPIO implementation from the GNU project"
 TERMUX_PKG_LICENSE="GPL-2.0"
-TERMUX_PKG_VERSION=2.12
+TERMUX_PKG_VERSION=2.13
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/cpio/cpio-$TERMUX_PKG_VERSION.tar.bz2
-TERMUX_PKG_SHA256=70998c5816ace8407c8b101c9ba1ffd3ebbecba1f5031046893307580ec1296e
+TERMUX_PKG_SHA256=eab5bdc5ae1df285c59f2a4f140a98fc33678a0bf61bdba67d9436ae26b46f6d
 TERMUX_PKG_DEPENDS="tar"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-rmt=$TERMUX_PREFIX/libexec/rmt"
 
diff --git a/packages/cpio/gnu-xalloc-oversized.h.patch b/packages/cpio/gnu-xalloc-oversized.h.patch
new file mode 100644
index 0000000000..0723c6bba4
--- /dev/null
+++ b/packages/cpio/gnu-xalloc-oversized.h.patch
@@ -0,0 +1,29 @@
+Fix ../gnu/libgnu.a(hash.o):hash.c:function compute_bucket_size: error: undefined reference to '__muloti4'
+(same patch as for m4).
+--- ../xalloc-oversized.h.orig	2020-04-03 20:50:58.942285629 +0200
++++ ./gnu/xalloc-oversized.h	2020-04-03 20:53:22.281922797 +0200
+@@ -46,23 +46,6 @@
+    positive and N must be nonnegative.  This is a macro, not a
+    function, so that it works correctly even when SIZE_MAX < N.  */
+ 
+-#if 7 <= __GNUC__ || __has_builtin (__builtin_add_overflow_p)
+-# define xalloc_oversized(n, s) \
+-   __builtin_mul_overflow_p (n, s, (__xalloc_count_type) 1)
+-#elif ((5 <= __GNUC__ \
+-        || (__has_builtin (__builtin_mul_overflow) \
+-            && __has_builtin (__builtin_constant_p))) \
+-       && !__STRICT_ANSI__)
+-# define xalloc_oversized(n, s) \
+-   (__builtin_constant_p (n) && __builtin_constant_p (s) \
+-    ? __xalloc_oversized (n, s) \
+-    : ({ __xalloc_count_type __xalloc_count; \
+-         __builtin_mul_overflow (n, s, &__xalloc_count); }))
+-
+-/* Other compilers use integer division; this may be slower but is
+-   more portable.  */
+-#else
+-# define xalloc_oversized(n, s) __xalloc_oversized (n, s)
+-#endif
++#define xalloc_oversized(n, s) __xalloc_oversized (n, s)
+ 
+ #endif /* !XALLOC_OVERSIZED_H_ */
diff --git a/packages/ffsend/build.sh b/packages/ffsend/build.sh
index 4083af0748..90ca1b4aec 100644
--- a/packages/ffsend/build.sh
+++ b/packages/ffsend/build.sh
@@ -1,9 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://gitlab.com/timvisee/ffsend
 TERMUX_PKG_DESCRIPTION="A fully featured Firefox Send client"
 TERMUX_PKG_LICENSE="GPL-3.0"
-TERMUX_PKG_VERSION=0.2.58
+TERMUX_PKG_VERSION=0.2.59
 TERMUX_PKG_SRCURL=https://gitlab.com/timvisee/ffsend/-/archive/v$TERMUX_PKG_VERSION/ffsend-v$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_SHA256=5a2e2b792d6763fdce4db6b4e815bbaa822bd7d4e6cf6c19fd3ec21ed4937700
+TERMUX_PKG_SHA256=02df26f8f880b9f991656c6f4cf0c95bee6636dbe1ce7c120ae424c0cbfe81c4
 TERMUX_PKG_DEPENDS="openssl"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--no-default-features --features send2,send3,history,archive,qrcode,urlshorten,infer-command"
diff --git a/packages/gmic/Makefile.patch b/packages/gmic/Makefile.patch
index 588729dbe6..c7a0c25e0e 100644
--- a/packages/gmic/Makefile.patch
+++ b/packages/gmic/Makefile.patch
@@ -1,7 +1,6 @@
-diff -uNr gmic-2.8.3/src/Makefile gmic-2.8.3.mod/src/Makefile
---- gmic-2.8.3/src/Makefile	2020-01-23 19:04:39.000000000 +0200
-+++ gmic-2.8.3.mod/src/Makefile	2020-01-30 21:21:41.886258357 +0200
-@@ -203,7 +203,7 @@
+--- ./src/Makefile.orig	2020-03-28 14:25:12.000000000 +0100
++++ ./src/Makefile	2020-04-03 21:01:21.744145133 +0200
+@@ -206,7 +206,7 @@
  # Enable multi-threading support.
  PARALLEL_CFLAGS = -Dgmic_is_parallel
  ifneq ($(OS),Windows)
@@ -10,21 +9,21 @@ diff -uNr gmic-2.8.3/src/Makefile gmic-2.8.3.mod/src/Makefile
  endif
  
  # Enable parallelization in CImg, using OpenMP.
-@@ -343,8 +343,8 @@
+@@ -346,8 +346,8 @@
  GMIC_CLI_CFLAGS = $(MANDATORY_CFLAGS) $(ABORT_CFLAGS) $(PARALLEL_CFLAGS) $(EIGEN_CFLAGS) $(FFTW_CFLAGS) $(CURL_CFLAGS) $(PNG_CFLAGS) $(JPEG_CFLAGS) $(TIFF_CFLAGS)
  GMIC_CLI_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(EIGEN_LIBS) $(FFTW_LIBS) $(CURL_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(TIFF_LIBS)
- ifeq ($(OS),Unix) # Unix.
+ ifeq ($(OS),Unix) # Unix
 -GMIC_CLI_CFLAGS += $(OPENMP_CFLAGS) $(X11_CFLAGS) $(OPENEXR_CFLAGS) $(OPENCV_CFLAGS) # $(XSHM_CFLAGS) # $(MAGICK_CFLAGS)
 -GMIC_CLI_LIBS += $(OPENMP_LIBS) $(X11_LIBS) $(OPENEXR_LIBS) $(OPENCV_LIBS) # $(XSHM_LIBS) # $(MAGICK_LIBS)
 +#GMIC_CLI_CFLAGS += $(OPENMP_CFLAGS) $(X11_CFLAGS) $(OPENEXR_CFLAGS) $(OPENCV_CFLAGS) # $(XSHM_CFLAGS) # $(MAGICK_CFLAGS)
 +#GMIC_CLI_LIBS += $(OPENMP_LIBS) $(X11_LIBS) $(OPENEXR_LIBS) $(OPENCV_LIBS) # $(XSHM_LIBS) # $(MAGICK_LIBS)
  else
- ifeq ($(OS),Darwin) # MacOSX.
+ ifeq ($(OS),Darwin) # MacOSX
  GMIC_CLI_CFLAGS += $(X11_CFLAGS) $(OPENEXR_CFLAGS) $(OPENCV_CFLAGS)
-@@ -357,13 +357,15 @@
+@@ -360,13 +360,15 @@
  
  cli:
- 	$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(GMIC_CLI_LIBS) $(OPT_LIBS)" _cli
+ 	$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) $(OPT_CLI_CFLAGS)" "LIBS+=$(GMIC_CLI_LIBS) $(OPT_LIBS)" _cli
 -	$(STRIP) gmic$(EXE)
 +	$(STRIP) gmic$(EXE) gmic-gm$(EXE)
  
diff --git a/packages/gmic/build.sh b/packages/gmic/build.sh
index 3e2f5de37f..18cb9320cb 100644
--- a/packages/gmic/build.sh
+++ b/packages/gmic/build.sh
@@ -1,9 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://gmic.eu
 TERMUX_PKG_DESCRIPTION="Full-featured framework for image processing"
 TERMUX_PKG_LICENSE="CeCILL-2.1"
-TERMUX_PKG_VERSION=2.8.4
+TERMUX_PKG_VERSION=2.9.0
 TERMUX_PKG_SRCURL=https://gmic.eu/files/source/gmic_$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_SHA256=b2a279bdf981595b30d8d7828fabf9a620cde06eae8db345a8cddf2160c25379
+TERMUX_PKG_SHA256=6233695f9b27999dcc7cc3aa7480b0f192bd44de85209091a3b4b8a65ae8c4b5
 TERMUX_PKG_DEPENDS="libc++, libcurl, fftw, libpng, libjpeg-turbo, libtiff, zlib"
 TERMUX_PKG_BUILD_DEPENDS="graphicsmagick"
 TERMUX_PKG_BUILD_IN_SRC=true
diff --git a/packages/libgrpc/build.sh b/packages/libgrpc/build.sh
index 84f6ee1958..ce36b27a6b 100644
--- a/packages/libgrpc/build.sh
+++ b/packages/libgrpc/build.sh
@@ -1,8 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://grpc.io/
 TERMUX_PKG_DESCRIPTION="High performance, open source, general RPC framework that puts mobile and HTTP/2 first"
 TERMUX_PKG_LICENSE="Apache-2.0"
-TERMUX_PKG_VERSION=1.27.3
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_VERSION=1.28.0
 TERMUX_PKG_DEPENDS="libc++, openssl, protobuf, c-ares, zlib"
 TERMUX_PKG_BREAKS="libgrpc-dev"
 TERMUX_PKG_REPLACES="libgrpc-dev"
diff --git a/packages/librsvg/build.sh b/packages/librsvg/build.sh
index be16effdc6..e20bf679f6 100644
--- a/packages/librsvg/build.sh
+++ b/packages/librsvg/build.sh
@@ -1,9 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://wiki.gnome.org/action/show/Projects/LibRsvg
 TERMUX_PKG_DESCRIPTION="Library to render SVG files using cairo"
 TERMUX_PKG_LICENSE="LGPL-2.0"
-TERMUX_PKG_VERSION=2.48.1
+TERMUX_PKG_VERSION=2.48.2
 TERMUX_PKG_SRCURL=http://ftp.gnome.org/pub/GNOME/sources/librsvg/${TERMUX_PKG_VERSION:0:4}/librsvg-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=91d7630cffbbe006c989ca575b404257abc2a4a636f0571ffb4607d69fd58f3a
+TERMUX_PKG_SHA256=272658a0e04fce21eb1368c345cc1305bfeada4ca6d7db99e77323ed0668bdca
 TERMUX_PKG_DEPENDS="gdk-pixbuf, libcairo, libcroco, pango, zlib"
 TERMUX_PKG_BREAKS="librsvg-dev"
 TERMUX_PKG_REPLACES="librsvg-dev"
diff --git a/packages/mpd/build.sh b/packages/mpd/build.sh
index a3de6f1e8b..85be499298 100644
--- a/packages/mpd/build.sh
+++ b/packages/mpd/build.sh
@@ -1,9 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://www.musicpd.org
 TERMUX_PKG_DESCRIPTION="Music player daemon"
 TERMUX_PKG_LICENSE="GPL-2.0"
-TERMUX_PKG_VERSION=0.21.21
+TERMUX_PKG_VERSION=0.21.22
 TERMUX_PKG_SRCURL=https://github.com/MusicPlayerDaemon/MPD/archive/v$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_SHA256=e52238442a4ce264de6dca836faa729cf21e748f99c90e553e267099d91bba81
+TERMUX_PKG_SHA256=e22fa3e772c56a6d2c1ca6b0a9eb4ee5251abc33e66fc678757391d4ca6cde12
 TERMUX_PKG_DEPENDS="libc++, libcurl, libid3tag, libopus, pulseaudio, libmpdclient, openal-soft, libvorbis, libsqlite, ffmpeg, libmp3lame, libbz2, libogg, libnfs, zlib"
 TERMUX_PKG_BUILD_DEPENDS="boost"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
diff --git a/packages/mpd/src-output-plugins-sles-SlesOutputPlugin.cxx.patch b/packages/mpd/src-output-plugins-sles-SlesOutputPlugin.cxx.patch
new file mode 100644
index 0000000000..949f13dec7
--- /dev/null
+++ b/packages/mpd/src-output-plugins-sles-SlesOutputPlugin.cxx.patch
@@ -0,0 +1,19 @@
+Reverts commit 81c16273c543822fa8b87522cb1146a7859edd7a in the mpd repo
+
+--- ../SlesOutputPlugin.cxx.orig	2020-04-03 22:18:11.070009046 +0200
++++ ./src/output/plugins/sles/SlesOutputPlugin.cxx	2020-04-03 22:18:58.189898556 +0200
+@@ -28,7 +28,6 @@
+ #include "util/Macros.hxx"
+ #include "util/Domain.hxx"
+ #include "system/ByteOrder.hxx"
+-#include "mixer/MixerList.hxx"
+ #include "Log.hxx"
+ 
+ #include <SLES/OpenSLES.h>
+@@ -413,5 +412,5 @@
+ 	"sles",
+ 	sles_test_default_device,
+ 	SlesOutput::Create,
+-	&android_mixer_plugin,
++	nullptr,
+ };
diff --git a/packages/perl/build.sh b/packages/perl/build.sh
index ca4587b919..52bb0de04d 100644
--- a/packages/perl/build.sh
+++ b/packages/perl/build.sh
@@ -1,11 +1,10 @@
 TERMUX_PKG_HOMEPAGE=https://www.perl.org/
 TERMUX_PKG_DESCRIPTION="Capable, feature-rich programming language"
 TERMUX_PKG_LICENSE="Artistic-License-2.0"
-TERMUX_PKG_VERSION=(5.30.1
-                    1.3.1)
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_SHA256=(bf3d25571ff1ee94186177c2cdef87867fd6a14aa5a84f0b1fb7bf798f42f964
-                   edce0b0c2f725e2db3f203d6d8e9f3f7161256f5d1590551e40694f21200141d)
+TERMUX_PKG_VERSION=(5.30.2
+                    1.3.2)
+TERMUX_PKG_SHA256=(66db7df8a91979eb576fac91743644da878244cf8ee152f02cd6f5cd7a731689
+                   defa12f0ad7be0b6c48b4f76e2fb5b37c1b37fbeb6e9ebe938279cd539a0c20c)
 TERMUX_PKG_SRCURL=(http://www.cpan.org/src/5.0/perl-${TERMUX_PKG_VERSION}.tar.gz
 		   https://github.com/arsv/perl-cross/releases/download/${TERMUX_PKG_VERSION[1]}/perl-cross-${TERMUX_PKG_VERSION[1]}.tar.gz)
 TERMUX_PKG_BUILD_IN_SRC=true
diff --git a/packages/ripgrep/build.sh b/packages/ripgrep/build.sh
index 5125abd40b..466456d07c 100644
--- a/packages/ripgrep/build.sh
+++ b/packages/ripgrep/build.sh
@@ -1,9 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://github.com/BurntSushi/ripgrep
 TERMUX_PKG_DESCRIPTION="Search tool like grep and The Silver Searcher"
 TERMUX_PKG_LICENSE="MIT"
-TERMUX_PKG_VERSION=12.0.0
+TERMUX_PKG_VERSION=12.0.1
 TERMUX_PKG_SRCURL=https://github.com/BurntSushi/ripgrep/archive/$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_SHA256=3c84c3a4c80cee961a2b0d00a4e5d1bc9eb58ba587cf69c06d84aff72fedbeff
+TERMUX_PKG_SHA256=5be34aa77a36ac9d8f1297a0d97069e4653e03f61c67d192cee32944cd2b6329
 TERMUX_PKG_BUILD_IN_SRC=true
 
 termux_step_post_make_install() {
diff --git a/packages/ruby/build.sh b/packages/ruby/build.sh
index 4b6c87e619..afe70b9a66 100644
--- a/packages/ruby/build.sh
+++ b/packages/ruby/build.sh
@@ -1,10 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://www.ruby-lang.org/
 TERMUX_PKG_DESCRIPTION="Dynamic programming language with a focus on simplicity and productivity"
 TERMUX_PKG_LICENSE="BSD 2-Clause"
-_MAJOR_VERSION=2.7
-TERMUX_PKG_VERSION=${_MAJOR_VERSION}.0
-TERMUX_PKG_SRCURL=https://cache.ruby-lang.org/pub/ruby/${_MAJOR_VERSION}/ruby-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=27d350a52a02b53034ca0794efe518667d558f152656c2baaf08f3d0c8b02343
+TERMUX_PKG_VERSION=2.7.1
+TERMUX_PKG_SRCURL=https://cache.ruby-lang.org/pub/ruby/${TERMUX_PKG_VERSION:0:3}/ruby-${TERMUX_PKG_VERSION}.tar.xz
+TERMUX_PKG_SHA256=b224f9844646cc92765df8288a46838511c1cec5b550d8874bd4686a904fcee7
 # libbffi is used by the fiddle extension module:
 TERMUX_PKG_DEPENDS="gdbm, libandroid-support, libffi, libgmp, readline, openssl, libyaml, zlib"
 TERMUX_PKG_BREAKS="ruby-dev"
@@ -40,7 +39,7 @@ termux_step_make_install() {
 	make uninstall # remove possible remains to get fresh timestamps
 	make install
 
-	local RBCONFIG=$TERMUX_PREFIX/lib/ruby/${_MAJOR_VERSION}.0/${TERMUX_HOST_PLATFORM}/rbconfig.rb
+	local RBCONFIG=$TERMUX_PREFIX/lib/ruby/${TERMUX_PKG_VERSION:0:3}.0/${TERMUX_HOST_PLATFORM}/rbconfig.rb
 
 	# Fix absolute paths to executables:
 	perl -p -i -e 's/^.*CONFIG\["INSTALL"\].*$/  CONFIG["INSTALL"] = "install -c"/' $RBCONFIG
@@ -52,7 +51,7 @@ termux_step_make_install() {
 }
 
 termux_step_post_massage() {
-	if [ ! -f $TERMUX_PREFIX/lib/ruby/${_MAJOR_VERSION}.0/${TERMUX_HOST_PLATFORM}/readline.so ]; then
+	if [ ! -f $TERMUX_PREFIX/lib/ruby/${TERMUX_PKG_VERSION:0:3}.0/${TERMUX_HOST_PLATFORM}/readline.so ]; then
 		echo "Error: The readline extension was not built"
 	fi
 }
diff --git a/scripts/repology/excluded_packages.txt b/scripts/repology/excluded_packages.txt
index 75a27a85b6..bc4852a1e7 100644
--- a/scripts/repology/excluded_packages.txt
+++ b/scripts/repology/excluded_packages.txt
@@ -58,12 +58,16 @@ utf8cpp
 # Can't be upgraded (3.x requires some Qt stuff that is unavailable in x11-packages).
 wireshark-gtk
 
+# newer version than 1.2 does not work on aarch64
+aircrack-ng
+
 # Other packages for delisting from Repology to keep updates list clean.
 # This includes packages which are rarely updated or have versioning scheme unexpected
 # by Repology.
 cmark
 dart
 guile
+guile18
 k2pdfopt
 libdispatch
 libmaa