Attachment #53178 for bug #80460

View | Details | Raw Unified | Return to bug 80460
Collapse All | Expand All




#

PORTNAME=	putty
PORTVERSION=	0.58
CATEGORIES=	security ipv6
MASTER_SITES=	http://the.earth.li/~sgtatham/putty/%SUBDIR%/
MASTER_SITE_SUBDIR=	${PORTVERSION}

MAINTAINER=	freebsd@galle.com.br
COMMENT=	Secure shell and telnet client

USE_GMAKE=	yes

.endif

post-patch:
	@${REINPLACE_CMD} -e 's,gtk-config,${GTK_CONFIG},; \
			      s,prefix=/usr/local,prefix=${PREFIX},' \
			     ${WRKSRC}/${MAKEFILE}

.include <bsd.port.pre.mk>


Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	MD5 (putty-0.57.tar.gz) = 0fc816093980246f6400693fe6146280	1	MD5 (putty-0.58.tar.gz) = ffb78a7db7e4802896189b2112714a9f
2	SIZE (putty-0.57.tar.gz) = 1319513	2	SIZE (putty-0.58.tar.gz) = 1567268




--- 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../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 =#
@@ -99,7 +99,11 @@
 .SUFFIXES:
 
 
+ifdef PUTTY_WITH_GTK
 all: plink pscp psftp pterm putty puttygen puttytel

+all: plink pscp psftp
+endif
 
 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) $(XFLAGS) $(CFLAGS) `cat ../version.def` -c ../version.c; \
 	else \
 		$(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




--- 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);

Lines 1-5 Link Here

(-)files/patch-uxnet.c (-3 / +3 lines)
1	--- uxnet.c.orig Tue Feb 3 15:47:43 2004	1	--- uxnet.c.orig Fri Apr 29 12:48:56 2005
2	+++ uxnet.c Fri Feb 13 14:19:00 2004	2	+++ uxnet.c Fri Apr 29 12:49:29 2005
3	@@ -11,8 +11,13 @@	3	@@ -11,8 +11,13 @@
4	#include <sys/types.h>	4	#include <sys/types.h>
5	#include <sys/socket.h>	5	#include <sys/socket.h>
Lines 13-16 Link Here
13	+#endif	13	+#endif
14	#include <netinet/tcp.h>	14	#include <netinet/tcp.h>
15	#include <netdb.h>	15	#include <netdb.h>
16		16	#include <sys/un.h>

Return to bug 80460

Lines 6-17 Link Here

(-)Makefile (-3 / +5 lines)
6	#	6	#
7		7
8	PORTNAME= putty	8	PORTNAME= putty
9	PORTVERSION= 0.57	9	PORTVERSION= 0.58
10	CATEGORIES= security ipv6	10	CATEGORIES= security ipv6
11	MASTER_SITES= http://the.earth.li/~sgtatham/putty/%SUBDIR%/	11	MASTER_SITES= http://the.earth.li/~sgtatham/putty/%SUBDIR%/
12	MASTER_SITE_SUBDIR= ${PORTVERSION}	12	MASTER_SITE_SUBDIR= ${PORTVERSION}
13		13
14	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= freebsd@galle.com.br
15	COMMENT= Secure shell and telnet client	15	COMMENT= Secure shell and telnet client
16		16
17	USE_GMAKE= yes	17	USE_GMAKE= yes
Lines 34-40 Link Here
34	.endif	34	.endif
35		35
36	post-patch:	36	post-patch:
37	${REINPLACE_CMD} -e 's,gtk-config,${GTK_CONFIG},' ${WRKSRC}/${MAKEFILE}	37	@${REINPLACE_CMD} -e 's,gtk-config,${GTK_CONFIG},; \
		38	s,prefix=/usr/local,prefix=${PREFIX},' \
		39	${WRKSRC}/${MAKEFILE}
38		40
39	.include <bsd.port.pre.mk>	41	.include <bsd.port.pre.mk>
40		42

Lines 1-17 Link Here

(-)files/patch-Makefile.gtk (-15 / +18 lines)
1	--- Makefile.gtk.orig Tue Aug 3 19:42:46 2004	1	--- Makefile.gtk.orig Fri Apr 29 13:01:07 2005
2	+++ Makefile.gtk Wed Aug 4 09:58:44 2004	2	+++ Makefile.gtk Fri Apr 29 13:06:39 2005
3	@@ -80,7 +80,7 @@	3	@@ -82,7 +82,7 @@
4	# TOOLPATH = /opt/gcc/bin	4	# TOOLPATH = /opt/gcc/bin
5	CC = $(TOOLPATH)cc	5	CC = $(TOOLPATH)cc
6		6
7	-CFLAGS = -O2 -Wall -Werror -g -I.././ -I../charset/ -I../unix/ -I../mac/ \	7	-CFLAGS = -O2 -Wall -Werror -g -I.././ -I../charset/ -I../windows/ -I../unix/ \
8	+CFLAGS += -O2 -Wall -g -I.././ -I../charset/ -I../unix/ -I../mac/ \	8	+CFLAGS += -O2 -Wall -g -I.././ -I../charset/ -I../windows/ -I../unix/ \
9	`gtk-config --cflags`	9	-I../mac/ -I../macosx/ `gtk-config --cflags`
10	XLDFLAGS = `gtk-config --libs`	10	XLDFLAGS = `gtk-config --libs`
11	ULDFLAGS =#	11	ULDFLAGS =#
12	@@ -98,7 +98,11 @@	12	@@ -99,7 +99,11 @@
13	%.o:	13	.SUFFIXES:
14	$(CC) $(COMPAT) $(FWHACK) $(XFLAGS) $(CFLAGS) -c $<	14
15		15
16	+ifdef PUTTY_WITH_GTK	16	+ifdef PUTTY_WITH_GTK
17	all: plink pscp psftp pterm putty puttygen puttytel	17	all: plink pscp psftp pterm putty puttygen puttytel
Lines 19-41 Link Here
19	+all: plink pscp psftp	19	+all: plink pscp psftp
20	+endif	20	+endif
21		21
22	plink: be_all.o cmdline.o ldisc.o logging.o misc.o portfwd.o proxy.o raw.o \	22	plink: be_all.o cmdline.o cproxy.o ldisc.o logging.o misc.o pinger.o \
23	rlogin.o settings.o signal.o ssh.o sshaes.o sshblowf.o \	23	portfwd.o proxy.o raw.o rlogin.o settings.o ssh.o sshaes.o \
24	@@ -616,7 +620,7 @@	24	@@ -828,7 +832,7 @@
25		25
26	version.o: FORCE;	26	version.o: FORCE;
27	FORCE:	27	FORCE:
28	- if test -z "$(VER)" && (cd ..; md5sum -c manifest); then \	28	- if test -z "$(VER)" && (cd ..; md5sum -c manifest); then \
29	+ if test -z "$(VER)" ; then \	29	+ if test -z "$(VER)" ; then \
30	$(CC) $(COMPAT) $(FWHACK) $(XFLAGS) $(CFLAGS) `cat ../version.def` -c ../version.c; \	30	$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) `cat ../version.def` -c ../version.c; \
31	else \	31	else \
32	$(CC) $(COMPAT) $(FWHACK) $(XFLAGS) $(CFLAGS) $(VER) -c ../version.c; \	32	$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) $(VER) -c ../version.c; \
33	@@ -625,17 +629,21 @@	33	@@ -837,6 +841,7 @@
34	$(INSTALL_PROGRAM) -m 755 plink $(DESTDIR)$(bindir)/plink	34	$(INSTALL_PROGRAM) -m 755 plink $(DESTDIR)$(bindir)/plink
35	$(INSTALL_PROGRAM) -m 755 pscp $(DESTDIR)$(bindir)/pscp	35	$(INSTALL_PROGRAM) -m 755 pscp $(DESTDIR)$(bindir)/pscp
36	$(INSTALL_PROGRAM) -m 755 psftp $(DESTDIR)$(bindir)/psftp	36	$(INSTALL_PROGRAM) -m 755 psftp $(DESTDIR)$(bindir)/psftp
37	+ifdef PUTTY_WITH_GTK	37	+ifdef PUTTY_WITH_GTK
38	$(INSTALL_PROGRAM) -m 755 pterm $(DESTDIR)$(bindir)/pterm	38	$(INSTALL_PROGRAM) -m 755 pterm $(DESTDIR)$(bindir)/pterm
		39	if test -n "$(UTMP_GROUP)"; then \
		40	chgrp $(UTMP_GROUP) $(DESTDIR)$(bindir)/pterm && \
		41	@@ -848,13 +853,16 @@
39	$(INSTALL_PROGRAM) -m 755 putty $(DESTDIR)$(bindir)/putty	42	$(INSTALL_PROGRAM) -m 755 putty $(DESTDIR)$(bindir)/putty
40	$(INSTALL_PROGRAM) -m 755 puttygen $(DESTDIR)$(bindir)/puttygen	43	$(INSTALL_PROGRAM) -m 755 puttygen $(DESTDIR)$(bindir)/puttygen
41	$(INSTALL_PROGRAM) -m 755 puttytel $(DESTDIR)$(bindir)/puttytel	44	$(INSTALL_PROGRAM) -m 755 puttytel $(DESTDIR)$(bindir)/puttytel

Removed Link Here

(-)files/patch-pty.c (-35 lines)
1	--- pty.c.orig Sun May 11 14:28:53 2003
2	+++ pty.c Fri Feb 13 15:06:26 2004
3	@@ -14,7 +14,9 @@
4	#define _XOPEN_SOURCE
5	#define _XOPEN_SOURCE_EXTENDED
6	#define _GNU_SOURCE
7	+#ifndef __FreeBSD__
8	#include <features.h>
9	+#endif
10
11	#include <stdio.h>
12	#include <stdlib.h>
13	@@ -32,6 +34,10 @@
14	#include <sys/ioctl.h>
15	#include <errno.h>
16
17	+#ifdef __FreeBSD__
18	+#include <sys/stat.h>
19	+#endif
20	+
21	#include "putty.h"
22
23	#ifndef FALSE
24	@@ -567,9 +573,9 @@
25	ioctl(slavefd, TIOCSCTTY, 1);
26	pgrp = getpid();
27	tcsetpgrp(slavefd, pgrp);
28	- setpgrp();
29	+ setpgrp( pgrp, -1 );
30	close(open(pty_name, O_WRONLY, 0));
31	- setpgrp();
32	+ setpgrp( pgrp, -1 );
33	/* Close everything _else_, for tidiness. */
34	for (i = 3; i < 1024; i++)
35	close(i);