diff options
Diffstat (limited to 'security/putty/patches')
| -rw-r--r-- | security/putty/patches/patch-aa | 69 | ||||
| -rw-r--r-- | security/putty/patches/patch-ah | 17 |
2 files changed, 12 insertions, 74 deletions
diff --git a/security/putty/patches/patch-aa b/security/putty/patches/patch-aa index 79a261dfd45..223484fdc7f 100644 --- a/security/putty/patches/patch-aa +++ b/security/putty/patches/patch-aa @@ -1,67 +1,22 @@ -$NetBSD: patch-aa,v 1.3 2005/04/13 16:45:46 rillig Exp $ +$NetBSD: patch-aa,v 1.4 2007/03/17 16:35:05 rillig Exp $ ---- unix/Makefile.gtk.orig 2005-04-06 23:00:44.000000000 +0200 -+++ unix/Makefile.gtk 2005-04-06 23:04:54.000000000 +0200 -@@ -80,16 +80,13 @@ - - # You can define this path to point at your tools if you need to +--- unix/Makefile.gtk.orig 2007-01-24 21:22:52.000000000 +0100 ++++ unix/Makefile.gtk 2007-03-17 17:27:25.000000000 +0100 +@@ -98,14 +98,14 @@ # TOOLPATH = /opt/gcc/bin --CC = $(TOOLPATH)cc -+#CC = $(TOOLPATH)cc + CC = $(TOOLPATH)cc -CFLAGS = -O2 -Wall -Werror -g -I.././ -I../charset/ -I../windows/ -I../unix/ \ -+CFLAGS += -Wall -Werror -I.././ -I../charset/ -I../windows/ -I../unix/ \ - -I../mac/ -I../macosx/ `gtk-config --cflags` ++CFLAGS += -O2 -Wall -Werror -g -I.././ -I../charset/ -I../windows/ -I../unix/ \ + -I../mac/ -I../macosx/ `gtk-config --cflags` -D _FILE_OFFSET_BITS=64 XLDFLAGS = `gtk-config --libs` -ULDFLAGS =# --INSTALL=install --INSTALL_PROGRAM=$(INSTALL) --INSTALL_DATA=$(INSTALL) --prefix=/usr/local +ULDFLAGS = $(LDFLAGS) -+prefix=$(PREFIX) + INSTALL=install + INSTALL_PROGRAM=$(INSTALL) + INSTALL_DATA=$(INSTALL) +-prefix=/usr/local ++prefix= ${PREFIX} exec_prefix=$(prefix) bindir=$(exec_prefix)/bin mandir=$(prefix)/man -@@ -834,10 +831,10 @@ - $(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) $(VER) -c ../version.c; \ - fi - install: -- $(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 pterm $(DESTDIR)$(bindir)/pterm -+ $(BSD_INSTALL_PROGRAM) plink $(DESTDIR)$(bindir)/plink -+ $(BSD_INSTALL_PROGRAM) pscp $(DESTDIR)$(bindir)/pscp -+ $(BSD_INSTALL_PROGRAM) psftp $(DESTDIR)$(bindir)/psftp -+ $(BSD_INSTALL_PROGRAM) pterm $(DESTDIR)$(bindir)/pterm - if test -n "$(UTMP_GROUP)"; then \ - chgrp $(UTMP_GROUP) $(DESTDIR)$(bindir)/pterm && \ - chmod 2755 $(DESTDIR)$(bindir)/pterm; \ -@@ -845,16 +842,16 @@ - chown $(UTMP_USER) $(DESTDIR)$(bindir)/pterm && \ - 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/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/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/puttytel.1 $(DESTDIR)$(man1dir)/puttytel.1 -+ $(BSD_INSTALL_PROGRAM) putty $(DESTDIR)$(bindir)/putty -+ $(BSD_INSTALL_PROGRAM) puttygen $(DESTDIR)$(bindir)/puttygen -+ $(BSD_INSTALL_PROGRAM) puttytel $(DESTDIR)$(bindir)/puttytel -+ $(BSD_INSTALL_MAN) ../doc/plink.1 $(DESTDIR)$(man1dir)/plink.1 -+ $(BSD_INSTALL_MAN) ../doc/pscp.1 $(DESTDIR)$(man1dir)/pscp.1 -+ $(BSD_INSTALL_MAN) ../doc/psftp.1 $(DESTDIR)$(man1dir)/psftp.1 -+ $(BSD_INSTALL_MAN) ../doc/pterm.1 $(DESTDIR)$(man1dir)/pterm.1 -+ $(BSD_INSTALL_MAN) ../doc/putty.1 $(DESTDIR)$(man1dir)/putty.1 -+ $(BSD_INSTALL_MAN) ../doc/puttygen.1 $(DESTDIR)$(man1dir)/puttygen.1 -+ $(BSD_INSTALL_MAN) ../doc/puttytel.1 $(DESTDIR)$(man1dir)/puttytel.1 - - install-strip: - $(MAKE) install INSTALL_PROGRAM="$(INSTALL_PROGRAM) -s" diff --git a/security/putty/patches/patch-ah b/security/putty/patches/patch-ah deleted file mode 100644 index 030692c561e..00000000000 --- a/security/putty/patches/patch-ah +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ah,v 1.2 2005/04/13 16:45:46 rillig Exp $ - ---- unix/uxpty.c.orig 2005-04-06 23:16:28.000000000 +0200 -+++ unix/uxpty.c 2005-04-06 23:28:38.000000000 +0200 -@@ -2,8 +2,10 @@ - * Pseudo-tty backend for pterm. - */ - --#define _XOPEN_SOURCE 600 --#define _XOPEN_SOURCE_EXTENDED -+/* Don't use _XOPEN_SOURCE/_XOPEN_SOURCE_EXTENDED here, because -+ * we are using strsignal() (which is not defined in POSIX). -+ */ -+ - #define _GNU_SOURCE - - #include <stdio.h> |