On 04/02/15 00:52, Ryan Freeman wrote:
> I created a new thread for this since my original was also including
> TCL itself in the question, which isn't the case.
>
> Thanks to Theo, Stuart, and Ted for the info they gave!
>
> I emailed the following patch to Don Libes a couple weeks ago now
> and have yet to hear even a peep back :(
>
> In the interest of keeping the port working going forward, I propose
> this diff, which is based off feedback I originally received.
>
> I use the lang/expect package daily at $WORK so I can at least say
> I haven't run into the issue with this patch applied.
>
> Thoughts? Tar and featherings?
>
Ok for me, ports' patch attached.
Cheers
Giovanni
Index: Makefile
===================================================================
RCS file: /var/cvs/ports/lang/expect/Makefile,v
retrieving revision 1.65
diff -u -p -r1.65 Makefile
--- Makefile 20 Nov 2013 15:58:31 -0000 1.65
+++ Makefile 2 Apr 2015 10:45:05 -0000
@@ -5,7 +5,7 @@ COMMENT = sophisticated scripter based o
VERSION = 5.45
DISTNAME = expect${VERSION}
PKGNAME = expect-${VERSION}
-REVISION = 1
+REVISION = 2
SHARED_LIBS = expect545 0.0
CATEGORIES = lang
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=expect/}
Index: patches/patch-exp_inter_c
===================================================================
RCS file: patches/patch-exp_inter_c
diff -N patches/patch-exp_inter_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-exp_inter_c 2 Apr 2015 10:49:19 -0000
@@ -0,0 +1,33 @@
+$OpenBSD$
+--- exp_inter.c.orig Thu Apr 2 12:49:07 2015
++++ exp_inter.c Thu Apr 2 12:48:49 2015
+@@ -1824,12 +1824,12 @@ got_action:
+ skip += matchLen;
+ size -= skip;
+ if (size) {
+- memcpy(u->buffer, u->buffer + skip, size);
++ memmove(u->buffer, u->buffer + skip, size);
+ }
+ } else {
+ if (skip) {
+ size -= skip;
+- memcpy(u->buffer, u->buffer + skip, size);
++ memmove(u->buffer, u->buffer + skip, size);
+ }
+ }
+ Tcl_SetObjLength(size);
+@@ -2070,12 +2070,12 @@ got_action:
+ skip += matchLen;
+ size -= skip;
+ if (size) {
+- memcpy(u->buffer, u->buffer + skip, size);
++ memmove(u->buffer, u->buffer + skip, size);
+ }
+ } else {
+ if (skip) {
+ size -= skip;
+- memcpy(u->buffer, u->buffer + skip, size);
++ memmove(u->buffer, u->buffer + skip, size);
+ }
+ }
+ Tcl_SetObjLength(size);
