6 files changed, 74 insertions, 35 deletions

diff --git a/security/putty/Makefile b/security/putty/Makefile
index b9281cd3fa19..3ab914d229a7 100644
--- a/security/putty/Makefile
+++ b/security/putty/Makefile
@@ -6,39 +6,69 @@
 #
 
 PORTNAME=	putty
-PORTVERSION=	0.60
-PORTREVISION=	1
+PORTVERSION=	0.61
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://the.earth.li/~sgtatham/putty/%SUBDIR%/ \
 		ftp://ftp.chiark.greenend.org.uk/users/sgtatham/putty-latest/
 MASTER_SITE_SUBDIR=	${PORTVERSION}
 
-MAINTAINER=	beat@FreeBSD.org
+# Beat Gaetzi (beat@) is permitted to take maintainership back
+# or commit to this port without my prior approval.
+MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	Secure shell and telnet client
 
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 MAKEFILE=	Makefile.gtk
-CFLAGS+=	-DBSD_PTYS -DOMIT_UTMP
 
 PLIST_FILES=	bin/plink bin/pscp bin/psftp bin/puttygen
 MAN1=		plink.1 pscp.1 psftp.1 puttygen.1
 
-.if !defined(WITHOUT_GTK)
-USE_GNOME=	gtk12
+OPTIONS=	GSSAPI "Enable GSSAPI support (broken on 9-CURRENT)" on \
+		GTK    "Enable GTK+ 2 GUI" on
+
+.include <bsd.port.options.mk>
+
+CFLAGS+=	-DBSD_PTYS -DOMIT_UTMP -DIPV6
+
+.if !defined(WITHOUT_GTK) && !defined(WITHOUT_X11)
+USE_GNOME=	gtk20
 PLIST_FILES+=	bin/pterm bin/putty bin/puttytel
 MAN1+=		pterm.1 putty.1 puttytel.1
-MAKE_ENV+=	PUTTY_WITH_GTK=yes
-CFLAGS+=	`${GTK_CONFIG} --cflags`
+MAKE_ARGS+=	PUTTY_WITH_GTK=yes GTK_CONFIG="pkg-config gtk+-2.0 x11 --cflags"
+.else
+MAKE_ARGS+=	GTK_CONFIG=:
 .endif
 
-.if !defined(WITHOUT_IPV6)
-CFLAGS+=	-DIPV6
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_GSSAPI)
+_COMPAT=		-DSTATIC_GSSAPI
+.if ${OSVERSION} >= 900000
+BROKEN=		FreeBSD 9's Kerberos misses MD2, use WITHOUT_GSSAPI=1
+.endif
+.else
+_COMPAT=		-DNO_GSSAPI
 .endif
 
+_COMPAT+=	-DOMIT_UTMP
+
+.if defined(WITH_DEBUG) && ${WITH_DEBUG} != "no"
+XFLAGS=		-DDEBUG
+.endif
+
+.if ${CC:T} == clang
+XFLAGS+=	-Wno-empty-body
+.endif
+
+MAKE_ARGS+=	COMPAT="${_COMPAT}" \
+		XFLAGS="${XFLAGS}" \
+		INSTALL_DATA="${INSTALL_DATA}" \
+		INSTALL_PROGRAM="${INSTALL_PROGRAM}"
+
 post-patch:
-	@${REINPLACE_CMD} -e 's,gtk-config,${GTK_CONFIG},g; \
-			      s,prefix=/usr/local,prefix=${PREFIX},' \
+	@${REINPLACE_CMD} -e 's,prefix=/usr/local,prefix=${PREFIX},;\
+			      s,make,${GMAKE},' \
 		${WRKSRC}/${MAKEFILE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/security/putty/distinfo b/security/putty/distinfo
index 602a804adaf1..b09ec5b57e1d 100644
--- a/security/putty/distinfo
+++ b/security/putty/distinfo
@@ -1,2 +1,2 @@
-SHA256 (putty-0.60.tar.gz) = b2bbaaf9324997e85cf15d44ed41e8e89539c8215dceac9d6d7272a37dbc2849
-SIZE (putty-0.60.tar.gz) = 1743711
+SHA256 (putty-0.61.tar.gz) = 0eb0ec2dcbaf803731343cd6cd03788f16781dc19f806c612e373430daf8c072
+SIZE (putty-0.61.tar.gz) = 1781830
diff --git a/security/putty/files/patch-Makefile.gtk b/security/putty/files/patch-Makefile.gtk
index 0fb7bef69bea..c9362d3e618a 100644
--- a/security/putty/files/patch-Makefile.gtk
+++ b/security/putty/files/patch-Makefile.gtk
@@ -1,17 +1,15 @@
---- Makefile.gtk.orig	Sun Apr 29 22:41:48 2007
-+++ Makefile.gtk	Thu May  3 13:52:34 2007
-@@ -99,8 +99,8 @@
- # TOOLPATH = /opt/gcc/bin
- CC = $(TOOLPATH)cc
+--- ./Makefile.gtk.orig	2011-07-12 20:29:31.000000000 +0200
++++ ./Makefile.gtk	2011-07-17 14:56:18.000000000 +0200
+@@ -119,7 +119,7 @@
+ 
+ unexport CFLAGS # work around a weird issue with krb5-config
  
 -CFLAGS = -O2 -Wall -Werror -g -I.././ -I../charset/ -I../windows/ -I../unix/ \
--		-I../mac/ -I../macosx/ `gtk-config --cflags` -D _FILE_OFFSET_BITS=64
-+CFLAGS += -O2 -Wall -g -I.././ -I../charset/ -I../windows/ -I../unix/ \
-+		-I../mac/ -I../macosx/ -D _FILE_OFFSET_BITS=64
- XLDFLAGS = $(LDFLAGS) `gtk-config --libs`
++CFLAGS := $(CFLAGS) -Wall -Werror -I.././ -I../charset/ -I../windows/ -I../unix/ \
+ 		-I../macosx/ $(shell $(GTK_CONFIG) --cflags) -D _FILE_OFFSET_BITS=64
+ XLDFLAGS = $(LDFLAGS) $(shell $(GTK_CONFIG) --libs)
  ULDFLAGS = $(LDFLAGS)
- INSTALL=install
-@@ -116,7 +116,11 @@
+@@ -146,7 +146,11 @@
  .SUFFIXES:
  
  
@@ -21,9 +19,9 @@
 +all: plink pscp psftp puttygen
 +endif
  
- plink: be_all_s.o cmdline.o cproxy.o ldisc.o logging.o misc.o pinger.o \
- 		portfwd.o proxy.o raw.o rlogin.o settings.o ssh.o sshaes.o \
-@@ -905,7 +909,7 @@
+ plink: be_all_s.o cmdline.o cproxy.o ldisc.o logging.o misc.o pgssapi.o \
+ 		pinger.o portfwd.o proxy.o raw.o rlogin.o settings.o ssh.o \
+@@ -851,7 +855,7 @@
  	$(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/xpmputty.c
  
  version.o: FORCE
@@ -32,7 +30,7 @@
  		$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) `cat ../version.def` -c ../version.c; \
  	else \
  		$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) $(VER) -c ../version.c; \
-@@ -914,6 +918,8 @@
+@@ -861,6 +865,8 @@
  	$(INSTALL_PROGRAM) -m 755 plink $(DESTDIR)$(bindir)/plink
  	$(INSTALL_PROGRAM) -m 755 pscp $(DESTDIR)$(bindir)/pscp
  	$(INSTALL_PROGRAM) -m 755 psftp $(DESTDIR)$(bindir)/psftp
@@ -41,7 +39,7 @@
  	$(INSTALL_PROGRAM) -m 755 pterm $(DESTDIR)$(bindir)/pterm
  	if test -n "$(UTMP_GROUP)"; then \
  	  chgrp $(UTMP_GROUP) $(DESTDIR)$(bindir)/pterm && \
-@@ -923,15 +929,17 @@
+@@ -870,15 +876,17 @@
  	    chmod 4755 $(DESTDIR)$(bindir)/pterm; \
  	fi
  	$(INSTALL_PROGRAM) -m 755 putty $(DESTDIR)$(bindir)/putty
diff --git a/security/putty/files/patch-timing.c b/security/putty/files/patch-timing.c
new file mode 100644
index 000000000000..507d1f7d1b1c
--- /dev/null
+++ b/security/putty/files/patch-timing.c
@@ -0,0 +1,11 @@
+--- ../timing.c.orig	2011-07-17 13:40:59.000000000 +0200
++++ ../timing.c	2011-07-17 13:41:13.000000000 +0200
+@@ -41,7 +41,7 @@
+      * Failing that, compare on the other two fields, just so that
+      * we don't get unwanted equality.
+      */
+-#ifdef __LCC__
++#if defined(__LCC__) || defined(__clang__)
+     /* lcc won't let us compare function pointers. Legal, but annoying. */
+     {
+ 	int c = memcmp(&a->fn, &b->fn, sizeof(a->fn));
diff --git a/security/putty/files/patch-uxnet.c b/security/putty/files/patch-uxnet.c
index f7971978077c..78e618506aaf 100644
--- a/security/putty/files/patch-uxnet.c
+++ b/security/putty/files/patch-uxnet.c
@@ -1,5 +1,5 @@
---- uxnet.c.orig	Fri Apr 29 12:48:56 2005
-+++ uxnet.c	Fri Apr 29 12:49:29 2005
+--- ./uxnet.c.orig	2009-08-07 00:55:15.000000000 +0200
++++ ./uxnet.c	2011-07-17 14:55:44.000000000 +0200
 @@ -11,8 +11,13 @@
  #include <sys/types.h>
  #include <sys/socket.h>
diff --git a/security/putty/files/patch-uxpty.c b/security/putty/files/patch-uxpty.c
index 9ffe3e233b15..c3ceee0949a7 100644
--- a/security/putty/files/patch-uxpty.c
+++ b/security/putty/files/patch-uxpty.c
@@ -1,5 +1,5 @@
---- uxpty.c.orig	2010-02-10 20:05:47.000000000 +0000
-+++ uxpty.c	2010-02-10 20:06:06.000000000 +0000
+--- ./uxpty.c.orig	2011-03-02 20:12:42.000000000 +0100
++++ ./uxpty.c	2011-07-17 14:55:44.000000000 +0200
 @@ -13,7 +13,6 @@
  #include <fcntl.h>
  #include <termios.h>