From d4ec417b5b1c5774074148fab3a68d22cd6625d2 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Sun, 28 Aug 2016 07:35:27 -0400 Subject: [PATCH] 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. --- packages/apt/build.sh | 3 ++- packages/gnupg/build.sh | 1 + packages/gnupg/gpgv.subpackage.sh | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 packages/gnupg/gpgv.subpackage.sh diff --git a/packages/apt/build.sh b/packages/apt/build.sh index 514ea6cc..dc9289c1 100644 --- 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_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 +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" diff --git a/packages/gnupg/build.sh b/packages/gnupg/build.sh index 0d8e7411..81e77257 100755 --- 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_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 diff --git a/packages/gnupg/gpgv.subpackage.sh b/packages/gnupg/gpgv.subpackage.sh new file mode 100644 index 00000000..d66d81c1 --- /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)" -- 2.11.0