pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/mlterm Pull post-3.3.6 fixes and improvements from...
details: https://anonhg.NetBSD.org/pkgsrc/rev/a7d6f9861018
branches: trunk
changeset: 635544:a7d6f9861018
user: tsutsui <tsutsui%pkgsrc.org@localhost>
date: Sun Jun 08 16:46:25 2014 +0000
description:
Pull post-3.3.6 fixes and improvements from upstream.
* Fix the failure of saving font configurations from mlconfig.
http://sourceforge.net/projects/mlterm/files/01release/mlterm-3.3.6/mlterm-3.3.6-fixes.patch/download
* x_display_get_closest_color() caches 512 + 64 pixels.
https://bitbucket.org/arakiken/mlterm/commits/f3ea4bb79134409b0b66ba22676b9b4d1f5e1c02
Bump PKGREVISION.
diffstat:
x11/mlterm/Makefile | 4 +-
x11/mlterm/distinfo | 10 +-
x11/mlterm/patches/patch-mlterm_ml__config__proto.c | 178 ++++++++++++++
x11/mlterm/patches/patch-mlterm_ml__config__proto.h | 17 +
x11/mlterm/patches/patch-mlterm_ml__vt100__parser.c | 49 +++
x11/mlterm/patches/patch-xwindow_fb_x.h | 39 +++
x11/mlterm/patches/patch-xwindow_fb_x__display.c | 154 ++++++++++++
x11/mlterm/patches/patch-xwindow_fb_x__display__freebsd.c | 17 +
x11/mlterm/patches/patch-xwindow_fb_x__display__linux.c | 17 +
x11/mlterm/patches/patch-xwindow_fb_x__display__wscons.c | 18 +
10 files changed, 500 insertions(+), 3 deletions(-)
diffs (truncated from 554 to 300 lines):
diff -r 19b161c905a7 -r a7d6f9861018 x11/mlterm/Makefile
--- a/x11/mlterm/Makefile Sun Jun 08 15:56:57 2014 +0000
+++ b/x11/mlterm/Makefile Sun Jun 08 16:46:25 2014 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.107 2014/06/01 18:11:35 wiz Exp $
+# $NetBSD: Makefile,v 1.108 2014/06/08 16:46:25 tsutsui Exp $
DISTNAME= mlterm-3.3.6
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mlterm/}
diff -r 19b161c905a7 -r a7d6f9861018 x11/mlterm/distinfo
--- a/x11/mlterm/distinfo Sun Jun 08 15:56:57 2014 +0000
+++ b/x11/mlterm/distinfo Sun Jun 08 16:46:25 2014 +0000
@@ -1,7 +1,15 @@
-$NetBSD: distinfo,v 1.47 2014/06/01 18:11:35 wiz Exp $
+$NetBSD: distinfo,v 1.48 2014/06/08 16:46:25 tsutsui Exp $
SHA1 (mlterm-3.3.6.tar.gz) = 02ce7544c17aa6c33ddc4ad4e103d2e2bbfde85a
RMD160 (mlterm-3.3.6.tar.gz) = a4145851a09595f1c07c9151f939a30fc55865bb
Size (mlterm-3.3.6.tar.gz) = 3600399 bytes
SHA1 (patch-configure) = 5e3b0c709d447c49b0d26c40bde8ded4ade013c3
SHA1 (patch-etc_font-fb) = c9f116aae7640807f4adc4042adc49ddd9805e67
+SHA1 (patch-mlterm_ml__config__proto.c) = 49f10818a07b5bd9114d48f37b7274dc289d9a18
+SHA1 (patch-mlterm_ml__config__proto.h) = f768eb18ad021aa85a734cf755334d09fdfacf89
+SHA1 (patch-mlterm_ml__vt100__parser.c) = 79fdd1ab3e539eef098dbedeed25e1c77455a95f
+SHA1 (patch-xwindow_fb_x.h) = 4def4f9f72fc2b5c34e3da476ef29d810880a0bb
+SHA1 (patch-xwindow_fb_x__display.c) = 22113aea58162ba650ee22fe6d39c667aa754030
+SHA1 (patch-xwindow_fb_x__display__freebsd.c) = 9dcb1cc6c8d73b1ee5ed990eb4f6f3eed49b1737
+SHA1 (patch-xwindow_fb_x__display__linux.c) = aec0904457ffcaebab6d1af99ef3147d0df62c40
+SHA1 (patch-xwindow_fb_x__display__wscons.c) = f94ada7963477ba43fa2cd8db0cc0202e8bd1fc9
diff -r 19b161c905a7 -r a7d6f9861018 x11/mlterm/patches/patch-mlterm_ml__config__proto.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/mlterm/patches/patch-mlterm_ml__config__proto.c Sun Jun 08 16:46:25 2014 +0000
@@ -0,0 +1,178 @@
+$NetBSD: patch-mlterm_ml__config__proto.c,v 1.1 2014/06/08 16:46:25 tsutsui Exp $
+
+Pull post-3.3.6 fix:
+ * Fix the failure of saving font configurations from mlconfig.
+http://sourceforge.net/projects/mlterm/files/01release/mlterm-3.3.6/mlterm-3.3.6-fixes.patch/download
+
+--- mlterm/ml_config_proto.c.orig 2014-05-25 05:42:15.000000000 +0000
++++ mlterm/ml_config_proto.c
+@@ -63,27 +63,6 @@ read_challenge(void)
+ return 1 ;
+ }
+
+-static int
+-challenge_it(
+- char * chal
+- )
+-{
+- if( challenge && strcmp( chal , challenge) == 0)
+- {
+- return 1 ;
+- }
+-
+- /*
+- * Challenge could be re-generated.
+- */
+- if( read_challenge() && challenge && strcmp( chal , challenge) == 0)
+- {
+- return 1 ;
+- }
+-
+- return 0 ;
+-}
+-
+
+ /* --- global functions --- */
+
+@@ -138,15 +117,44 @@ ml_gen_proto_challenge(void)
+ return 1 ;
+ }
+
+-char *
++/*
++ * Returns 0 if dev is not found.
++ * Returns -1 if do_challenge is 1 and challenge failed.
++ */
++int
+ ml_parse_proto_prefix(
+- char ** str
++ char ** dev , /* can be NULL */
++ char ** str ,
++ int do_challenge
+ )
+ {
+- char * beg ;
+ char * p ;
+
+- beg = p = *str ;
++ p = *str ;
++
++ while( do_challenge)
++ {
++ char * chal ;
++
++ chal = p ;
++
++ if( ( p = strchr( p , ';')))
++ {
++ *(p ++) = '\0' ;
++
++ if( ( challenge && strcmp( chal , challenge) == 0) ||
++ /* Challenge could have been re-generated. */
++ ( read_challenge() && challenge && strcmp( chal , challenge) == 0))
++ {
++ /* challenge succeeded. */
++ break ;
++ }
++ }
++
++ return -1 ;
++ }
++
++ *str = p ; /* for no_dev */
+
+ if( strncmp( p , "/dev" , 4) == 0)
+ {
+@@ -161,7 +169,7 @@ ml_parse_proto_prefix(
+ kik_warn_printf( KIK_DEBUG_TAG " Illegal protocol format.\n") ;
+ #endif
+
+- return NULL ;
++ goto no_dev ;
+ }
+ }
+ }
+@@ -187,15 +195,28 @@ ml_parse_proto_prefix(
+ }
+ else
+ {
+- return NULL ;
++ goto no_dev ;
+ }
+ }
+ }
+
++ if( dev)
++ {
++ *dev = *str ;
++ }
++
+ *(p ++) = '\0' ;
+ *str = p ;
+
+- return beg ;
++ return 1 ;
++
++no_dev:
++ if( dev)
++ {
++ *dev = NULL ;
++ }
++
++ return 0 ;
+ }
+
+ /*
+@@ -214,36 +235,12 @@ ml_parse_proto(
+ )
+ {
+ char * p ;
+- char * _dev ;
+
+ p = *str ;
+-
+- if( do_challenge)
+- {
+- char * chal ;
+-
+- chal = p ;
+
+- if( ( p = strchr( p , ';')) == NULL)
+- {
+- /* Illegal format */
+-
+- #ifdef DEBUG
+- kik_warn_printf( KIK_DEBUG_TAG " Illegal protocol format.\n") ;
+- #endif
+-
+- return 0 ;
+- }
+-
+- *(p ++) = '\0' ;
+-
+- if( ! challenge_it( chal))
+- {
+- kik_msg_printf( "Protocol 5380 is not permitted "
+- "because client password is wrong.\n") ;
+-
+- return -1 ;
+- }
++ if( ml_parse_proto_prefix( dev , &p , do_challenge) < 0)
++ {
++ return -1 ;
+ }
+
+ if( sep_by_semicolon)
+@@ -259,12 +256,6 @@ ml_parse_proto(
+ *str = NULL ;
+ }
+
+- _dev = ml_parse_proto_prefix( &p) ;
+- if( dev)
+- {
+- *dev = _dev ;
+- }
+-
+ if( key)
+ {
+ *key = p ;
diff -r 19b161c905a7 -r a7d6f9861018 x11/mlterm/patches/patch-mlterm_ml__config__proto.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/mlterm/patches/patch-mlterm_ml__config__proto.h Sun Jun 08 16:46:25 2014 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-mlterm_ml__config__proto.h,v 1.1 2014/06/08 16:46:25 tsutsui Exp $
+
+Pull post-3.3.6 fix:
+ * Fix the failure of saving font configurations from mlconfig.
+http://sourceforge.net/projects/mlterm/files/01release/mlterm-3.3.6/mlterm-3.3.6-fixes.patch/download
+
+--- mlterm/ml_config_proto.h.orig 2014-05-25 05:42:15.000000000 +0000
++++ mlterm/ml_config_proto.h
+@@ -16,7 +16,7 @@ int ml_config_proto_final(void) ;
+
+ int ml_gen_proto_challenge(void) ;
+
+-char * ml_parse_proto_prefix( char ** str) ;
++int ml_parse_proto_prefix( char ** dev , char ** str , int do_challenge) ;
+
+ int ml_parse_proto( char ** dev , char ** key , char ** val , char ** str ,
+ int do_challenge , int sep_by_semicolon) ;
diff -r 19b161c905a7 -r a7d6f9861018 x11/mlterm/patches/patch-mlterm_ml__vt100__parser.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/mlterm/patches/patch-mlterm_ml__vt100__parser.c Sun Jun 08 16:46:25 2014 +0000
@@ -0,0 +1,49 @@
+$NetBSD: patch-mlterm_ml__vt100__parser.c,v 1.3 2014/06/08 16:46:25 tsutsui Exp $
+
+Pull post-3.3.6 fix:
+ * Fix the failure of saving font configurations from mlconfig.
+http://sourceforge.net/projects/mlterm/files/01release/mlterm-3.3.6/mlterm-3.3.6-fixes.patch/download
+
+--- mlterm/ml_vt100_parser.c.orig 2014-05-25 05:42:15.000000000 +0000
++++ mlterm/ml_vt100_parser.c
+@@ -1553,7 +1553,12 @@ config_protocol_set(
+ {
+ char * dev ;
+
+- dev = ml_parse_proto_prefix( &pt) ;
++ if( ml_parse_proto_prefix( &dev , &pt , save) == -1)
++ {
++ kik_msg_printf( "Forbid config protocol.\n") ;
++
++ return ;
++ }
+
+ if( strcmp( pt , "gen_proto_challenge") == 0)
+ {
+@@ -1689,7 +1694,7 @@ config_protocol_set(
+ char * key ;
+ char * val ;
+
+- if( ml_parse_proto( NULL , &key , &val , &pt , save , 0) && val &&
++ if( ml_parse_proto( NULL , &key , &val , &pt , 0 , 0) && val &&
+ HAS_CONFIG_LISTENER(vt100_parser,set_font))
+ {
+ /*
+@@ -1716,7 +1721,7 @@ config_protocol_set(
+ char * key ;
+ char * val ;
+
+- if( ml_parse_proto( NULL , &key , &val , &pt , save , 0) && val &&
++ if( ml_parse_proto( NULL , &key , &val , &pt , 0 , 0) && val &&
+ HAS_CONFIG_LISTENER(vt100_parser,set_color))
+ {
+ /*
+@@ -1772,7 +1777,7 @@ config_protocol_set(
+ char * val ;
+
+ if( ! ml_parse_proto( dev ? NULL : &dev ,
+- &key , &val , &pt , save , 1))
++ &key , &val , &pt , 0 , 1))
+ {
+ break ;
+ }
diff -r 19b161c905a7 -r a7d6f9861018 x11/mlterm/patches/patch-xwindow_fb_x.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/mlterm/patches/patch-xwindow_fb_x.h Sun Jun 08 16:46:25 2014 +0000
@@ -0,0 +1,39 @@
+$NetBSD: patch-xwindow_fb_x.h,v 1.1 2014/06/08 16:46:25 tsutsui Exp $
+
+Pull upstream changes:
+ * fb/x_display.c, x.h: x_display_get_closest_color() caches 512 + 64 pixels.
+https://bitbucket.org/arakiken/mlterm/commits/f3ea4bb79134409b0b66ba22676b9b4d1f5e1c02
+
+--- xwindow/fb/x.h.orig 2014-05-25 05:42:24.000000000 +0000
Home |
Main Index |
Thread Index |
Old Index