Split out gpgv from gnupg

The full gnupg package is not needed by apt (and thus the base
installation) - gpgv is enough. So we split out gpgv to a separate
package.

diff --git a/packages/apt/build.sh b/packages/apt/build.sh
index 514ea6cc07f242b722ba7ba189feeb5e931a1b7f..dc9289c14f633242ce746836c99f029396f80167 100644 (file)
--- a/packages/apt/build.sh
+++ b/packages/apt/build.sh
@@ -1,9 +1,10 @@
 TERMUX_PKG_HOMEPAGE=https://packages.debian.org/apt
 TERMUX_PKG_DESCRIPTION="Front-end for the dpkg package manager"
 TERMUX_PKG_HOMEPAGE=https://packages.debian.org/apt
 TERMUX_PKG_DESCRIPTION="Front-end for the dpkg package manager"

-TERMUX_PKG_DEPENDS="liblzma, dpkg, gnupg"
+TERMUX_PKG_DEPENDS="liblzma, dpkg, gpgv"

 # Wait with updating to later version until the NDK supports std::to_string() and other
 # functions (hopefully in r13):
 TERMUX_PKG_VERSION=1.2.12
 # Wait with updating to later version until the NDK supports std::to_string() and other
 # functions (hopefully in r13):
 TERMUX_PKG_VERSION=1.2.12

+TERMUX_PKG_BUILD_REVISION=1

 # TERMUX_PKG_SRCURL=http://ftp.debian.org/debian/pool/main/a/apt/apt_${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SRCURL=https://launchpad.net/ubuntu/+archive/primary/+files/apt_${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--host=${TERMUX_ARCH}-linux --disable-rpath acl_cv_rpath=$TERMUX_PREFIX/lib gt_cv_func_CFPreferencesCopyAppValue=no gt_cv_func_CFLocaleCopyCurrent=no ac_cv_c_bigendian=no --no-create"
 # TERMUX_PKG_SRCURL=http://ftp.debian.org/debian/pool/main/a/apt/apt_${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SRCURL=https://launchpad.net/ubuntu/+archive/primary/+files/apt_${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--host=${TERMUX_ARCH}-linux --disable-rpath acl_cv_rpath=$TERMUX_PREFIX/lib gt_cv_func_CFPreferencesCopyAppValue=no gt_cv_func_CFLocaleCopyCurrent=no ac_cv_c_bigendian=no --no-create"

diff --git a/packages/gnupg/build.sh b/packages/gnupg/build.sh
index 0d8e7411914f7161aa48cd144e4c8214d1b65d57..81e77257757cf1bf48250538e36bd656f49b3d39 100755 (executable)
--- a/packages/gnupg/build.sh
+++ b/packages/gnupg/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://www.gnupg.org/
 TERMUX_PKG_DESCRIPTION="OpenPGP implementation for encrypting and signing data and communication"
 TERMUX_PKG_VERSION=1.4.21
 TERMUX_PKG_HOMEPAGE=http://www.gnupg.org/
 TERMUX_PKG_DESCRIPTION="OpenPGP implementation for encrypting and signing data and communication"
 TERMUX_PKG_VERSION=1.4.21

+TERMUX_PKG_BUILD_REVISION=1

 TERMUX_PKG_SRCURL=ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-${TERMUX_PKG_VERSION}.tar.bz2
 # disable readline since gnupg is used in bootstrap, so nice to avoid readline+ncurses dependencies.
 # ac_cv_sys_symbol_underscore=no needed for i686 build to avoid "undefined reference to `mpihelp_sub_n'" errors
 TERMUX_PKG_SRCURL=ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-${TERMUX_PKG_VERSION}.tar.bz2
 # disable readline since gnupg is used in bootstrap, so nice to avoid readline+ncurses dependencies.
 # ac_cv_sys_symbol_underscore=no needed for i686 build to avoid "undefined reference to `mpihelp_sub_n'" errors

diff --git a/packages/gnupg/gpgv.subpackage.sh b/packages/gnupg/gpgv.subpackage.sh
new file mode 100644 (file)
index 0000000..d66d81c
--- /dev/null
+++ b/packages/gnupg/gpgv.subpackage.sh
@@ -0,0 +1,4 @@
+TERMUX_SUBPKG_INCLUDE="bin/gpgv share/man/man1/gpgv.1"
+TERMUX_SUBPKG_DESCRIPTION="GNU privacy guard - signature verification tool"
+# Conflict with older gnupg package before splitting out gpgv:
+TERMUX_SUBPKG_CONFLICTS="gnupg (<= 1.4.21)"