libgpg-error: Fix posix lock objet on aarch64

Bump build revision on dependant packages since this changes the
libgpg ABI.

packages/gnupg2/build.sh

@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://www.gnupg.org/
 TERMUX_PKG_DESCRIPTION="Implementation of the OpenPGP standard for encrypting and signing data and communication"
 TERMUX_PKG_VERSION=2.1.11
+TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_SRCURL=ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_DEPENDS="libassuan,libbz2,libgcrypt,libksba,libnpth,readline,pinentry"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-ldap --disable-sqlite"

packages/libassuan/build.sh

@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://www.gnupg.org/related_software/libassuan/
 TERMUX_PKG_DESCRIPTION="Library implementing the Assuan IPC protocol used between most newer GnuPG components"
 TERMUX_PKG_VERSION=2.4.2
+TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_SRCURL=ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_RM_AFTER_INSTALL="bin/libassuan-config"
 TERMUX_PKG_DEPENDS="libgpg-error"

packages/libgcrypt/build.sh

@@ -1,4 +1,5 @@
 TERMUX_PKG_VERSION=1.6.5
+TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_HOMEPAGE=http://www.gnu.org/software/libgcrypt/
 TERMUX_PKG_DESCRIPTION="General purpose cryptographic library based on the code from GnuPG"
 TERMUX_PKG_SRCURL=ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${TERMUX_PKG_VERSION}.tar.bz2

packages/libgpg-error/build.sh

@@ -1,12 +1,21 @@
-TERMUX_PKG_VERSION=1.21
 TERMUX_PKG_HOMEPAGE=http://www.gnupg.org/related_software/libgpg-error/
 TERMUX_PKG_DESCRIPTION="Small library that defines common error values for all GnuPG components"
+TERMUX_PKG_VERSION=1.21
+TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_SRCURL=ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_RM_AFTER_INSTALL="share/common-lisp"
 
-termux_step_post_configure () {
+termux_step_post_extract_package () {
-	# To fix non-arm builds, see:
+	# Upstream only has Android definitions for platform-specific lock objects.
-	# https://lists.gnupg.org/pipermail/gnupg-devel/2014-January/028203.html
+	# See https://lists.gnupg.org/pipermail/gnupg-devel/2014-January/028203.html
-	# https://gitorious.org/vlc/vlc/commit/3054560987971aff19c496db38834458f8c29377
+	# for how to generate a lock-obj header file on devices.
-	cp $TERMUX_PKG_SRCDIR/src/syscfg/lock-obj-pub.arm-unknown-linux-androideabi.h $TERMUX_PKG_SRCDIR/src/syscfg/lock-obj-pub.linux-android.h
+
+	# For aarch64 this was generated on a device:
+	cp $TERMUX_PKG_BUILDER_DIR/lock-obj-pub.aarch64-unknown-linux-android.h $TERMUX_PKG_SRCDIR/src/syscfg/
+
+	if [ $TERMUX_ARCH = i686 ]; then
+		# Android i686 has same config as arm (verified by generating a file on a i686 device):
+		cp $TERMUX_PKG_SRCDIR/src/syscfg/lock-obj-pub.arm-unknown-linux-androideabi.h \
+		   $TERMUX_PKG_SRCDIR/src/syscfg/lock-obj-pub.linux-android.h
+	fi
 }

packages/libgpg-error/lock-obj-pub.aarch64-unknown-linux-android.h

@@ -0,0 +1,25 @@
+## lock-obj-pub.armv8l-unknown-linux-gnu.h
+## File created by gen-posix-lock-obj - DO NOT EDIT
+## To be included by mkheader into gpg-error.h
+
+typedef struct
+{
+  long _vers;
+  union {
+    volatile char _priv[40];
+    long _x_align;
+    long *_xp_align;
+  } u;
+} gpgrt_lock_t;
+
+#define GPGRT_LOCK_INITIALIZER {1,{{0,0,0,0,0,0,0,0, \
+                                    0,0,0,0,0,0,0,0, \
+                                    0,0,0,0,0,0,0,0, \
+                                    0,0,0,0,0,0,0,0, \
+                                    0,0,0,0,0,0,0,0}}}
+##
+## Local Variables:
+## mode: c
+## buffer-read-only: t
+## End:
+##

packages/libksba/build.sh

@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://gnupg.org/related_software/libksba/
 TERMUX_PKG_DESCRIPTION="Library for using X.509 certificates and CMS (Cryptographic Message Syntax) easily accessible"
 TERMUX_PKG_VERSION=1.3.3
-TERMUX_PKG_BUILD_REVISION=1
+TERMUX_PKG_BUILD_REVISION=2
 TERMUX_PKG_SRCURL=ftp://ftp.gnupg.org/gcrypt/libksba/libksba-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_DEPENDS="libgpg-error"
 TERMUX_PKG_RM_AFTER_INSTALL=bin/ksba-config

packages/pinentry/build.sh

@@ -1,5 +1,6 @@
 TERMUX_PKG_HOMEPAGE=https://www.gnupg.org/related_software/pinentry/index.html
 TERMUX_PKG_DESCRIPTION="Dialog allowing secure password entry"
 TERMUX_PKG_VERSION=0.9.7
+TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_SRCURL=https://www.gnupg.org/ftp/gcrypt/pinentry/pinentry-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_DEPENDS="libandroid-support, libassuan, ncurses"