[Midnightbsd-cvs] mports [18061] trunk/security/gnupg: gnupg 2.1.2
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Mar 7 16:07:37 EST 2015
Revision: 18061
http://svnweb.midnightbsd.org/mports/?rev=18061
Author: laffer1
Date: 2015-03-07 16:07:36 -0500 (Sat, 07 Mar 2015)
Log Message:
-----------
gnupg 2.1.2
Modified Paths:
--------------
trunk/security/gnupg/Makefile
trunk/security/gnupg/distinfo
trunk/security/gnupg/files/patch-doc-Makefile.in
trunk/security/gnupg/pkg-message
trunk/security/gnupg/pkg-plist
Modified: trunk/security/gnupg/Makefile
===================================================================
--- trunk/security/gnupg/Makefile 2015-03-07 21:07:11 UTC (rev 18060)
+++ trunk/security/gnupg/Makefile 2015-03-07 21:07:36 UTC (rev 18061)
@@ -1,10 +1,10 @@
# $MidnightBSD$
PORTNAME= gnupg
-PORTVERSION= 2.0.26
+PORTVERSION= 2.1.2
+#PORTREVISION= 0
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_GNUPG}
-MASTER_SITE_SUBDIR= gnupg
+MASTER_SITES= GNUPG/gnupg
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
@@ -19,69 +19,41 @@
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
+ libnpth.so:${PORTSDIR}/devel/npth
+BUILD_DEPENDS= libgpg-error>=1.16:${PORTSDIR}/security/libgpg-error
+RUN_DEPENDS= pinentry>0:${PORTSDIR}/security/pinentry
GNU_CONFIGURE= YES
-USES= gmake iconv tar:bzip2
+USES= gmake iconv pkgconfig tar:bzip2
USE_LDCONFIG= YES
-CONFIGURE_ARGS+= --enable-symcryptrun
+CONFIGURE_ARGS+= --disable-ntbtls --enable-symcryptrun
+CONFLICTS= gnupg-2.0.* dirmngr-*
-OPTIONS_DEFINE= PINENTRY LDAP SCDAEMON CURL GPGSM KDNS STD_SOCKET NLS DOCS SUID_GPG
-PINENTRY_DESC= Use pinentry
+OPTIONS_DEFINE= GNUTLS LDAP SCDAEMON KDNS NLS DOCS SUID_GPG
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= 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).
DOCS_CONFIGURE_ENABLE= doc
-PINENTRY_RUN_DEPENDS= pinentry>0:${PORTSDIR}/security/pinentry
-GPGSM_RUN_DEPENDS= dirmngr:${PORTSDIR}/security/dirmngr
-GPGSM_CONFIGURE_ENABLE= gpgsm
+DOCS_INFO= gnupg
+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}
-STD_SOCKET_CONFIGURE_ENABLE= standard-socket
+LDAP_CONFIGURE_ENABLE= ldap
+LDAP_CONFIGURE_ON= --with-ldap=${LOCALBASE}
+LDAP_LIBS= -L${LOCALBASE}/lib
+LDAP_USE= OPENLDAP=yes
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}
-INFO= gnupg
-.endif
-
-.if ${PORT_OPTIONS:MGPGSM}
-PORT_OPTIONS+= LDAP
-.endif
-
-.if ${PORT_OPTIONS:MLDAP}
-USE_OPENLDAP= YES
-CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=--disable-ldap
-.endif
-
-.if ! ${PORT_OPTIONS:MKDNS}
-CONFIGURE_SUB= -e '/GPGKEYS_KDNS=/s/".*"/""/'
-.endif
-
verify: checksum
gpg2 --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.sig
-post-patch:
- @${REINPLACE_CMD} -e "s at -lpthread@${PTHREAD_LIBS}@g" ${CONFIGURE_SUB} \
- ${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4 ${WRKSRC}/configure
- @${REINPLACE_CMD} -e "/#include <utmp.h>/d" \
- ${WRKSRC}/tools/symcryptrun.c
-
.include <bsd.port.mk>
Modified: trunk/security/gnupg/distinfo
===================================================================
--- trunk/security/gnupg/distinfo 2015-03-07 21:07:11 UTC (rev 18060)
+++ trunk/security/gnupg/distinfo 2015-03-07 21:07:36 UTC (rev 18061)
@@ -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.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
Modified: trunk/security/gnupg/files/patch-doc-Makefile.in
===================================================================
--- trunk/security/gnupg/files/patch-doc-Makefile.in 2015-03-07 21:07:11 UTC (rev 18060)
+++ trunk/security/gnupg/files/patch-doc-Makefile.in 2015-03-07 21:07:36 UTC (rev 18061)
@@ -1,13 +1,11 @@
-$FreeBSD$
-
---- doc/Makefile.in 2012-08-05 12:21:36.163578307 +0900
-+++ doc/Makefile.in.orig 2012-08-05 12:21:25.241287984 +0900
-@@ -367,7 +367,7 @@
- myman_pages = gpg2.1 gpgsm.1 gpg-agent.1 scdaemon.1 gpgv2.1 \
+--- doc/Makefile.in.orig 2014-11-22 17:40:32.499461775 +0900
++++ doc/Makefile.in 2014-11-22 17:41:10.997462066 +0900
+@@ -415,7 +415,7 @@
+ myman_pages = gpg2.1 gpgsm.1 gpg-agent.1 dirmngr.8 scdaemon.1 gpgv2.1 \
watchgnupg.1 gpgconf.1 addgnupghome.8 gpg-preset-passphrase.1 \
gpg-connect-agent.1 gpgparsemail.1 symcryptrun.1 \
-- gpgsm-gencert.sh.1 applygnupgdefaults.8 gpg-zip.1
-+ gpgsm-gencert.sh.1 applygnupgdefaults.8
+- gpgsm-gencert.sh.1 applygnupgdefaults.8 gpg-zip.1 \
++ gpgsm-gencert.sh.1 applygnupgdefaults.8 \
+ dirmngr-client.1
- man_MANS = $(myman_pages)
- noinst_MANS = gnupg.7
+ man_MANS = $(myman_pages) gnupg.7
Modified: trunk/security/gnupg/pkg-message
===================================================================
--- trunk/security/gnupg/pkg-message 2015-03-07 21:07:11 UTC (rev 18060)
+++ trunk/security/gnupg/pkg-message 2015-03-07 21:07:36 UTC (rev 18061)
@@ -1,9 +1,12 @@
+###############################################################################
+ A T T E N T I O N
+
In order to use gpg-agent, you need to install a pinentry dialog.
The following ports of pinentry dialogs are available:
security/pinentry-curses (ncurses based dialog)
-security/pinentry-gtk (GTK 1.2 based dialog)
security/pinentry-gtk2 (GTK 2.x based dialog)
-security/pinentry-qt (QT based dialog)
+security/pinentry-qt4 (QT4 based dialog)
+###############################################################################
Modified: trunk/security/gnupg/pkg-plist
===================================================================
--- trunk/security/gnupg/pkg-plist 2015-03-07 21:07:11 UTC (rev 18060)
+++ trunk/security/gnupg/pkg-plist 2015-03-07 21:07:36 UTC (rev 18061)
@@ -1,5 +1,11 @@
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
@@ -6,22 +12,16 @@
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
@@ -34,10 +34,13 @@
%%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 +54,7 @@
%%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,7 +85,6 @@
%%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
@@ -102,7 +105,6 @@
%%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
@@ -111,7 +113,4 @@
%%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 dirrmtry %%DATADIR%%
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/examples
- at dirrmtry %%DOCSDIR%%
@unexec [ -L %D/bin/gpg ] && rm -f %D/bin/gpg || true
More information about the Midnightbsd-cvs
mailing list