pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/security/putty Add patches so that the home/end keys w...
details: https://anonhg.NetBSD.org/pkgsrc/rev/40fca94c9106
branches: trunk
changeset: 555174:40fca94c9106
user: roy <roy%pkgsrc.org@localhost>
date: Wed Feb 25 18:08:01 2009 +0000
description:
Add patches so that the home/end keys work on BSD servers as well as Linux
diffstat:
security/putty/Makefile | 5 ++-
security/putty/distinfo | 5 +++-
security/putty/patches/patch-al | 28 +++++++++++++++++++++++
security/putty/patches/patch-am | 48 +++++++++++++++++++++++++++++++++++++++++
security/putty/patches/patch-an | 29 ++++++++++++++++++++++++
5 files changed, 112 insertions(+), 3 deletions(-)
diffs (155 lines):
diff -r 5b1a80e7f699 -r 40fca94c9106 security/putty/Makefile
--- a/security/putty/Makefile Wed Feb 25 18:07:40 2009 +0000
+++ b/security/putty/Makefile Wed Feb 25 18:08:01 2009 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2008/06/12 02:14:45 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2009/02/25 18:08:01 roy Exp $
#
DISTNAME= putty-0.60
+PKGNAME= putty-0.60nb1
CATEGORIES= security
MASTER_SITES= http://the.earth.li/~sgtatham/putty/0.60/
@@ -12,7 +13,7 @@
PKG_DESTDIR_SUPPORT= user-destdir
USE_TOOLS+= gmake
-BUILD_DIRS= ${WRKSRC}/unix
+BUILD_DIRS= unix
MAKE_FILE= Makefile.gtk
MAKE_FLAGS+= mandir=${PREFIX}/${PKGMANDIR}
diff -r 5b1a80e7f699 -r 40fca94c9106 security/putty/distinfo
--- a/security/putty/distinfo Wed Feb 25 18:07:40 2009 +0000
+++ b/security/putty/distinfo Wed Feb 25 18:08:01 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2007/10/13 09:14:16 obache Exp $
+$NetBSD: distinfo,v 1.8 2009/02/25 18:08:01 roy Exp $
SHA1 (putty-0.60.tar.gz) = 8d99f8f1077b7ab25f014126b5d812a1ad55ce37
RMD160 (putty-0.60.tar.gz) = 9c56ee4d2d05f5b1079c65f19a5d9d06b596aba3
@@ -12,3 +12,6 @@
SHA1 (patch-ai) = 3965e71c222d7db61d5d852dedf8fb3ec082c9a1
SHA1 (patch-aj) = 7c22c5cb2c41445fa70dfff9e6d756af444daf06
SHA1 (patch-ak) = 2ca42d1ea913505d7d265a3fde71e09aa292d75f
+SHA1 (patch-al) = dd8d49697806d9087b9691c3bb48fe32b70a77e1
+SHA1 (patch-am) = 4dc40f37310f8bcebee3e41bb684c89bae9323e3
+SHA1 (patch-an) = 8411855d0a21b0ddb490384990003a3cfc58edcf
diff -r 5b1a80e7f699 -r 40fca94c9106 security/putty/patches/patch-al
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/putty/patches/patch-al Wed Feb 25 18:08:01 2009 +0000
@@ -0,0 +1,28 @@
+$NetBSD: patch-al,v 1.1 2009/02/25 18:08:01 roy Exp $
+
+Make the home/end keys work on BSD servers as well as Linux ones
+
+Index: windows/window.c
+===================================================================
+--- windows/window.c (revision 8466)
++++ windows/window.c (working copy)
+@@ -4189,8 +4189,17 @@
+ p += sprintf((char *) p, "\x1BO%c", code + 'P' - 11);
+ return p - output;
+ }
+- if (cfg.rxvt_homeend && (code == 1 || code == 4)) {
+- p += sprintf((char *) p, code == 1 ? "\x1B[H" : "\x1BOw");
++ /* Home/End */
++ if (code == 1 || code == 4) {
++ /* Send the correct XTerm or rxvt codes for home/end
++ * We used to send ^[1~ and [4~ for Xterm,
++ * but those are Linux console */
++ const char *he;
++ if (cfg.rxvt_homeend)
++ he = code == 1 ? "\x1B[7~" : "\x1B[8~";
++ else
++ he = code == 1 ? "\x1BOH" : "\x1BOF";
++ p += sprintf((char *) p, he);
+ return p - output;
+ }
+ if (code) {
diff -r 5b1a80e7f699 -r 40fca94c9106 security/putty/patches/patch-am
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/putty/patches/patch-am Wed Feb 25 18:08:01 2009 +0000
@@ -0,0 +1,48 @@
+$NetBSD: patch-am,v 1.1 2009/02/25 18:08:01 roy Exp $
+
+Make the home/end keys work on BSD servers as well as Linux ones
+
+Index: terminal.c
+===================================================================
+--- terminal.c (revision 8466)
++++ terminal.c (working copy)
+@@ -6131,13 +6131,6 @@
+ }
+ }
+
+- /* RXVT Home/End */
+- if (term->cfg.rxvt_homeend &&
+- (keysym == PK_HOME || keysym == PK_END)) {
+- p += sprintf((char *) p, keysym == PK_HOME ? "\x1B[H" : "\x1BOw");
+- goto done;
+- }
+-
+ if (term->vt52_mode) {
+ int xkey;
+
+@@ -6158,11 +6151,23 @@
+ goto done;
+ }
+
++ /* Home/End */
++ if (keysym == PK_HOME || keysym == PK_END) {
++ /* Send the correct XTerm or rxvt codes for home/end
++ * We used to send ^[1~ and [4~ for Xterm,
++ * but those are Linux console */
++ const char *he;
++ if (term->cfg.rxvt_homeend)
++ he = keysym == PK_HOME ? "\x1B[7~" : "\x1B[8~";
++ else
++ he = keysym == PK_HOME ? "\x1BOH" : "\x1BOF";
++ p += sprintf((char *) p, he);
++ goto done;
++ }
++
+ switch (keysym) {
+- case PK_HOME: code = 1; break;
+ case PK_INSERT: code = 2; break;
+ case PK_DELETE: code = 3; break;
+- case PK_END: code = 4; break;
+ case PK_PAGEUP: code = 5; break;
+ case PK_PAGEDOWN: code = 6; break;
+ default: code = 0; break; /* else gcc warns `enum value not used' */
diff -r 5b1a80e7f699 -r 40fca94c9106 security/putty/patches/patch-an
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/putty/patches/patch-an Wed Feb 25 18:08:01 2009 +0000
@@ -0,0 +1,29 @@
+$NetBSD: patch-an,v 1.1 2009/02/25 18:08:01 roy Exp $
+
+Make the home/end keys work on BSD servers as well as Linux ones
+
+Index: unix/gtkwin.c
+===================================================================
+--- unix/gtkwin.c (revision 8466)
++++ unix/gtkwin.c (working copy)
+@@ -979,9 +979,17 @@
+ use_ucsoutput = FALSE;
+ goto done;
+ }
+- if (inst->cfg.rxvt_homeend && (code == 1 || code == 4)) {
+- end = 1 + sprintf(output+1, code == 1 ? "\x1B[H" : "\x1BOw");
+- use_ucsoutput = FALSE;
++ /* Home/End */
++ if (code == 1 || code == 4) {
++ /* Send the correct XTerm or rxvt codes for home/end
++ * We used to send ^[1~ and [4~ for Xterm,
++ * but those are Linux console */
++ const char *he;
++ if (inst->cfg.rxvt_homeend)
++ he = code == 1 ? "\x1B[7~" : "\x1B[8~";
++ else
++ he = code == 1 ? "\x1BOH" : "\x1BOF";
++ end = 1 + sprintf(output+1, he);
+ goto done;
+ }
+ if (code) {
Home |
Main Index |
Thread Index |
Old Index