[Midnightbsd-cvs] mports [23009] trunk/security/gnupg: 2.2.4

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Feb 17 14:24:24 EST 2018


Revision: 23009
          http://svnweb.midnightbsd.org/mports/?rev=23009
Author:   laffer1
Date:     2018-02-17 14:24:23 -0500 (Sat, 17 Feb 2018)
Log Message:
-----------
2.2.4

Modified Paths:
--------------
    trunk/security/gnupg/Makefile
    trunk/security/gnupg/distinfo
    trunk/security/gnupg/pkg-descr
    trunk/security/gnupg/pkg-plist

Removed Paths:
-------------
    trunk/security/gnupg/files/

Modified: trunk/security/gnupg/Makefile
===================================================================
--- trunk/security/gnupg/Makefile	2018-02-17 19:23:41 UTC (rev 23008)
+++ trunk/security/gnupg/Makefile	2018-02-17 19:24:23 UTC (rev 23009)
@@ -1,12 +1,9 @@
 # $MidnightBSD$
 
 PORTNAME=	gnupg
-PORTVERSION=	2.1.2
-#PORTREVISION=	0
+PORTVERSION=	2.2.4
 CATEGORIES=	security
-MASTER_SITES=	GNUPG/gnupg
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+MASTER_SITES=	GNUPG
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	The GNU Privacy Guard
@@ -14,46 +11,53 @@
 LICENSE=	gpl3 lgpl3
 LICENSE_COMB=	multi
 LICENSE_FILE_gpl3=	${WRKSRC}/COPYING
-LICENSE_FILE_lgpl3=	${WRKSRC}/COPYING.LIB
+LICENSE_FILE_lgpl3=	${WRKSRC}/COPYING.LGPL3
 
-LIB_DEPENDS=	libassuan.so:${PORTSDIR}/security/libassuan \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libksba.so:${PORTSDIR}/security/libksba \
-		libnpth.so:${PORTSDIR}/devel/npth
-BUILD_DEPENDS=	libgpg-error>=1.16:${PORTSDIR}/security/libgpg-error
-RUN_DEPENDS=	pinentry>0:${PORTSDIR}/security/pinentry
+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.5.1:security/libassuan \
+		libgpg-error>=1.16:security/libgpg-error
+RUN_DEPENDS=	pinentry:security/pinentry
 
-GNU_CONFIGURE=	YES
-USES=		gmake iconv pkgconfig tar:bzip2
-USE_LDCONFIG=	YES
-CONFIGURE_ARGS+=	--disable-ntbtls --enable-symcryptrun
-CONFLICTS=	gnupg-2.0.* dirmngr-*
+CONFLICTS=	gnupg-2.0.* dirmngr-[0-9]*
+CPE_VENDOR=	gnupg
 
-OPTIONS_DEFINE=		GNUTLS LDAP SCDAEMON KDNS NLS DOCS SUID_GPG
-LDAP_DESC=		LDAP keyserver interface
-SCDAEMON_DESC=		Enable Smartcard daemon (with libusb)
-KDNS_DESC=		Use DNS CERT helper
-SUID_GPG_DESC=		Install GPG with suid
-OPTIONS_DEFAULT=	GNUTLS
-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).
+USES=		compiler:c11 cpe gmake iconv pkgconfig readline sqlite tar:bzip2
+CONFIGURE_ARGS=	--disable-ntbtls --disable-wks-tools \
+		--enable-gpg-is-gpg2 --enable-symcryptrun
+GNU_CONFIGURE=	yes
+USE_LDCONFIG=	yes
+INFO=		gnupg
+TEST_TARGET=	check
 
-DOCS_CONFIGURE_ENABLE=	doc
-DOCS_INFO=		gnupg
+OPTIONS_DEFINE=	GNUTLS LDAP SCDAEMON NLS DOCS SUID_GPG
+OPTIONS_DEFAULT=GNUTLS SCDAEMON
+NO_OPTIONS_SORT=yes
+OPTIONS_SUB=	yes
+
+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:${PORTSDIR}/security/gnutls
-KDNS_LIB_DEPENDS=	libadns.so:${PORTSDIR}/dns/adns
-KDNS_CONFIGURE_ON=	--with-adns=${LOCALBASE}
-LDAP_CONFIGURE_ENABLE=	ldap
-LDAP_CONFIGURE_ON=	--with-ldap=${LOCALBASE}
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
+
+LDAP_CONFIGURE_WITH=	ldap=${LOCALBASE}
 LDAP_LIBS=		-L${LOCALBASE}/lib
 LDAP_USE=		OPENLDAP=yes
+LDAP_USES=		readline
+
+NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
-NLS_CONFIGURE_ENABLE=	nls
+
 SCDAEMON_CONFIGURE_ENABLE=	scdaemon
 
-verify:	checksum
-	gpg2 --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.sig
+post-install:
+	@${MV} ${STAGEDIR}${DATADIR}/help*.txt ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: trunk/security/gnupg/distinfo
===================================================================
--- trunk/security/gnupg/distinfo	2018-02-17 19:23:41 UTC (rev 23008)
+++ trunk/security/gnupg/distinfo	2018-02-17 19:24:23 UTC (rev 23009)
@@ -1,4 +1,3 @@
-SHA256 (gnupg-2.1.2.tar.bz2) = 404f5a43d591dfe41f0ffb204b49a1533b67d77bc1fd68febd7e447575616792
-SIZE (gnupg-2.1.2.tar.bz2) = 4832996
-SHA256 (gnupg-2.1.2.tar.bz2.sig) = f8f8374f5c4c34bd4caf4802b27d93ff5800b1bd60a7618e1b87618851adcdb7
-SIZE (gnupg-2.1.2.tar.bz2.sig) = 574
+TIMESTAMP = 1513817754
+SHA256 (gnupg-2.2.4.tar.bz2) = 401a3e64780fdfa6d7670de0880aa5c9d589b3db7a7098979d7606cec546f2ec
+SIZE (gnupg-2.2.4.tar.bz2) = 6571487

Modified: trunk/security/gnupg/pkg-descr
===================================================================
--- trunk/security/gnupg/pkg-descr	2018-02-17 19:23:41 UTC (rev 23008)
+++ trunk/security/gnupg/pkg-descr	2018-02-17 19:24:23 UTC (rev 23009)
@@ -1,7 +1,9 @@
-GnuPG is a complete and free replacement for PGP.
+GnuPG is a complete and free replacement for PGP. This is the "stable"
+version.
 
-Because it does not use the patented IDEA algorithm, it can be used
-without any restrictions.  GnuPG is an RFC2440 (OpenPGP) compliant
-application.
+GnuPG allows encrypting and signing your data and communication, and
+features a versatile key management system as well as access modules
+for many public key directories. GnuPG, also known as GPG, is a command
+line tool with features for easy integration with other applications.
 
-WWW: http://www.gnupg.org/
+WWW: https://www.gnupg.org/

Modified: trunk/security/gnupg/pkg-plist
===================================================================
--- trunk/security/gnupg/pkg-plist	2018-02-17 19:23:41 UTC (rev 23008)
+++ trunk/security/gnupg/pkg-plist	2018-02-17 19:24:23 UTC (rev 23009)
@@ -1,7 +1,7 @@
 bin/gpg-agent
 bin/dirmngr
 bin/dirmngr-client
-bin/g13
+bin/gpgscm
 bin/gpgsm
 bin/gpgtar
 bin/gpg-connect-agent
@@ -10,9 +10,7 @@
 bin/gpg2
 %%SUID_GPG%%@mode
 bin/gpgconf
-bin/gpgkey2ssh
 bin/gpgparsemail
-bin/gpgsm-gencert.sh
 bin/gpgv2
 bin/symcryptrun
 bin/watchgnupg
@@ -20,24 +18,27 @@
 libexec/gpg-check-pattern
 libexec/gpg-preset-passphrase
 libexec/gpg-protect-tool
+libexec/gpg-wks-client
 %%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/gpg2.1.gz
-%%PORTDOCS%%man/man1/gpgconf.1.gz
-%%PORTDOCS%%man/man1/gpgparsemail.1.gz
-%%PORTDOCS%%man/man1/gpgsm-gencert.sh.1.gz
-%%PORTDOCS%%man/man1/gpgsm.1.gz
-%%PORTDOCS%%man/man1/gpgv2.1.gz
-%%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
+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/gpg-wks-client.1.gz
+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/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
@@ -46,45 +47,53 @@
 %%PORTDOCS%%%%DOCSDIR%%/HACKING
 %%PORTDOCS%%%%DOCSDIR%%/KEYSERVER
 %%PORTDOCS%%%%DOCSDIR%%/OpenPGP
-%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TRANSLATE
 %%PORTDOCS%%%%DOCSDIR%%/examples/README
+%%PORTDOCS%%%%DOCSDIR%%/examples/debug.prf
 %%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-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%%%%DATADIR%%/com-certs.pem
+%%PORTDOCS%%%%DOCSDIR%%/examples/vsnfd.prf
+%%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
-%%DATADIR%%/gpg-conf.skel
-%%PORTDOCS%%%%DATADIR%%/help.be.txt
-%%PORTDOCS%%%%DATADIR%%/help.ca.txt
-%%PORTDOCS%%%%DATADIR%%/help.cs.txt
-%%PORTDOCS%%%%DATADIR%%/help.da.txt
-%%PORTDOCS%%%%DATADIR%%/help.de.txt
-%%PORTDOCS%%%%DATADIR%%/help.el.txt
-%%PORTDOCS%%%%DATADIR%%/help.eo.txt
-%%PORTDOCS%%%%DATADIR%%/help.es.txt
-%%PORTDOCS%%%%DATADIR%%/help.et.txt
-%%PORTDOCS%%%%DATADIR%%/help.fi.txt
-%%PORTDOCS%%%%DATADIR%%/help.fr.txt
-%%PORTDOCS%%%%DATADIR%%/help.gl.txt
-%%PORTDOCS%%%%DATADIR%%/help.hu.txt
-%%PORTDOCS%%%%DATADIR%%/help.id.txt
-%%PORTDOCS%%%%DATADIR%%/help.it.txt
-%%PORTDOCS%%%%DATADIR%%/help.ja.txt
-%%PORTDOCS%%%%DATADIR%%/help.nb.txt
-%%PORTDOCS%%%%DATADIR%%/help.pl.txt
-%%PORTDOCS%%%%DATADIR%%/help.pt.txt
-%%PORTDOCS%%%%DATADIR%%/help.pt_BR.txt
-%%PORTDOCS%%%%DATADIR%%/help.ro.txt
-%%PORTDOCS%%%%DATADIR%%/help.ru.txt
-%%PORTDOCS%%%%DATADIR%%/help.sk.txt
-%%PORTDOCS%%%%DATADIR%%/help.sv.txt
-%%PORTDOCS%%%%DATADIR%%/help.tr.txt
-%%PORTDOCS%%%%DATADIR%%/help.txt
-%%PORTDOCS%%%%DATADIR%%/help.zh_CN.txt
-%%PORTDOCS%%%%DATADIR%%/help.zh_TW.txt
-%%PORTDOCS%%%%DATADIR%%/qualified.txt
+%%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
@@ -113,4 +122,5 @@
 %%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
- at unexec [ -L %D/bin/gpg ] && rm -f %D/bin/gpg || true
+ at postexec [ -e %D/bin/gpg ] || ln -sf gpg2 %D/bin/gpg
+ at postunexec [ -e %D/bin/gpg ] || rm -f %D/bin/gpg



More information about the Midnightbsd-cvs mailing list