From 2f1ff11c4d27965aed201184828f757f3907d27a Mon Sep 17 00:00:00 2001
From: Leonid Plyushch <leonid.plyushch@gmail.com>
Date: Thu, 30 Jan 2020 20:19:17 +0200
Subject: [PATCH] alpine: update to 2.22

---
 packages/alpine/build.sh                      |  5 +-
 .../alpine/imap-src-osdep-unix-Makefile.patch | 49 +++----------------
 2 files changed, 10 insertions(+), 44 deletions(-)

diff --git a/packages/alpine/build.sh b/packages/alpine/build.sh
index c3c092239..efc4c435b 100644
--- a/packages/alpine/build.sh
+++ b/packages/alpine/build.sh
@@ -1,10 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://repo.or.cz/alpine.git
 TERMUX_PKG_DESCRIPTION="Fast, easy to use email client"
 TERMUX_PKG_LICENSE="Apache-2.0"
-TERMUX_PKG_VERSION=2.21.99999
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_VERSION=2.22
 TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/alpine-$TERMUX_PKG_VERSION.tar.xz
-TERMUX_PKG_SHA256=229de9f673430190055207f8980205186ed6f73873f1ae6e1467d9d78e0f9dec
+TERMUX_PKG_SHA256=849567c1b6f71fde3aaa1c97cf0577b12a525d9e22c0ea47797c4bf1cd2bbfdb
 TERMUX_PKG_DEPENDS="libcrypt, ncurses, openssl-tool"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --disable-debug
diff --git a/packages/alpine/imap-src-osdep-unix-Makefile.patch b/packages/alpine/imap-src-osdep-unix-Makefile.patch
index 1ce1b961a..2c925e07e 100644
--- a/packages/alpine/imap-src-osdep-unix-Makefile.patch
+++ b/packages/alpine/imap-src-osdep-unix-Makefile.patch
@@ -1,45 +1,12 @@
---- ../cache/alpine-2.20/imap/src/osdep/unix/Makefile	2015-01-12 05:12:25.505178442 +0000
-+++ ./imap/src/osdep/unix/Makefile	2016-12-11 07:08:54.821695452 +0000
-@@ -131,13 +131,8 @@
+diff -uNr alpine-2.22/imap/src/osdep/unix/Makefile alpine-2.22.mod/imap/src/osdep/unix/Makefile
+--- alpine-2.22/imap/src/osdep/unix/Makefile	2020-01-19 10:32:22.615427440 +0200
++++ alpine-2.22.mod/imap/src/osdep/unix/Makefile	2020-01-30 20:13:29.529329050 +0200
+@@ -133,7 +133,7 @@
+ # Commands possibly overridden by the individual port
  
- 
- # Commands possibly overriden by the individual port
--
--ARRC=ar rc
+ ARRC=ar rc
 -CC=cc
++CC?=cc
  LN=ln -s
--RANLIB=ranlib
--
--
-+AARC="ar rc"
- # Standard distribution build parameters
- 
- DEFAULTAUTHENTICATORS=ext md5 pla log
-@@ -513,8 +508,10 @@
- 	 SPOOLDIR=/var/spool \
- 	 ACTIVEFILE=/var/lib/news/active \
- 	 RSHPATH=/usr/bin/rsh \
--	 BASECFLAGS="$(GCCCFLAGS)"
--
-+	 CC=$(TCC) \
-+ 	 BASECFLAGS="$(GCCCFLAGS)" \
-+	RANLIB="$(TRANLIB)"
-+                                  
- lyn:	# LynxOS
- 	$(BUILD) `$(CAT) SPECIALS` OS=$@ \
- 	 CRXTYPE=nfs \
-@@ -869,8 +866,13 @@
- all:	$(ARCHIVE)
- 
- $(ARCHIVE): $(BINARIES)
--	sh -c '$(RM) $(ARCHIVE) || true'
-+	rm -rf client-a
-+	 { echo -n 'ar rc '; cat ARCHIVE; } >ARCHIVE.new
-+	rm ARCHIVE
-+	mv ARCHIVE.new ARCHIVE
-+	chmod +x ARCHIVE
- 	@$(CAT) ./ARCHIVE
-+	
- 	@$(SH) ./ARCHIVE
+ RANLIB=ranlib
  
- .c.o: