Date: Thu, 4 May 2017 21:27:43 +0000 (UTC) From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r440116 - in head/security/putty: . files Message-ID: <201705042127.v44LRhK0072739@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mandree Date: Thu May 4 21:27:43 2017 New Revision: 440116 URL: https://svnweb.freebsd.org/changeset/ports/440116 Log: Update to new upstream release 0.69. Upstream change "You can now explicitly configure SSH terminal mode settings not to be sent to the server, if your server objects to them." Enable pageant, was missing from the 0.68 upgrade. Switch to GTK3, no longer compiles with GTK2. The security fixes contained in 0.69 are only good on Windows, so not flagging this as a security update. Modified: head/security/putty/Makefile head/security/putty/distinfo head/security/putty/files/patch-Makefile.gtk Modified: head/security/putty/Makefile ============================================================================== --- head/security/putty/Makefile Thu May 4 20:30:48 2017 (r440115) +++ head/security/putty/Makefile Thu May 4 21:27:43 2017 (r440116) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= putty -PORTVERSION= 0.68 +PORTVERSION= 0.69 CATEGORIES= security ipv6 MASTER_SITES= http://the.earth.li/~sgtatham/putty/${PORTVERSION}/ \ ftp://ftp.chiark.greenend.org.uk/users/sgtatham/putty-latest/ @@ -23,8 +23,8 @@ CPE_VENDOR= simon_tatham PLIST_FILES= bin/plink bin/pscp bin/psftp bin/puttygen PLIST_FILES+= man/man1/plink.1.gz man/man1/pscp.1.gz man/man1/psftp.1.gz man/man1/puttygen.1.gz -OPTIONS_DEFINE= GSSAPI GTK2 -OPTIONS_DEFAULT=GSSAPI GTK2 +OPTIONS_DEFINE= GSSAPI GTK3 +OPTIONS_DEFAULT=GSSAPI GTK3 CONFLICTS_INSTALL?= pssh-[0-9]* putty-nogtk-[0-9]* @@ -33,13 +33,13 @@ CONFLICTS_INSTALL?= pssh-[0-9]* putty-no CFLAGS+= -DBSD_PTYS -DOMIT_UTMP -DIPV6 LDFLAGS+= -Wl,--as-needed -.if ${PORT_OPTIONS:MGTK2} && !defined(WITHOUT_X11) -USE_GNOME= cairo gdkpixbuf2 gtk20 +.if ${PORT_OPTIONS:MGTK3} && !defined(WITHOUT_X11) +USE_GNOME= cairo gdkpixbuf2 gtk30 USE_XORG= x11 -PLIST_FILES+= bin/pterm bin/putty bin/puttytel -PLIST_FILES+= man/man1/pterm.1.gz man/man1/putty.1.gz man/man1/puttytel.1.gz -MAKE_ARGS+= PUTTY_WITH_GTK=yes GTK_CONFIG="pkg-config gtk+-2.0 x11 --cflags" +PLIST_FILES+= bin/pageant bin/pterm bin/putty bin/puttytel +PLIST_FILES+= man/man1/pageant.1.gz man/man1/pterm.1.gz man/man1/putty.1.gz man/man1/puttytel.1.gz +MAKE_ARGS+= PUTTY_WITH_GTK=yes GTK_CONFIG="pkg-config gtk+-3.0 x11 --cflags" .else MAKE_ARGS+= GTK_CONFIG=: .endif Modified: head/security/putty/distinfo ============================================================================== --- head/security/putty/distinfo Thu May 4 20:30:48 2017 (r440115) +++ head/security/putty/distinfo Thu May 4 21:27:43 2017 (r440116) @@ -1,3 +1,3 @@ -TIMESTAMP = 1489606314 -SHA256 (putty-0.68.tar.gz) = 7ba256f46e5a353cafe811ce7914d0e22a52bdfc0e6e2d183ad28b5af44cd09c -SIZE (putty-0.68.tar.gz) = 2114499 +TIMESTAMP = 1493852442 +SHA256 (putty-0.69.tar.gz) = b7dad241ff01b0cbb9dc4c1471ec7cacf8f08d98a581aeb2f336da3c0eb96ad1 +SIZE (putty-0.69.tar.gz) = 2122306 Modified: head/security/putty/files/patch-Makefile.gtk ============================================================================== --- head/security/putty/files/patch-Makefile.gtk Thu May 4 20:30:48 2017 (r440115) +++ head/security/putty/files/patch-Makefile.gtk Thu May 4 21:27:43 2017 (r440116) @@ -1,6 +1,6 @@ ---- Makefile.gtk.orig 2017-03-16 02:47:16.000000000 +0000 -+++ Makefile.gtk 2017-03-16 02:47:16.000000000 +0000 -@@ -111,7 +111,7 @@ +--- Makefile.gtk.orig 2017-04-24 13:52:46 UTC ++++ Makefile.gtk +@@ -111,7 +111,7 @@ GTK_CONFIG = sh -c 'pkg-config gtk+-3.0 unexport CFLAGS # work around a weird issue with krb5-config @@ -9,7 +9,7 @@ $(shell $(GTK_CONFIG) --cflags) -D _FILE_OFFSET_BITS=64 XLDFLAGS = $(LDFLAGS) $(shell $(GTK_CONFIG) --libs) ULDFLAGS = $(LDFLAGS) -@@ -138,8 +138,12 @@ +@@ -138,8 +138,12 @@ man1dir=$(mandir)/man1 .SUFFIXES: @@ -22,21 +22,27 @@ cgtest: cgtest.o conf.o import.o misc.o notiming.o sshaes.o sshbcrypt.o \ sshblowf.o sshbn.o sshdes.o sshdss.o sshdssg.o sshecc.o \ -@@ -1050,6 +1054,8 @@ +@@ -1047,10 +1051,12 @@ xpmputty.o: ../unix/xpmputty.c + + install: + mkdir -p $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) +- $(INSTALL_PROGRAM) -m 755 pageant $(DESTDIR)$(bindir)/pageant $(INSTALL_PROGRAM) -m 755 plink $(DESTDIR)$(bindir)/plink $(INSTALL_PROGRAM) -m 755 pscp $(DESTDIR)$(bindir)/pscp $(INSTALL_PROGRAM) -m 755 psftp $(DESTDIR)$(bindir)/psftp + $(INSTALL_PROGRAM) -m 755 puttygen $(DESTDIR)$(bindir)/puttygen +ifdef PUTTY_WITH_GTK ++ $(INSTALL_PROGRAM) -m 755 pageant $(DESTDIR)$(bindir)/pageant $(INSTALL_PROGRAM) -m 755 pterm $(DESTDIR)$(bindir)/pterm if test -n "$(UTMP_GROUP)"; then \ chgrp $(UTMP_GROUP) $(DESTDIR)$(bindir)/pterm && \ -@@ -1059,15 +1065,17 @@ +@@ -1060,16 +1066,18 @@ install: chmod 4755 $(DESTDIR)$(bindir)/pterm; \ fi $(INSTALL_PROGRAM) -m 755 putty $(DESTDIR)$(bindir)/putty - $(INSTALL_PROGRAM) -m 755 puttygen $(DESTDIR)$(bindir)/puttygen $(INSTALL_PROGRAM) -m 755 puttytel $(DESTDIR)$(bindir)/puttytel + $(INSTALL_DATA) -m 644 ../doc/pageant.1 $(DESTDIR)$(man1dir)/pageant.1 +endif $(INSTALL_DATA) -m 644 ../doc/plink.1 $(DESTDIR)$(man1dir)/plink.1 $(INSTALL_DATA) -m 644 ../doc/pscp.1 $(DESTDIR)$(man1dir)/pscp.1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705042127.v44LRhK0072739>