diff options
Diffstat (limited to 'package/gnupg2')
| -rw-r--r-- | package/gnupg2/Makefile | 14 | ||||
| -rw-r--r-- | package/gnupg2/patches/patch-Makefile_in | 23 |
2 files changed, 9 insertions, 28 deletions
diff --git a/package/gnupg2/Makefile b/package/gnupg2/Makefile index de1b8f03b..64e94c4da 100644 --- a/package/gnupg2/Makefile +++ b/package/gnupg2/Makefile @@ -4,18 +4,18 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= gnupg2 -PKG_VERSION:= 2.2.7 +PKG_VERSION:= 2.4.8 PKG_RELEASE:= 1 -PKG_HASH:= d95b361ee6ef7eff86af40c8c72bf9313736ac9f7010d6604d78bf83818e976e +PKG_HASH:= b58c80d79b04d3243ff49c1c3fc6b5f83138eb3784689563bcdd060595318616 PKG_DESCR:= gnu privacy guard (modern) PKG_SECTION:= app/crypto PKG_DEPENDS:= libreadline libncurses libgcrypt libgpg-error libassuan -PKG_DEPENDS+= libksba npth +PKG_DEPENDS+= libksba npth pinentry PKG_BUILDDEP:= readline ncurses libgcrypt libgpg-error libassuan PKG_BUILDDEP+= libksba npth PKG_NEEDS:= iconv PKG_URL:= http://www.gnupg.org/ -PKG_SITES:= ftp://ftp.gnupg.org/gcrypt/gnupg/ +PKG_SITES:= https://www.gnupg.org/ftp/gcrypt/gnupg/ DISTFILES:= gnupg-$(PKG_VERSION).tar.bz2 WRKDIST= ${WRKDIR}/gnupg-${PKG_VERSION} @@ -28,6 +28,7 @@ $(eval $(call PKG_template,GNUPG2,gnupg2,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEP $(eval $(call PKG_template,GPGV2,gpgv2,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) CONFIGURE_ARGS+= --disable-dirmngr \ + --disable-keyboxd \ --disable-gpgsm \ --disable-scdaemon \ --disable-card-support \ @@ -35,7 +36,9 @@ CONFIGURE_ARGS+= --disable-dirmngr \ --disable-exec \ --disable-ldap \ --disable-rpath \ - --disable-regex + --disable-regex \ + --disable-tests \ + --disable-doc gpgv2-install: $(INSTALL_DIR) $(IDIR_GPGV2)/usr/bin @@ -45,6 +48,7 @@ gpgv2-install: gnupg2-install: $(INSTALL_DIR) $(IDIR_GNUPG2)/usr/bin/ $(INSTALL_BIN) $(WRKBUILD)/g10/gpg $(IDIR_GNUPG2)/usr/bin/ + $(INSTALL_BIN) $(WRKBUILD)/agent/gpg-agent $(IDIR_GNUPG2)/usr/bin/ # we need root privileges for secure memory (locked pages) chmod u+s $(IDIR_GNUPG2)/usr/bin/gpg diff --git a/package/gnupg2/patches/patch-Makefile_in b/package/gnupg2/patches/patch-Makefile_in deleted file mode 100644 index 54361aff9..000000000 --- a/package/gnupg2/patches/patch-Makefile_in +++ /dev/null @@ -1,23 +0,0 @@ ---- gnupg-2.2.0.orig/Makefile.in 2017-08-28 11:21:34.000000000 +0200 -+++ gnupg-2.2.0/Makefile.in 2017-09-06 19:20:04.560251562 +0200 -@@ -220,8 +220,7 @@ am__define_uniq_tagged_files = \ - ETAGS = etags - CTAGS = ctags - CSCOPE = cscope --DIST_SUBDIRS = m4 common kbx g10 sm agent scd g13 dirmngr tools po doc \ -- tests -+DIST_SUBDIRS = m4 common kbx g10 agent scd g13 dirmngr tools - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - distdir = $(PACKAGE)-$(VERSION) - top_distdir = $(distdir) -@@ -492,8 +491,8 @@ DISTCLEANFILES = g10defs.h - @BUILD_DOC_FALSE@doc = - @BUILD_DOC_TRUE@doc = doc - SUBDIRS = m4 common kbx \ -- ${gpg} ${sm} ${agent} ${scd} ${g13} ${dirmngr} \ -- tools po ${doc} tests -+ ${gpg} ${agent} ${scd} ${g13} ${dirmngr} \ -+ tools - - dist_doc_DATA = README - gen_start_date = 2011-12-01T06:00:00 |