pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/security/putty Update to 0.58.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f3c79816ab84
branches:  trunk
changeset: 492211:f3c79816ab84
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Wed Apr 06 21:51:13 2005 +0000

description:
Update to 0.58.

Changes:

# Wildcards (mput/mget) and recursive file transfer in PSFTP.
# You can now save your session details from the Change Settings
  dialog box, after you've started your session.
# Various improvements to Unicode support, including:

    * support for right-to-left and bidirectional text (Arabic,
      Hebrew etc). Thanks to arabeyes.org for design and most of
      the implementation.
    * support for Arabic text shaping, again thanks to arabeyes.org.
    * support for Unicode combining characters.

# Support for the xterm 256-colour control sequences.
# Port forwardings can now be reconfigured in mid-session.
# Support for IPv6. Thanks to unfix.org for having patiently maintained
  the patch for this until we were finally ready to integrate it.
# More configurability and flexibility in SSH-2 key exchange. In
  particular, PuTTY can now initiate repeat key exchange during the
  session, which means that if your server doesn't initiate it (OpenSSH
  is known not to bother) you can still have the cryptographic benefits.
# Bug fix: display artefacts caused by characters overflowing their
  character cell should now all be gone. (This would probably have
  bothered Windows ClearType users more than anyone else.)
# Bug fix: keepalives are now supported everywhere. (Previously they
  were supported by Windows GUI PuTTY, but were missing in Plink, PSFTP
  and the Unix port.)
# Miscellaneous improvements for CJK/IME users; many thanks to Hung-Te
  Lin for assistance.

diffstat:

 security/putty/Makefile         |   4 +-
 security/putty/distinfo         |  20 +++++++++++----
 security/putty/patches/patch-aa |  50 ++++++++++++++++++++++------------------
 security/putty/patches/patch-ab |  34 ---------------------------
 security/putty/patches/patch-ac |  13 ++++++++++
 security/putty/patches/patch-ad |  17 +++++++++++++
 security/putty/patches/patch-ae |  13 ++++++++++
 security/putty/patches/patch-af |  13 ++++++++++
 security/putty/patches/patch-ag |  13 ++++++++++
 security/putty/patches/patch-ah |  17 +++++++++++++
 security/putty/patches/patch-ai |  13 ++++++++++
 security/putty/patches/patch-aj |  13 ++++++++++
 security/putty/patches/patch-ak |  25 ++++++++++++++++++++
 13 files changed, 180 insertions(+), 65 deletions(-)

diffs (truncated from 340 to 300 lines):

diff -r ee8c968caf11 -r f3c79816ab84 security/putty/Makefile
--- a/security/putty/Makefile   Wed Apr 06 20:49:23 2005 +0000
+++ b/security/putty/Makefile   Wed Apr 06 21:51:13 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2005/03/29 14:40:09 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2005/04/06 21:51:13 xtraeme Exp $
 #
 
-DISTNAME=      putty-0.57
+DISTNAME=      putty-0.58
 CATEGORIES=    security
 MASTER_SITES=  http://the.earth.li/~sgtatham/putty/latest/
 
diff -r ee8c968caf11 -r f3c79816ab84 security/putty/distinfo
--- a/security/putty/distinfo   Wed Apr 06 20:49:23 2005 +0000
+++ b/security/putty/distinfo   Wed Apr 06 21:51:13 2005 +0000
@@ -1,7 +1,15 @@
-$NetBSD: distinfo,v 1.3 2005/03/29 14:40:09 wiz Exp $
+$NetBSD: distinfo,v 1.4 2005/04/06 21:51:13 xtraeme Exp $
 
-SHA1 (putty-0.57.tar.gz) = 006e336c9c5a77538f22f545c38ca2afb0dd46e9
-RMD160 (putty-0.57.tar.gz) = c44e61b6fb8899ab2a6f2ee6f265085281eb866b
-Size (putty-0.57.tar.gz) = 1319513 bytes
-SHA1 (patch-aa) = 843dd63165d715ca7e6c3c4b573d9e5d560beae1
-SHA1 (patch-ab) = a96d4630fc8a74dd373fa66c3665ab17f6290797
+SHA1 (putty-0.58.tar.gz) = 25504ca4fe4e3b1a8d96d9c50be5eb6cd370f018
+RMD160 (putty-0.58.tar.gz) = 3a01b629d9646d2c328881d3011a9f2da08702dd
+Size (putty-0.58.tar.gz) = 1567268 bytes
+SHA1 (patch-aa) = a03ab13bddca16aef6f8b2c5a2ceb4ae10ee972a
+SHA1 (patch-ac) = 58c3928a0903ce9028fa47d1caa42b8502c29f56
+SHA1 (patch-ad) = a5ff354431f4f21309dc697d7a355708789eee9d
+SHA1 (patch-ae) = e54b92ea6b4030ee9ac342fcc0d3edb98c8d1c45
+SHA1 (patch-af) = f479153cfe14d93ba5d538f48268bbce2ebdf17d
+SHA1 (patch-ag) = c38cde511ab5730d13451628d0763460ca37e759
+SHA1 (patch-ah) = c01fc3bd3527d784685d4eda2f07a2e0bd22b46d
+SHA1 (patch-ai) = eacb4a3ecb97e5e636baf65aa9a3d721137369ad
+SHA1 (patch-aj) = 48f2d8581110c79767f4af1393a619db3271c7f3
+SHA1 (patch-ak) = a9aaa2c3c7945559f802b2a7a6c628ad7fa0cece
diff -r ee8c968caf11 -r f3c79816ab84 security/putty/patches/patch-aa
--- a/security/putty/patches/patch-aa   Wed Apr 06 20:49:23 2005 +0000
+++ b/security/putty/patches/patch-aa   Wed Apr 06 21:51:13 2005 +0000
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/10/29 23:00:31 xtraeme Exp $
+$NetBSD: patch-aa,v 1.2 2005/04/06 21:51:13 xtraeme Exp $
 
---- Makefile.gtk.orig  2004-10-30 00:39:30.000000000 +0200
-+++ Makefile.gtk       2004-10-30 00:42:07.000000000 +0200
-@@ -78,16 +78,15 @@
+--- Makefile.gtk.orig  2005-04-06 23:00:44.000000000 +0200
++++ 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
  # TOOLPATH = /opt/gcc/bin
 -CC = $(TOOLPATH)cc
 +#CC = $(TOOLPATH)cc
  
--CFLAGS = -O2 -Wall -Werror -g -I.././ -I../charset/ -I../unix/ -I../mac/ \
--              `gtk-config --cflags`
-+CFLAGS += -I.././ -I../charset/ -I../unix/ -I../mac/ `gtk-config --cflags`
+-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`
  XLDFLAGS = `gtk-config --libs`
 -ULDFLAGS =#
 -INSTALL=install
@@ -19,21 +19,29 @@
 -INSTALL_DATA=$(INSTALL)
 -prefix=/usr/local
 +ULDFLAGS = $(LDFLAGS)
-+#INSTALL=install
-+#INSTALL_PROGRAM=$(INSTALL)
-+#BSD_INSTALL_DATA=$(INSTALL)
 +prefix=$(PREFIX)
  exec_prefix=$(prefix)
  bindir=$(exec_prefix)/bin
  mandir=$(prefix)/man
-@@ -634,20 +633,20 @@
-               $(CC) $(COMPAT) $(FWHACK) $(XFLAGS) $(CFLAGS) $(VER) -c ../version.c; \
+@@ -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
@@ -44,20 +52,16 @@
 -      $(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) 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
 +      $(BSD_INSTALL_PROGRAM) putty $(DESTDIR)$(bindir)/putty
 +      $(BSD_INSTALL_PROGRAM) puttygen $(DESTDIR)$(bindir)/puttygen
 +      $(BSD_INSTALL_PROGRAM) puttytel $(DESTDIR)$(bindir)/puttytel
-+      $(BSD_INSTALL_DATA) ../doc/plink.1 $(DESTDIR)$(man1dir)/plink.1
-+      $(BSD_INSTALL_DATA) ../doc/pscp.1 $(DESTDIR)$(man1dir)/pscp.1
-+      $(BSD_INSTALL_DATA) ../doc/psftp.1 $(DESTDIR)$(man1dir)/psftp.1
-+      $(BSD_INSTALL_DATA) ../doc/pterm.1 $(DESTDIR)$(man1dir)/pterm.1
-+      $(BSD_INSTALL_DATA) ../doc/putty.1 $(DESTDIR)$(man1dir)/putty.1
-+      $(BSD_INSTALL_DATA) ../doc/puttygen.1 $(DESTDIR)$(man1dir)/puttygen.1
-+      $(BSD_INSTALL_DATA) ../doc/puttytel.1 $(DESTDIR)$(man1dir)/puttytel.1
++      $(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 -r ee8c968caf11 -r f3c79816ab84 security/putty/patches/patch-ab
--- a/security/putty/patches/patch-ab   Wed Apr 06 20:49:23 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/10/29 23:00:31 xtraeme Exp $
-
---- pty.c.orig 2004-10-30 00:44:17.000000000 +0200
-+++ pty.c      2004-10-30 00:46:49.000000000 +0200
-@@ -14,7 +14,11 @@
- #define _XOPEN_SOURCE
- #define _XOPEN_SOURCE_EXTENDED
- #define _GNU_SOURCE
-+#ifndef __NetBSD__ || !defined(__FreeBSD__) || !defined(__OpenBSD__)
- #include <features.h>
-+#else
-+#include <sys/stat.h>
-+#endif
- 
- #include <stdio.h>
- #include <stdlib.h>
-@@ -574,9 +578,17 @@
-       ioctl(slavefd, TIOCSCTTY, 1);
-       pgrp = getpid();
-       tcsetpgrp(slavefd, pgrp);
-+#ifdef __linux__
-       setpgrp();
-+#else
-+      setpgrp(pgrp, -1);
-+#endif
-       close(open(pty_name, O_WRONLY, 0));
-+#ifdef __linux__
-       setpgrp();
-+#else
-+      setpgrp(pgrp, -1);
-+#endif
-       /* Close everything _else_, for tidiness. */
-       for (i = 3; i < 1024; i++)
-           close(i);
diff -r ee8c968caf11 -r f3c79816ab84 security/putty/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/putty/patches/patch-ac   Wed Apr 06 21:51:13 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2005/04/06 21:51:13 xtraeme Exp $
+
+--- ../logging.c.orig  2005-04-06 23:11:53.000000000 +0200
++++ ../logging.c       2005-04-06 23:12:15.000000000 +0200
+@@ -361,7 +361,7 @@
+           char c;
+           s++;
+           size = 0;
+-          if (*s) switch (c = *s++, tolower(c)) {
++          if (*s) switch (c = *s++, tolower((int)c)) {
+             case 'y':
+               size = strftime(buf, sizeof(buf), "%Y", tm);
+               break;
diff -r ee8c968caf11 -r f3c79816ab84 security/putty/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/putty/patches/patch-ad   Wed Apr 06 21:51:13 2005 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-ad,v 1.1 2005/04/06 21:51:13 xtraeme Exp $
+
+--- uxnet.c.orig       2005-04-06 23:12:47.000000000 +0200
++++ uxnet.c    2005-04-06 23:13:06.000000000 +0200
+@@ -443,10 +443,10 @@
+ #endif
+     struct sockaddr_in a;
+     struct sockaddr_un au;
+-    const struct sockaddr *sa;
++    const struct sockaddr *sa = NULL;
+     int err = 0;
+     short localport;
+-    int fl, salen;
++    int fl, salen = 0;
+ 
+     if (sock->s >= 0)
+         close(sock->s);
diff -r ee8c968caf11 -r f3c79816ab84 security/putty/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/putty/patches/patch-ae   Wed Apr 06 21:51:13 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2005/04/06 21:51:13 xtraeme Exp $
+
+--- ../charset/localenc.c.orig 2005-04-06 23:13:39.000000000 +0200
++++ ../charset/localenc.c      2005-04-06 23:13:57.000000000 +0200
+@@ -101,7 +101,7 @@
+       p = name;
+       q = localencs[i].name;
+       while (*p || *q) {
+-          if (tolower(*p) != tolower(*q))
++          if (tolower((int)*p) != tolower((int)*q))
+               break;
+           p++; q++;
+       }
diff -r ee8c968caf11 -r f3c79816ab84 security/putty/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/putty/patches/patch-af   Wed Apr 06 21:51:13 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2005/04/06 21:51:13 xtraeme Exp $
+
+--- ../charset/mimeenc.c.orig  2005-04-06 23:14:37.000000000 +0200
++++ ../charset/mimeenc.c       2005-04-06 23:14:57.000000000 +0200
+@@ -197,7 +197,7 @@
+       p = name;
+       q = mimeencs[i].name;
+       while (*p || *q) {
+-          if (tolower(*p) != tolower(*q))
++          if (tolower((int)*p) != tolower((int)*q))
+               break;
+           p++; q++;
+       }
diff -r ee8c968caf11 -r f3c79816ab84 security/putty/patches/patch-ag
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/putty/patches/patch-ag   Wed Apr 06 21:51:13 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2005/04/06 21:51:13 xtraeme Exp $
+
+--- ../terminal.c.orig 2005-04-06 23:15:37.000000000 +0200
++++ ../terminal.c      2005-04-06 23:15:48.000000000 +0200
+@@ -5818,7 +5818,7 @@
+               if (modifiers & PKM_CONTROL)
+                   c &= 0x1f;
+               else if (modifiers & PKM_SHIFT)
+-                  c = toupper(c);
++                  c = toupper((int)c);
+           }
+           *p++ = c;
+           goto done;
diff -r ee8c968caf11 -r f3c79816ab84 security/putty/patches/patch-ah
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/putty/patches/patch-ah   Wed Apr 06 21:51:13 2005 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-ah,v 1.1 2005/04/06 21:51:13 xtraeme Exp $
+
+--- uxpty.c.orig       2005-04-06 23:16:28.000000000 +0200
++++ 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>
diff -r ee8c968caf11 -r f3c79816ab84 security/putty/patches/patch-ai
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/putty/patches/patch-ai   Wed Apr 06 21:51:13 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2005/04/06 21:51:13 xtraeme Exp $
+
+--- ../charset/xenc.c.orig     2005-04-06 23:29:15.000000000 +0200
++++ ../charset/xenc.c  2005-04-06 23:29:31.000000000 +0200
+@@ -80,7 +80,7 @@
+       p = name;
+       q = xencs[i].name;
+       while (*p || *q) {
+-          if (tolower(*p) != tolower(*q))
++          if (tolower((int)*p) != tolower((int)*q))
+               break;
+           p++; q++;
+       }
diff -r ee8c968caf11 -r f3c79816ab84 security/putty/patches/patch-aj
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/putty/patches/patch-aj   Wed Apr 06 21:51:13 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2005/04/06 21:51:13 xtraeme Exp $
+



Home | Main Index | Thread Index | Old Index