[Midnightbsd-cvs] mports [16817] trunk/security/gnupg: 2.0.26

Fri Sep 5 19:20:02 EDT 2014

Revision: 16817
          http://svnweb.midnightbsd.org/mports/?rev=16817
Author:   laffer1
Date:     2014-09-05 19:20:02 -0400 (Fri, 05 Sep 2014)
Log Message:
-----------
2.0.26

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

Modified: trunk/security/gnupg/Makefile
===================================================================

--- trunk/security/gnupg/Makefile	2014-09-05 23:14:18 UTC (rev 16816)
+++ trunk/security/gnupg/Makefile	2014-09-05 23:20:02 UTC (rev 16817)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	gnupg
-PORTVERSION=	2.0.25
+PORTVERSION=	2.0.26
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	gnupg
@@ -11,13 +11,16 @@
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	The GNU Privacy Guard
 
-LICENSE=	gpl3
+LICENSE=	gpl3 lgpl3
+LICENSE_COMB=	multi
+LICENSE_FILE_gpl3=	${WRKSRC}/COPYING
+LICENSE_FILE_lgpl3=	${WRKSRC}/COPYING.LIB
 
-LIB_DEPENDS=	assuan:${PORTSDIR}/security/libassuan \
-		gcrypt:${PORTSDIR}/security/libgcrypt \
-		gpg-error:${PORTSDIR}/security/libgpg-error \
-		ksba:${PORTSDIR}/security/libksba \
-		pth:${PORTSDIR}/devel/pth
+LIB_DEPENDS=	libassuan.so:${PORTSDIR}/security/libassuan \
+		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
+		libksba.so:${PORTSDIR}/security/libksba \
+		libpth.so:${PORTSDIR}/devel/pth
+BUILD_DEPENDS=	libgpg-error>=1.11:${PORTSDIR}/security/libgpg-error
 
 GNU_CONFIGURE=	YES
 USES=		gmake iconv tar:bzip2
@@ -24,7 +27,7 @@
 USE_LDCONFIG=	YES
 CONFIGURE_ARGS+=	--enable-symcryptrun
 
-OPTIONS_DEFINE=		PINENTRY LDAP SCDAEMON CURL GPGSM KDNS STD_SOCKET NLS
+OPTIONS_DEFINE=		PINENTRY LDAP SCDAEMON CURL GPGSM KDNS STD_SOCKET NLS DOCS SUID_GPG
 PINENTRY_DESC=		Use pinentry
 LDAP_DESC=		LDAP keyserver interface
 SCDAEMON_DESC=		Enable Smartcard daemon (with libusb)
@@ -32,79 +35,46 @@
 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
 NO_OPTIONS_SORT=	YES
+OPTIONS_SUB=		YES
 
+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.mport.options.mk>
 
-.if ! ${PORT_OPTIONS:MDOCS}
-CONFIGURE_ARGS+=	--disable-doc
-.else
-MAN1=		gpg2.1 gpgsm.1 gpgv2.1 gpg-agent.1 scdaemon.1 watchgnupg.1 \
-		gpgconf.1 gpg-preset-passphrase.1 gpg-connect-agent.1 \
-		gpgparsemail.1 symcryptrun.1 gpgsm-gencert.sh.1
-MAN8=		addgnupghome.8 applygnupgdefaults.8
+.if ${PORT_OPTIONS:MDOCS}
 INFO=		gnupg
 .endif
 
-.if ${PORT_OPTIONS:MPINENTRY}
-RUN_DEPENDS+=	pinentry>0:${PORTSDIR}/security/pinentry
-.endif
-
 .if ${PORT_OPTIONS:MGPGSM}
-RUN_DEPENDS+=	dirmngr:${PORTSDIR}/security/dirmngr
 PORT_OPTIONS+=	LDAP
-PLIST_SUB+=	GPGSM=""
-.else
-CONFIGURE_ARGS+=--disable-gpgsm
-PLIST_SUB+=	GPGSM="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MLDAP}
 USE_OPENLDAP=	YES
 CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
-PLIST_SUB+=	LDAP=""
 .else
 CONFIGURE_ARGS+=--disable-ldap
-PLIST_SUB+=	LDAP="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MKDNS}
-LIB_DEPENDS+=	adns:${PORTSDIR}/dns/adns
-PLIST_SUB+=	ADNS=""
-.else
+.if ! ${PORT_OPTIONS:MKDNS}
 CONFIGURE_SUB=	-e '/GPGKEYS_KDNS=/s/".*"/""/'
-PLIST_SUB+=	ADNS="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MSTD_SOCKET}
-CONFIGURE_ARGS+=--enable-standard-socket
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-CONFIGURE_ARGS+=--enable-nls
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSCDAEMON}
-CONFIGURE_ARGS+=--enable-scdaemon
-PLIST_SUB+=	SCDAEMON=""
-.else
-CONFIGURE_ARGS+=--disable-scdaemon
-PLIST_SUB+=	SCDAEMON="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MCURL}
-LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
-CONFIGURE_ARGS+=--with-libcurl=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=--without-libcurl
-.endif
-
 verify:	checksum
 	gpg2 --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.sig
 
@@ -114,11 +84,4 @@
 	@${REINPLACE_CMD} -e "/#include <utmp.h>/d" \
 		${WRKSRC}/tools/symcryptrun.c
 
-post-install:
-	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.if defined(WITH_SUID_GPG)
-	${CHMOD} u+s ${PREFIX}/bin/gpg2
-.endif
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.mk>

Modified: trunk/security/gnupg/distinfo
===================================================================
--- trunk/security/gnupg/distinfo	2014-09-05 23:14:18 UTC (rev 16816)
+++ trunk/security/gnupg/distinfo	2014-09-05 23:20:02 UTC (rev 16817)
@@ -1,4 +1,4 @@
-SHA256 (gnupg-2.0.25.tar.bz2) = b3abe97df096cf53d6a422ac922f3c48e688bc892b7ccf669b92f0b7fc6c5823
-SIZE (gnupg-2.0.25.tar.bz2) = 4301689
-SHA256 (gnupg-2.0.25.tar.bz2.sig) = d48d6c37b60953c35cc5464218a9dfcf2e7599fdb9ec29642822c065cfd3f18d
-SIZE (gnupg-2.0.25.tar.bz2.sig) = 287
+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

Modified: trunk/security/gnupg/pkg-plist
===================================================================
--- trunk/security/gnupg/pkg-plist	2014-09-05 23:14:18 UTC (rev 16816)
+++ trunk/security/gnupg/pkg-plist	2014-09-05 23:20:02 UTC (rev 16817)
@@ -1,6 +1,8 @@
 bin/gpg-agent
 bin/gpg-connect-agent
+%%SUID_GPG%%@mode 4555
 bin/gpg2
+%%SUID_GPG%%@mode
 bin/gpgconf
 bin/gpgkey2ssh
 bin/gpgparsemail

