CVS commit: pkgsrc/emulators/ucon64

["Frederic Cambus" <fcambus%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   fcambus
Date:           Sun Dec 20 15:15:02 UTC 2020

Modified Files:
        pkgsrc/emulators/ucon64: Makefile distinfo
Added Files:
        pkgsrc/emulators/ucon64/patches: patch-libdiscmage_misc.c
            patch-misc_misc.c

Log Message:
ucon64: fix crash in change_mem2() on 64-bit platforms.

Patch from upstream: https://sourceforge.net/p/ucon64/svn/2822/

Thanks to Daniel Horchner for the heads up!


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/emulators/ucon64/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/emulators/ucon64/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/emulators/ucon64/patches/patch-libdiscmage_misc.c \
    pkgsrc/emulators/ucon64/patches/patch-misc_misc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/ucon64/Makefile
diff -u pkgsrc/emulators/ucon64/Makefile:1.17 pkgsrc/emulators/ucon64/Makefile:1.18
--- pkgsrc/emulators/ucon64/Makefile:1.17       Sat Dec  5 13:16:36 2020
+++ pkgsrc/emulators/ucon64/Makefile    Sun Dec 20 15:15:01 2020
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2020/12/05 13:16:36 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2020/12/20 15:15:01 fcambus Exp $
 
 DISTNAME=              ucon64-2.2.1-src
 PKGNAME=               ${DISTNAME:S/-src//}
+PKGREVISION=           1
 CATEGORIES=            emulators
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=ucon64/}
 

Index: pkgsrc/emulators/ucon64/distinfo
diff -u pkgsrc/emulators/ucon64/distinfo:1.11 pkgsrc/emulators/ucon64/distinfo:1.12
--- pkgsrc/emulators/ucon64/distinfo:1.11       Sat Dec  5 13:16:36 2020
+++ pkgsrc/emulators/ucon64/distinfo    Sun Dec 20 15:15:01 2020
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.11 2020/12/05 13:16:36 wiz Exp $
+$NetBSD: distinfo,v 1.12 2020/12/20 15:15:01 fcambus Exp $
 
 SHA1 (ucon64-2.2.1-src.tar.gz) = bfc6fad1b82cb0d5ffe734f46d088567e8d93126
 RMD160 (ucon64-2.2.1-src.tar.gz) = ca363e350be23fa2f083deb598efab307066b231
 SHA512 (ucon64-2.2.1-src.tar.gz) = 34453399151e5ed256fdcf387b9d32a052718b264e51b99a2be251b90589337d13cd317f8d1aa7d3c8e39c8e407b22797d4608ec6d14b99c8673ec74f349f6c2
 Size (ucon64-2.2.1-src.tar.gz) = 1476080 bytes
 SHA1 (patch-libdiscmage_ioapi.h) = a5857b1623a3180d09e19815e261f23491aaad96
+SHA1 (patch-libdiscmage_misc.c) = df3124b713b9db5379fa2bfd529c5637b6e8f6d0
 SHA1 (patch-misc_ioapi.h) = dc2939f8f404e25a7dcb841555024551f2962984
+SHA1 (patch-misc_misc.c) = 528e1f79df8c01841a95c0632becf8fcd1358255

Added files:

Index: pkgsrc/emulators/ucon64/patches/patch-libdiscmage_misc.c
diff -u /dev/null pkgsrc/emulators/ucon64/patches/patch-libdiscmage_misc.c:1.1
--- /dev/null   Sun Dec 20 15:15:02 2020
+++ pkgsrc/emulators/ucon64/patches/patch-libdiscmage_misc.c    Sun Dec 20 15:15:02 2020
@@ -0,0 +1,17 @@
+$NetBSD: patch-libdiscmage_misc.c,v 1.1 2020/12/20 15:15:02 fcambus Exp $
+
+Fixed crash in change_mem2() on 64-bit platforms.
+
+Patch from upstream: https://sourceforge.net/p/ucon64/svn/2822/
+
+--- libdiscmage/misc.c.orig    2020-07-03 08:13:04.000000000 +0000
++++ libdiscmage/misc.c
+@@ -1874,7 +1874,7 @@ change_mem2 (char *buf, size_t bufsize, 
+ 
+           if (strpos == pos_1st_esc)
+             setindex = 0;                       // reset argument pointer
+-          if (pos_1st_esc == (unsigned int) -1)
++          if (pos_1st_esc == (size_t) -1)
+             pos_1st_esc = strpos;
+ 
+           set = sets[setindex].data;            // get next set of characters
Index: pkgsrc/emulators/ucon64/patches/patch-misc_misc.c
diff -u /dev/null pkgsrc/emulators/ucon64/patches/patch-misc_misc.c:1.1
--- /dev/null   Sun Dec 20 15:15:02 2020
+++ pkgsrc/emulators/ucon64/patches/patch-misc_misc.c   Sun Dec 20 15:15:02 2020
@@ -0,0 +1,17 @@
+$NetBSD: patch-misc_misc.c,v 1.1 2020/12/20 15:15:02 fcambus Exp $
+
+Fixed crash in change_mem2() on 64-bit platforms.
+
+Patch from upstream: https://sourceforge.net/p/ucon64/svn/2822/
+
+--- misc/misc.c.orig   2020-07-03 08:09:50.000000000 +0000
++++ misc/misc.c
+@@ -501,7 +501,7 @@ change_mem2 (char *buf, size_t bufsize, 
+ 
+           if (strpos == pos_1st_esc)
+             setindex = 0;                       // reset argument pointer
+-          if (pos_1st_esc == (unsigned int) -1)
++          if (pos_1st_esc == (size_t) -1)
+             pos_1st_esc = strpos;
+ 
+           set = sets[setindex].data;            // get next set of characters