From 5bc8da79e2f9f87a1aca2fbe1cec7d53f12f2ff4 Mon Sep 17 00:00:00 2001 From: Michal Nowak <mnowak@startmail.com> Date: Mon, 29 Jul 2019 12:35:47 +0200 Subject: [PATCH] Update GnuPG to 2.2.17 --- components/sysutils/gnupg/Makefile | 72 ++++++++++++++--------------------- 1 files changed, 29 insertions(+), 43 deletions(-) diff --git a/components/sysutils/gnupg/Makefile b/components/sysutils/gnupg/Makefile index 8d6c408..8e1d085 100644 --- a/components/sysutils/gnupg/Makefile +++ b/components/sysutils/gnupg/Makefile @@ -20,48 +20,49 @@ # # Copyright (c) 2013, Colin Ellis. All rights reserved. # Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2019, Michal Nowak # + include ../../../make-rules/shared-macros.mk COMPONENT_NAME= gnupg -COMPONENT_VERSION= 2.0.30 +COMPONENT_VERSION= 2.2.17 COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_PROJECT_URL= http://www.gnupg.org/ COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.bz2 COMPONENT_ARCHIVE_HASH= \ - sha256:e329785a4f366ba5d72c2c678a7e388b0892ac8440c2f4e6810042123c235d71 + sha256:afa262868e39b651a2db4c071fba90415154243e83a830ca00516f9a807fd514 COMPONENT_ARCHIVE_URL= ftp://ftp.gnupg.org/gcrypt/gnupg/$(COMPONENT_ARCHIVE) -COMPONENT_SIG_URL= $(COMPONENT_ARCHIVE_URL).sig -COMPONENT_BUGDB= utility/gnupg include $(WS_MAKE_RULES)/prep.mk include $(WS_MAKE_RULES)/configure.mk include $(WS_MAKE_RULES)/ips.mk -# Enable C99 mode + -Xc for its additional warnings. -#studio_C99MODE = -Xc $(studio_C99_ENABLE) +PATH=$(PATH.gnu) -# -xinline=%auto -- we like inlining where appropriate -#CFLAGS += -xinline=%auto +# Force use of gnutls-3 pkgconfig during 2.x->3.x transition +GNUTLS_PKG_CONFIG_PATH_32 = /usr/lib/pkgconfig/gnutls-3 +GNUTLS_PKG_CONFIG_PATH_64 = /usr/lib/$(MACH64)/pkgconfig/gnutls-3 +PKG_CONFIG_PATH = $(GNUTLS_PKG_CONFIG_PATH_$(BITS)):$(PKG_CONFIG_PATH.$(BITS)) -# -xbuiltin=%none -- builtins have been known to be buggy -#CFLAGS += -xbuiltin=%none +LD_OPTIONS.32 += -L/usr/lib/gnutls-3 -R/usr/lib/gnutls-3 +LD_OPTIONS.64 += -L/usr/lib/$(MACH64)/gnutls-3 -R/usr/lib/$(MACH64)/gnutls-3 +LD_OPTIONS += $(LD_OPTIONS.$(BITS)) CFLAGS += $(CPP_LARGEFILES) -#CFLAGS += $(XPG6MODE) -#CFLAGS += $(CPP_POSIX) -#CFLAGS += $(CPP_C99_EXTENDED_MATH) -#CFLAGS += $(studio_PIC) +CFLAGS += -I/usr/include/openldap +CFLAGS += -I/usr/include/gnutls-3 # If we pass -lc, -mt won't link with -lthread # (which is what it does by default, and we don't # want that, because we use POSIX threads). -LDFLAGS += -lc -z defs +LDFLAGS += -lc -z defs -lsocket -lnsl LD_OPTIONS += -z defs CONFIGURE_ENV += CFLAGS="$(CFLAGS)" CONFIGURE_ENV += LDFLAGS="$(LDFLAGS)" CONFIGURE_ENV += INSTALL="$(INSTALL)" +CONFIGURE_ENV += LDAPLIBS="-lldap-2.4 -llber-2.4" CONFIGURE_OPTIONS += --localstatedir=/var CONFIGURE_OPTIONS += --libexecdir=$(USRBINDIR) @@ -71,52 +72,35 @@ CONFIGURE_OPTIONS += --enable-nls CONFIGURE_OPTIONS += --enable-largefile CONFIGURE_OPTIONS += --disable-selinux-support +# gpg -> gpg2 +CONFIGURE_OPTIONS += --enable-gpg-is-gpg2 CONFIGURE_OPTIONS += --with-pinentry-pgm=$(CONFIGURE_PREFIX)/lib/pinentry CONFIGURE_OPTIONS += --with-gpg-error-prefix=$(CONFIGURE_PREFIX) CONFIGURE_OPTIONS += --with-libassuan-prefix=$(CONFIGURE_PREFIX) CONFIGURE_OPTIONS += --with-ksba-prefix=$(CONFIGURE_PREFIX) -CONFIGURE_OPTIONS += --with-pth-prefix=$(CONFIGURE_PREFIX) -CONFIGURE_OPTIONS += --with-libcurl=$(CONFIGURE_PREFIX) CONFIGURE_OPTIONS += --with-libiconv-prefix=$(CONFIGURE_PREFIX) CONFIGURE_OPTIONS += --with-libintl-prefix=$(CONFIGURE_PREFIX) CONFIGURE_OPTIONS += --with-zlib=$(CONFIGURE_PREFIX) CONFIGURE_OPTIONS += --with-bzip2=$(CONFIGURE_PREFIX) CONFIGURE_OPTIONS += --with-readline=$(CONFIGURE_PREFIX) -LIBKSBA_MANIFEST = manifest-$(MACH)-libksba.depend -LIBASSUAN_MANIFEST = manifest-$(MACH)-libassuan.depend -GPGME_MANIFEST = manifest-$(MACH)-gpgme.depend -PINENTRY_MANIFEST = manifest-$(MACH)-pinentry.depend - -# Work around pkgdepend bug which doesn't resolve dependencies from -# the local workspace repo. Fortunately we only have to do this once. -DEPENDED += $(WS_TOP)/components/library/libksba/build/$(LIBKSBA_MANIFEST) -DEPENDED += $(WS_TOP)/components/library/libassuan/build/$(LIBASSUAN_MANIFEST) -DEPENDED += $(WS_TOP)/components/sysutils/gpgme/build/$(GPGME_MANIFEST) -DEPENDED += $(WS_TOP)/components/sysutils/pinentry/build/$(PINENTRY_MANIFEST) - -PKG_PROTO_DIRS += $(WS_TOP)/components/library/libksba -PKG_PROTO_DIRS += $(WS_TOP)/components/library/libassuan -PKG_PROTO_DIRS += $(WS_TOP)/components/sysutils/gpgme -PKG_PROTO_DIRS += $(WS_TOP)/components/sysutils/pinentry - MAN8LIST = addgnupghome applygnupgdefaults -build: $(BUILD_32) +build: $(BUILD_32) -install: $(INSTALL_32) +install: $(INSTALL_32) ( cd $(PROTOUSRSHARELOCALEDIR) ; \ $(CP) -R 'en@boldquot' en ) ( cd $(PROTOUSRSHAREMANDIR) ; \ if test -d man8 ; then \ - $(MV) man8 man1m ; fi ) + $(MV) -f man8 man1m ; fi ) ( cd $(PROTOUSRSHAREMANDIR)/man1m ; \ list1='$(MAN8LIST)' ; for f in $$list1; do \ if test -f $$f.8 ; then \ - $(MV) $$f.8 $$f.1m ; fi ; \ + $(MV) -f $$f.8 $$f.1m ; fi ; \ done ) -test: $(TEST_32) +test: $(TEST_32) # Missing dependencies for pinentry REQUIRED_PACKAGES += library/desktop/gtk2 @@ -124,16 +108,18 @@ REQUIRED_PACKAGES += library/libsecret # Auto-generated dependencies -REQUIRED_PACKAGES += SUNWcs REQUIRED_PACKAGES += compress/bzip2 -REQUIRED_PACKAGES += library/pth +REQUIRED_PACKAGES += database/sqlite-3 +REQUIRED_PACKAGES += library/gnutls-3 +REQUIRED_PACKAGES += library/libusb-1 +REQUIRED_PACKAGES += library/npth +REQUIRED_PACKAGES += library/openldap REQUIRED_PACKAGES += library/readline REQUIRED_PACKAGES += library/security/libassuan REQUIRED_PACKAGES += library/security/libgpg-error REQUIRED_PACKAGES += library/security/libksba REQUIRED_PACKAGES += library/zlib REQUIRED_PACKAGES += security/pinentry +REQUIRED_PACKAGES += SUNWcs REQUIRED_PACKAGES += system/library REQUIRED_PACKAGES += system/library/security/libgcrypt -REQUIRED_PACKAGES += system/library/usb/libusb -REQUIRED_PACKAGES += web/curl -- Gitblit v1.9.3