Date: Thu, 20 Nov 2014 05:11:21 +0000 (UTC) From: Jun Kuriyama <kuriyama@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r372835 - in head/security: . gnupg gnupg/files gnupg20 Message-ID: <201411200511.sAK5BLYU043402@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kuriyama Date: Thu Nov 20 05:11:20 2014 New Revision: 372835 URL: https://svnweb.freebsd.org/changeset/ports/372835 QAT: https://qat.redports.org/buildarchive/r372835/ Log: - Upgrade security/gnupg to 2.1.0 (modern release) and copy previous as security/gnupg20 (stable release). - Set PINENTRY as default option. Added: head/security/gnupg20/ - copied from r372216, head/security/gnupg/ Deleted: head/security/gnupg/files/ Modified: head/security/Makefile head/security/gnupg/Makefile head/security/gnupg/distinfo head/security/gnupg/pkg-plist head/security/gnupg20/Makefile Modified: head/security/Makefile ============================================================================== --- head/security/Makefile Thu Nov 20 04:37:20 2014 (r372834) +++ head/security/Makefile Thu Nov 20 05:11:20 2014 (r372835) @@ -150,6 +150,7 @@ SUBDIR += gnomint SUBDIR += gnupg SUBDIR += gnupg1 + SUBDIR += gnupg20 SUBDIR += gnutls SUBDIR += go.crypto SUBDIR += goptlib Modified: head/security/gnupg/Makefile ============================================================================== --- head/security/gnupg/Makefile Thu Nov 20 04:37:20 2014 (r372834) +++ head/security/gnupg/Makefile Thu Nov 20 05:11:20 2014 (r372835) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= gnupg -PORTVERSION= 2.0.26 -PORTREVISION= 1 +PORTVERSION= 2.1.0 +PORTREVISION= 0 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GNUPG} MASTER_SITE_SUBDIR= gnupg @@ -20,40 +20,32 @@ LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LI LIB_DEPENDS= libassuan.so:${PORTSDIR}/security/libassuan \ libgcrypt.so:${PORTSDIR}/security/libgcrypt \ libksba.so:${PORTSDIR}/security/libksba \ - libpth.so:${PORTSDIR}/devel/pth + libnpth.so:${PORTSDIR}/devel/npth BUILD_DEPENDS= libgpg-error>=1.11:${PORTSDIR}/security/libgpg-error GNU_CONFIGURE= YES USES= gmake iconv tar:bzip2 USE_LDCONFIG= YES -CONFIGURE_ARGS+= --enable-symcryptrun +CONFIGURE_ARGS+= --enable-symcryptrun --enable-gpgsm -OPTIONS_DEFINE= PINENTRY LDAP SCDAEMON CURL GPGSM KDNS STD_SOCKET NLS DOCS SUID_GPG +OPTIONS_DEFINE= PINENTRY LDAP SCDAEMON KDNS NLS DOCS SUID_GPG PINENTRY_DESC= Use pinentry LDAP_DESC= LDAP keyserver interface SCDAEMON_DESC= Enable Smartcard daemon (with libusb) -CURL_DESC= Use the real curl library (worked around if no) -GPGSM_DESC= Enable GPGSM (requires LDAP) KDNS_DESC= Use DNS CERT helper -STD_SOCKET_DESC= Use standard socket for agent SUID_GPG_DESC= Install GPG with suid -OPTIONS_DEFAULT= CURL +OPTIONS_DEFAULT= PINENTRY NO_OPTIONS_SORT= YES OPTIONS_SUB= YES +# In jail, SUID is required to avoid warning (security.bsd.unprivileged_mlock sysctl is not used in jail). DOCS_CONFIGURE_ENABLE= doc PINENTRY_RUN_DEPENDS= pinentry>0:${PORTSDIR}/security/pinentry -GPGSM_RUN_DEPENDS= dirmngr:${PORTSDIR}/security/dirmngr -GPGSM_CONFIGURE_ENABLE= gpgsm KDNS_LIB_DEPENDS= libadns.so:${PORTSDIR}/dns/adns KDNS_CONFIGURE_ON= --with-adns=${LOCALBASE} -STD_SOCKET_CONFIGURE_ENABLE= standard-socket NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls SCDAEMON_CONFIGURE_ENABLE= scdaemon -CURL_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl -CURL_CONFIGURE_ON= --with-libcurl=${LOCALBASE} -CURL_CONFIGURE_OFF= --without-libcurl .include <bsd.port.options.mk> @@ -61,10 +53,6 @@ CURL_CONFIGURE_OFF= --without-libcurl INFO= gnupg .endif -.if ${PORT_OPTIONS:MGPGSM} -PORT_OPTIONS+= LDAP -.endif - .if ${PORT_OPTIONS:MLDAP} USE_OPENLDAP= YES CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} Modified: head/security/gnupg/distinfo ============================================================================== --- head/security/gnupg/distinfo Thu Nov 20 04:37:20 2014 (r372834) +++ head/security/gnupg/distinfo Thu Nov 20 05:11:20 2014 (r372835) @@ -1,4 +1,4 @@ -SHA256 (gnupg-2.0.26.tar.bz2) = 7758e30dc382ae7a7167ed41b7f936aa50af5ea2d6fccdef663b5b750b65b8e0 -SIZE (gnupg-2.0.26.tar.bz2) = 4303384 -SHA256 (gnupg-2.0.26.tar.bz2.sig) = ef206280607f81f80682018879ffd724aabc5aa85535c3bb10e16285bb8b03fd -SIZE (gnupg-2.0.26.tar.bz2.sig) = 287 +SHA256 (gnupg-2.1.0.tar.bz2) = 16a8c3f50a15bf37d2dfb1c5e4bb3ec533e1d0b6a4043ff3680a376a3ad4058b +SIZE (gnupg-2.1.0.tar.bz2) = 3111585 +SHA256 (gnupg-2.1.0.tar.bz2.sig) = 3a8e970340febb1cf27c1a0b4424088a61b1c9dec0a9bdb1ec8e493973a5f6a9 +SIZE (gnupg-2.1.0.tar.bz2.sig) = 861 Modified: head/security/gnupg/pkg-plist ============================================================================== --- head/security/gnupg/pkg-plist Thu Nov 20 04:37:20 2014 (r372834) +++ head/security/gnupg/pkg-plist Thu Nov 20 05:11:20 2014 (r372835) @@ -1,30 +1,31 @@ bin/gpg-agent +bin/dirmngr +bin/dirmngr-client +bin/g13 +bin/gpgsm +bin/gpgtar bin/gpg-connect-agent +bin/kbxutil %%SUID_GPG%%@mode 4555 bin/gpg2 %%SUID_GPG%%@mode bin/gpgconf bin/gpgkey2ssh bin/gpgparsemail -%%GPGSM%%bin/gpgsm bin/gpgsm-gencert.sh bin/gpgv2 -%%GPGSM%%bin/kbxutil bin/symcryptrun bin/watchgnupg +%%LDAP%%libexec/dirmngr_ldap libexec/gpg-check-pattern -%%KDNS%%libexec/gpg2keys_kdns -%%SCDAEMON%%libexec/gnupg-pcsc-wrapper libexec/gpg-preset-passphrase libexec/gpg-protect-tool -libexec/gpg2keys_curl -libexec/gpg2keys_finger -libexec/gpg2keys_hkp -%%LDAP%%libexec/gpg2keys_ldap %%SCDAEMON%%libexec/scdaemon +%%PORTDOCS%%man/man1/dirmngr-client.1.gz %%PORTDOCS%%man/man1/gpg-agent.1.gz %%PORTDOCS%%man/man1/gpg-connect-agent.1.gz %%PORTDOCS%%man/man1/gpg-preset-passphrase.1.gz +%%PORTDOCS%%man/man1/gpg-zip.1.gz %%PORTDOCS%%man/man1/gpg2.1.gz %%PORTDOCS%%man/man1/gpgconf.1.gz %%PORTDOCS%%man/man1/gpgparsemail.1.gz @@ -34,10 +35,13 @@ libexec/gpg2keys_hkp %%PORTDOCS%%man/man1/scdaemon.1.gz %%PORTDOCS%%man/man1/symcryptrun.1.gz %%PORTDOCS%%man/man1/watchgnupg.1.gz +%%PORTDOCS%%man/man7/gnupg.7.gz %%PORTDOCS%%man/man8/addgnupghome.8.gz %%PORTDOCS%%man/man8/applygnupgdefaults.8.gz +%%PORTDOCS%%man/man8/dirmngr.8.gz sbin/addgnupghome sbin/applygnupgdefaults +%%PORTDOCS%%%%DOCSDIR%%/DCO %%PORTDOCS%%%%DOCSDIR%%/DETAILS %%PORTDOCS%%%%DOCSDIR%%/FAQ %%PORTDOCS%%%%DOCSDIR%%/HACKING @@ -51,6 +55,7 @@ sbin/applygnupgdefaults %%PORTDOCS%%%%DOCSDIR%%/examples/scd-event %%PORTDOCS%%%%DOCSDIR%%/examples/trustlist.txt %%PORTDOCS%%%%DATADIR%%/com-certs.pem +%%DATADIR%%/distsigkey.gpg %%DATADIR%%/gpg-conf.skel %%PORTDOCS%%%%DATADIR%%/help.be.txt %%PORTDOCS%%%%DATADIR%%/help.ca.txt @@ -81,34 +86,8 @@ sbin/applygnupgdefaults %%PORTDOCS%%%%DATADIR%%/help.zh_CN.txt %%PORTDOCS%%%%DATADIR%%/help.zh_TW.txt %%PORTDOCS%%%%DATADIR%%/qualified.txt -%%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/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 @unexec [ -L %D/bin/gpg ] && rm -f %D/bin/gpg || true Modified: head/security/gnupg20/Makefile ============================================================================== --- head/security/gnupg/Makefile Thu Nov 6 06:58:10 2014 (r372216) +++ head/security/gnupg20/Makefile Thu Nov 20 05:11:20 2014 (r372835) @@ -6,6 +6,7 @@ PORTREVISION= 1 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GNUPG} MASTER_SITE_SUBDIR= gnupg +PKGNAMESUFFIX= 20 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411200511.sAK5BLYU043402>