Date: Wed, 30 Jul 2014 03:57:24 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363436 - in head: . audio/ario audio/gogglesmm audio/pianobar comms/svxlink databases/xtrabackup devel/ccrtp devel/gsoap devel/gvfs devel/gwenhywfar devel/libsoup devel/libvirt devel/l... Message-ID: <201407300357.s6U3vOhR060830@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Wed Jul 30 03:57:23 2014 New Revision: 363436 URL: http://svnweb.freebsd.org/changeset/ports/363436 QAT: https://qat.redports.org/buildarchive/r363436/ Log: security/libgcrypt: 1.5.3_3 -> 1.6.1 - Update to 1.6.1 - Remove some unneeded patches - Fix pkg-plist - report configure bug upstream https://bugs.g10code.com/gnupg/issue1668 - report API breakage downstream and find that MacPorts had the same issue https://rt.cpan.org/Ticket/Display.html?id=97201 - bump PORTREVISION for dependent ports (approx. 100 ports) - Thanks to exp-run by antoine@ to find ports that break - patch ports that would otherwise break security/shishi with PR 192164 is already committed [1] devel/ccrtp [2] editors/abiword [3] security/p5-Crypt-GCrypt PR: 191256, 192162 [1], 192163 [2], 192166 [3] Submitted by: Carlos Jacobo Puga Medina <cjpugmed@gmail.com> Approved by: maintainer timeout, antoine (exp-run), portmgr (implicit) Added: head/editors/abiword/files/patch-tls_tunnel.cpp (contents, props changed) head/security/libgcrypt/files/patch-gcrypt.h.in (contents, props changed) head/security/p5-Crypt-GCrypt/files/ head/security/p5-Crypt-GCrypt/files/patch-GCrypt.xs (contents, props changed) Deleted: head/security/libgcrypt/files/patch-cipher-rijndael.c head/security/libgcrypt/files/patch-mpi-config.links head/security/libgcrypt/files/patch-mpi-longlong.h Modified: head/UPDATING head/audio/ario/Makefile head/audio/gogglesmm/Makefile head/audio/pianobar/Makefile head/comms/svxlink/Makefile head/databases/xtrabackup/Makefile head/devel/ccrtp/Makefile head/devel/ccrtp/distinfo head/devel/ccrtp/pkg-plist head/devel/gsoap/Makefile head/devel/gvfs/Makefile head/devel/gwenhywfar/Makefile head/devel/libsoup/Makefile head/devel/libvirt/Makefile head/devel/libzrtpcpp/Makefile head/devel/srecord/Makefile head/emulators/fuse/Makefile head/emulators/libspectrum/Makefile head/ftp/filezilla/Makefile head/games/libggz/Makefile head/graphics/telak/Makefile head/irc/bitlbee/Makefile head/irc/irssi-otr/Makefile head/irc/weechat-devel/Makefile head/irc/weechat/Makefile head/japanese/jd/Makefile head/lang/gnustep-base/Makefile head/mail/libetpan/Makefile head/mail/wmbiff/Makefile head/mail/xfce4-mailwatch-plugin/Makefile head/misc/metalink-tools/Makefile head/multimedia/libaacs/Makefile head/multimedia/libmtp/Makefile head/multimedia/vlc/Makefile head/net-im/climm/Makefile head/net-im/mcabber/Makefile head/net-p2p/gnunet/Makefile head/net-p2p/libktorrent/Makefile head/net-p2p/ncdc/Makefile head/net-p2p/retroshare/Makefile head/net/afpfs-ng/Makefile head/net/clamz/Makefile head/net/cyphesis/Makefile head/net/glib-networking/Makefile head/net/grive/Makefile head/net/gtk-vnc/Makefile head/net/librouteros/Makefile head/net/quagga-re/Makefile head/net/remmina/Makefile head/net/uget/Makefile head/net/wireshark/Makefile head/news/nzbget/Makefile head/print/cups-base/Makefile head/security/fiked/Makefile head/security/gnomint/Makefile head/security/gsasl/Makefile head/security/libgcrypt/Makefile head/security/libgcrypt/distinfo head/security/libgcrypt/pkg-plist head/security/libmatekeyring/Makefile head/security/libotr/Makefile head/security/libotr3/Makefile head/security/libprelude/Makefile head/security/libpreludedb/Makefile head/security/libsecret/Makefile head/security/libssh2/Makefile head/security/opencdk/Makefile head/security/openvas-libraries/Makefile head/security/openvpn-auth-radius/Makefile head/security/p5-Crypt-GCrypt/Makefile head/security/pam-pgsql/Makefile head/security/pidgin-otr/Makefile head/security/pinentry/Makefile head/security/prelude-lml/Makefile head/security/prelude-manager/Makefile head/security/seahorse-plugins/Makefile head/security/seccure/Makefile head/security/vpnc/Makefile head/sysutils/dar/Makefile head/sysutils/freeipmi/Makefile head/sysutils/fusefs-cryptofs/Makefile head/sysutils/rsyslog7-devel/Makefile head/sysutils/rsyslog7/Makefile head/sysutils/rsyslog8-devel/Makefile head/sysutils/rsyslog8/Makefile head/textproc/libxslt/Makefile head/www/libmicrohttpd/Makefile Modified: head/UPDATING ============================================================================== --- head/UPDATING Wed Jul 30 03:34:01 2014 (r363435) +++ head/UPDATING Wed Jul 30 03:57:23 2014 (r363436) @@ -5,6 +5,20 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20140730: + AFFECTS: users of security/libgcrypt + AUTHOR: pi@FreeBSD.org + + libgcrypt has been updated to 1.6.1 and all shared libraries versions have + been bumped. So you need to rebuild all applications that depend on + libgcrypt. + + # portmaster -r libgcrypt + or + # portupgrade -fr security/libgcrypt + or + # pkg install -fR security/libgcrypt + 20140728: AFFECTS: users of net/GeoIP AUTHOR: adamw@FreeBSD.org Modified: head/audio/ario/Makefile ============================================================================== --- head/audio/ario/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/audio/ario/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= ario PORTVERSION= 1.5.1 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= audio MASTER_SITES= SF/ario-player/ario-player/${PORTVERSION} Modified: head/audio/gogglesmm/Makefile ============================================================================== --- head/audio/gogglesmm/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/audio/gogglesmm/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= gogglesmm PORTVERSION= 0.12.7 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= audio MASTER_SITES= GOOGLE_CODE Modified: head/audio/pianobar/Makefile ============================================================================== --- head/audio/pianobar/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/audio/pianobar/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= pianobar PORTVERSION= 2013.09.15 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio MASTER_SITES= http://6xq.net/projects/${PORTNAME}/ Modified: head/comms/svxlink/Makefile ============================================================================== --- head/comms/svxlink/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/comms/svxlink/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,6 +3,7 @@ PORTNAME= svxlink PORTVERSION= 13.12 +PORTREVISION= 1 CATEGORIES= comms hamradio MASTER_SITES= SF/svxlink/svxlink/${PORTVERSION} Modified: head/databases/xtrabackup/Makefile ============================================================================== --- head/databases/xtrabackup/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/databases/xtrabackup/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,6 +3,7 @@ PORTNAME= xtrabackup PORTVERSION= 2.1.7 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://www.percona.com/downloads/%SUBDIR%/ DISTNAME= percona-${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} Modified: head/devel/ccrtp/Makefile ============================================================================== --- head/devel/ccrtp/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/devel/ccrtp/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= ccrtp -PORTVERSION= 2.0.6 -PORTREVISION= 4 +PORTVERSION= 2.0.9 CATEGORIES= devel MASTER_SITES= GNU @@ -19,7 +18,7 @@ USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib -INFO= ccrtp +INFO= ccrtp post-patch: @cd ${WRKSRC}/src && \ @@ -29,4 +28,7 @@ post-configure: ${FIND} ${WRKSRC} -name Makefile | ${XARGS} \ ${REINPLACE_CMD} -e 's|-l-pthread|-pthread|g' +post-stage: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libccrtp.so.2.0.6 + .include <bsd.port.mk> Modified: head/devel/ccrtp/distinfo ============================================================================== --- head/devel/ccrtp/distinfo Wed Jul 30 03:34:01 2014 (r363435) +++ head/devel/ccrtp/distinfo Wed Jul 30 03:57:23 2014 (r363436) @@ -1,2 +1,2 @@ -SHA256 (ccrtp-2.0.6.tar.gz) = 39fe4cd98635f710800b1d3f4090cae7110cbfee97ad42c77233eac2c5e4381b -SIZE (ccrtp-2.0.6.tar.gz) = 735455 +SHA256 (ccrtp-2.0.9.tar.gz) = 2032176f7d64db05d7bc557a045d0b24ec76f264448a30a7de9f12c5a31530df +SIZE (ccrtp-2.0.9.tar.gz) = 751786 Modified: head/devel/ccrtp/pkg-plist ============================================================================== --- head/devel/ccrtp/pkg-plist Wed Jul 30 03:34:01 2014 (r363435) +++ head/devel/ccrtp/pkg-plist Wed Jul 30 03:57:23 2014 (r363436) @@ -14,9 +14,9 @@ include/ccrtp/rtcppkt.h include/ccrtp/rtp.h include/ccrtp/rtppkt.h include/ccrtp/sources.h -lib/libccrtp.so.0.0.0 -lib/libccrtp.so.0 -lib/libccrtp.so lib/libccrtp.a +lib/libccrtp.so +lib/libccrtp.so.2 +lib/libccrtp.so.2.0.6 libdata/pkgconfig/libccrtp.pc @dirrm include/ccrtp Modified: head/devel/gsoap/Makefile ============================================================================== --- head/devel/gsoap/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/devel/gsoap/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= gsoap PORTVERSION= 2.8.17 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}2/gSOAP DISTNAME= ${PORTNAME}_${PORTVERSION} Modified: head/devel/gvfs/Makefile ============================================================================== --- head/devel/gvfs/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/devel/gvfs/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -4,7 +4,7 @@ PORTNAME= gvfs PORTVERSION= 1.12.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 Modified: head/devel/gwenhywfar/Makefile ============================================================================== --- head/devel/gwenhywfar/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/devel/gwenhywfar/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -2,7 +2,7 @@ PORTNAME= gwenhywfar PORTVERSION= 4.3.3 -PORTREVISION?= 6 +PORTREVISION?= 7 CATEGORIES= devel net security MASTER_SITES= http://www.aquamaniac.de/sites/download/download.php?package=01&release=67&file=01&dummy=/ Modified: head/devel/libsoup/Makefile ============================================================================== --- head/devel/libsoup/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/devel/libsoup/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -4,7 +4,7 @@ PORTNAME= libsoup PORTVERSION= 2.40.3 -PORTREVISION?= 5 +PORTREVISION?= 6 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 Modified: head/devel/libvirt/Makefile ============================================================================== --- head/devel/libvirt/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/devel/libvirt/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= libvirt PORTVERSION= 1.2.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= http://libvirt.org/sources/ \ ftp://libvirt.org/libvirt/ Modified: head/devel/libzrtpcpp/Makefile ============================================================================== --- head/devel/libzrtpcpp/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/devel/libzrtpcpp/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= libzrtpcpp PORTVERSION= 2.3.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR=ccrtp Modified: head/devel/srecord/Makefile ============================================================================== --- head/devel/srecord/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/devel/srecord/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,6 +3,7 @@ PORTNAME= srecord PORTVERSION= 1.64 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= SF Added: head/editors/abiword/files/patch-tls_tunnel.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/abiword/files/patch-tls_tunnel.cpp Wed Jul 30 03:57:23 2014 (r363436) @@ -0,0 +1,17 @@ +--- plugins/collab/backends/service/xp/tls_tunnel.cpp-orig 2014-07-27 14:22:00.000000000 +0200 ++++ plugins/collab/backends/service/xp/tls_tunnel.cpp 2014-07-27 14:22:46.000000000 +0200 +@@ -124,10 +124,14 @@ + } + + static struct gcry_thread_cbs gcry_threads_tunnel = ++#if GCRYPT_VERSION_NUMBER < 0x010600 + { GCRY_THREAD_OPTION_USER, NULL, + gcry_tunnel_mutex_init, gcry_tunnel_mutex_destroy, + gcry_tunnel_mutex_lock, gcry_tunnel_mutex_unlock, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }; ++#else ++{ GCRY_THREAD_OPTION_USER }; ++#endif + + bool Proxy::tls_tunnel_init() { + if (gcry_control(GCRYCTL_SET_THREAD_CBS, &tls_tunnel::gcry_threads_tunnel) != 0) Modified: head/emulators/fuse/Makefile ============================================================================== --- head/emulators/fuse/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/emulators/fuse/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= fuse PORTVERSION= 1.1.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}-emulator/${PORTNAME}/${PORTVERSION} Modified: head/emulators/libspectrum/Makefile ============================================================================== --- head/emulators/libspectrum/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/emulators/libspectrum/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= libspectrum PORTVERSION= 1.1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators devel MASTER_SITES= SF/fuse-emulator/${PORTNAME}/${PORTVERSION} Modified: head/ftp/filezilla/Makefile ============================================================================== --- head/ftp/filezilla/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/ftp/filezilla/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= filezilla PORTVERSION= 3.8.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= ftp MASTER_SITES= SF/${PORTNAME}/FileZilla_Client/${PORTVERSION} DISTNAME= FileZilla_${PORTVERSION}_src Modified: head/games/libggz/Makefile ============================================================================== --- head/games/libggz/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/games/libggz/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= libggz PORTVERSION= ${GGZ_VERSION} -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= games MAINTAINER= ports@FreeBSD.org Modified: head/graphics/telak/Makefile ============================================================================== --- head/graphics/telak/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/graphics/telak/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= telak PORTVERSION= 0.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://julien.danjou.info/telak/ \ CRITICAL Modified: head/irc/bitlbee/Makefile ============================================================================== --- head/irc/bitlbee/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/irc/bitlbee/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -2,7 +2,7 @@ PORTNAME= bitlbee PORTVERSION= 3.2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= irc MASTER_SITES= http://get.bitlbee.org/src/ \ ${MASTER_SITE_LOCAL} Modified: head/irc/irssi-otr/Makefile ============================================================================== --- head/irc/irssi-otr/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/irc/irssi-otr/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,6 +3,7 @@ PORTNAME= irssi-otr PORTVERSION= 1.0.0 +PORTREVISION= 1 CATEGORIES= irc MASTER_SITES= GH Modified: head/irc/weechat-devel/Makefile ============================================================================== --- head/irc/weechat-devel/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/irc/weechat-devel/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -2,7 +2,7 @@ PORTNAME= weechat PORTVERSION= 20140213 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= irc MASTER_SITES= http://perturb.me.uk/distfiles/weechat-devel/ \ ${MASTER_SITE_LOCAL} Modified: head/irc/weechat/Makefile ============================================================================== --- head/irc/weechat/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/irc/weechat/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= weechat PORTVERSION= 0.4.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= irc MASTER_SITES= http://weechat.org/files/src/ \ http://perturb.me.uk/distfiles/weechat/:mandocs \ Modified: head/japanese/jd/Makefile ============================================================================== --- head/japanese/jd/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/japanese/jd/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= jd PORTVERSION= 2.8.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese www MASTER_SITES= SFJP MASTER_SITE_SUBDIR= jd4linux/61281 Modified: head/lang/gnustep-base/Makefile ============================================================================== --- head/lang/gnustep-base/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/lang/gnustep-base/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= gnustep-base PORTVERSION= 1.24.6 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= lang devel gnustep MASTER_SITES= ${MASTER_SITE_GNUSTEP} MASTER_SITE_SUBDIR= core Modified: head/mail/libetpan/Makefile ============================================================================== --- head/mail/libetpan/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/mail/libetpan/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= libetpan PORTVERSION= 1.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail ipv6 MAINTAINER= pawel@FreeBSD.org Modified: head/mail/wmbiff/Makefile ============================================================================== --- head/mail/wmbiff/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/mail/wmbiff/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= wmbiff PORTVERSION= 0.4.27 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= mail windowmaker afterstep MASTER_SITES= SF Modified: head/mail/xfce4-mailwatch-plugin/Makefile ============================================================================== --- head/mail/xfce4-mailwatch-plugin/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/mail/xfce4-mailwatch-plugin/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= xfce4-mailwatch-plugin PORTVERSION= 1.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R} Modified: head/misc/metalink-tools/Makefile ============================================================================== --- head/misc/metalink-tools/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/misc/metalink-tools/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= metalink PORTVERSION= 0.3.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= misc MASTER_SITES= SF/metalinks/Metalink%20commandline/${PORTVERSION} PKGNAMESUFFIX?= -tools Modified: head/multimedia/libaacs/Makefile ============================================================================== --- head/multimedia/libaacs/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/multimedia/libaacs/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= libaacs PORTVERSION= 0.7.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/${PORTNAME}/${PORTVERSION}/ \ http://blu.opsec.eu/ Modified: head/multimedia/libmtp/Makefile ============================================================================== --- head/multimedia/libmtp/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/multimedia/libmtp/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= libmtp PORTVERSION= 1.1.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia audio MASTER_SITES= SF Modified: head/multimedia/vlc/Makefile ============================================================================== --- head/multimedia/vlc/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/multimedia/vlc/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= vlc DISTVERSION= 2.1.5 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 4 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \ Modified: head/net-im/climm/Makefile ============================================================================== --- head/net-im/climm/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/net-im/climm/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= climm PORTVERSION= 0.7.1 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= net-im MASTER_SITES= http://www.climm.org/source/ \ http://http.bg.climm.org/source/ Modified: head/net-im/mcabber/Makefile ============================================================================== --- head/net-im/mcabber/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/net-im/mcabber/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= mcabber PORTVERSION= 0.10.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-im MASTER_SITES= http://www.lilotux.net/~mikael/mcabber/files/ CENKES Modified: head/net-p2p/gnunet/Makefile ============================================================================== --- head/net-p2p/gnunet/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/net-p2p/gnunet/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= gnunet DISTVERSION= 0.9.3 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= net-p2p ipv6 security MASTER_SITES= GNU Modified: head/net-p2p/libktorrent/Makefile ============================================================================== --- head/net-p2p/libktorrent/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/net-p2p/libktorrent/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -2,7 +2,7 @@ PORTNAME= libktorrent DISTVERSION= 1.3.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-p2p kde MASTER_SITES= http://ktorrent.org/downloads/${DISTVERSION:C,^1,4,:C,-.*,,}/ Modified: head/net-p2p/ncdc/Makefile ============================================================================== --- head/net-p2p/ncdc/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/net-p2p/ncdc/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= ncdc PORTVERSION= 1.19.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-p2p MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \ http://dev.yorhel.nl/download/ Modified: head/net-p2p/retroshare/Makefile ============================================================================== --- head/net-p2p/retroshare/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/net-p2p/retroshare/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= retroshare PORTVERSION= 0.5.5c -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-p2p MASTER_SITES= SF MASTER_SITE_SUBDIR=${PORTNAME}/${BINARY}/${PORTVERSION} Modified: head/net/afpfs-ng/Makefile ============================================================================== --- head/net/afpfs-ng/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/net/afpfs-ng/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= afpfs-ng PORTVERSION= 0.8.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MASTER_SITES= SF Modified: head/net/clamz/Makefile ============================================================================== --- head/net/clamz/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/net/clamz/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= clamz PORTVERSION= 0.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net audio MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} Modified: head/net/cyphesis/Makefile ============================================================================== --- head/net/cyphesis/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/net/cyphesis/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= cyphesis PORTVERSION= 0.6.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MASTER_SITES= SF/worldforge/${PORTNAME}%20%28server%29/${PORTVERSION} Modified: head/net/glib-networking/Makefile ============================================================================== --- head/net/glib-networking/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/net/glib-networking/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -4,7 +4,7 @@ PORTNAME= glib-networking PORTVERSION= 2.36.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net MASTER_SITES= GNOME DIST_SUBDIR= gnome2 Modified: head/net/grive/Makefile ============================================================================== --- head/net/grive/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/net/grive/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= grive PORTVERSION= 0.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MAINTAINER= ktsin@acm.org Modified: head/net/gtk-vnc/Makefile ============================================================================== --- head/net/gtk-vnc/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/net/gtk-vnc/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= gtk-vnc PORTVERSION= 0.3.10 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= net gnome MASTER_SITES= GNOME Modified: head/net/librouteros/Makefile ============================================================================== --- head/net/librouteros/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/net/librouteros/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= librouteros PORTVERSION= 1.1.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MASTER_SITES= http://verplant.org/librouteros/files/ Modified: head/net/quagga-re/Makefile ============================================================================== --- head/net/quagga-re/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/net/quagga-re/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= quagga PORTVERSION= 0.99.17.12 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net ipv6 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= quagga-re Modified: head/net/remmina/Makefile ============================================================================== --- head/net/remmina/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/net/remmina/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= remmina PORTVERSION= 1.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net gnome MAINTAINER= fluffy@FreeBSD.org Modified: head/net/uget/Makefile ============================================================================== --- head/net/uget/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/net/uget/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,6 +3,7 @@ PORTNAME= uget PORTVERSION= 1.10.4 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= SF MASTER_SITE_SUBDIR= urlget/${PORTNAME}%20%28stable%29/${PORTVERSION} Modified: head/net/wireshark/Makefile ============================================================================== --- head/net/wireshark/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/net/wireshark/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME?= wireshark PORTVERSION= 1.10.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net ipv6 MASTER_SITES= http://www.wireshark.org/download/src/ \ http://ftp.uni-kl.de/pub/wireshark/src/ \ Modified: head/news/nzbget/Makefile ============================================================================== --- head/news/nzbget/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/news/nzbget/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= nzbget PORTVERSION= 12.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= news MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION} Modified: head/print/cups-base/Makefile ============================================================================== --- head/print/cups-base/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/print/cups-base/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -51,7 +51,7 @@ USERS= cups # UNIQUENAME must be set before bsd.port.pre.mk so OPTIONSFILE can be included .if defined(CUPS_CLIENT) -PORTREVISION= 1 +PORTREVISION= 2 LICENSE= LGPL21 CUPS_SUFFIX= -client OPTIONS_SINGLE= SSL @@ -59,7 +59,7 @@ OPTIONS_SINGLE_SSL= GNUTLS OPENSSL OPTIONS_DEFAULT= OPENSSL OPTIONS_SUB= yes .elif defined(CUPS_IMAGE) -PORTREVISION= 0 +PORTREVISION= 1 CUPS_SUFFIX= -image LICENSE= LGPL21 OPTIONS_SINGLE= SSL Modified: head/security/fiked/Makefile ============================================================================== --- head/security/fiked/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/security/fiked/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= fiked PORTVERSION= 0.0.5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= security MASTER_SITES= http://mirror.roe.ch/dist/fiked/ Modified: head/security/gnomint/Makefile ============================================================================== --- head/security/gnomint/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/security/gnomint/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= gnomint PORTVERSION= 1.2.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= security MASTER_SITES= SF Modified: head/security/gsasl/Makefile ============================================================================== --- head/security/gsasl/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/security/gsasl/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= gsasl PORTVERSION= 1.8.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= security MASTER_SITES= GNU Modified: head/security/libgcrypt/Makefile ============================================================================== --- head/security/libgcrypt/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/security/libgcrypt/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= libgcrypt -PORTVERSION= 1.5.3 -PORTREVISION= 3 +PORTVERSION= 1.6.1 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GNUPG} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -17,10 +16,12 @@ LICENSE_COMB= multi BUILD_DEPENDS= libgpg-error>=1.8:${PORTSDIR}/security/libgpg-error RUN_DEPENDS= libgpg-error>=1.8:${PORTSDIR}/security/libgpg-error -USES= libtool:oldver makeinfo tar:bzip2 +USES= libtool makeinfo tar:bzip2 USE_CSTD= gnu89 GNU_CONFIGURE= yes CONFIGURE_ENV= MAKEINFO="makeinfo --no-split" +CONFIGURE_TARGET=${ARCH:S/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL} +INSTALL_TARGET= install-strip USE_LDCONFIG= yes DOCS= AUTHORS ChangeLog ChangeLog-2011 INSTALL NEWS README \ @@ -39,14 +40,21 @@ CONFIGURE_ARGS+= --disable-asm .if (${OSVERSION} < 900033) CONFIGURE_ARGS+= --disable-aesni-support .endif + +.elif ${ARCH} == "amd64" +.if (${OSVERSION} < 900000) +USE_GCC= yes +.endif + .endif post-patch: - @${RM} -f ${WRKSRC}/doc/gcrypt.info* + ${RM} -f ${WRKSRC}/doc/gcrypt.info* + ${REINPLACE_CMD} -e 's|ALIGN (3)|ALIGN (2)|g' ${WRKSRC}/mpi/i386/*.S .if ${PORT_OPTIONS:MDOCS} post-install: - @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} .endif Modified: head/security/libgcrypt/distinfo ============================================================================== --- head/security/libgcrypt/distinfo Wed Jul 30 03:34:01 2014 (r363435) +++ head/security/libgcrypt/distinfo Wed Jul 30 03:57:23 2014 (r363436) @@ -1,2 +1,2 @@ -SHA256 (libgcrypt-1.5.3.tar.bz2) = bcf5334e7da352c45de6aec5d2084ce9a1d30029ff4a4a5da13f1848874759d1 -SIZE (libgcrypt-1.5.3.tar.bz2) = 1508530 +SHA256 (libgcrypt-1.6.1.tar.bz2) = a1c3efea69f8ffe769f488b300ce190eeeb0c30de24a53f1c1b6e4202fdc2070 +SIZE (libgcrypt-1.6.1.tar.bz2) = 2470885 Added: head/security/libgcrypt/files/patch-gcrypt.h.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/libgcrypt/files/patch-gcrypt.h.in Wed Jul 30 03:57:23 2014 (r363436) @@ -0,0 +1,20 @@ +--- src/gcrypt.h.in-orig 2014-07-28 03:54:16.000000000 +0200 ++++ src/gcrypt.h.in 2014-07-28 03:54:32.000000000 +0200 +@@ -508,7 +508,7 @@ + GCRYMPI_FLAG_USER1 = 0x0100,/* User flag 1. */ + GCRYMPI_FLAG_USER2 = 0x0200,/* User flag 2. */ + GCRYMPI_FLAG_USER3 = 0x0400,/* User flag 3. */ +- GCRYMPI_FLAG_USER4 = 0x0800,/* User flag 4. */ ++ GCRYMPI_FLAG_USER4 = 0x0800 /* User flag 4. */ + }; + + +@@ -1345,7 +1345,7 @@ + /* Flags used with the open function. */ + enum gcry_mac_flags + { +- GCRY_MAC_FLAG_SECURE = 1, /* Allocate all buffers in "secure" memory. */ ++ GCRY_MAC_FLAG_SECURE = 1 /* Allocate all buffers in "secure" memory. */ + }; + + /* Create a MAC handle for algorithm ALGO. FLAGS may be given as an bitwise OR Modified: head/security/libgcrypt/pkg-plist ============================================================================== --- head/security/libgcrypt/pkg-plist Wed Jul 30 03:34:01 2014 (r363435) +++ head/security/libgcrypt/pkg-plist Wed Jul 30 03:57:23 2014 (r363436) @@ -1,9 +1,10 @@ +bin/mpicalc bin/dumpsexp bin/hmac256 bin/libgcrypt-config include/gcrypt.h -include/gcrypt-module.h -lib/libgcrypt.la lib/libgcrypt.so -lib/libgcrypt.so.19 +lib/libgcrypt.so.20 +lib/libgcrypt.so.20.0.1 +man/man1/hmac256.1.gz share/aclocal/libgcrypt.m4 Modified: head/security/libmatekeyring/Makefile ============================================================================== --- head/security/libmatekeyring/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/security/libmatekeyring/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= libmatekeyring PORTVERSION= 1.6.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security mate MASTER_SITES= MATE DIST_SUBDIR= mate Modified: head/security/libotr/Makefile ============================================================================== --- head/security/libotr/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/security/libotr/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -2,7 +2,7 @@ PORTNAME= libotr PORTVERSION= 4.0.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= security net-im net MASTER_SITES= https://otr.cypherpunks.ca/ \ http://www.c-s.li/ports/ Modified: head/security/libotr3/Makefile ============================================================================== --- head/security/libotr3/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/security/libotr3/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -4,7 +4,7 @@ PORTNAME= libotr PORTVERSION= 3.2.1 # Please do not bump PORTREVISION for this port unless you have # confirmed via testing that it is necessary -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security net-im net MASTER_SITES= http://www.c-s.li/ports/ \ https://otr.cypherpunks.ca/ Modified: head/security/libprelude/Makefile ============================================================================== --- head/security/libprelude/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/security/libprelude/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= libprelude PORTVERSION= 1.0.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= security MASTER_SITES= https://www.prelude-ids.org/attachments/download/241/ Modified: head/security/libpreludedb/Makefile ============================================================================== --- head/security/libpreludedb/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/security/libpreludedb/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= libpreludedb PORTVERSION= 1.0.1p1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= security MASTER_SITES= https://www.prelude-ids.org/attachments/download/287/ Modified: head/security/libsecret/Makefile ============================================================================== --- head/security/libsecret/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/security/libsecret/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -4,7 +4,7 @@ PORTNAME= libsecret PORTVERSION= 0.15 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security gnome MASTER_SITES= GNOME Modified: head/security/libssh2/Makefile ============================================================================== --- head/security/libssh2/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/security/libssh2/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= libssh2 PORTVERSION= 1.4.3 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 2 CATEGORIES= security devel MASTER_SITES= http://www.libssh2.org/download/ \ Modified: head/security/opencdk/Makefile ============================================================================== --- head/security/opencdk/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/security/opencdk/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= opencdk PORTVERSION= 0.6.6 -PORTREVISION= 5 +PORTREVISION= 6 PORTEPOCH= 1 CATEGORIES= security MASTER_SITES= http://josefsson.org/gnutls/releases/opencdk/ Modified: head/security/openvas-libraries/Makefile ============================================================================== --- head/security/openvas-libraries/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/security/openvas-libraries/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= openvas-libraries PORTVERSION= 2.0.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= security MASTER_SITES= http://wald.intevation.org/frs/download.php/600/ Modified: head/security/openvpn-auth-radius/Makefile ============================================================================== --- head/security/openvpn-auth-radius/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/security/openvpn-auth-radius/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,7 +3,7 @@ PORTNAME= openvpn-auth-radius PORTVERSION= 2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= http://www.nongnu.org/radiusplugin/ \ http://svn-cache.ipcopaddons.org/ Modified: head/security/p5-Crypt-GCrypt/Makefile ============================================================================== --- head/security/p5-Crypt-GCrypt/Makefile Wed Jul 30 03:34:01 2014 (r363435) +++ head/security/p5-Crypt-GCrypt/Makefile Wed Jul 30 03:57:23 2014 (r363436) @@ -3,6 +3,7 @@ PORTNAME= Crypt-GCrypt PORTVERSION= 1.26 +PORTREVISION= 1 CATEGORIES= security perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -20,4 +21,7 @@ CONFIGURE_ARGS= GCRYPTINCPATH=${LOCALBAS USE_PERL5= configure USES= perl5 +post-stage: + ${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Crypt/GCrypt/GCrypt.so + .include <bsd.port.mk> Added: head/security/p5-Crypt-GCrypt/files/patch-GCrypt.xs ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/p5-Crypt-GCrypt/files/patch-GCrypt.xs Wed Jul 30 03:57:23 2014 (r363436) @@ -0,0 +1,143 @@ +--- GCrypt.xs.orig 2011-05-27 22:04:03.000000000 +0200 ++++ GCrypt.xs 2014-07-27 16:14:05.000000000 +0200 +@@ -56,9 +56,13 @@ + int type; + int action; + gcry_cipher_hd_t h; ++/* + gcry_ac_handle_t h_ac; ++*/ + gcry_md_hd_t h_md; ++/* + gcry_ac_key_t key_ac; ++*/ + gcry_error_t err; + int mode; + int padding; +@@ -203,7 +207,9 @@ + char *s, *algo_s, *mode_s, *key_s; + int i, algo, mode; + unsigned int c_flags, ac_flags, md_flags; ++/* + gcry_ac_id_t ac_algo; ++*/ + bool have_mode; + CODE: + New(0, RETVAL, 1, struct Crypt_GCrypt_s); +@@ -322,25 +328,19 @@ + if (!(algo = gcry_md_map_name(algo_s))) + croak("Unknown digest algorithm %s", algo_s); + +- RETVAL->err = gcry_md_open(&RETVAL->h_md, algo, md_flags); ++ RETVAL->err = gcry_md_open(&RETVAL->h_md, algo, md_flags); + if (RETVAL->h_md == NULL) XSRETURN_UNDEF; + +- if (md_flags & GCRY_MD_FLAG_HMAC) { +- /* what if this overwrites the earlier error value? */ +- RETVAL->err = gcry_md_setkey(RETVAL->h_md, key_s, RETVAL->keylen); ++ if (md_flags & GCRY_MD_FLAG_HMAC) { ++ /* what if this overwrites the earlier error value? */ ++ RETVAL->err = gcry_md_setkey(RETVAL->h_md, key_s, RETVAL->keylen); ++ } + } +- } + if (RETVAL->type == CG_TYPE_ASYMM) { + + croak("Asymmetric cryptography is not yet supported by Crypt::GCrypt"); ++ XSRETURN_UNDEF; + +- RETVAL->err = gcry_ac_name_to_id(algo_s, &ac_algo); +- if (RETVAL->err) +- croak("Unknown algorithm %s", algo_s); +- +- /* Init ac */ +- RETVAL->err = gcry_ac_open(&RETVAL->h_ac, ac_algo, ac_flags); +- if (RETVAL->h_ac == NULL) XSRETURN_UNDEF; + } + + +@@ -532,39 +532,6 @@ + OUTPUT: + RETVAL + +-SV * +-cg_sign(gcr, in) +- Crypt_GCrypt gcr; +- SV *in; +- PREINIT: +- gcry_mpi_t in_mpi, out_mpi; +- gcry_ac_data_t outdata; +- size_t len; +- const void *inbuf; +- const char *label; +- char* outbuf; +- CODE: +- /* +- in_mpi = gcry_mpi_new(0); +- out_mpi = gcry_mpi_new(0); +- inbuf = SvPV(in, len); +- printf("inbuf: %s\n", inbuf); +- gcry_mpi_scan( &in_mpi, GCRYMPI_FMT_STD, inbuf, strlen(inbuf), NULL ); +- printf("Key: %s\n", gcr->key_ac); +- gcr->err = gcry_ac_data_sign(gcr->h_ac, gcr->key_ac, in_mpi, &outdata); +- if (gcr->err) { +- croak( gcry_strerror(gcr->err) ); +- } +- printf("Here\n"); +- gcr->err = gcry_ac_data_get_index (outdata, 0, 0, &label, &out_mpi); +- printf("Before (%s)\n", label); +- gcry_mpi_print(GCRYMPI_FMT_STD, outbuf, 1024, NULL, out_mpi); +- printf("After\n"); +- RETVAL = newSVpv(outbuf, 0); +- */ +- OUTPUT: +- RETVAL +- + void + cg_start(gcr, act) + Crypt_GCrypt gcr; +@@ -594,8 +561,10 @@ + PREINIT: + char *k, *s; + char *mykey, *buf; ++/* *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407300357.s6U3vOhR060830>