diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile index 018ca8a1bfa3..da89e93fc2e4 100644 --- a/security/gnupg/Makefile +++ b/security/gnupg/Makefile @@ -1,80 +1,83 @@ PORTNAME= gnupg -DISTVERSION= 2.3.8 +DISTVERSION= 2.4.3 CATEGORIES= security MASTER_SITES= GNUPG +PATCH_SITES= https://github.com/gpg/${PORTNAME}/commit/ +PATCHFILES+= 9ae3cfcabec9252c22d67b7a15c36f0a8cf22f0f.patch:-p1 #Fix linking without LDAP + MAINTAINER= adridg@FreeBSD.org COMMENT= Complete and free PGP implementation WWW= https://www.gnupg.org/ LICENSE= GPLv3 LGPL3 LICENSE_COMB= multi LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LGPL3 LIB_DEPENDS= libassuan.so:security/libassuan \ libgcrypt.so:security/libgcrypt \ libgpg-error.so:security/libgpg-error \ libksba.so:security/libksba \ libnpth.so:devel/npth RUN_DEPENDS= pinentry:security/pinentry USES= compiler:c11 cpe gmake iconv makeinfo pkgconfig readline sqlite tar:bzip2 CONFLICTS= dirmngr CPE_VENDOR= gnupg CONFIGURE_ARGS= --disable-ntbtls --enable-gpg-is-gpg2 GNU_CONFIGURE= yes INFO= gnupg TEST_TARGET= check TEST_ARGS= TESTARGS=--parallel OPTIONS_DEFINE= DOCS GNUTLS LARGE_RSA LDAP NLS SCDAEMON SUID_GPG WKS_SERVER OPTIONS_DEFAULT=GNUTLS SCDAEMON WKS_SERVER OPTIONS_SUB= yes LARGE_RSA_DESC= Enable support for 8192-bit RSA keys LDAP_DESC= LDAP keyserver interface SCDAEMON_DESC= Enable Smartcard daemon (with libusb) SUID_GPG_DESC= Install GPG as SUID root WKS_SERVER_DESC=Install the Web Key Service server GNUTLS_CONFIGURE_ENABLE=gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls LARGE_RSA_CONFIGURE_ENABLE= large-secmem LDAP_CONFIGURE_WITH= ldap=${LOCALBASE} LDAP_LIBS= -L${LOCALBASE}/lib LDAP_USES= ldap NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext SCDAEMON_CONFIGURE_ENABLE= scdaemon WKS_SERVER_CONFIGURE_ENABLE= wks-tools .include .if ${PORT_OPTIONS:MGNUTLS} && ${PORT_OPTIONS:MLDAP} PLIST_SUB+= DIRMNGRLDAP="" .else PLIST_SUB+= DIRMNGRLDAP="@comment " .endif # Touch the texinfo files to force makeinfo to run. This fixes Linuxisms in # the paths in the man pages. pre-build: ${TOUCH} ${WRKSRC}/doc/*.texi post-install: ${MV} ${STAGEDIR}${PREFIX}/bin/gpgsplit ${STAGEDIR}${PREFIX}/bin/gpgsplit2 ${MV} ${STAGEDIR}${DATADIR}/help*.txt ${STAGEDIR}${DOCSDIR} # Necessary because of --enable-gpg-is-gpg2 pre-test: ${LN} -s gpg ${WRKSRC}/bin/gpg2 .include diff --git a/security/gnupg/distinfo b/security/gnupg/distinfo index 72aa673c8552..59804d414b94 100644 --- a/security/gnupg/distinfo +++ b/security/gnupg/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1666020426 -SHA256 (gnupg-2.3.8.tar.bz2) = 540b7a40e57da261fb10ef521a282e0021532a80fd023e75fb71757e8a4969ed -SIZE (gnupg-2.3.8.tar.bz2) = 7644926 +TIMESTAMP = 1689011640 +SHA256 (gnupg-2.4.3.tar.bz2) = a271ae6d732f6f4d80c258ad9ee88dd9c94c8fdc33c3e45328c4d7c126bd219d +SIZE (gnupg-2.4.3.tar.bz2) = 7351327 +SHA256 (9ae3cfcabec9252c22d67b7a15c36f0a8cf22f0f.patch) = 186154a2bd7750c212571c8be51a6f02d56e323d001673f2abe7342181d49d13 +SIZE (9ae3cfcabec9252c22d67b7a15c36f0a8cf22f0f.patch) = 806 diff --git a/security/gnupg/files/patch-dirmngr_server.c b/security/gnupg/files/patch-dirmngr_server.c deleted file mode 100644 index 3a20a36994a1..000000000000 --- a/security/gnupg/files/patch-dirmngr_server.c +++ /dev/null @@ -1,13 +0,0 @@ ---- dirmngr/server.c.orig 2022-10-07 13:23:50 UTC -+++ dirmngr/server.c -@@ -3137,8 +3137,10 @@ start_command_handler (assuan_fd_t fd, unsigned int se - ctrl->refcount); - else - { -+#if USE_LDAP - ks_ldap_free_state (ctrl->ks_get_state); - ctrl->ks_get_state = NULL; -+#endif /*USE_LDAP*/ - release_ctrl_ocsp_certs (ctrl); - xfree (ctrl->server_local); - dirmngr_deinit_default_ctrl (ctrl); diff --git a/security/gnupg/pkg-plist b/security/gnupg/pkg-plist index 33becc416461..49090edb2b2e 100644 --- a/security/gnupg/pkg-plist +++ b/security/gnupg/pkg-plist @@ -1,136 +1,125 @@ %%GNUTLS%%bin/dirmngr %%GNUTLS%%bin/dirmngr-client bin/gpg-agent bin/gpg-card bin/gpg-connect-agent bin/gpg-wks-client %%WKS_SERVER%%bin/gpg-wks-server %%SUID_GPG%%@(,,4555) bin/gpg2 %%NO_SUID_GPG%%bin/gpg2 bin/gpgconf bin/gpgparsemail bin/gpgscm bin/gpgsm bin/gpgsplit2 bin/gpgtar bin/gpgv2 bin/kbxutil bin/watchgnupg %%DIRMNGRLDAP%%libexec/dirmngr_ldap libexec/gpg-auth libexec/gpg-check-pattern libexec/gpg-pair-tool libexec/gpg-preset-passphrase libexec/gpg-protect-tool libexec/gpg-wks-client libexec/keyboxd %%SCDAEMON%%libexec/scdaemon man/man1/dirmngr-client.1.gz man/man1/gpg-agent.1.gz man/man1/gpg-card.1.gz man/man1/gpg-check-pattern.1.gz man/man1/gpg-connect-agent.1.gz man/man1/gpg-preset-passphrase.1.gz man/man1/gpg-wks-client.1.gz %%WKS_SERVER%%man/man1/gpg-wks-server.1.gz man/man1/gpg2.1.gz man/man1/gpgconf.1.gz man/man1/gpgparsemail.1.gz man/man1/gpgsm.1.gz man/man1/gpgtar.1.gz man/man1/gpgv2.1.gz man/man1/scdaemon.1.gz man/man1/watchgnupg.1.gz man/man7/gnupg.7.gz man/man8/addgnupghome.8.gz man/man8/applygnupgdefaults.8.gz man/man8/dirmngr.8.gz sbin/addgnupghome sbin/applygnupgdefaults %%PORTDOCS%%%%DOCSDIR%%/DCO %%PORTDOCS%%%%DOCSDIR%%/DETAILS %%PORTDOCS%%%%DOCSDIR%%/FAQ %%PORTDOCS%%%%DOCSDIR%%/HACKING %%PORTDOCS%%%%DOCSDIR%%/KEYSERVER %%PORTDOCS%%%%DOCSDIR%%/OpenPGP %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/TRANSLATE -%%PORTDOCS%%%%DOCSDIR%%/examples/Automatic.prf %%PORTDOCS%%%%DOCSDIR%%/examples/README -%%PORTDOCS%%%%DOCSDIR%%/examples/VS-NfD.prf %%PORTDOCS%%%%DOCSDIR%%/examples/common.conf -%%PORTDOCS%%%%DOCSDIR%%/examples/debug.prf %%PORTDOCS%%%%DOCSDIR%%/examples/gpgconf.conf %%PORTDOCS%%%%DOCSDIR%%/examples/gpgconf.rnames %%PORTDOCS%%%%DOCSDIR%%/examples/pwpattern.list %%PORTDOCS%%%%DOCSDIR%%/examples/qualified.txt %%PORTDOCS%%%%DOCSDIR%%/examples/scd-event -%%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/README -%%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/dirmngr.service -%%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/dirmngr.socket -%%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/gpg-agent-browser.socket -%%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/gpg-agent-extra.socket -%%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/gpg-agent-ssh.socket -%%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/gpg-agent.service -%%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/gpg-agent.socket %%PORTDOCS%%%%DOCSDIR%%/examples/trustlist.txt %%PORTDOCS%%%%DOCSDIR%%/help.be.txt %%PORTDOCS%%%%DOCSDIR%%/help.ca.txt %%PORTDOCS%%%%DOCSDIR%%/help.cs.txt %%PORTDOCS%%%%DOCSDIR%%/help.da.txt %%PORTDOCS%%%%DOCSDIR%%/help.de.txt %%PORTDOCS%%%%DOCSDIR%%/help.el.txt %%PORTDOCS%%%%DOCSDIR%%/help.eo.txt %%PORTDOCS%%%%DOCSDIR%%/help.es.txt %%PORTDOCS%%%%DOCSDIR%%/help.et.txt %%PORTDOCS%%%%DOCSDIR%%/help.fi.txt %%PORTDOCS%%%%DOCSDIR%%/help.fr.txt %%PORTDOCS%%%%DOCSDIR%%/help.gl.txt %%PORTDOCS%%%%DOCSDIR%%/help.hu.txt %%PORTDOCS%%%%DOCSDIR%%/help.id.txt %%PORTDOCS%%%%DOCSDIR%%/help.it.txt %%PORTDOCS%%%%DOCSDIR%%/help.ja.txt %%PORTDOCS%%%%DOCSDIR%%/help.nb.txt %%PORTDOCS%%%%DOCSDIR%%/help.pl.txt %%PORTDOCS%%%%DOCSDIR%%/help.pt.txt %%PORTDOCS%%%%DOCSDIR%%/help.pt_BR.txt %%PORTDOCS%%%%DOCSDIR%%/help.ro.txt %%PORTDOCS%%%%DOCSDIR%%/help.ru.txt %%PORTDOCS%%%%DOCSDIR%%/help.sk.txt %%PORTDOCS%%%%DOCSDIR%%/help.sv.txt %%PORTDOCS%%%%DOCSDIR%%/help.tr.txt %%PORTDOCS%%%%DOCSDIR%%/help.txt %%PORTDOCS%%%%DOCSDIR%%/help.zh_CN.txt %%PORTDOCS%%%%DOCSDIR%%/help.zh_TW.txt %%DATADIR%%/distsigkey.gpg %%GNUTLS%%%%DATADIR%%/sks-keyservers.netCA.pem %%NLS%%share/locale/ca/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/cs/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/da/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/de/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/el/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/en@boldquot/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/en@quot/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/eo/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/es/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/et/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/fi/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/fr/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/gl/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/hu/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/id/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/it/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/ja/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/nb/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/pl/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/pt/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/ro/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/ru/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/sk/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/sv/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/tr/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/uk/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/gnupg2.mo @postexec [ -e %D/bin/gpg ] || ln -sf gpg2 %D/bin/gpg @postunexec [ -e %D/bin/gpg ] || rm -f %D/bin/gpg