Attachment 53178 Details for Bug 80460 – putty-0.58.patch

[patch] putty-0.58.patch

putty-0.58.patch (text/plain), 5.60 KB, created by Renato Botelho on 2005-04-29 18:10:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Renato Botelho

Created: 2005-04-29 18:10:01 UTC

Size: 5.60 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/security/putty/Makefile,v
>retrieving revision 1.7
>diff -u -r1.7 Makefile
>--- Makefile	20 Feb 2005 21:09:31 -0000	1.7
>+++ Makefile	29 Apr 2005 17:04:26 -0000
>@@ -6,12 +6,12 @@
> #
> 
> PORTNAME=	putty
>-PORTVERSION=	0.57
>+PORTVERSION=	0.58
> CATEGORIES=	security ipv6
> MASTER_SITES=	http://the.earth.li/~sgtatham/putty/%SUBDIR%/
> MASTER_SITE_SUBDIR=	${PORTVERSION}
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	freebsd@galle.com.br
> COMMENT=	Secure shell and telnet client
> 
> USE_GMAKE=	yes
>@@ -34,7 +34,9 @@
> .endif
> 
> post-patch:
>-	${REINPLACE_CMD} -e 's,gtk-config,${GTK_CONFIG},' ${WRKSRC}/${MAKEFILE}
>+	@${REINPLACE_CMD} -e 's,gtk-config,${GTK_CONFIG},; \
>+			      s,prefix=/usr/local,prefix=${PREFIX},' \
>+			     ${WRKSRC}/${MAKEFILE}
> 
> .include <bsd.port.pre.mk>
> 
>Index: distinfo
>===================================================================
>RCS file: /home/ncvs/ports/security/putty/distinfo,v
>retrieving revision 1.4
>diff -u -r1.4 distinfo
>--- distinfo	20 Feb 2005 21:09:31 -0000	1.4
>+++ distinfo	29 Apr 2005 17:04:26 -0000
>@@ -1,2 +1,2 @@
>-MD5 (putty-0.57.tar.gz) = 0fc816093980246f6400693fe6146280
>-SIZE (putty-0.57.tar.gz) = 1319513
>+MD5 (putty-0.58.tar.gz) = ffb78a7db7e4802896189b2112714a9f
>+SIZE (putty-0.58.tar.gz) = 1567268
>Index: files/patch-Makefile.gtk
>===================================================================
>RCS file: /home/ncvs/ports/security/putty/files/patch-Makefile.gtk,v
>retrieving revision 1.2
>diff -u -r1.2 patch-Makefile.gtk
>--- files/patch-Makefile.gtk	4 Aug 2004 08:03:06 -0000	1.2
>+++ files/patch-Makefile.gtk	29 Apr 2005 17:04:26 -0000
>@@ -1,17 +1,17 @@
>---- Makefile.gtk.orig	Tue Aug  3 19:42:46 2004
>-+++ Makefile.gtk	Wed Aug  4 09:58:44 2004
>-@@ -80,7 +80,7 @@
>+--- Makefile.gtk.orig	Fri Apr 29 13:01:07 2005
>++++ Makefile.gtk	Fri Apr 29 13:06:39 2005
>+@@ -82,7 +82,7 @@
>  # TOOLPATH = /opt/gcc/bin
>  CC = $(TOOLPATH)cc
>  
>--CFLAGS = -O2 -Wall -Werror -g -I.././ -I../charset/ -I../unix/ -I../mac/ \
>-+CFLAGS += -O2 -Wall -g -I.././ -I../charset/ -I../unix/ -I../mac/ \
>- 		`gtk-config --cflags`
>+-CFLAGS = -O2 -Wall -Werror -g -I.././ -I../charset/ -I../windows/ -I../unix/ \
>++CFLAGS += -O2 -Wall -g -I.././ -I../charset/ -I../windows/ -I../unix/ \
>+ 		-I../mac/ -I../macosx/ `gtk-config --cflags`
>  XLDFLAGS = `gtk-config --libs`
>  ULDFLAGS =#
>-@@ -98,7 +98,11 @@
>- %.o:
>- 	$(CC) $(COMPAT) $(FWHACK) $(XFLAGS) $(CFLAGS) -c $<
>+@@ -99,7 +99,11 @@
>+ .SUFFIXES:
>+ 
>  
> +ifdef PUTTY_WITH_GTK
>  all: plink pscp psftp pterm putty puttygen puttytel
>@@ -19,23 +19,26 @@
> +all: plink pscp psftp
> +endif
>  
>- plink: be_all.o cmdline.o ldisc.o logging.o misc.o portfwd.o proxy.o raw.o \
>- 		rlogin.o settings.o signal.o ssh.o sshaes.o sshblowf.o \
>-@@ -616,7 +620,7 @@
>+ plink: be_all.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 \
>+@@ -828,7 +832,7 @@
>  
>  version.o: FORCE;
>  FORCE:
> -	if test -z "$(VER)" && (cd ..; md5sum -c manifest); then \
> +	if test -z "$(VER)" ; then \
>- 		$(CC) $(COMPAT) $(FWHACK) $(XFLAGS) $(CFLAGS) `cat ../version.def` -c ../version.c; \
>+ 		$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) `cat ../version.def` -c ../version.c; \
>  	else \
>- 		$(CC) $(COMPAT) $(FWHACK) $(XFLAGS) $(CFLAGS) $(VER) -c ../version.c; \
>-@@ -625,17 +629,21 @@
>+ 		$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) $(VER) -c ../version.c; \
>+@@ -837,6 +841,7 @@
>  	$(INSTALL_PROGRAM) -m 755 plink $(DESTDIR)$(bindir)/plink
>  	$(INSTALL_PROGRAM) -m 755 pscp $(DESTDIR)$(bindir)/pscp
>  	$(INSTALL_PROGRAM) -m 755 psftp $(DESTDIR)$(bindir)/psftp
> +ifdef PUTTY_WITH_GTK
>  	$(INSTALL_PROGRAM) -m 755 pterm $(DESTDIR)$(bindir)/pterm
>+ 	if test -n "$(UTMP_GROUP)"; then \
>+ 	  chgrp $(UTMP_GROUP) $(DESTDIR)$(bindir)/pterm && \
>+@@ -848,13 +853,16 @@
>  	$(INSTALL_PROGRAM) -m 755 putty $(DESTDIR)$(bindir)/putty
>  	$(INSTALL_PROGRAM) -m 755 puttygen $(DESTDIR)$(bindir)/puttygen
>  	$(INSTALL_PROGRAM) -m 755 puttytel $(DESTDIR)$(bindir)/puttytel
>Index: files/patch-pty.c
>===================================================================
>RCS file: files/patch-pty.c
>diff -N files/patch-pty.c
>--- files/patch-pty.c	13 Feb 2004 17:45:38 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,35 +0,0 @@
>---- pty.c.orig	Sun May 11 14:28:53 2003
>-+++ pty.c	Fri Feb 13 15:06:26 2004
>-@@ -14,7 +14,9 @@
>- #define _XOPEN_SOURCE
>- #define _XOPEN_SOURCE_EXTENDED
>- #define _GNU_SOURCE
>-+#ifndef __FreeBSD__
>- #include <features.h>
>-+#endif
>- 
>- #include <stdio.h>
>- #include <stdlib.h>
>-@@ -32,6 +34,10 @@
>- #include <sys/ioctl.h>
>- #include <errno.h>
>- 
>-+#ifdef __FreeBSD__
>-+#include <sys/stat.h>
>-+#endif
>-+
>- #include "putty.h"
>- 
>- #ifndef FALSE
>-@@ -567,9 +573,9 @@
>- 	ioctl(slavefd, TIOCSCTTY, 1);
>- 	pgrp = getpid();
>- 	tcsetpgrp(slavefd, pgrp);
>--	setpgrp();
>-+	setpgrp( pgrp, -1 );
>- 	close(open(pty_name, O_WRONLY, 0));
>--	setpgrp();
>-+	setpgrp( pgrp, -1 );
>- 	/* Close everything _else_, for tidiness. */
>- 	for (i = 3; i < 1024; i++)
>- 	    close(i);
>Index: files/patch-uxnet.c
>===================================================================
>RCS file: /home/ncvs/ports/security/putty/files/patch-uxnet.c,v
>retrieving revision 1.1
>diff -u -r1.1 patch-uxnet.c
>--- files/patch-uxnet.c	13 Feb 2004 17:45:38 -0000	1.1
>+++ files/patch-uxnet.c	29 Apr 2005 17:04:26 -0000
>@@ -1,5 +1,5 @@
>---- uxnet.c.orig	Tue Feb  3 15:47:43 2004
>-+++ uxnet.c	Fri Feb 13 14:19:00 2004
>+--- uxnet.c.orig	Fri Apr 29 12:48:56 2005
>++++ uxnet.c	Fri Apr 29 12:49:29 2005
> @@ -11,8 +11,13 @@
>  #include <sys/types.h>
>  #include <sys/socket.h>
>@@ -13,4 +13,4 @@
> +#endif
>  #include <netinet/tcp.h>
>  #include <netdb.h>
>- 
>+ #include <sys/un.h>

Actions: View | Diff

Attachments on bug 80460: 53178