From b95d127471e2fd17cc8d189dbeec094e3ff556db Mon Sep 17 00:00:00 2001 From: Kurt Jaeger Date: Wed, 30 Jul 2014 03:57:23 +0000 Subject: [PATCH] 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 Approved by: maintainer timeout, antoine (exp-run), portmgr (implicit) --- UPDATING | 14 ++ audio/ario/Makefile | 2 +- audio/gogglesmm/Makefile | 2 +- audio/pianobar/Makefile | 2 +- comms/svxlink/Makefile | 1 + databases/xtrabackup/Makefile | 1 + devel/ccrtp/Makefile | 8 +- devel/ccrtp/distinfo | 4 +- devel/ccrtp/pkg-plist | 6 +- devel/gsoap/Makefile | 2 +- devel/gvfs/Makefile | 2 +- devel/gwenhywfar/Makefile | 2 +- devel/libsoup/Makefile | 2 +- devel/libvirt/Makefile | 2 +- devel/libzrtpcpp/Makefile | 2 +- devel/srecord/Makefile | 1 + editors/abiword/files/patch-tls_tunnel.cpp | 17 +++ emulators/fuse/Makefile | 2 +- emulators/libspectrum/Makefile | 2 +- ftp/filezilla/Makefile | 2 +- games/libggz/Makefile | 2 +- graphics/telak/Makefile | 2 +- irc/bitlbee/Makefile | 2 +- irc/irssi-otr/Makefile | 1 + irc/weechat-devel/Makefile | 2 +- irc/weechat/Makefile | 2 +- japanese/jd/Makefile | 2 +- lang/gnustep-base/Makefile | 2 +- mail/libetpan/Makefile | 2 +- mail/wmbiff/Makefile | 2 +- mail/xfce4-mailwatch-plugin/Makefile | 2 +- misc/metalink-tools/Makefile | 2 +- multimedia/libaacs/Makefile | 2 +- multimedia/libmtp/Makefile | 2 +- multimedia/vlc/Makefile | 2 +- net-im/climm/Makefile | 2 +- net-im/mcabber/Makefile | 2 +- net-p2p/gnunet/Makefile | 2 +- net-p2p/libktorrent/Makefile | 2 +- net-p2p/ncdc/Makefile | 2 +- net-p2p/retroshare/Makefile | 2 +- net/afpfs-ng/Makefile | 2 +- net/clamz/Makefile | 2 +- net/cyphesis/Makefile | 2 +- net/glib-networking/Makefile | 2 +- net/grive/Makefile | 2 +- net/gtk-vnc/Makefile | 2 +- net/librouteros/Makefile | 2 +- net/quagga-re/Makefile | 2 +- net/remmina/Makefile | 2 +- net/uget/Makefile | 1 + net/wireshark/Makefile | 2 +- news/nzbget/Makefile | 2 +- print/cups-base/Makefile | 4 +- security/fiked/Makefile | 2 +- security/gnomint/Makefile | 2 +- security/gsasl/Makefile | 2 +- security/libgcrypt/Makefile | 18 ++- security/libgcrypt/distinfo | 4 +- .../libgcrypt/files/patch-cipher-rijndael.c | 61 -------- security/libgcrypt/files/patch-gcrypt.h.in | 20 +++ .../libgcrypt/files/patch-mpi-config.links | 32 ---- security/libgcrypt/files/patch-mpi-longlong.h | 79 ---------- security/libgcrypt/pkg-plist | 7 +- security/libmatekeyring/Makefile | 2 +- security/libotr/Makefile | 2 +- security/libotr3/Makefile | 2 +- security/libprelude/Makefile | 2 +- security/libpreludedb/Makefile | 2 +- security/libsecret/Makefile | 2 +- security/libssh2/Makefile | 2 +- security/opencdk/Makefile | 2 +- security/openvas-libraries/Makefile | 2 +- security/openvpn-auth-radius/Makefile | 2 +- security/p5-Crypt-GCrypt/Makefile | 4 + .../p5-Crypt-GCrypt/files/patch-GCrypt.xs | 143 ++++++++++++++++++ security/pam-pgsql/Makefile | 2 +- security/pidgin-otr/Makefile | 2 +- security/pinentry/Makefile | 2 +- security/prelude-lml/Makefile | 2 +- security/prelude-manager/Makefile | 2 +- security/seahorse-plugins/Makefile | 2 +- security/seccure/Makefile | 2 +- security/vpnc/Makefile | 2 +- sysutils/dar/Makefile | 1 + sysutils/freeipmi/Makefile | 1 + sysutils/fusefs-cryptofs/Makefile | 2 +- sysutils/rsyslog7-devel/Makefile | 2 +- sysutils/rsyslog7/Makefile | 2 +- sysutils/rsyslog8-devel/Makefile | 2 +- sysutils/rsyslog8/Makefile | 2 +- textproc/libxslt/Makefile | 2 +- www/libmicrohttpd/Makefile | 2 +- 93 files changed, 307 insertions(+), 263 deletions(-) create mode 100644 editors/abiword/files/patch-tls_tunnel.cpp delete mode 100644 security/libgcrypt/files/patch-cipher-rijndael.c create mode 100644 security/libgcrypt/files/patch-gcrypt.h.in delete mode 100644 security/libgcrypt/files/patch-mpi-config.links delete mode 100644 security/libgcrypt/files/patch-mpi-longlong.h create mode 100644 security/p5-Crypt-GCrypt/files/patch-GCrypt.xs diff --git a/UPDATING b/UPDATING index 3c1e99c8a53a..785b48d95a0a 100644 --- a/UPDATING +++ b/UPDATING @@ -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 diff --git a/audio/ario/Makefile b/audio/ario/Makefile index e1e53b4a7000..c764d3e4b50e 100644 --- a/audio/ario/Makefile +++ b/audio/ario/Makefile @@ -3,7 +3,7 @@ PORTNAME= ario PORTVERSION= 1.5.1 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= audio MASTER_SITES= SF/ario-player/ario-player/${PORTVERSION} diff --git a/audio/gogglesmm/Makefile b/audio/gogglesmm/Makefile index dcc99a2201ed..d8ef71f7ab00 100644 --- a/audio/gogglesmm/Makefile +++ b/audio/gogglesmm/Makefile @@ -3,7 +3,7 @@ PORTNAME= gogglesmm PORTVERSION= 0.12.7 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= audio MASTER_SITES= GOOGLE_CODE diff --git a/audio/pianobar/Makefile b/audio/pianobar/Makefile index c90b1bd7d9cc..e5ad5d25f18c 100644 --- a/audio/pianobar/Makefile +++ b/audio/pianobar/Makefile @@ -3,7 +3,7 @@ PORTNAME= pianobar PORTVERSION= 2013.09.15 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio MASTER_SITES= http://6xq.net/projects/${PORTNAME}/ diff --git a/comms/svxlink/Makefile b/comms/svxlink/Makefile index fad73ac90978..8f64e0f06f9e 100644 --- a/comms/svxlink/Makefile +++ b/comms/svxlink/Makefile @@ -3,6 +3,7 @@ PORTNAME= svxlink PORTVERSION= 13.12 +PORTREVISION= 1 CATEGORIES= comms hamradio MASTER_SITES= SF/svxlink/svxlink/${PORTVERSION} diff --git a/databases/xtrabackup/Makefile b/databases/xtrabackup/Makefile index 6b8767eb0202..34b8e9230325 100644 --- a/databases/xtrabackup/Makefile +++ b/databases/xtrabackup/Makefile @@ -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} diff --git a/devel/ccrtp/Makefile b/devel/ccrtp/Makefile index ab6359d6c987..c8162443a675 100644 --- a/devel/ccrtp/Makefile +++ b/devel/ccrtp/Makefile @@ -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 diff --git a/devel/ccrtp/distinfo b/devel/ccrtp/distinfo index 36964f0c8dc5..dcd0319b48b1 100644 --- a/devel/ccrtp/distinfo +++ b/devel/ccrtp/distinfo @@ -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 diff --git a/devel/ccrtp/pkg-plist b/devel/ccrtp/pkg-plist index 15d1fd24d5cc..4669bd34e3b4 100644 --- a/devel/ccrtp/pkg-plist +++ b/devel/ccrtp/pkg-plist @@ -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 diff --git a/devel/gsoap/Makefile b/devel/gsoap/Makefile index 2c937e1fdcde..7933c7bdbb39 100644 --- a/devel/gsoap/Makefile +++ b/devel/gsoap/Makefile @@ -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} diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile index 8e2cca570b61..04d862d95bdd 100644 --- a/devel/gvfs/Makefile +++ b/devel/gvfs/Makefile @@ -4,7 +4,7 @@ PORTNAME= gvfs PORTVERSION= 1.12.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 diff --git a/devel/gwenhywfar/Makefile b/devel/gwenhywfar/Makefile index c718626a2308..f28e72fefa2f 100644 --- a/devel/gwenhywfar/Makefile +++ b/devel/gwenhywfar/Makefile @@ -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=/ diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile index 8f7105683001..740323affb1c 100644 --- a/devel/libsoup/Makefile +++ b/devel/libsoup/Makefile @@ -4,7 +4,7 @@ PORTNAME= libsoup PORTVERSION= 2.40.3 -PORTREVISION?= 5 +PORTREVISION?= 6 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/devel/libvirt/Makefile b/devel/libvirt/Makefile index f2824524d17e..61474827ef27 100644 --- a/devel/libvirt/Makefile +++ b/devel/libvirt/Makefile @@ -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/ diff --git a/devel/libzrtpcpp/Makefile b/devel/libzrtpcpp/Makefile index 40b11b227ec9..65825789d20f 100644 --- a/devel/libzrtpcpp/Makefile +++ b/devel/libzrtpcpp/Makefile @@ -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 diff --git a/devel/srecord/Makefile b/devel/srecord/Makefile index 7d64f9b205f6..f1a98a3a8972 100644 --- a/devel/srecord/Makefile +++ b/devel/srecord/Makefile @@ -3,6 +3,7 @@ PORTNAME= srecord PORTVERSION= 1.64 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= SF diff --git a/editors/abiword/files/patch-tls_tunnel.cpp b/editors/abiword/files/patch-tls_tunnel.cpp new file mode 100644 index 000000000000..9447b8dd855c --- /dev/null +++ b/editors/abiword/files/patch-tls_tunnel.cpp @@ -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) diff --git a/emulators/fuse/Makefile b/emulators/fuse/Makefile index 5fed04abfff2..cec7163280a8 100644 --- a/emulators/fuse/Makefile +++ b/emulators/fuse/Makefile @@ -3,7 +3,7 @@ PORTNAME= fuse PORTVERSION= 1.1.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}-emulator/${PORTNAME}/${PORTVERSION} diff --git a/emulators/libspectrum/Makefile b/emulators/libspectrum/Makefile index 01be2eba5802..1c1a92e2cd15 100644 --- a/emulators/libspectrum/Makefile +++ b/emulators/libspectrum/Makefile @@ -3,7 +3,7 @@ PORTNAME= libspectrum PORTVERSION= 1.1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators devel MASTER_SITES= SF/fuse-emulator/${PORTNAME}/${PORTVERSION} diff --git a/ftp/filezilla/Makefile b/ftp/filezilla/Makefile index e1d0807b81e8..497c269eccf7 100644 --- a/ftp/filezilla/Makefile +++ b/ftp/filezilla/Makefile @@ -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 diff --git a/games/libggz/Makefile b/games/libggz/Makefile index b1ecc524ef5d..ac12e3fd5e10 100644 --- a/games/libggz/Makefile +++ b/games/libggz/Makefile @@ -3,7 +3,7 @@ PORTNAME= libggz PORTVERSION= ${GGZ_VERSION} -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= games MAINTAINER= ports@FreeBSD.org diff --git a/graphics/telak/Makefile b/graphics/telak/Makefile index ca7deb3b7e57..9fde86921574 100644 --- a/graphics/telak/Makefile +++ b/graphics/telak/Makefile @@ -3,7 +3,7 @@ PORTNAME= telak PORTVERSION= 0.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://julien.danjou.info/telak/ \ CRITICAL diff --git a/irc/bitlbee/Makefile b/irc/bitlbee/Makefile index 430d0a535ae0..16b370b3ea82 100644 --- a/irc/bitlbee/Makefile +++ b/irc/bitlbee/Makefile @@ -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} diff --git a/irc/irssi-otr/Makefile b/irc/irssi-otr/Makefile index e1109b63f018..a574b40a65b7 100644 --- a/irc/irssi-otr/Makefile +++ b/irc/irssi-otr/Makefile @@ -3,6 +3,7 @@ PORTNAME= irssi-otr PORTVERSION= 1.0.0 +PORTREVISION= 1 CATEGORIES= irc MASTER_SITES= GH diff --git a/irc/weechat-devel/Makefile b/irc/weechat-devel/Makefile index ba5fd37c2530..7a488e8339ea 100644 --- a/irc/weechat-devel/Makefile +++ b/irc/weechat-devel/Makefile @@ -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} diff --git a/irc/weechat/Makefile b/irc/weechat/Makefile index 3aa53945c66f..f977ec85e357 100644 --- a/irc/weechat/Makefile +++ b/irc/weechat/Makefile @@ -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 \ diff --git a/japanese/jd/Makefile b/japanese/jd/Makefile index fea6e86f7ebb..5a00223168e5 100644 --- a/japanese/jd/Makefile +++ b/japanese/jd/Makefile @@ -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 diff --git a/lang/gnustep-base/Makefile b/lang/gnustep-base/Makefile index bbcc7a91f114..324dce5c62cc 100644 --- a/lang/gnustep-base/Makefile +++ b/lang/gnustep-base/Makefile @@ -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 diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile index 3e2442ad1ecc..7a7609bbae68 100644 --- a/mail/libetpan/Makefile +++ b/mail/libetpan/Makefile @@ -3,7 +3,7 @@ PORTNAME= libetpan PORTVERSION= 1.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail ipv6 MAINTAINER= pawel@FreeBSD.org diff --git a/mail/wmbiff/Makefile b/mail/wmbiff/Makefile index be0659b0a98b..d8f8d5fccc74 100644 --- a/mail/wmbiff/Makefile +++ b/mail/wmbiff/Makefile @@ -3,7 +3,7 @@ PORTNAME= wmbiff PORTVERSION= 0.4.27 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= mail windowmaker afterstep MASTER_SITES= SF diff --git a/mail/xfce4-mailwatch-plugin/Makefile b/mail/xfce4-mailwatch-plugin/Makefile index 2ab31657559f..36f4c9d6a7af 100644 --- a/mail/xfce4-mailwatch-plugin/Makefile +++ b/mail/xfce4-mailwatch-plugin/Makefile @@ -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} diff --git a/misc/metalink-tools/Makefile b/misc/metalink-tools/Makefile index 22fac08d79d7..d51c2b3a1876 100644 --- a/misc/metalink-tools/Makefile +++ b/misc/metalink-tools/Makefile @@ -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 diff --git a/multimedia/libaacs/Makefile b/multimedia/libaacs/Makefile index bd52a5b7990c..a1e12f5d253c 100644 --- a/multimedia/libaacs/Makefile +++ b/multimedia/libaacs/Makefile @@ -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/ diff --git a/multimedia/libmtp/Makefile b/multimedia/libmtp/Makefile index fe8c54021ed4..ca533c6d7e2d 100644 --- a/multimedia/libmtp/Makefile +++ b/multimedia/libmtp/Makefile @@ -3,7 +3,7 @@ PORTNAME= libmtp PORTVERSION= 1.1.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia audio MASTER_SITES= SF diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index ed6a359a1bd4..6e6decbc9d64 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -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$//}/ \ diff --git a/net-im/climm/Makefile b/net-im/climm/Makefile index 2c58a4f069bd..98bea78d4217 100644 --- a/net-im/climm/Makefile +++ b/net-im/climm/Makefile @@ -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/ diff --git a/net-im/mcabber/Makefile b/net-im/mcabber/Makefile index 1473dc990135..0a8ee12e9330 100644 --- a/net-im/mcabber/Makefile +++ b/net-im/mcabber/Makefile @@ -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 diff --git a/net-p2p/gnunet/Makefile b/net-p2p/gnunet/Makefile index e9ff2503a21d..257c8b324d1c 100644 --- a/net-p2p/gnunet/Makefile +++ b/net-p2p/gnunet/Makefile @@ -3,7 +3,7 @@ PORTNAME= gnunet DISTVERSION= 0.9.3 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= net-p2p ipv6 security MASTER_SITES= GNU diff --git a/net-p2p/libktorrent/Makefile b/net-p2p/libktorrent/Makefile index 80759ca9e027..cc94a2120c21 100644 --- a/net-p2p/libktorrent/Makefile +++ b/net-p2p/libktorrent/Makefile @@ -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,-.*,,}/ diff --git a/net-p2p/ncdc/Makefile b/net-p2p/ncdc/Makefile index e31ef14c0e0a..3d8769dfbf48 100644 --- a/net-p2p/ncdc/Makefile +++ b/net-p2p/ncdc/Makefile @@ -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/ diff --git a/net-p2p/retroshare/Makefile b/net-p2p/retroshare/Makefile index 53ad91b31d5d..4536654e743c 100644 --- a/net-p2p/retroshare/Makefile +++ b/net-p2p/retroshare/Makefile @@ -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} diff --git a/net/afpfs-ng/Makefile b/net/afpfs-ng/Makefile index ce4196c58488..bc6c1519e787 100644 --- a/net/afpfs-ng/Makefile +++ b/net/afpfs-ng/Makefile @@ -3,7 +3,7 @@ PORTNAME= afpfs-ng PORTVERSION= 0.8.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MASTER_SITES= SF diff --git a/net/clamz/Makefile b/net/clamz/Makefile index a476cb74d613..856206bdaf14 100644 --- a/net/clamz/Makefile +++ b/net/clamz/Makefile @@ -3,7 +3,7 @@ PORTNAME= clamz PORTVERSION= 0.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net audio MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} diff --git a/net/cyphesis/Makefile b/net/cyphesis/Makefile index 0c6e3dce80df..3b9c79832b25 100644 --- a/net/cyphesis/Makefile +++ b/net/cyphesis/Makefile @@ -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} diff --git a/net/glib-networking/Makefile b/net/glib-networking/Makefile index 63331e729f1b..1b32e7dfc2d1 100644 --- a/net/glib-networking/Makefile +++ b/net/glib-networking/Makefile @@ -4,7 +4,7 @@ PORTNAME= glib-networking PORTVERSION= 2.36.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/net/grive/Makefile b/net/grive/Makefile index 159a4a9981da..8c95865073c0 100644 --- a/net/grive/Makefile +++ b/net/grive/Makefile @@ -3,7 +3,7 @@ PORTNAME= grive PORTVERSION= 0.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MAINTAINER= ktsin@acm.org diff --git a/net/gtk-vnc/Makefile b/net/gtk-vnc/Makefile index d2adafb2220b..486d5d2d28f6 100644 --- a/net/gtk-vnc/Makefile +++ b/net/gtk-vnc/Makefile @@ -3,7 +3,7 @@ PORTNAME= gtk-vnc PORTVERSION= 0.3.10 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= net gnome MASTER_SITES= GNOME diff --git a/net/librouteros/Makefile b/net/librouteros/Makefile index 529d5773e3bb..4728fb51ea13 100644 --- a/net/librouteros/Makefile +++ b/net/librouteros/Makefile @@ -3,7 +3,7 @@ PORTNAME= librouteros PORTVERSION= 1.1.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MASTER_SITES= http://verplant.org/librouteros/files/ diff --git a/net/quagga-re/Makefile b/net/quagga-re/Makefile index cdc0f0c2da62..d85857afc980 100644 --- a/net/quagga-re/Makefile +++ b/net/quagga-re/Makefile @@ -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 diff --git a/net/remmina/Makefile b/net/remmina/Makefile index 9ed121916a5b..d575354c9675 100644 --- a/net/remmina/Makefile +++ b/net/remmina/Makefile @@ -3,7 +3,7 @@ PORTNAME= remmina PORTVERSION= 1.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net gnome MAINTAINER= fluffy@FreeBSD.org diff --git a/net/uget/Makefile b/net/uget/Makefile index 4f1fec253fbd..2618bdef9dbc 100644 --- a/net/uget/Makefile +++ b/net/uget/Makefile @@ -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} diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index 535dcd9fe3f9..4e989eb604b5 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -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/ \ diff --git a/news/nzbget/Makefile b/news/nzbget/Makefile index 6fe120f948cd..c3af42689150 100644 --- a/news/nzbget/Makefile +++ b/news/nzbget/Makefile @@ -3,7 +3,7 @@ PORTNAME= nzbget PORTVERSION= 12.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= news MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION} diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile index 254e01d0d048..89b12244e102 100644 --- a/print/cups-base/Makefile +++ b/print/cups-base/Makefile @@ -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 diff --git a/security/fiked/Makefile b/security/fiked/Makefile index d442883005bf..3f52103f8137 100644 --- a/security/fiked/Makefile +++ b/security/fiked/Makefile @@ -3,7 +3,7 @@ PORTNAME= fiked PORTVERSION= 0.0.5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= security MASTER_SITES= http://mirror.roe.ch/dist/fiked/ diff --git a/security/gnomint/Makefile b/security/gnomint/Makefile index fce89b2521a4..fd84f700c2af 100644 --- a/security/gnomint/Makefile +++ b/security/gnomint/Makefile @@ -3,7 +3,7 @@ PORTNAME= gnomint PORTVERSION= 1.2.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= security MASTER_SITES= SF diff --git a/security/gsasl/Makefile b/security/gsasl/Makefile index 8a2631e9828c..c00b3023143f 100644 --- a/security/gsasl/Makefile +++ b/security/gsasl/Makefile @@ -3,7 +3,7 @@ PORTNAME= gsasl PORTVERSION= 1.8.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= security MASTER_SITES= GNU diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile index f7dcf1786246..f679c934e81a 100644 --- a/security/libgcrypt/Makefile +++ b/security/libgcrypt/Makefile @@ -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 diff --git a/security/libgcrypt/distinfo b/security/libgcrypt/distinfo index 19389a3ab5d0..44bc5d8f6113 100644 --- a/security/libgcrypt/distinfo +++ b/security/libgcrypt/distinfo @@ -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 diff --git a/security/libgcrypt/files/patch-cipher-rijndael.c b/security/libgcrypt/files/patch-cipher-rijndael.c deleted file mode 100644 index c93a3a13f347..000000000000 --- a/security/libgcrypt/files/patch-cipher-rijndael.c +++ /dev/null @@ -1,61 +0,0 @@ ---- cipher/rijndael.c.orig 2011-02-22 15:57:59.000000000 +0100 -+++ cipher/rijndael.c 2011-07-26 08:38:07.000000000 +0200 -@@ -844,13 +844,13 @@ do_aesni_cfb (const RIJNDAEL_context *ct - "movdqa 0x90(%%esi), %%xmm1\n\t" - aesenc_xmm1_xmm0 - "movdqa 0xa0(%%esi), %%xmm1\n\t" -- "cmp $10, %[rounds]\n\t" -+ "cmpl $10, %[rounds]\n\t" - "jz .Lenclast%=\n\t" - aesenc_xmm1_xmm0 - "movdqa 0xb0(%%esi), %%xmm1\n\t" - aesenc_xmm1_xmm0 - "movdqa 0xc0(%%esi), %%xmm1\n\t" -- "cmp $12, %[rounds]\n\t" -+ "cmpl $12, %[rounds]\n\t" - "jz .Lenclast%=\n\t" - aesenc_xmm1_xmm0 - "movdqa 0xd0(%%esi), %%xmm1\n\t" -@@ -862,7 +862,7 @@ do_aesni_cfb (const RIJNDAEL_context *ct - "movdqu %[src], %%xmm1\n\t" /* Save input. */ - "pxor %%xmm1, %%xmm0\n\t" /* xmm0 = input ^ IV */ - -- "cmp $1, %[decrypt]\n\t" -+ "cmpl $1, %[decrypt]\n\t" - "jz .Ldecrypt_%=\n\t" - "movdqa %%xmm0, %[iv]\n\t" /* [encrypt] Store IV. */ - "jmp .Lleave_%=\n" -@@ -923,13 +923,13 @@ do_aesni_ctr (const RIJNDAEL_context *ct - "movdqa 0x90(%%esi), %%xmm1\n\t" - aesenc_xmm1_xmm0 - "movdqa 0xa0(%%esi), %%xmm1\n\t" -- "cmp $10, %[rounds]\n\t" -+ "cmpl $10, %[rounds]\n\t" - "jz .Lenclast%=\n\t" - aesenc_xmm1_xmm0 - "movdqa 0xb0(%%esi), %%xmm1\n\t" - aesenc_xmm1_xmm0 - "movdqa 0xc0(%%esi), %%xmm1\n\t" -- "cmp $12, %[rounds]\n\t" -+ "cmpl $12, %[rounds]\n\t" - "jz .Lenclast%=\n\t" - aesenc_xmm1_xmm0 - "movdqa 0xd0(%%esi), %%xmm1\n\t" -@@ -1050,7 +1050,7 @@ do_aesni_ctr_4 (const RIJNDAEL_context * - aesenc_xmm1_xmm3 - aesenc_xmm1_xmm4 - "movdqa 0xa0(%%esi), %%xmm1\n\t" -- "cmp $10, %[rounds]\n\t" -+ "cmpl $10, %[rounds]\n\t" - "jz .Lenclast%=\n\t" - aesenc_xmm1_xmm0 - aesenc_xmm1_xmm2 -@@ -1062,7 +1062,7 @@ do_aesni_ctr_4 (const RIJNDAEL_context * - aesenc_xmm1_xmm3 - aesenc_xmm1_xmm4 - "movdqa 0xc0(%%esi), %%xmm1\n\t" -- "cmp $12, %[rounds]\n\t" -+ "cmpl $12, %[rounds]\n\t" - "jz .Lenclast%=\n\t" - aesenc_xmm1_xmm0 - aesenc_xmm1_xmm2 diff --git a/security/libgcrypt/files/patch-gcrypt.h.in b/security/libgcrypt/files/patch-gcrypt.h.in new file mode 100644 index 000000000000..ed18bf91aca8 --- /dev/null +++ b/security/libgcrypt/files/patch-gcrypt.h.in @@ -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 diff --git a/security/libgcrypt/files/patch-mpi-config.links b/security/libgcrypt/files/patch-mpi-config.links deleted file mode 100644 index 3a75a6053dec..000000000000 --- a/security/libgcrypt/files/patch-mpi-config.links +++ /dev/null @@ -1,32 +0,0 @@ ---- mpi/config.links.orig 2013-07-25 11:10:04.000000000 +0200 -+++ mpi/config.links 2014-03-16 17:53:55.000000000 +0100 -@@ -46,9 +46,7 @@ - path="" - ;; - i[3467]86*-*-openbsd* | \ -- i[3467]86*-*-freebsd*-elf | \ -- i[3467]86*-*-freebsd[3-9]* | \ -- i[3467]86*-*-freebsdelf* | \ -+ i[3467]86*-*-freebsd* | \ - i[3467]86*-*-netbsd* | \ - i[3467]86*-*-k*bsd*) - echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h -@@ -56,9 +54,7 @@ - path="i386" - ;; - i586*-*-openbsd* | \ -- i586*-*-freebsd*-elf | \ -- i586*-*-freebsd[3-9]* | \ -- i586*-*-freebsdelf* | \ -+ i586*-*-freebsd* | \ - i586*-*-netbsd* | \ - i586*-*-k*bsd* | \ - pentium-*-netbsd* | \ -@@ -112,6 +108,7 @@ - cat $srcdir/mpi/i386/syntax.h >>./mpi/asm-syntax.h - path="i586 i386" - ;; -+ amd64-*-* | \ - x86_64-*-*) - echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h - cat $srcdir/mpi/i386/syntax.h >>./mpi/asm-syntax.h diff --git a/security/libgcrypt/files/patch-mpi-longlong.h b/security/libgcrypt/files/patch-mpi-longlong.h deleted file mode 100644 index cd50255bf223..000000000000 --- a/security/libgcrypt/files/patch-mpi-longlong.h +++ /dev/null @@ -1,79 +0,0 @@ ---- ./mpi/longlong.h.orig 2013-07-25 09:10:04.000000000 +0000 -+++ ./mpi/longlong.h 2014-06-09 18:53:59.000000000 +0000 -@@ -188,8 +188,8 @@ - #define add_ssaaaa(sh, sl, ah, al, bh, bl) \ - __asm__ ("adds %1, %4, %5\n" \ - "adc %0, %2, %3" \ -- : "=r" ((USItype)(sh)), \ -- "=&r" ((USItype)(sl)) \ -+ : "=r" ((sh)), \ -+ "=&r" ((sl)) \ - : "%r" ((USItype)(ah)), \ - "rI" ((USItype)(bh)), \ - "%r" ((USItype)(al)), \ -@@ -197,8 +197,8 @@ - #define sub_ddmmss(sh, sl, ah, al, bh, bl) \ - __asm__ ("subs %1, %4, %5\n" \ - "sbc %0, %2, %3" \ -- : "=r" ((USItype)(sh)), \ -- "=&r" ((USItype)(sl)) \ -+ : "=r" ((sh)), \ -+ "=&r" ((sl)) \ - : "r" ((USItype)(ah)), \ - "rI" ((USItype)(bh)), \ - "r" ((USItype)(al)), \ -@@ -225,10 +225,10 @@ - : "r0", "r1", "r2") - #else - #define umul_ppmm(xh, xl, a, b) \ -- __asm__ ("%@ Inlined umul_ppmm\n" \ -- "umull %r1, %r0, %r2, %r3" \ -- : "=&r" ((USItype)(xh)), \ -- "=r" ((USItype)(xl)) \ -+ __asm__ ( \ -+ "umull %1, %0, %2, %3" \ -+ : "=&r" ((xh)), \ -+ "=r" ((xl)) \ - : "r" ((USItype)(a)), \ - "r" ((USItype)(b)) \ - : "r0", "r1") -@@ -437,8 +437,8 @@ - #define add_ssaaaa(sh, sl, ah, al, bh, bl) \ - __asm__ ("addl %5,%1\n" \ - "adcl %3,%0" \ -- : "=r" ((USItype)(sh)), \ -- "=&r" ((USItype)(sl)) \ -+ : "=r" (sh), \ -+ "=&r" (sl) \ - : "%0" ((USItype)(ah)), \ - "g" ((USItype)(bh)), \ - "%1" ((USItype)(al)), \ -@@ -446,22 +446,22 @@ - #define sub_ddmmss(sh, sl, ah, al, bh, bl) \ - __asm__ ("subl %5,%1\n" \ - "sbbl %3,%0" \ -- : "=r" ((USItype)(sh)), \ -- "=&r" ((USItype)(sl)) \ -+ : "=r" (sh), \ -+ "=&r" (sl) \ - : "0" ((USItype)(ah)), \ - "g" ((USItype)(bh)), \ - "1" ((USItype)(al)), \ - "g" ((USItype)(bl))) - #define umul_ppmm(w1, w0, u, v) \ - __asm__ ("mull %3" \ -- : "=a" ((USItype)(w0)), \ -- "=d" ((USItype)(w1)) \ -+ : "=a" (w0), \ -+ "=d" (w1) \ - : "%0" ((USItype)(u)), \ - "rm" ((USItype)(v))) - #define udiv_qrnnd(q, r, n1, n0, d) \ - __asm__ ("divl %4" \ -- : "=a" ((USItype)(q)), \ -- "=d" ((USItype)(r)) \ -+ : "=a" (q), \ -+ "=d" (r) \ - : "0" ((USItype)(n0)), \ - "1" ((USItype)(n1)), \ - "rm" ((USItype)(d))) diff --git a/security/libgcrypt/pkg-plist b/security/libgcrypt/pkg-plist index 6aacf8801de3..d49939726fa8 100644 --- a/security/libgcrypt/pkg-plist +++ b/security/libgcrypt/pkg-plist @@ -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 diff --git a/security/libmatekeyring/Makefile b/security/libmatekeyring/Makefile index e806deb26377..60451a42b15f 100644 --- a/security/libmatekeyring/Makefile +++ b/security/libmatekeyring/Makefile @@ -3,7 +3,7 @@ PORTNAME= libmatekeyring PORTVERSION= 1.6.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security mate MASTER_SITES= MATE DIST_SUBDIR= mate diff --git a/security/libotr/Makefile b/security/libotr/Makefile index ce81fa0b2326..e16189569567 100644 --- a/security/libotr/Makefile +++ b/security/libotr/Makefile @@ -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/ diff --git a/security/libotr3/Makefile b/security/libotr3/Makefile index 7460bcfc9548..cb900e6a3610 100644 --- a/security/libotr3/Makefile +++ b/security/libotr3/Makefile @@ -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/ diff --git a/security/libprelude/Makefile b/security/libprelude/Makefile index 682b5add84cc..ce115d8b38f7 100644 --- a/security/libprelude/Makefile +++ b/security/libprelude/Makefile @@ -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/ diff --git a/security/libpreludedb/Makefile b/security/libpreludedb/Makefile index c24308058e40..ce7056cef8d7 100644 --- a/security/libpreludedb/Makefile +++ b/security/libpreludedb/Makefile @@ -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/ diff --git a/security/libsecret/Makefile b/security/libsecret/Makefile index 9deb7b9ff6d5..a568f1d84060 100644 --- a/security/libsecret/Makefile +++ b/security/libsecret/Makefile @@ -4,7 +4,7 @@ PORTNAME= libsecret PORTVERSION= 0.15 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security gnome MASTER_SITES= GNOME diff --git a/security/libssh2/Makefile b/security/libssh2/Makefile index 52b4828b5366..9d1da783c02c 100644 --- a/security/libssh2/Makefile +++ b/security/libssh2/Makefile @@ -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/ \ diff --git a/security/opencdk/Makefile b/security/opencdk/Makefile index e9b1785be8dd..060f68e1c6dc 100644 --- a/security/opencdk/Makefile +++ b/security/opencdk/Makefile @@ -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/ diff --git a/security/openvas-libraries/Makefile b/security/openvas-libraries/Makefile index d9d3925acf2d..cbef34dd4e41 100644 --- a/security/openvas-libraries/Makefile +++ b/security/openvas-libraries/Makefile @@ -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/ diff --git a/security/openvpn-auth-radius/Makefile b/security/openvpn-auth-radius/Makefile index ccd7618867d1..8f63c1ef8808 100644 --- a/security/openvpn-auth-radius/Makefile +++ b/security/openvpn-auth-radius/Makefile @@ -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/ diff --git a/security/p5-Crypt-GCrypt/Makefile b/security/p5-Crypt-GCrypt/Makefile index 71f9f65da1ff..cbc5933bdcc4 100644 --- a/security/p5-Crypt-GCrypt/Makefile +++ b/security/p5-Crypt-GCrypt/Makefile @@ -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=${LOCALBASE}/include \ USE_PERL5= configure USES= perl5 +post-stage: + ${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Crypt/GCrypt/GCrypt.so + .include diff --git a/security/p5-Crypt-GCrypt/files/patch-GCrypt.xs b/security/p5-Crypt-GCrypt/files/patch-GCrypt.xs new file mode 100644 index 000000000000..b1e041e18232 --- /dev/null +++ b/security/p5-Crypt-GCrypt/files/patch-GCrypt.xs @@ -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; ++/* + gcry_ac_key_type_t keytype; + gcry_ac_data_t keydata; ++*/ + gcry_mpi_t mpi; + size_t len; + CODE: +@@ -617,22 +586,7 @@ + + /* Set key for asymmetric criptography */ + if (gcr->type == CG_TYPE_ASYMM) { +- k = SvPV(ST(2), len); +- +- /* Key type */ +- keytype = -1; +- s = SvPV(ST(1), len); +- if (strcmp(s, "private") == 0) keytype = GCRY_AC_KEY_SECRET; +- if (strcmp(s, "public") == 0) keytype = GCRY_AC_KEY_PUBLIC; +- if (keytype == -1) +- croak("Key must be private or public"); +- +- gcry_control(GCRYCTL_INIT_SECMEM, strlen(k)); +- mpi = gcry_mpi_snew(0); +- /* gcry_mpi_scan( &mpi, GCRYMPI_FMT_STD, k, NULL, NULL ); */ +- gcr->err = gcry_ac_data_new(&keydata); +- gcr->err = gcry_ac_data_set(keydata, GCRY_AC_FLAG_COPY, "s", mpi); +- gcr->err = gcry_ac_key_init(&gcr->key_ac, gcr->h_ac, keytype, keydata); ++ croak("Asymmetric cryptography is not yet supported by Crypt::GCrypt"); + } + + void +@@ -796,7 +750,9 @@ + Crypt_GCrypt gcr; + CODE: + if (gcr->type == CG_TYPE_CIPHER) gcry_cipher_close(gcr->h); ++/* + if (gcr->type == CG_TYPE_ASYMM) gcry_ac_close(gcr->h_ac); ++*/ + if (gcr->type == CG_TYPE_DIGEST) gcry_md_close(gcr->h_md); + + if (gcr->need_to_call_finish == 1) diff --git a/security/pam-pgsql/Makefile b/security/pam-pgsql/Makefile index db6368772794..bce1dc35732e 100644 --- a/security/pam-pgsql/Makefile +++ b/security/pam-pgsql/Makefile @@ -3,7 +3,7 @@ PORTNAME= pam-pgsql PORTVERSION= 0.7.3.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security databases MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.7/ diff --git a/security/pidgin-otr/Makefile b/security/pidgin-otr/Makefile index 51f425ca003b..d3dede3739e9 100644 --- a/security/pidgin-otr/Makefile +++ b/security/pidgin-otr/Makefile @@ -2,7 +2,7 @@ PORTNAME= otr PORTVERSION= 4.0.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security net-im net MASTER_SITES= http://www.cypherpunks.ca/otr/ PKGNAMEPREFIX= pidgin- diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile index 1b7d95a6b24b..6ba9ef577453 100644 --- a/security/pinentry/Makefile +++ b/security/pinentry/Makefile @@ -3,7 +3,7 @@ PORTNAME= pinentry PORTVERSION= 0.8.3 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= security MASTER_SITES= GNUPG/pinentry diff --git a/security/prelude-lml/Makefile b/security/prelude-lml/Makefile index aceddaabe34d..6f690f552e1f 100644 --- a/security/prelude-lml/Makefile +++ b/security/prelude-lml/Makefile @@ -3,7 +3,7 @@ PORTNAME= prelude-lml PORTVERSION= 1.0.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= security MASTER_SITES= https://www.prelude-ids.org/attachments/download/242/ diff --git a/security/prelude-manager/Makefile b/security/prelude-manager/Makefile index 2f4d4843a77a..a6fb80fcbf55 100644 --- a/security/prelude-manager/Makefile +++ b/security/prelude-manager/Makefile @@ -3,7 +3,7 @@ PORTNAME= prelude-manager PORTVERSION= 1.0.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= security MASTER_SITES= https://www.prelude-ids.org/attachments/download/243/ diff --git a/security/seahorse-plugins/Makefile b/security/seahorse-plugins/Makefile index b4afdffe2873..9a04d97373c9 100644 --- a/security/seahorse-plugins/Makefile +++ b/security/seahorse-plugins/Makefile @@ -4,7 +4,7 @@ PORTNAME= seahorse-plugins PORTVERSION= 2.30.1 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= security gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/security/seccure/Makefile b/security/seccure/Makefile index e50c3174a2a0..bc2be51af4a2 100644 --- a/security/seccure/Makefile +++ b/security/seccure/Makefile @@ -3,7 +3,7 @@ PORTNAME= seccure PORTVERSION= 0.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= security MASTER_SITES= http://point-at-infinity.org/seccure/ \ ${MASTER_SITE_NETBSD} diff --git a/security/vpnc/Makefile b/security/vpnc/Makefile index 9389b9ed104e..fead04fb429c 100644 --- a/security/vpnc/Makefile +++ b/security/vpnc/Makefile @@ -3,7 +3,7 @@ PORTNAME= vpnc PORTVERSION= 0.5.3 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= security MASTER_SITES= http://www.unix-ag.uni-kl.de/~massar/vpnc/ \ CRITICAL diff --git a/sysutils/dar/Makefile b/sysutils/dar/Makefile index 96ccdc27802f..50b60ef89a3e 100644 --- a/sysutils/dar/Makefile +++ b/sysutils/dar/Makefile @@ -3,6 +3,7 @@ PORTNAME= dar PORTVERSION= 2.4.14 +PORTREVISION= 1 CATEGORIES= sysutils archivers MASTER_SITES= SF diff --git a/sysutils/freeipmi/Makefile b/sysutils/freeipmi/Makefile index 3776baa29f48..a3f7f46d8ea1 100644 --- a/sysutils/freeipmi/Makefile +++ b/sysutils/freeipmi/Makefile @@ -3,6 +3,7 @@ PORTNAME= freeipmi PORTVERSION= 1.4.5 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= GNU/${PORTNAME}/ \ http://ftp.gluster.com/pub/${PORTNAME}/${PORTVERSION}/ diff --git a/sysutils/fusefs-cryptofs/Makefile b/sysutils/fusefs-cryptofs/Makefile index 4ad119b09ee8..f6303e414ebd 100644 --- a/sysutils/fusefs-cryptofs/Makefile +++ b/sysutils/fusefs-cryptofs/Makefile @@ -3,7 +3,7 @@ PORTNAME= cryptofs PORTVERSION= 0.6.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MASTER_SITES= http://reboot78.re.funpic.de/cryptofs/ PKGNAMEPREFIX= fusefs- diff --git a/sysutils/rsyslog7-devel/Makefile b/sysutils/rsyslog7-devel/Makefile index 5af2fd9cac9f..3beecf84fe69 100644 --- a/sysutils/rsyslog7-devel/Makefile +++ b/sysutils/rsyslog7-devel/Makefile @@ -2,7 +2,7 @@ PORTNAME= rsyslog PORTVERSION= 7.5.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ diff --git a/sysutils/rsyslog7/Makefile b/sysutils/rsyslog7/Makefile index 01e0a1c08585..b25054a3fdcc 100644 --- a/sysutils/rsyslog7/Makefile +++ b/sysutils/rsyslog7/Makefile @@ -2,7 +2,7 @@ PORTNAME= rsyslog PORTVERSION= 7.6.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ diff --git a/sysutils/rsyslog8-devel/Makefile b/sysutils/rsyslog8-devel/Makefile index 291dc697690b..8f3e8e62d2d2 100644 --- a/sysutils/rsyslog8-devel/Makefile +++ b/sysutils/rsyslog8-devel/Makefile @@ -2,7 +2,7 @@ PORTNAME= rsyslog PORTVERSION= 8.3.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ diff --git a/sysutils/rsyslog8/Makefile b/sysutils/rsyslog8/Makefile index 4beccf184796..72872434f65f 100644 --- a/sysutils/rsyslog8/Makefile +++ b/sysutils/rsyslog8/Makefile @@ -2,7 +2,7 @@ PORTNAME= rsyslog PORTVERSION= 8.2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile index c80d0dd3d8c3..1c670bb2ab3c 100644 --- a/textproc/libxslt/Makefile +++ b/textproc/libxslt/Makefile @@ -3,7 +3,7 @@ PORTNAME= libxslt PORTVERSION= 1.1.28 -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES?= textproc gnome MASTER_SITES= ftp://xmlsoft.org/libxml2/ \ http://xmlsoft.org/sources/ \ diff --git a/www/libmicrohttpd/Makefile b/www/libmicrohttpd/Makefile index e995a3369c71..d8ac87060a4a 100644 --- a/www/libmicrohttpd/Makefile +++ b/www/libmicrohttpd/Makefile @@ -3,7 +3,7 @@ PORTNAME= libmicrohttpd PORTVERSION= 0.9.33 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= GNU