| components/sysutils/gnupg/Makefile | ●●●●● patch | view | raw | blame | history | |
| components/sysutils/gnupg/depend.mk | ●●●●● patch | view | raw | blame | history | |
| components/sysutils/gnupg/gnupg.p5m | ●●●●● patch | view | raw | blame | history | |
| components/sysutils/gnupg/manifests/sample-manifest.p5m | ●●●●● patch | view | raw | blame | history | |
| components/sysutils/gnupg/patches/01-use-openldap.patch | ●●●●● patch | view | raw | blame | history | |
| tools/.gnupg/pubring.gpg | patch | view | raw | blame | history |
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 components/sysutils/gnupg/depend.mk
File was deleted components/sysutils/gnupg/gnupg.p5m
@@ -20,6 +20,7 @@ # # Copyright (c) 2013, Colin Ellis. All rights reserved. # Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2019, Michal Nowak # <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted> <transform dir path=usr/share/gnupg$ -> default facet.locale true> @@ -28,37 +29,38 @@ set name=pkg.fmri value=pkg:/crypto/gnupg@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) set name=pkg.summary value="GNU Privacy Guard" set name=pkg.description value="A complete and free implementation of the OpenPGP Standard as defined by RFC4880." set name=com.oracle.info.description value="GNU Privacy Guard" set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities" set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) set name=info.source-url value=$(COMPONENT_ARCHIVE_URL) set name=org.opensolaris.arc-caseid \ value=PSARC/2009/397 set name=org.opensolaris.consolidation value=$(CONSOLIDATION) # # file path=usr/bin/gnupg-pcsc-wrapper depend fmri=__TBD pkg.debug.depend.file=usr/lib/pinentry type=require license gnupg.license license="GPLv3, LGPLv3" file path=usr/bin/dirmngr file path=usr/bin/dirmngr-client file path=usr/bin/dirmngr_ldap file path=usr/bin/gpg-agent file path=usr/bin/gpg-check-pattern file path=usr/bin/gpg-connect-agent file path=usr/bin/gpg-preset-passphrase file path=usr/bin/gpg-protect-tool file path=usr/bin/gpg-wks-client file path=usr/bin/gpg-wks-server file path=usr/bin/gpg2 file path=usr/bin/gpg2keys_curl file path=usr/bin/gpg2keys_finger file path=usr/bin/gpg2keys_hkp file path=usr/bin/gpg2keys_ldap file path=usr/bin/gpgconf file path=usr/bin/gpgkey2ssh file path=usr/bin/gpgparsemail file path=usr/bin/gpgscm file path=usr/bin/gpgsm file path=usr/bin/gpgsm-gencert.sh file path=usr/bin/gpgtar file path=usr/bin/gpgv2 file path=usr/bin/kbxutil file path=usr/bin/scdaemon file path=usr/bin/watchgnupg file path=usr/sbin/addgnupghome file path=usr/sbin/applygnupgdefaults file path=usr/share/doc/gnupg/DCO file path=usr/share/doc/gnupg/DETAILS file path=usr/share/doc/gnupg/FAQ file path=usr/share/doc/gnupg/HACKING @@ -67,12 +69,21 @@ file path=usr/share/doc/gnupg/README file path=usr/share/doc/gnupg/TRANSLATE file path=usr/share/doc/gnupg/examples/README file path=usr/share/doc/gnupg/examples/debug.prf file path=usr/share/doc/gnupg/examples/gpgconf.conf file path=usr/share/doc/gnupg/examples/pwpattern.list file path=usr/share/doc/gnupg/examples/scd-event file path=usr/share/doc/gnupg/examples/systemd-user/README file path=usr/share/doc/gnupg/examples/systemd-user/dirmngr.service file path=usr/share/doc/gnupg/examples/systemd-user/dirmngr.socket file path=usr/share/doc/gnupg/examples/systemd-user/gpg-agent-browser.socket file path=usr/share/doc/gnupg/examples/systemd-user/gpg-agent-extra.socket file path=usr/share/doc/gnupg/examples/systemd-user/gpg-agent-ssh.socket file path=usr/share/doc/gnupg/examples/systemd-user/gpg-agent.service file path=usr/share/doc/gnupg/examples/systemd-user/gpg-agent.socket file path=usr/share/doc/gnupg/examples/trustlist.txt file path=usr/share/gnupg/com-certs.pem file path=usr/share/gnupg/gpg-conf.skel file path=usr/share/doc/gnupg/examples/vsnfd.prf file path=usr/share/gnupg/distsigkey.gpg file path=usr/share/gnupg/help.be.txt file path=usr/share/gnupg/help.ca.txt file path=usr/share/gnupg/help.cs.txt @@ -101,17 +112,18 @@ file path=usr/share/gnupg/help.txt file path=usr/share/gnupg/help.zh_CN.txt file path=usr/share/gnupg/help.zh_TW.txt file path=usr/share/gnupg/qualified.txt file path=usr/share/gnupg/sks-keyservers.netCA.pem #file path=usr/share/info/dir file path=usr/share/info/gnupg.info file path=usr/share/info/gnupg.info-1 file path=usr/share/info/gnupg.info-2 file path=usr/share/locale/be/LC_MESSAGES/gnupg2.mo file path=usr/share/locale/ca/LC_MESSAGES/gnupg2.mo file path=usr/share/locale/cs/LC_MESSAGES/gnupg2.mo file path=usr/share/locale/da/LC_MESSAGES/gnupg2.mo file path=usr/share/locale/de/LC_MESSAGES/gnupg2.mo file path=usr/share/locale/el/LC_MESSAGES/gnupg2.mo file path=usr/share/locale/en/LC_MESSAGES/gnupg2.mo file path=usr/share/locale/en@boldquot/LC_MESSAGES/gnupg2.mo file path=usr/share/locale/en@quot/LC_MESSAGES/gnupg2.mo file path=usr/share/locale/eo/LC_MESSAGES/gnupg2.mo file path=usr/share/locale/es/LC_MESSAGES/gnupg2.mo @@ -124,10 +136,8 @@ file path=usr/share/locale/it/LC_MESSAGES/gnupg2.mo file path=usr/share/locale/ja/LC_MESSAGES/gnupg2.mo file path=usr/share/locale/nb/LC_MESSAGES/gnupg2.mo file path=usr/share/locale/nl/LC_MESSAGES/gnupg2.mo file path=usr/share/locale/pl/LC_MESSAGES/gnupg2.mo file path=usr/share/locale/pt/LC_MESSAGES/gnupg2.mo file path=usr/share/locale/pt_BR/LC_MESSAGES/gnupg2.mo file path=usr/share/locale/ro/LC_MESSAGES/gnupg2.mo file path=usr/share/locale/ru/LC_MESSAGES/gnupg2.mo file path=usr/share/locale/sk/LC_MESSAGES/gnupg2.mo @@ -136,21 +146,22 @@ file path=usr/share/locale/uk/LC_MESSAGES/gnupg2.mo file path=usr/share/locale/zh_CN/LC_MESSAGES/gnupg2.mo file path=usr/share/locale/zh_TW/LC_MESSAGES/gnupg2.mo file path=usr/share/man/man1/dirmngr-client.1 file path=usr/share/man/man1/gpg-agent.1 file path=usr/share/man/man1/gpg-connect-agent.1 file path=usr/share/man/man1/gpg-preset-passphrase.1 file path=usr/share/man/man1/gpg-wks-client.1 file path=usr/share/man/man1/gpg-wks-server.1 file path=usr/share/man/man1/gpg2.1 file path=usr/share/man/man1/gpgconf.1 file path=usr/share/man/man1/gpgparsemail.1 file path=usr/share/man/man1/gpgsm-gencert.sh.1 file path=usr/share/man/man1/gpgsm.1 file path=usr/share/man/man1/gpgtar.1 file path=usr/share/man/man1/gpgv2.1 file path=usr/share/man/man1/scdaemon.1 file path=usr/share/man/man1/symcryptrun.1 file path=usr/share/man/man1/watchgnupg.1 file path=usr/share/man/man1m/addgnupghome.1m file path=usr/share/man/man1m/applygnupgdefaults.1m # license gnupg.license license="GPLv3, LGPLv3" # depend fmri=__TBD pkg.debug.depend.file=usr/lib/pinentry type=require file path=usr/share/man/man1m/dirmngr.8 file path=usr/share/man/man7/gnupg.7 components/sysutils/gnupg/manifests/sample-manifest.p5m
@@ -10,7 +10,7 @@ # # # Copyright 2016 <contributor> # Copyright 2018 <contributor> # set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) @@ -22,28 +22,29 @@ license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)' file path=usr/bin/gnupg-pcsc-wrapper file path=usr/bin/dirmngr file path=usr/bin/dirmngr-client file path=usr/bin/dirmngr_ldap file path=usr/bin/gpg-agent file path=usr/bin/gpg-check-pattern file path=usr/bin/gpg-connect-agent file path=usr/bin/gpg-preset-passphrase file path=usr/bin/gpg-protect-tool file path=usr/bin/gpg-wks-client file path=usr/bin/gpg-wks-server file path=usr/bin/gpg2 file path=usr/bin/gpg2keys_curl file path=usr/bin/gpg2keys_finger file path=usr/bin/gpg2keys_hkp file path=usr/bin/gpg2keys_ldap file path=usr/bin/gpgconf file path=usr/bin/gpgkey2ssh file path=usr/bin/gpgparsemail file path=usr/bin/gpgscm file path=usr/bin/gpgsm file path=usr/bin/gpgsm-gencert.sh file path=usr/bin/gpgtar file path=usr/bin/gpgv2 file path=usr/bin/kbxutil file path=usr/bin/scdaemon file path=usr/bin/watchgnupg file path=usr/sbin/addgnupghome file path=usr/sbin/applygnupgdefaults file path=usr/share/doc/gnupg/DCO file path=usr/share/doc/gnupg/DETAILS file path=usr/share/doc/gnupg/FAQ file path=usr/share/doc/gnupg/HACKING @@ -52,12 +53,21 @@ file path=usr/share/doc/gnupg/README file path=usr/share/doc/gnupg/TRANSLATE file path=usr/share/doc/gnupg/examples/README file path=usr/share/doc/gnupg/examples/debug.prf file path=usr/share/doc/gnupg/examples/gpgconf.conf file path=usr/share/doc/gnupg/examples/pwpattern.list file path=usr/share/doc/gnupg/examples/scd-event file path=usr/share/doc/gnupg/examples/systemd-user/README file path=usr/share/doc/gnupg/examples/systemd-user/dirmngr.service file path=usr/share/doc/gnupg/examples/systemd-user/dirmngr.socket file path=usr/share/doc/gnupg/examples/systemd-user/gpg-agent-browser.socket file path=usr/share/doc/gnupg/examples/systemd-user/gpg-agent-extra.socket file path=usr/share/doc/gnupg/examples/systemd-user/gpg-agent-ssh.socket file path=usr/share/doc/gnupg/examples/systemd-user/gpg-agent.service file path=usr/share/doc/gnupg/examples/systemd-user/gpg-agent.socket file path=usr/share/doc/gnupg/examples/trustlist.txt file path=usr/share/gnupg/com-certs.pem file path=usr/share/gnupg/gpg-conf.skel file path=usr/share/doc/gnupg/examples/vsnfd.prf file path=usr/share/gnupg/distsigkey.gpg file path=usr/share/gnupg/help.be.txt file path=usr/share/gnupg/help.ca.txt file path=usr/share/gnupg/help.cs.txt @@ -86,12 +96,11 @@ file path=usr/share/gnupg/help.txt file path=usr/share/gnupg/help.zh_CN.txt file path=usr/share/gnupg/help.zh_TW.txt file path=usr/share/gnupg/qualified.txt file path=usr/share/gnupg/sks-keyservers.netCA.pem file path=usr/share/info/dir file path=usr/share/info/gnupg.info file path=usr/share/info/gnupg.info-1 file path=usr/share/info/gnupg.info-2 file path=usr/share/locale/be/LC_MESSAGES/gnupg2.mo file path=usr/share/locale/ca/LC_MESSAGES/gnupg2.mo file path=usr/share/locale/cs/LC_MESSAGES/gnupg2.mo file path=usr/share/locale/da/LC_MESSAGES/gnupg2.mo @@ -111,10 +120,8 @@ file path=usr/share/locale/it/LC_MESSAGES/gnupg2.mo file path=usr/share/locale/ja/LC_MESSAGES/gnupg2.mo file path=usr/share/locale/nb/LC_MESSAGES/gnupg2.mo file path=usr/share/locale/nl/LC_MESSAGES/gnupg2.mo file path=usr/share/locale/pl/LC_MESSAGES/gnupg2.mo file path=usr/share/locale/pt/LC_MESSAGES/gnupg2.mo file path=usr/share/locale/pt_BR/LC_MESSAGES/gnupg2.mo file path=usr/share/locale/ro/LC_MESSAGES/gnupg2.mo file path=usr/share/locale/ru/LC_MESSAGES/gnupg2.mo file path=usr/share/locale/sk/LC_MESSAGES/gnupg2.mo @@ -123,17 +130,22 @@ file path=usr/share/locale/uk/LC_MESSAGES/gnupg2.mo file path=usr/share/locale/zh_CN/LC_MESSAGES/gnupg2.mo file path=usr/share/locale/zh_TW/LC_MESSAGES/gnupg2.mo file path=usr/share/man/man1/dirmngr-client.1 file path=usr/share/man/man1/gpg-agent.1 file path=usr/share/man/man1/gpg-connect-agent.1 file path=usr/share/man/man1/gpg-preset-passphrase.1 file path=usr/share/man/man1/gpg-wks-client.1 file path=usr/share/man/man1/gpg-wks-server.1 file path=usr/share/man/man1/gpg2.1 file path=usr/share/man/man1/gpgconf.1 file path=usr/share/man/man1/gpgparsemail.1 file path=usr/share/man/man1/gpgsm-gencert.sh.1 file path=usr/share/man/man1/gpgsm.1 file path=usr/share/man/man1/gpgtar.1 file path=usr/share/man/man1/gpgv2.1 file path=usr/share/man/man1/scdaemon.1 file path=usr/share/man/man1/symcryptrun.1 file path=usr/share/man/man1/watchgnupg.1 file path=usr/share/man/man1m/addgnupghome.1m file path=usr/share/man/man1m/applygnupgdefaults.1m file path=usr/share/man/man1m/dirmngr.8 file path=usr/share/man/man7/gnupg.7 components/sysutils/gnupg/patches/01-use-openldap.patch
New file @@ -0,0 +1,11 @@ --- gnupg-2.2.17/dirmngr/ldap-parse-uri.c 2017-08-28 12:22:54.000000000 +0000 +++ gnupg-2.2.17/dirmngr/ldap-parse-uri.c.new 2019-07-19 18:00:44.660541625 +0000 @@ -24,7 +24,7 @@ #ifdef HAVE_W32_SYSTEM # include "ldap-url.h" #else -# include <ldap.h> +# include <openldap/ldap.h> #endif #include "../common/util.h" tools/.gnupg/pubring.gpgBinary files differ
