Index: head/security/gnupg/Makefile =================================================================== --- head/security/gnupg/Makefile (revision 431096) +++ head/security/gnupg/Makefile (revision 431097) @@ -1,65 +1,65 @@ # $FreeBSD$ PORTNAME= gnupg PORTVERSION= 2.1.16 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= GNUPG MAINTAINER= adamw@FreeBSD.org COMMENT= The GNU Privacy Guard (modern version) LICENSE= GPLv3 LGPL3 LICENSE_COMB= multi LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LIB LIB_DEPENDS= libassuan.so:security/libassuan \ libgcrypt.so:security/libgcrypt \ libgpg-error.so:security/libgpg-error \ libksba.so:security/libksba \ libnpth.so:devel/npth BUILD_DEPENDS= libassuan>=2.4.3:security/libassuan \ libgpg-error>=1.16:security/libgpg-error RUN_DEPENDS= pinentry:security/pinentry CONFLICTS= gnupg-2.0.* dirmngr-[0-9]* CPE_VENDOR= gnupg USES= compiler:c11 cpe gmake iconv pkgconfig readline sqlite tar:bzip2 USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-ntbtls --enable-symcryptrun --disable-wks-tools INFO= gnupg OPTIONS_DEFINE= GNUTLS LDAP SCDAEMON KDNS NLS DOCS SUID_GPG OPTIONS_DEFAULT=GNUTLS NO_OPTIONS_SORT=yes OPTIONS_SUB= yes KDNS_DESC= Use DNS CERT helper LDAP_DESC= LDAP keyserver interface SCDAEMON_DESC= Enable Smartcard daemon (with libusb) SUID_GPG_DESC= Install GPG with suid # In jail, SUID is required to avoid warning (security.bsd.unprivileged_mlock sysctl is not used in jail). GNUTLS_CONFIGURE_ENABLE=gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls KDNS_LIB_DEPENDS= libadns.so:dns/adns KDNS_CONFIGURE_WITH= adns=${LOCALBASE} LDAP_CONFIGURE_WITH= ldap=${LOCALBASE} LDAP_LIBS= -L${LOCALBASE}/lib LDAP_USE= OPENLDAP=yes LDAP_USES= readline NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext SCDAEMON_CONFIGURE_ENABLE= scdaemon post-install: @${MV} ${STAGEDIR}${DATADIR}/help*.txt ${STAGEDIR}${DOCSDIR} .include Index: head/security/gnupg/pkg-plist =================================================================== --- head/security/gnupg/pkg-plist (revision 431096) +++ head/security/gnupg/pkg-plist (revision 431097) @@ -1,121 +1,121 @@ bin/gpg-agent bin/dirmngr bin/dirmngr-client bin/gpgscm bin/gpgsm bin/gpgtar bin/gpg-connect-agent bin/kbxutil %%SUID_GPG%%@(,,4555) bin/gpg2 %%NO_SUID_GPG%%bin/gpg2 bin/gpgconf bin/gpgparsemail bin/gpgv2 bin/symcryptrun bin/watchgnupg %%LDAP%%libexec/dirmngr_ldap libexec/gpg-check-pattern libexec/gpg-preset-passphrase libexec/gpg-protect-tool libexec/gpg-wks-client %%SCDAEMON%%libexec/scdaemon man/man1/dirmngr-client.1.gz man/man1/gpg-agent.1.gz man/man1/gpg-connect-agent.1.gz man/man1/gpg-preset-passphrase.1.gz man/man1/gpg2.1.gz man/man1/gpgconf.1.gz man/man1/gpgparsemail.1.gz man/man1/gpgsm.1.gz man/man1/gpgv2.1.gz man/man1/scdaemon.1.gz man/man1/symcryptrun.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/README %%PORTDOCS%%%%DOCSDIR%%/examples/gpgconf.conf %%PORTDOCS%%%%DOCSDIR%%/examples/pwpattern.list %%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-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%%/dirmngr-conf.skel %%DATADIR%%/distsigkey.gpg %%DATADIR%%/gpg-conf.skel %%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 -s gpg2 %D/bin/gpg -@postunexec [ "$(readlink %D/bin/gpg)" = "gpg2" ] && rm -f %D/bin/gpg || true +@postexec [ -e %D/bin/gpg ] || ln -sf gpg2 %D/bin/gpg +@postunexec [ -e %D/bin/gpg ] || rm -f %D/bin/gpg Index: head/security/gnupg20/Makefile =================================================================== --- head/security/gnupg20/Makefile (revision 431096) +++ head/security/gnupg20/Makefile (revision 431097) @@ -1,74 +1,74 @@ # $FreeBSD$ PORTNAME= gnupg PORTVERSION= 2.0.29 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= GNUPG PKGNAMESUFFIX= 20 MAINTAINER= adamw@FreeBSD.org COMMENT= The GNU Privacy Guard (stable version) LICENSE= GPLv3 LGPL3 LICENSE_COMB= multi LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LIB LIB_DEPENDS= libassuan.so:security/libassuan \ libgcrypt.so:security/libgcrypt \ libgpg-error.so:security/libgpg-error \ libksba.so:security/libksba \ libpth.so:devel/pth BUILD_DEPENDS= libgpg-error>=1.11:security/libgpg-error RUN_DEPENDS= pinentry:security/pinentry CONFLICTS= gnupg-2.1.* CPE_VENDOR= gnupg USES= cpe gmake iconv readline tar:bzip2 USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-symcryptrun INFO= gnupg OPTIONS_DEFINE= LDAP SCDAEMON CURL GPGSM KDNS STD_SOCKET NLS DOCS SUID_GPG OPTIONS_DEFAULT=CURL NO_OPTIONS_SORT=yes OPTIONS_SUB= yes GPGSM_DESC= Enable GPGSM (requires LDAP) LDAP_DESC= LDAP keyserver interface KDNS_DESC= Use DNS CERT helper SCDAEMON_DESC= Enable Smartcard daemon (with libusb) STD_SOCKET_DESC=Use standard socket for agent SUID_GPG_DESC= Install GPG setuid CURL_LIB_DEPENDS= libcurl.so:ftp/curl CURL_CONFIGURE_WITH= libcurl=${LOCALBASE} GPGSM_RUN_DEPENDS= dirmngr:security/dirmngr GPGSM_CONFIGURE_ENABLE= gpgsm GPGSM_IMPLIES= LDAP KDNS_LIB_DEPENDS= libadns.so:dns/adns KDNS_CONFIGURE_WITH= adns=${LOCALBASE} LDAP_USE= OPENLDAP=yes LDAP_CONFIGURE_WITH= ldap=${LOCALBASE} NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls SCDAEMON_CONFIGURE_ENABLE= scdaemon STD_SOCKET_CONFIGURE_ENABLE= standard-socket post-patch: @${REINPLACE_CMD} -e "/#include /d" \ ${WRKSRC}/tools/symcryptrun.c post-install: @${MV} ${STAGEDIR}${DATADIR}/*.txt ${STAGEDIR}${DOCSDIR} .include Index: head/security/gnupg20/pkg-plist =================================================================== --- head/security/gnupg20/pkg-plist (revision 431096) +++ head/security/gnupg20/pkg-plist (revision 431097) @@ -1,115 +1,115 @@ bin/gpg-agent bin/gpg-connect-agent %%SUID_GPG%%@(,,4555) bin/gpg2 %%NO_SUID_GPG%%bin/gpg2 bin/gpgconf bin/gpgkey2ssh bin/gpgparsemail %%GPGSM%%bin/gpgsm bin/gpgsm-gencert.sh bin/gpgv2 %%GPGSM%%bin/kbxutil bin/symcryptrun bin/watchgnupg libexec/gpg-check-pattern %%SCDAEMON%%libexec/gnupg-pcsc-wrapper libexec/gpg-preset-passphrase libexec/gpg-protect-tool libexec/gpg2keys_curl libexec/gpg2keys_finger libexec/gpg2keys_hkp %%KDNS%%libexec/gpg2keys_kdns %%LDAP%%libexec/gpg2keys_ldap %%SCDAEMON%%libexec/scdaemon man/man1/gpg-agent.1.gz man/man1/gpg-connect-agent.1.gz man/man1/gpg-preset-passphrase.1.gz man/man1/gpg2.1.gz man/man1/gpgconf.1.gz man/man1/gpgparsemail.1.gz man/man1/gpgsm-gencert.sh.1.gz man/man1/gpgsm.1.gz man/man1/gpgv2.1.gz man/man1/scdaemon.1.gz man/man1/symcryptrun.1.gz man/man1/watchgnupg.1.gz man/man8/addgnupghome.8.gz man/man8/applygnupgdefaults.8.gz sbin/addgnupghome sbin/applygnupgdefaults %%PORTDOCS%%%%DOCSDIR%%/DETAILS %%PORTDOCS%%%%DOCSDIR%%/FAQ %%PORTDOCS%%%%DOCSDIR%%/HACKING %%PORTDOCS%%%%DOCSDIR%%/KEYSERVER %%PORTDOCS%%%%DOCSDIR%%/OpenPGP %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/TRANSLATE %%PORTDOCS%%%%DOCSDIR%%/examples/README %%PORTDOCS%%%%DOCSDIR%%/examples/gpgconf.conf %%PORTDOCS%%%%DOCSDIR%%/examples/pwpattern.list %%PORTDOCS%%%%DOCSDIR%%/examples/scd-event %%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 %%PORTDOCS%%%%DOCSDIR%%/qualified.txt %%DATADIR%%/com-certs.pem %%DATADIR%%/gpg-conf.skel %%NLS%%share/locale/be/LC_MESSAGES/gnupg2.mo %%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/nl/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/pl/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/pt/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/pt_BR/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 -s gpg2 %D/bin/gpg -@postunexec [ "$(readlink %D/bin/gpg)" = "gpg2" ] && rm -f %D/bin/gpg || true +@postexec [ -e %D/bin/gpg ] || ln -sf gpg2 %D/bin/gpg +@postunexec [ -e %D/bin/gpg ] || rm -f %D/bin/gpg