Date: Mon, 11 Dec 2006 12:42:15 +0900 From: Jun Kuriyama <kuriyama@imgsrc.co.jp> To: ports@FreeBSD.org Subject: HEADS UP : security/gnupg will be upgraded to 2.0.1 Message-ID: <7mu003jdyg.wl%kuriyama@imgsrc.co.jp>
next in thread | raw e-mail | index | archive | help
--Multipart_Mon_Dec_11_12:42:15_2006-1
Content-Type: text/plain; charset=US-ASCII
Hi,
I'm planning to upgrade security/gnupg to 2.0.1. This upgrade
includes portrevision bumps to indicate dependency changes.
I'm testing conditional plist, upgrading procedure by portupgrade.
But I think it's almost ready to commit.
If you have further suggestions, please let me know.
--
Jun Kuriyama <kuriyama@imgsrc.co.jp> // IMG SRC, Inc.
<kuriyama@FreeBSD.org> // FreeBSD Project
--Multipart_Mon_Dec_11_12:42:15_2006-1
Content-Type: application/octet-stream; type=patch
Content-Disposition: attachment; filename="gnupg.diff"
Content-Transfer-Encoding: 7bit
Index: UPDATING
===================================================================
RCS file: /home/ncvs/ports/UPDATING,v
retrieving revision 1.431
diff -u -r1.431 UPDATING
--- UPDATING 8 Dec 2006 03:27:47 -0000 1.431
+++ UPDATING 11 Dec 2006 03:38:01 -0000
@@ -6,6 +6,22 @@
time you update your ports collection, before attempting any port
upgrades.
+20061212:
+ AFFECTS: users of security/gnupg
+ AUTHOR: kuriyama@FreeBSD.org
+
+ The security/gnupg port was upgraded to 2.0.1 (with securty fix)
+ and good-old gnupg-1.4.6 was repocopied to security/gnupg1.
+
+ Both of security/gnupg (2.x) and security/gnupg1 (1.4.x) are
+ designed not to conflict with each other. So you can use
+ security/gnupg1 for gpg(1), and use security/gnupg for gpg2(1)
+ commands.
+
+ All directly dependents are $PORTREVISION bumped, so portupgrade -R
+ gnupg will works fine. After portupgrade, you will have both of
+ gnupg-2.0.1 and gnupg-1.4.6.
+
20061207:
AFFECTS: users of devel/p5-PAR
AUTHOR: rafan@FreeBSD.org
Index: mail/cone/Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/cone/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- mail/cone/Makefile 20 Nov 2006 21:21:05 -0000 1.23
+++ mail/cone/Makefile 11 Dec 2006 03:14:54 -0000
@@ -7,6 +7,7 @@
PORTNAME= cone
PORTVERSION= 0.69
+PORTREVISION= 1
CATEGORIES= mail
# This is for beta versions, leave it in please:
#MASTER_SITES= http://www.courier-mta.org/beta/${PORTNAME}/ \
@@ -19,7 +20,7 @@
COMMENT= Console based mail client with POP3/IMAP/SMAP support
LIB_DEPENDS= aspell.16:${PORTSDIR}/textproc/aspell
-BUILD_DEPENDS= gpg:${PORTSDIR}/security/gnupg
+BUILD_DEPENDS= gpg:${PORTSDIR}/security/gnupg1
RUN_DEPENDS= ${BUILD_DEPENDS}
USE_FAM= yes
Index: mail/enigmail/Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/enigmail/Makefile,v
retrieving revision 1.35
diff -u -r1.35 Makefile
--- mail/enigmail/Makefile 14 Oct 2006 08:53:11 -0000 1.35
+++ mail/enigmail/Makefile 11 Dec 2006 03:15:05 -0000
@@ -7,7 +7,7 @@
PORTNAME= enigmail
PORTVERSION?= 0.93.0
-PORTREVISION?= 2
+PORTREVISION?= 3
CATEGORIES= mail security
MASTER_SITES= \
http://mozdev.secsup.org/enigmail/src/ \
@@ -30,7 +30,7 @@
LIB_DEPENDS?= nspr4:${PORTSDIR}/devel/nspr
RUN_DEPENDS?= mozilla:${PORTSDIR}/${LOCAL_SRCDIR}
-RUN_DEPENDS+= gpg:${PORTSDIR}/security/gnupg
+RUN_DEPENDS+= gpg:${PORTSDIR}/security/gnupg1
IPCVERSION?= 1.1.3
Index: mail/enigmail-thunderbird/Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/enigmail-thunderbird/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- mail/enigmail-thunderbird/Makefile 14 Oct 2006 08:53:11 -0000 1.30
+++ mail/enigmail-thunderbird/Makefile 11 Dec 2006 03:15:32 -0000
@@ -7,7 +7,7 @@
PORTNAME= enigmail
PORTVERSION= 0.94.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail security
MASTER_SITES= http://www.mozilla-enigmail.org/downloads/src/
PKGNAMEPREFIX?= thunderbird-
@@ -23,7 +23,7 @@
nss3:${PORTSDIR}/security/nss \
Xft.2:${PORTSDIR}/x11-fonts/libXft
RUN_DEPENDS= ${GECKO}:${PORTSDIR}/${GECKO_PORTDIR} \
- gpg:${PORTSDIR}/security/gnupg
+ gpg:${PORTSDIR}/security/gnupg1
GECKO= ${PKGNAMEPREFIX:S/-//}
.if ${GECKO} == "thunderbird"
Index: mail/imp/Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/imp/Makefile,v
retrieving revision 1.37
diff -u -r1.37 Makefile
--- mail/imp/Makefile 18 Aug 2006 02:57:58 -0000 1.37
+++ mail/imp/Makefile 11 Dec 2006 03:16:36 -0000
@@ -7,6 +7,7 @@
PORTNAME= imp
PORTVERSION= 4.1.3
+PORTREVISION= 1
CATEGORIES= mail www
MASTER_SITES= ftp://ftp.horde.org/pub/imp/ \
ftp://ftp.planetmirror.com/pub/horde/imp/ \
@@ -89,7 +90,7 @@
.endif
.if !defined(NOCRYPT)
-RUN_DEPENDS+= ${LOCALBASE}/bin/gpg:${PORTSDIR}/security/gnupg
+RUN_DEPENDS+= ${LOCALBASE}/bin/gpg:${PORTSDIR}/security/gnupg1
.endif
.if !defined(WITHOUT_ASPELL)
Index: mail/p5-Mail-SpamAssassin/Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/p5-Mail-SpamAssassin/Makefile,v
retrieving revision 1.99
diff -u -r1.99 Makefile
--- mail/p5-Mail-SpamAssassin/Makefile 7 Nov 2006 03:34:43 -0000 1.99
+++ mail/p5-Mail-SpamAssassin/Makefile 11 Dec 2006 03:17:54 -0000
@@ -7,7 +7,7 @@
PORTNAME= Mail-SpamAssassin
PORTVERSION= 3.1.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail perl5
MASTER_SITES= ${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/}
MASTER_SITE_SUBDIR= spamassassin/source/:apache Mail/:cpan
@@ -23,7 +23,7 @@
RUN_DEPENDS= ${BUILD_DEPENDS} \
${SITE_PERL}/Bundle/LWP.pm:${PORTSDIR}/www/p5-libwww \
${SITE_PERL}/Archive/Tar.pm:${PORTSDIR}/archivers/p5-Archive-Tar \
- gpg:${PORTSDIR}/security/gnupg
+ gpg:${PORTSDIR}/security/gnupg1
PERL_CONFIGURE= yes
CONFIGURE_ARGS= SYSCONFDIR="${PREFIX}/etc" \
Index: mail/pygmy/Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/pygmy/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
--- mail/pygmy/Makefile 7 Mar 2006 08:26:48 -0000 1.29
+++ mail/pygmy/Makefile 11 Dec 2006 03:18:04 -0000
@@ -7,7 +7,7 @@
PORTNAME= pygmy
PORTVERSION= 0.6.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= mail python gnome
MASTER_SITES= http://pygmy.sourceforge.net/
@@ -16,7 +16,7 @@
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-1.2/_gnomemodule.so:${PORTSDIR}/x11-toolkits/py-gnome
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-1.2/_gnomemodule.so:${PORTSDIR}/x11-toolkits/py-gnome \
- gpg:${PORTSDIR}/security/gnupg
+ gpg:${PORTSDIR}/security/gnupg1
USE_PYTHON= yes
Index: misc/instant-workstation/Makefile
===================================================================
RCS file: /home/ncvs/ports/misc/instant-workstation/Makefile,v
retrieving revision 1.32
diff -u -r1.32 Makefile
--- misc/instant-workstation/Makefile 29 Sep 2006 05:40:00 -0000 1.32
+++ misc/instant-workstation/Makefile 11 Dec 2006 03:18:53 -0000
@@ -7,7 +7,7 @@
PORTNAME= instant-workstation
PORTVERSION= 1.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= misc
MASTER_SITES= ftp://ftp.lemis.com/pub/
@@ -29,7 +29,7 @@
grip:${PORTSDIR}/audio/grip \
gimp:${PORTSDIR}/graphics/gimp1 \
gv:${PORTSDIR}/print/gv \
- gpg:${PORTSDIR}/security/gnupg \
+ gpg:${PORTSDIR}/security/gnupg1 \
ispell:${PORTSDIR}/textproc/ispell \
startkde:${PORTSDIR}/x11/kde3 \
mutt:${PORTSDIR}/mail/mutt \
Index: misc/kdeutils3/Makefile
===================================================================
RCS file: /home/ncvs/ports/misc/kdeutils3/Makefile,v
retrieving revision 1.107
diff -u -r1.107 Makefile
--- misc/kdeutils3/Makefile 12 Sep 2006 23:26:33 -0000 1.107
+++ misc/kdeutils3/Makefile 11 Dec 2006 03:19:08 -0000
@@ -7,6 +7,7 @@
PORTNAME= kdeutils
PORTVERSION= ${KDE_VERSION}
+PORTREVISION= 1
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
@@ -17,7 +18,7 @@
LIB_DEPENDS= gmp.7:${PORTSDIR}/math/libgmp4 \
netsnmp:${PORTSDIR}/net-mgmt/net-snmp
-RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg
+RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg1
CONFLICTS= kgpg-[0-9]* superkaramba-[0-9]*
Index: net/nocatauth-gateway/Makefile
===================================================================
RCS file: /home/ncvs/ports/net/nocatauth-gateway/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- net/nocatauth-gateway/Makefile 12 Dec 2005 21:53:39 -0000 1.4
+++ net/nocatauth-gateway/Makefile 11 Dec 2006 03:19:24 -0000
@@ -7,7 +7,7 @@
PORTNAME= nocatauth-gateway
PORTVERSION= 0.82
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://nocat.net/download/NoCatAuth/
DISTNAME= NoCatAuth-${PORTVERSION}
@@ -16,7 +16,7 @@
COMMENT= Open 802.11 Authentication Gateway
RUN_DEPENDS= \
- ${LOCALBASE}/bin/gpg:${PORTSDIR}/security/gnupg
+ ${LOCALBASE}/bin/gpg:${PORTSDIR}/security/gnupg1
CONFLICTS= nocatauth-server-*
Index: net/nocatauth-server/Makefile
===================================================================
RCS file: /home/ncvs/ports/net/nocatauth-server/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- net/nocatauth-server/Makefile 12 Dec 2005 21:53:39 -0000 1.3
+++ net/nocatauth-server/Makefile 11 Dec 2006 03:19:32 -0000
@@ -7,7 +7,7 @@
PORTNAME= nocatauth-server
PORTVERSION= 0.82
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://nocat.net/download/NoCatAuth/
DISTNAME= NoCatAuth-${PORTVERSION}
@@ -16,7 +16,7 @@
COMMENT= Open 802.11 Authentication Server
RUN_DEPENDS= \
- ${LOCALBASE}/bin/gpg:${PORTSDIR}/security/gnupg
+ ${LOCALBASE}/bin/gpg:${PORTSDIR}/security/gnupg1
CONFLICTS= nocatauth-gateway-*
Index: news/c-nocem/Makefile
===================================================================
RCS file: /home/ncvs/ports/news/c-nocem/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- news/c-nocem/Makefile 26 Mar 2004 17:55:38 -0000 1.21
+++ news/c-nocem/Makefile 11 Dec 2006 03:20:03 -0000
@@ -6,7 +6,7 @@
PORTNAME= c-nocem
PORTVERSION= 3.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= news security
MASTER_SITES= http://sites.inka.de/~bigred/sw/ \
ftp://ftp.dinoex.de/pub/FreeBSD/distfiles/
@@ -16,7 +16,7 @@
BUILD_DEPENDS= ${CNEWSWRK}/conf/substitutions:${PORTSDIR}/${CNEWS_PORT}:configure
BUILD_DEPENDS+= ${LOCALBASE}/lib/libcnews.a:${PORTSDIR}/${CNEWS_PORT} \
- gpg:${PORTSDIR}/security/gnupg
+ gpg:${PORTSDIR}/security/gnupg1
WRKSRC= ${WRKDIR}/c-nocem
CNEWS_PORT?= news/cnews
Index: security/gnome-gpg/Makefile
===================================================================
RCS file: /home/ncvs/ports/security/gnome-gpg/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- security/gnome-gpg/Makefile 14 Oct 2006 09:10:57 -0000 1.1
+++ security/gnome-gpg/Makefile 11 Dec 2006 03:20:33 -0000
@@ -7,6 +7,7 @@
PORTNAME= gnome-gpg
PORTVERSION= 0.5.0
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -14,9 +15,9 @@
MAINTAINER= gnome@FreeBSD.org
COMMENT= Simple commandline wrapper around gpg for gnome-keyring
-BUILD_DEPENDS= gpg:${PORTSDIR}/security/gnupg
+BUILD_DEPENDS= gpg:${PORTSDIR}/security/gnupg1
LIB_DEPENDS= gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
-RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg
+RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg1
USE_BZIP2= yes
GNU_CONFIGURE= yes
Index: security/gnupg/Makefile
===================================================================
RCS file: /home/ncvs/ports/security/gnupg/Makefile,v
retrieving revision 1.92
diff -u -r1.92 Makefile
--- security/gnupg/Makefile 8 Dec 2006 09:25:31 -0000 1.92
+++ security/gnupg/Makefile 9 Dec 2006 07:56:41 -0000
@@ -6,8 +6,7 @@
#
PORTNAME= gnupg
-PORTVERSION= 1.4.6
-PORTREVISION= 1
+PORTVERSION= 2.0.1
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNUPG}
MASTER_SITE_SUBDIR= gnupg
@@ -17,95 +16,73 @@
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= The GNU Privacy Guard
+BUILD_DEPENDS= ${LOCALBASE}/lib/libassuan.a:${PORTSDIR}/security/libassuan
+LIB_DEPENDS= gcrypt.13:${PORTSDIR}/security/libgcrypt \
+ gpg-error:${PORTSDIR}/security/libgpg-error \
+ ksba.17:${PORTSDIR}/security/libksba \
+ pth.20:${PORTSDIR}/devel/pth
+RUN_DEPENDS= dirmngr:${PORTSDIR}/security/dirmngr
+
USE_BZIP2= YES
USE_GMAKE= YES
GNU_CONFIGURE= YES
-CONFIGURE_TARGET= --build ${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS= --infodir=${PREFIX}/info --mandir=${PREFIX}/man
-.if ${MACHINE_CPU:Mi586}
-MACHINE_ARCH= i586
-.endif
-CFLAGS:= ${CFLAGS:S/-pipe//g}
-MAN1= gpg.1 gpgv.1 gpg.ru.1
-MAN7= gnupg.7
-INFO= gnupg1
-
-PORTDOCS= *
-
-OPTIONS= LDAP "LDAP keyserver interface" off \
- LIBICONV "use libiconv" off \
- LIBUSB "use libusb" off \
- SUID_GPG "install GPG with suid" off \
- NLS "Native Language Support" on \
- CURL "use libcurl for the keyserver interface" on
+USE_ICONV= YES
+USE_LDCONFIG= YES
+CONFIGURE_TARGET=# empty
+CONFIGURE_ARGS+= --infodir=${PREFIX}/info --mandir=${PREFIX}/man \
+ --with-libpth-prefix=${LOCALBASE}/lib/pth
+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
+INFO= gnupg
+
+OPTIONS= NLS "Include National Language Support" on \
+ LDAP "Include LDAP keyserver support" off \
+ SCDAEMON "Enable Smartcard daemon (with libusb)" off \
+ CURL "Use the real curl library (worked around if no)" on
.include <bsd.port.pre.mk>
-.if defined(WITH_LIBICONV)
-USE_ICONV= yes
-.else
-CONFIGURE_ARGS+= --without-libiconv-prefix
-.endif
-
-.if defined(WITH_LIBUSB)
-CONFIGURE_ARGS+= --with-libusb=${LOCALBASE}
-LIB_DEPENDS+= usb-0.1.8:${PORTSDIR}/devel/libusb
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+= NLS="@comment "
.else
-CONFIGURE_ARGS+= --without-libusb
+USE_GETTEXT= YES
+PLIST_SUB+= NLS=""
.endif
.if defined(WITH_LDAP)
-USE_OPENLDAP= yes
-PLIST_SUB+= WITH_LDAP=""
-CONFIGURE_ARGS+= --with-ldap=${LOCALBASE}
-#CONFIGURE_ENV+= LDFLAGS="-L/usr/lib"
+USE_OPENLDAP= YES
+CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
+PLIST_SUB+= LDAP=""
.else
-PLIST_SUB+= WITH_LDAP="@comment "
-CONFIGURE_ARGS+= --disable-ldap
+CONFIGURE_ARGS+=--disable-ldap
+PLIST_SUB+= LDAP="@comment "
.endif
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT= YES
-PLIST_SUB+= NLS=""
+.if defined(WITH_SCDAEMON)
+CONFIGURE_ARGS+=--enable-scdaemon
+LIB_DEPENDS+= usb-0.1:${PORTSDIR}/devel/libusb
.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+= NLS="@comment "
+CONFIGURE_ARGS+=--disable-scdaemon
.endif
-.if !defined(WITHOUT_CURL)
+.if defined(WITHOUT_CURL)
+CONFIGURE_ARGS+=--without-libcurl
+.else
LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
CONFIGURE_ARGS+=--with-libcurl=${LOCALBASE}
-# Work around a GnuPG configure buglet
-CONFIGURE_ENV+= _libcurl_config=${LOCALBASE}/bin/curl-config
-.else
-CONFIGURE_ARGS+=--without-libcurl
.endif
-post-install:
-.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCSDIR}
-.for i in DETAILS FAQ HACKING OpenPGP
- ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR}
-.endfor
-.for i in ABOUT-NLS AUTHORS BUGS COPYING INSTALL NEWS PROJECTS \
- README THANKS TODO VERSION
- ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-.endfor
-.endif
-.if defined(WITH_SUID_GPG)
- ${CHMOD} u+s ${PREFIX}/bin/gpg
-.endif
-.if ${OSVERSION} < 500019
- @${CAT} ${PKGMESSAGE}
-.else
-PKGMESSAGE= /nonexistent
-.endif
+verify: checksum
+ gpg --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.sig
-.if ${OSVERSION} < 500000
-CONFIGURE_ARGS+= --without-readline
-.endif
+pre-configure:
+ ${REINPLACE_CMD} -e "s@-lpthread@${PTHREAD_LIBS}@g" \
+ ${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4 ${WRKSRC}/configure
-check:
- (cd ${WRKSRC}; ${MAKE} check)
+post-install:
+ @${CAT} ${PKGMESSAGE}
.include <bsd.port.post.mk>
Index: security/gnupg/distinfo
===================================================================
RCS file: /home/ncvs/ports/security/gnupg/distinfo,v
retrieving revision 1.39
diff -u -r1.39 distinfo
--- security/gnupg/distinfo 7 Dec 2006 00:34:16 -0000 1.39
+++ security/gnupg/distinfo 9 Dec 2006 07:54:26 -0000
@@ -1,6 +1,6 @@
-MD5 (gnupg-1.4.6.tar.bz2) = ec8dc6df1bd83c1d7e1a1ea10653f9f4
-SHA256 (gnupg-1.4.6.tar.bz2) = fd5a72418e55669b88076c2a6f11c3a59bf92a2071008567e65ae12b7372008e
-SIZE (gnupg-1.4.6.tar.bz2) = 3149454
-MD5 (gnupg-1.4.6.tar.bz2.sig) = 8b905292140d60fe493fab7d5b22c96d
-SHA256 (gnupg-1.4.6.tar.bz2.sig) = fb9294762932b34f2fd5a4b168f4c3a248aa7403c2aed8bffa5f67274b1b052d
-SIZE (gnupg-1.4.6.tar.bz2.sig) = 158
+MD5 (gnupg-2.0.1.tar.bz2) = eb24e258db73f4cb53a3ce18375efa21
+SHA256 (gnupg-2.0.1.tar.bz2) = 49949762a4e080379dcca23948442d50488f0d74e04bcba87fc49e19a899b01d
+SIZE (gnupg-2.0.1.tar.bz2) = 3923924
+MD5 (gnupg-2.0.1.tar.bz2.sig) = 58b1bbc2f34c0882ab1a49542a8ffd45
+SHA256 (gnupg-2.0.1.tar.bz2.sig) = 2e49d6cfcb9ad12bc10e7185435761622c2da12b850c6c31925da3b4c8100628
+SIZE (gnupg-2.0.1.tar.bz2.sig) = 158
Index: security/gnupg/pkg-descr
===================================================================
RCS file: /home/ncvs/ports/security/gnupg/pkg-descr,v
retrieving revision 1.4
diff -u -r1.4 pkg-descr
--- security/gnupg/pkg-descr 6 Nov 2000 08:37:20 -0000 1.4
+++ security/gnupg/pkg-descr 3 Dec 2006 11:45:20 -0000
@@ -5,5 +5,3 @@
application.
WWW: http://www.gnupg.org/
-
-kuriyama@FreeBSD.org
Index: security/gnupg/pkg-message
===================================================================
RCS file: /home/ncvs/ports/security/gnupg/pkg-message,v
retrieving revision 1.2
diff -u -r1.2 pkg-message
--- security/gnupg/pkg-message 12 May 2003 01:46:27 -0000 1.2
+++ security/gnupg/pkg-message 3 Dec 2006 11:57:42 -0000
@@ -1,5 +1,19 @@
-************************************************************
-TIPS:
- o Use rndcontrol(8) if you want more entropy.
- See http://people.freebsd.org/~dougb/randomness.html for more details.
-************************************************************
+
+
+
+###############################################################################
+ 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)
+
+###############################################################################
+
+
+
Index: security/gnupg/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/security/gnupg/pkg-plist,v
retrieving revision 1.37
diff -u -r1.37 pkg-plist
--- security/gnupg/pkg-plist 17 Aug 2006 19:39:48 -0000 1.37
+++ security/gnupg/pkg-plist 3 Dec 2006 11:57:30 -0000
@@ -1,64 +1,55 @@
-bin/gpg
-bin/gpg-zip
-bin/gpgsplit
-bin/gpgv
-%%WITH_LDAP%%libexec/gnupg/gpgkeys_ldap
-libexec/gnupg/gpgkeys_curl
-libexec/gnupg/gpgkeys_finger
-libexec/gnupg/gpgkeys_hkp
-@dirrm libexec/gnupg
-%%DATADIR%%/FAQ
-%%DATADIR%%/faq.html
-%%DATADIR%%/options.skel
-%%NLS%%share/locale/be/LC_MESSAGES/gnupg.mo
-%%NLS%%share/locale/ca/LC_MESSAGES/gnupg.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/gnupg.mo
-%%NLS%%share/locale/da/LC_MESSAGES/gnupg.mo
-%%NLS%%share/locale/de/LC_MESSAGES/gnupg.mo
-%%NLS%%share/locale/el/LC_MESSAGES/gnupg.mo
-%%NLS%%share/locale/eo/LC_MESSAGES/gnupg.mo
-%%NLS%%share/locale/en@boldquot/LC_MESSAGES/gnupg.mo
-%%NLS%%share/locale/en@quot/LC_MESSAGES/gnupg.mo
-%%NLS%%share/locale/es/LC_MESSAGES/gnupg.mo
-%%NLS%%share/locale/et/LC_MESSAGES/gnupg.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/gnupg.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/gnupg.mo
-%%NLS%%share/locale/gl/LC_MESSAGES/gnupg.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/gnupg.mo
-%%NLS%%share/locale/id/LC_MESSAGES/gnupg.mo
-%%NLS%%share/locale/it/LC_MESSAGES/gnupg.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/gnupg.mo
-%%NLS%%share/locale/nb/LC_MESSAGES/gnupg.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/gnupg.mo
-%%NLS%%share/locale/pt/LC_MESSAGES/gnupg.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/gnupg.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/gnupg.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/gnupg.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/gnupg.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/gnupg.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/gnupg.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/gnupg.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/gnupg.mo
-@dirrm %%DATADIR%%
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
+bin/gpg-agent
+bin/gpg-connect-agent
+bin/gpg2
+bin/gpgconf
+bin/gpgkey2ssh
+bin/gpgparsemail
+bin/gpgsm
+bin/gpgsm-gencert.sh
+bin/gpgv2
+bin/kbxutil
+bin/scdaemon
+bin/watchgnupg
+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
+sbin/addgnupghome
+share/gnupg/FAQ
+share/gnupg/com-certs.pem
+share/gnupg/faq.html
+share/gnupg/gpg-conf.skel
+share/gnupg/qualified.txt
+%%NLS%%share/locale/da/LC_MESSAGES/gnupg2.mo
+%%NLS%%share/locale/de/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/fr/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/pt_BR/LC_MESSAGES/gnupg2.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/gnupg2.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/gnupg2.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/gnupg2.mo
+%%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/el/LC_MESSAGES/gnupg2.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/gnupg2.mo
+%%NLS%%share/locale/gl/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/sk/LC_MESSAGES/gnupg2.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/gnupg2.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/gnupg2.mo
+%%NLS%%share/locale/en@quot/LC_MESSAGES/gnupg2.mo
+%%NLS%%share/locale/en@boldquot/LC_MESSAGES/gnupg2.mo
+@dirrmtry share/gnupg
Index: security/gnupg-devel/Makefile
===================================================================
RCS file: /home/ncvs/ports/security/gnupg-devel/Makefile,v
retrieving revision 1.33
diff -u -r1.33 Makefile
--- security/gnupg-devel/Makefile 28 Nov 2006 12:39:38 -0000 1.33
+++ security/gnupg-devel/Makefile 11 Dec 2006 03:21:47 -0000
@@ -7,7 +7,7 @@
PORTNAME= gnupg
PORTVERSION= 1.9.22
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNUPG}
MASTER_SITE_SUBDIR= alpha/gnupg
@@ -21,7 +21,7 @@
ksba.17:${PORTSDIR}/security/libksba \
pth.20:${PORTSDIR}/devel/pth \
usb-0.1:${PORTSDIR}/devel/libusb
-RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg \
+RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg1 \
dirmngr:${PORTSDIR}/security/dirmngr
USE_BZIP2= yes
Index: security/gnupg-idea/Makefile
===================================================================
RCS file: /home/ncvs/ports/security/gnupg-idea/Makefile,v
retrieving revision 1.28
diff -u -r1.28 Makefile
--- security/gnupg-idea/Makefile 3 Sep 2006 02:05:55 -0000 1.28
+++ security/gnupg-idea/Makefile 11 Dec 2006 03:22:00 -0000
@@ -7,6 +7,7 @@
PORTNAME= gnupg-idea
PORTVERSION= 1.0.6
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNUPG} \
ftp://ftp.gnupg.org/gcrypt/%SUBDIR%/ \
@@ -21,7 +22,7 @@
MAINTAINER= dinoex@FreeBSD.org
COMMENT= IDEA extension module for gnupg (and RSA for demonstration)
-RUN_DEPENDS= ${LOCALBASE}/bin/gpg:${PORTSDIR}/security/gnupg
+RUN_DEPENDS= ${LOCALBASE}/bin/gpg:${PORTSDIR}/security/gnupg1
EXTRACT_AFTER_ARGS= > ${WRKSRC}/idea.c
RESTRICTED= IDEA is Patented in the USA and many European countries
Index: security/gpa/Makefile
===================================================================
RCS file: /home/ncvs/ports/security/gpa/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- security/gpa/Makefile 23 Sep 2006 15:35:38 -0000 1.24
+++ security/gpa/Makefile 11 Dec 2006 03:22:11 -0000
@@ -7,6 +7,7 @@
PORTNAME= gpa
PORTVERSION= 0.7.4
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= http://wald.intevation.org/frs/download.php/241/
@@ -14,8 +15,8 @@
COMMENT= A graphical frontend for the GNU Privacy Guard
LIB_DEPENDS= gpgme:${PORTSDIR}/security/gpgme
-BUILD_DEPENDS= gpg:${PORTSDIR}/security/gnupg
-RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg
+BUILD_DEPENDS= gpg:${PORTSDIR}/security/gnupg1
+RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg1
USE_BZIP2= yes
USE_GMAKE= yes
Index: security/gpgme/Makefile
===================================================================
RCS file: /home/ncvs/ports/security/gpgme/Makefile,v
retrieving revision 1.39
diff -u -r1.39 Makefile
--- security/gpgme/Makefile 22 Sep 2006 07:10:30 -0000 1.39
+++ security/gpgme/Makefile 11 Dec 2006 03:22:23 -0000
@@ -7,7 +7,7 @@
PORTNAME= gpgme
PORTVERSION= 1.1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNUPG}
MASTER_SITE_SUBDIR= gpgme
@@ -15,7 +15,7 @@
MAINTAINER= lofi@FreeBSD.org
COMMENT= A library to make access to GnuPG easier
-BUILD_DEPENDS= gpg:${PORTSDIR}/security/gnupg \
+BUILD_DEPENDS= gpg:${PORTSDIR}/security/gnupg1 \
gpgsm:${PORTSDIR}/security/gnupg-devel
LIB_DEPENDS= gpg-error.3:${PORTSDIR}/security/libgpg-error
Index: security/gpgme03/Makefile
===================================================================
RCS file: /home/ncvs/ports/security/gpgme03/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
--- security/gpgme03/Makefile 13 May 2006 04:15:03 -0000 1.29
+++ security/gpgme03/Makefile 11 Dec 2006 03:22:31 -0000
@@ -7,7 +7,7 @@
PORTNAME= gpgme
PORTVERSION= 0.3.16
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNUPG}
MASTER_SITE_SUBDIR= gpgme
@@ -15,7 +15,7 @@
MAINTAINER= markun@onohara.to
COMMENT= A library to make access to GnuPG easier
-BUILD_DEPENDS= gpg:${PORTSDIR}/security/gnupg
+BUILD_DEPENDS= gpg:${PORTSDIR}/security/gnupg1
LIB_DEPENDS= pth.20:${PORTSDIR}/devel/pth
LATEST_LINK= gpgme03
Index: security/gtkpasman/Makefile
===================================================================
RCS file: /home/ncvs/ports/security/gtkpasman/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- security/gtkpasman/Makefile 14 Oct 2006 08:54:42 -0000 1.8
+++ security/gtkpasman/Makefile 11 Dec 2006 03:22:48 -0000
@@ -7,6 +7,7 @@
PORTNAME= gtkpasman
PORTVERSION= 0.8
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -14,7 +15,7 @@
MAINTAINER= phil@teaser.fr
COMMENT= A GTK+ passwords manager for system and network administrators
-RUN_DEPENDS+= gpg:${PORTSDIR}/security/gnupg
+RUN_DEPENDS+= gpg:${PORTSDIR}/security/gnupg1
BUILD_DEPENDS+= gdk-pixbuf-config:${PORTSDIR}/graphics/gdk-pixbuf
USE_X_PREFIX= yes
Index: security/kgpg/Makefile
===================================================================
RCS file: /home/ncvs/ports/security/kgpg/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- security/kgpg/Makefile 13 May 2006 04:15:05 -0000 1.16
+++ security/kgpg/Makefile 11 Dec 2006 03:23:01 -0000
@@ -7,14 +7,14 @@
PORTNAME= kgpg
PORTVERSION= 1.0.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= security kde
MASTER_SITES= http://developer.kde.org/~kgpg/src/
MAINTAINER= rick@rptn.net
COMMENT= A simple KDE frontend for GnuPG
-RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg
+RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg1
CONFLICTS= kdeutils-3.[2-4].*
Index: security/nofgpg/Makefile
===================================================================
RCS file: /home/ncvs/ports/security/nofgpg/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- security/nofgpg/Makefile 14 Oct 2006 08:54:42 -0000 1.12
+++ security/nofgpg/Makefile 11 Dec 2006 03:23:09 -0000
@@ -8,14 +8,14 @@
PORTNAME= nofgpg
PORTVERSION= 0.5.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security python
MASTER_SITES= http://www.cgabriel.org/download/nofgpg/
MAINTAINER= ports@FreeBSD.org
COMMENT= No One Fears GPG
-RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg \
+RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg1 \
${PYTHON_SITELIBDIR}/gtk-1.2/gnome/ui.py:${PORTSDIR}/x11-toolkits/py-gnome
USE_PYTHON= yes
Index: security/p5-GnuPG-Interface/Makefile
===================================================================
RCS file: /home/ncvs/ports/security/p5-GnuPG-Interface/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- security/p5-GnuPG-Interface/Makefile 16 Mar 2006 13:13:57 -0000 1.18
+++ security/p5-GnuPG-Interface/Makefile 11 Dec 2006 03:23:32 -0000
@@ -7,6 +7,7 @@
PORTNAME= GnuPG-Interface
PORTVERSION= 0.34
+PORTREVISION= 2
CATEGORIES= security perl5
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gnupg-interface
@@ -17,7 +18,7 @@
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Class/MethodMaker.pm:${PORTSDIR}/devel/p5-Class-MethodMaker \
${RUN_DEPENDS}
-RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg
+RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg1
PERL_CONFIGURE= yes
Index: security/p5-Module-Signature/Makefile
===================================================================
RCS file: /home/ncvs/ports/security/p5-Module-Signature/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- security/p5-Module-Signature/Makefile 31 Jul 2006 00:22:36 -0000 1.13
+++ security/p5-Module-Signature/Makefile 11 Dec 2006 03:23:43 -0000
@@ -7,6 +7,7 @@
PORTNAME= Module-Signature
PORTVERSION= 0.55
+PORTREVISION= 1
CATEGORIES= security perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Module
@@ -17,7 +18,7 @@
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Digest/SHA.pm:${PORTSDIR}/security/p5-Digest-SHA \
${SITE_PERL}/PAR/Dist.pm:${PORTSDIR}/devel/p5-PAR-Dist \
- ${LOCALBASE}/bin/gpg:${PORTSDIR}/security/gnupg
+ ${LOCALBASE}/bin/gpg:${PORTSDIR}/security/gnupg1
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
Index: security/pgpgpg/Makefile
===================================================================
RCS file: /home/ncvs/ports/security/pgpgpg/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- security/pgpgpg/Makefile 25 May 2004 18:48:23 -0000 1.8
+++ security/pgpgpg/Makefile 11 Dec 2006 03:23:53 -0000
@@ -7,7 +7,7 @@
PORTNAME= pgpgpg
PORTVERSION= 0.13
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_PACKETSTORM} \
ftp://ftp.gnupg.org/gcrypt/historic/ \
@@ -21,8 +21,8 @@
# if it can't find gpg. RUN_DEPENDS is necessary to make the package
# dependency register correctly. Hence the apparent redundancy.
-BUILD_DEPENDS= ${PREFIX}/bin/gpg:${PORTSDIR}/security/gnupg
-RUN_DEPENDS= ${PREFIX}/bin/gpg:${PORTSDIR}/security/gnupg
+BUILD_DEPENDS= ${PREFIX}/bin/gpg:${PORTSDIR}/security/gnupg1
+RUN_DEPENDS= ${PREFIX}/bin/gpg:${PORTSDIR}/security/gnupg1
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-gpg-path=${PREFIX}/bin/gpg
Index: security/pwman/Makefile
===================================================================
RCS file: /home/ncvs/ports/security/pwman/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- security/pwman/Makefile 13 May 2006 04:15:13 -0000 1.7
+++ security/pwman/Makefile 11 Dec 2006 03:24:00 -0000
@@ -7,7 +7,7 @@
PORTNAME= pwman
PORTVERSION= 0.3.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -16,7 +16,7 @@
COMMENT= Console password management application based on gpg(me)
LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2
-RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg
+RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg1
GNU_CONFIGURE= yes
Index: security/seahorse/Makefile
===================================================================
RCS file: /home/ncvs/ports/security/seahorse/Makefile,v
retrieving revision 1.52
diff -u -r1.52 Makefile
--- security/seahorse/Makefile 14 Oct 2006 08:54:43 -0000 1.52
+++ security/seahorse/Makefile 11 Dec 2006 03:24:09 -0000
@@ -8,7 +8,7 @@
PORTNAME= seahorse
PORTVERSION= 0.8.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR=sources/${PORTNAME}/0.8
@@ -17,7 +17,7 @@
MAINTAINER= gnome@FreeBSD.org
COMMENT= A front end for GnuPG
-BUILD_DEPENDS= gpg:${PORTSDIR}/security/gnupg
+BUILD_DEPENDS= gpg:${PORTSDIR}/security/gnupg1
RUN_DEPENDS= ${BUILD_DEPENDS}
LIB_DEPENDS= gpgme.17:${PORTSDIR}/security/gpgme
Index: security/sguil-client/Makefile
===================================================================
RCS file: /home/ncvs/ports/security/sguil-client/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- security/sguil-client/Makefile 15 Nov 2006 21:33:51 -0000 1.1
+++ security/sguil-client/Makefile 11 Dec 2006 03:24:23 -0000
@@ -7,6 +7,7 @@
PORTNAME= sguil-client
PORTVERSION= 0.6.1
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= sguil
@@ -15,7 +16,7 @@
COMMENT= Sguil is a network security monitoring program
RUN_DEPENDS= dtplite:${PORTSDIR}/devel/tcllib \
- gpg:${PORTSDIR}/security/gnupg \
+ gpg:${PORTSDIR}/security/gnupg1 \
${LOCALBASE}/lib/tclx8.4/tclx.tcl:${PORTSDIR}/lang/tclX \
${LOCALBASE}/lib/iwidgets/iwidgets.tcl:${PORTSDIR}/x11-toolkits/iwidgets
Index: security/signing-party/Makefile
===================================================================
RCS file: /home/ncvs/ports/security/signing-party/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- security/signing-party/Makefile 5 Nov 2006 17:31:27 -0000 1.7
+++ security/signing-party/Makefile 11 Dec 2006 03:24:41 -0000
@@ -7,6 +7,7 @@
PORTNAME= signing-party
PORTVERSION= 0.4.9.1
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_DEBIAN}
MASTER_SITE_SUBDIR= pool/main/s/signing-party
@@ -20,7 +21,7 @@
MAINTAINER= johans@stack.nl
COMMENT= Various OpenPGP related tools
-RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg \
+RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg1 \
${SITE_PERL}/GnuPG/Interface.pm:${PORTSDIR}/security/p5-GnuPG-Interface \
${SITE_PERL}/Mail/Util.pm:${PORTSDIR}/mail/p5-Mail-Tools \
${SITE_PERL}/MIME/Tools.pm:${PORTSDIR}/mail/p5-MIME-Tools \
Index: sysutils/duplicity/Makefile
===================================================================
RCS file: /home/ncvs/ports/sysutils/duplicity/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- sysutils/duplicity/Makefile 3 Feb 2006 16:11:11 -0000 1.7
+++ sysutils/duplicity/Makefile 11 Dec 2006 03:24:57 -0000
@@ -7,6 +7,7 @@
PORTNAME= duplicity
PORTVERSION= 0.4.2
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -16,7 +17,7 @@
COMMENT= Untrusted backup using rsync algorithm
LIB_DEPENDS= rsync.1:${PORTSDIR}/net/librsync
-RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg
+RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg1
USE_PYTHON= yes
USE_PYDISTUTILS= yes
Index: sysutils/hdup/Makefile
===================================================================
RCS file: /home/ncvs/ports/sysutils/hdup/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- sysutils/hdup/Makefile 7 Feb 2006 17:56:15 -0000 1.14
+++ sysutils/hdup/Makefile 11 Dec 2006 03:25:08 -0000
@@ -7,6 +7,7 @@
PORTNAME= hdup
PORTVERSION= 2.0.14
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://www.miek.nl/projects/hdup2/ \
http://www.miek.nl/projects/hdup2/previous/
@@ -20,7 +21,7 @@
BUILD_DEPENDS= mcrypt:${PORTSDIR}/security/mcrypt
RUN_DEPENDS= mcrypt:${PORTSDIR}/security/mcrypt \
- gpg:${PORTSDIR}/security/gnupg \
+ gpg:${PORTSDIR}/security/gnupg1 \
lzop:${PORTSDIR}/archivers/lzop
USE_BZIP2= yes
Index: security/gnupg/files/patch-CVE-2006-6235
===================================================================
RCS file: security/gnupg/files/patch-CVE-2006-6235
diff -N security/gnupg/files/patch-CVE-2006-6235
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ security/gnupg/files/patch-CVE-2006-6235 11 Dec 2006 03:38:45 -0000
@@ -0,0 +1,260 @@
+This is a patch against GnuPG 2.0.1. Change the directory to g10/ and
+apply this patch.
+
+2006-12-02 Werner Koch <wk@g10code.com>
+
+ * encr-data.c: Allocate DFX context on the heap and not on the
+ stack. Changes at several places. Fixes CVE-2006-6235.
+
+
+Index: g10/encr-data.c
+===================================================================
+--- g10/encr-data.c (revision 4352)
++++ g10/encr-data.c (working copy)
+@@ -39,16 +39,37 @@
+ static int decode_filter ( void *opaque, int control, IOBUF a,
+ byte *buf, size_t *ret_len);
+
+-typedef struct
++typedef struct decode_filter_context_s
+ {
+ gcry_cipher_hd_t cipher_hd;
+ gcry_md_hd_t mdc_hash;
+ char defer[22];
+ int defer_filled;
+ int eof_seen;
+-} decode_filter_ctx_t;
++ int refcount;
++} *decode_filter_ctx_t;
+
+
++/* Helper to release the decode context. */
++static void
++release_dfx_context (decode_filter_ctx_t dfx)
++{
++ if (!dfx)
++ return;
++
++ assert (dfx->refcount);
++ if ( !--dfx->refcount )
++ {
++ gcry_cipher_close (dfx->cipher_hd);
++ dfx->cipher_hd = NULL;
++ gcry_md_close (dfx->mdc_hash);
++ dfx->mdc_hash = NULL;
++ xfree (dfx);
++ }
++}
++
++
++
+ /****************
+ * Decrypt the data, specified by ED with the key DEK.
+ */
+@@ -62,7 +83,11 @@
+ unsigned blocksize;
+ unsigned nprefix;
+
+- memset( &dfx, 0, sizeof dfx );
++ dfx = xtrycalloc (1, sizeof *dfx);
++ if (!dfx)
++ return gpg_error_from_syserror ();
++ dfx->refcount = 1;
++
+ if ( opt.verbose && !dek->algo_info_printed )
+ {
+ const char *s = gcry_cipher_algo_name (dek->algo);
+@@ -77,20 +102,20 @@
+ goto leave;
+ blocksize = gcry_cipher_get_algo_blklen (dek->algo);
+ if ( !blocksize || blocksize > 16 )
+- log_fatal("unsupported blocksize %u\n", blocksize );
++ log_fatal ("unsupported blocksize %u\n", blocksize );
+ nprefix = blocksize;
+ if ( ed->len && ed->len < (nprefix+2) )
+ BUG();
+
+ if ( ed->mdc_method )
+ {
+- if (gcry_md_open (&dfx.mdc_hash, ed->mdc_method, 0 ))
++ if (gcry_md_open (&dfx->mdc_hash, ed->mdc_method, 0 ))
+ BUG ();
+ if ( DBG_HASHING )
+- gcry_md_start_debug (dfx.mdc_hash, "checkmdc");
++ gcry_md_start_debug (dfx->mdc_hash, "checkmdc");
+ }
+
+- rc = gcry_cipher_open (&dfx.cipher_hd, dek->algo,
++ rc = gcry_cipher_open (&dfx->cipher_hd, dek->algo,
+ GCRY_CIPHER_MODE_CFB,
+ (GCRY_CIPHER_SECURE
+ | ((ed->mdc_method || dek->algo >= 100)?
+@@ -104,7 +129,7 @@
+
+
+ /* log_hexdump( "thekey", dek->key, dek->keylen );*/
+- rc = gcry_cipher_setkey (dfx.cipher_hd, dek->key, dek->keylen);
++ rc = gcry_cipher_setkey (dfx->cipher_hd, dek->key, dek->keylen);
+ if ( gpg_err_code (rc) == GPG_ERR_WEAK_KEY )
+ {
+ log_info(_("WARNING: message was encrypted with"
+@@ -123,7 +148,7 @@
+ goto leave;
+ }
+
+- gcry_cipher_setiv (dfx.cipher_hd, NULL, 0);
++ gcry_cipher_setiv (dfx->cipher_hd, NULL, 0);
+
+ if ( ed->len )
+ {
+@@ -144,8 +169,8 @@
+ temp[i] = c;
+ }
+
+- gcry_cipher_decrypt (dfx.cipher_hd, temp, nprefix+2, NULL, 0);
+- gcry_cipher_sync (dfx.cipher_hd);
++ gcry_cipher_decrypt (dfx->cipher_hd, temp, nprefix+2, NULL, 0);
++ gcry_cipher_sync (dfx->cipher_hd);
+ p = temp;
+ /* log_hexdump( "prefix", temp, nprefix+2 ); */
+ if (dek->symmetric
+@@ -155,17 +180,18 @@
+ goto leave;
+ }
+
+- if ( dfx.mdc_hash )
+- gcry_md_write (dfx.mdc_hash, temp, nprefix+2);
+-
++ if ( dfx->mdc_hash )
++ gcry_md_write (dfx->mdc_hash, temp, nprefix+2);
++
++ dfx->refcount++;
+ if ( ed->mdc_method )
+- iobuf_push_filter( ed->buf, mdc_decode_filter, &dfx );
++ iobuf_push_filter ( ed->buf, mdc_decode_filter, dfx );
+ else
+- iobuf_push_filter( ed->buf, decode_filter, &dfx );
++ iobuf_push_filter ( ed->buf, decode_filter, dfx );
+
+ proc_packets ( procctx, ed->buf );
+ ed->buf = NULL;
+- if ( ed->mdc_method && dfx.eof_seen == 2 )
++ if ( ed->mdc_method && dfx->eof_seen == 2 )
+ rc = gpg_error (GPG_ERR_INV_PACKET);
+ else if ( ed->mdc_method )
+ {
+@@ -184,26 +210,28 @@
+ bytes are appended. */
+ int datalen = gcry_md_get_algo_dlen (ed->mdc_method);
+
+- gcry_cipher_decrypt (dfx.cipher_hd, dfx.defer, 22, NULL, 0);
+- gcry_md_write (dfx.mdc_hash, dfx.defer, 2);
+- gcry_md_final (dfx.mdc_hash);
++ assert (dfx->cipher_hd);
++ assert (dfx->mdc_hash);
++ gcry_cipher_decrypt (dfx->cipher_hd, dfx->defer, 22, NULL, 0);
++ gcry_md_write (dfx->mdc_hash, dfx->defer, 2);
++ gcry_md_final (dfx->mdc_hash);
+
+- if (dfx.defer[0] != '\xd3' || dfx.defer[1] != '\x14' )
++ if (dfx->defer[0] != '\xd3' || dfx->defer[1] != '\x14' )
+ {
+ log_error("mdc_packet with invalid encoding\n");
+ rc = gpg_error (GPG_ERR_INV_PACKET);
+ }
+ else if (datalen != 20
+- || memcmp (gcry_md_read (dfx.mdc_hash, 0),dfx.defer+2,datalen))
++ || memcmp (gcry_md_read (dfx->mdc_hash, 0),
++ dfx->defer+2,datalen ))
+ rc = gpg_error (GPG_ERR_BAD_SIGNATURE);
+- /* log_printhex("MDC message:", dfx.defer, 22); */
+- /* log_printhex("MDC calc:", gcry_md_read (dfx.mdc_hash,0), datalen); */
++ /* log_printhex("MDC message:", dfx->defer, 22); */
++ /* log_printhex("MDC calc:", gcry_md_read (dfx->mdc_hash,0), datalen); */
+ }
+
+
+ leave:
+- gcry_cipher_close (dfx.cipher_hd);
+- gcry_md_close (dfx.mdc_hash);
++ release_dfx_context (dfx);
+ return rc;
+ }
+
+@@ -214,7 +242,7 @@
+ mdc_decode_filter (void *opaque, int control, IOBUF a,
+ byte *buf, size_t *ret_len)
+ {
+- decode_filter_ctx_t *dfx = opaque;
++ decode_filter_ctx_t dfx = opaque;
+ size_t n, size = *ret_len;
+ int rc = 0;
+ int c;
+@@ -226,11 +254,11 @@
+ }
+ else if( control == IOBUFCTRL_UNDERFLOW )
+ {
+- assert(a);
+- assert( size > 44 );
++ assert (a);
++ assert ( size > 44 );
+
+ /* Get at least 22 bytes and put it somewhere ahead in the buffer. */
+- for(n=22; n < 44 ; n++ )
++ for (n=22; n < 44 ; n++ )
+ {
+ if( (c = iobuf_get(a)) == -1 )
+ break;
+@@ -279,8 +307,10 @@
+
+ if ( n )
+ {
+- gcry_cipher_decrypt (dfx->cipher_hd, buf, n, NULL, 0);
+- gcry_md_write (dfx->mdc_hash, buf, n);
++ if ( dfx->cipher_hd )
++ gcry_cipher_decrypt (dfx->cipher_hd, buf, n, NULL, 0);
++ if ( dfx->mdc_hash )
++ gcry_md_write (dfx->mdc_hash, buf, n);
+ }
+ else
+ {
+@@ -289,6 +319,10 @@
+ }
+ *ret_len = n;
+ }
++ else if ( control == IOBUFCTRL_FREE )
++ {
++ release_dfx_context (dfx);
++ }
+ else if ( control == IOBUFCTRL_DESC )
+ {
+ *(char**)buf = "mdc_decode_filter";
+@@ -300,7 +334,7 @@
+ static int
+ decode_filter( void *opaque, int control, IOBUF a, byte *buf, size_t *ret_len)
+ {
+- decode_filter_ctx_t *fc = opaque;
++ decode_filter_ctx_t fc = opaque;
+ size_t n, size = *ret_len;
+ int rc = 0;
+
+@@ -311,11 +345,18 @@
+ if ( n == -1 )
+ n = 0;
+ if ( n )
+- gcry_cipher_decrypt (fc->cipher_hd, buf, n, NULL, 0);
++ {
++ if (fc->cipher_hd)
++ gcry_cipher_decrypt (fc->cipher_hd, buf, n, NULL, 0);
++ }
+ else
+ rc = -1; /* EOF */
+ *ret_len = n;
+ }
++ else if ( control == IOBUFCTRL_FREE )
++ {
++ release_dfx_context (fc);
++ }
+ else if ( control == IOBUFCTRL_DESC )
+ {
+ *(char**)buf = "decode_filter";
Index: security/gnupg/files/patch-config.links
===================================================================
RCS file: /home/pcvs/ports/security/gnupg/files/patch-config.links,v
retrieving revision 1.1
diff -u -r1.1 patch-config.links
--- security/gnupg/files/patch-config.links 10 May 2003 07:55:33 -0000 1.1
+++ security/gnupg/files/patch-config.links 11 Dec 2006 03:38:45 -0000
@@ -1,15 +0,0 @@
---- mpi/config.links.orig Thu Apr 24 20:15:58 2003
-+++ mpi/config.links Sat May 10 16:29:28 2003
-@@ -142,6 +142,12 @@
- echo '/* configured for sparc64-*netbsd */' >>./mpi/asm-syntax.h
- path=""
- ;;
-+ sparc64-*-freebsd*)
-+ # There are no sparc64 assembler modules that work, so
-+ # just use generic C functions
-+ echo '/* configured for sparc64-*freebsd* */' >>./mpi/asm-syntax.h
-+ path=""
-+ ;;
- sparc9*-*-* | \
- sparc64*-*-* | \
- ultrasparc*-*-* )
--Multipart_Mon_Dec_11_12:42:15_2006-1--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?7mu003jdyg.wl%kuriyama>