Date: Thu, 15 Mar 2007 14:51:36 GMT From: Kenneth Vestergaard Schmidt<kvs@pil.dk> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/110335: [patch] security/putty should build puttygen even when WITHOUT_GTK is defined Message-ID: <200703151451.l2FEpaad075190@www.freebsd.org> Resent-Message-ID: <200703151500.l2FF09FJ058971@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 110335
>Category: ports
>Synopsis: [patch] security/putty should build puttygen even when WITHOUT_GTK is defined
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Thu Mar 15 15:00:08 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Kenneth Vestergaard Schmidt
>Release: 6.2-RELEASE-p2
>Organization:
pil.dk
>Environment:
FreeBSD fahrenheit.pil.dk 6.2-RELEASE FreeBSD 6.2-RELEASE #13: Mon Jan 15 10:56:55 CET 2007 root@fahrenheit.pil.dk:/usr/obj/usr/dana/src/freebsd6/src/sys/X2100 amd64
>Description:
puttygen isn't a GTK-program, and as such should be included even when
WITHOUT_GTK is defined.
>How-To-Repeat:
>Fix:
--- putty.old/Makefile Sat May 13 06:15:13 2006
+++ putty/Makefile Fri Dec 22 11:17:17 2006
@@ -24,8 +24,8 @@
CFLAGS+= -DIPV6
.endif
-PLIST_FILES= bin/plink bin/pscp bin/psftp
-MAN1= plink.1 pscp.1 psftp.1
+PLIST_FILES= bin/plink bin/pscp bin/psftp bin/puttygen
+MAN1= plink.1 pscp.1 psftp.1 puttygen.1
.ifndef WITHOUT_GTK
USE_GNOME= gtk12
--- putty.old/files/patch-Makefile.gtk Sun Feb 11 18:10:03 2007
+++ putty/files/patch-Makefile.gtk Thu Mar 1 17:27:28 2007
@@ -18,7 +20,7 @@
+ifdef PUTTY_WITH_GTK
all: plink pscp psftp pterm putty puttygen puttytel
+else
-+all: plink pscp psftp
++all: plink pscp psftp puttygen
+endif
plink: be_all_s.o cmdline.o cproxy.o ldisc.o logging.o misc.o pinger.o \
@@ -32,26 +34,30 @@
$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) `cat ../version.def` -c ../version.c; \
else \
$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) $(VER) -c ../version.c; \
-@@ -913,6 +917,7 @@
+@@ -913,6 +917,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
++ $(INSTALL_PROGRAM) -m 755 puttygen $(DESTDIR)$(bindir)/puttygen
+ifdef PUTTY_WITH_GTK
$(INSTALL_PROGRAM) -m 755 pterm $(DESTDIR)$(bindir)/pterm
if test -n "$(UTMP_GROUP)"; then \
chgrp $(UTMP_GROUP) $(DESTDIR)$(bindir)/pterm && \
-@@ -924,13 +929,16 @@
+@@ -922,15 +928,17 @@
+ 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 puttygen $(DESTDIR)$(bindir)/puttygen
$(INSTALL_PROGRAM) -m 755 puttytel $(DESTDIR)$(bindir)/puttytel
+endif
$(INSTALL_DATA) -m 644 ../doc/plink.1 $(DESTDIR)$(man1dir)/plink.1
$(INSTALL_DATA) -m 644 ../doc/pscp.1 $(DESTDIR)$(man1dir)/pscp.1
$(INSTALL_DATA) -m 644 ../doc/psftp.1 $(DESTDIR)$(man1dir)/psftp.1
++ $(INSTALL_DATA) -m 644 ../doc/puttygen.1 $(DESTDIR)$(man1dir)/puttygen.1
+ifdef PUTTY_WITH_GTK
$(INSTALL_DATA) -m 644 ../doc/pterm.1 $(DESTDIR)$(man1dir)/pterm.1
$(INSTALL_DATA) -m 644 ../doc/putty.1 $(DESTDIR)$(man1dir)/putty.1
- $(INSTALL_DATA) -m 644 ../doc/puttygen.1 $(DESTDIR)$(man1dir)/puttygen.1
+- $(INSTALL_DATA) -m 644 ../doc/puttygen.1 $(DESTDIR)$(man1dir)/puttygen.1
$(INSTALL_DATA) -m 644 ../doc/puttytel.1 $(DESTDIR)$(man1dir)/puttytel.1
+endif
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200703151451.l2FEpaad075190>