From nobody@FreeBSD.org  Thu Mar 15 14:51:36 2007
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 881F816A401
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 15 Mar 2007 14:51:36 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [69.147.83.33])
	by mx1.freebsd.org (Postfix) with ESMTP id 6AB6913C455
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 15 Mar 2007 14:51:36 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.13.1/8.13.1) with ESMTP id l2FEpa1b075191
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 15 Mar 2007 14:51:36 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.13.1/8.13.1/Submit) id l2FEpaad075190;
	Thu, 15 Mar 2007 14:51:36 GMT
	(envelope-from nobody)
Message-Id: <200703151451.l2FEpaad075190@www.freebsd.org>
Date: Thu, 15 Mar 2007 14:51:36 GMT
From: Kenneth Vestergaard Schmidt<kvs@pil.dk>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] security/putty should build puttygen even when WITHOUT_GTK is defined
X-Send-Pr-Version: www-3.0

>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:    garga
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Mar 15 15:00:08 GMT 2007
>Closed-Date:    Thu Mar 15 17:59:37 GMT 2007
>Last-Modified:  Thu Mar 15 18:00:13 GMT 2007
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->garga 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Mar 15 15:00:20 UTC 2007 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=110335 
State-Changed-From-To: open->closed 
State-Changed-By: garga 
State-Changed-When: Thu Mar 15 17:59:35 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=110335 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/110335: commit references a PR
Date: Thu, 15 Mar 2007 17:59:10 +0000 (UTC)

 garga       2007-03-15 17:59:02 UTC
 
   FreeBSD ports repository
 
   Modified files:
     security/putty       Makefile 
     security/putty/files patch-Makefile.gtk 
   Log:
   Install puttygen even if you set WITHOUT_GTK since it doesn't require gtk.
   
   PR:             ports/110335
   Submitted by:   Kenneth Vestergaard Schmidt<kvs@pil.dk>
   
   Revision  Changes    Path
   1.14      +8 -8      ports/security/putty/Makefile
   1.5       +10 -6     ports/security/putty/files/patch-Makefile.gtk
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
