CVS commit: pkgsrc/sysutils/efreet

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Wed Oct 29 00:30:08 UTC 2025

Modified Files:
        pkgsrc/sysutils/efreet: Makefile distinfo
Added Files:
        pkgsrc/sysutils/efreet/patches: patch-src_lib_efreet__ini.c

Log Message:
efreet: patch ctype(3) issues

Noted to cause runtime failures on recent NetBSD (after ctype(3)
changes circa 10.99.14), when used by x11/enlightenment. For now, only
this particular file/function has been patched, though there are more
potential issues, from code inspection. This patch gets enlightenment
to actually start from scratch, initialize a new user profile, and run
correctly for me under typical use.


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 pkgsrc/sysutils/efreet/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/efreet/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/efreet/patches/patch-src_lib_efreet__ini.c

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

Modified files:

Index: pkgsrc/sysutils/efreet/Makefile
diff -u pkgsrc/sysutils/efreet/Makefile:1.51 pkgsrc/sysutils/efreet/Makefile:1.52
--- pkgsrc/sysutils/efreet/Makefile:1.51        Sun Oct  5 19:26:19 2025
+++ pkgsrc/sysutils/efreet/Makefile     Wed Oct 29 00:30:08 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2025/10/05 19:26:19 js Exp $
+# $NetBSD: Makefile,v 1.52 2025/10/29 00:30:08 gutteridge Exp $
 
 DISTNAME=      efreet-1.7.10
-PKGREVISION=   21
+PKGREVISION=   22
 CATEGORIES=    sysutils devel
 MASTER_SITES=  https://download.enlightenment.org/att/releases/
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/sysutils/efreet/distinfo
diff -u pkgsrc/sysutils/efreet/distinfo:1.6 pkgsrc/sysutils/efreet/distinfo:1.7
--- pkgsrc/sysutils/efreet/distinfo:1.6 Tue Oct 26 11:19:33 2021
+++ pkgsrc/sysutils/efreet/distinfo     Wed Oct 29 00:30:08 2025
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 11:19:33 nia Exp $
+$NetBSD: distinfo,v 1.7 2025/10/29 00:30:08 gutteridge Exp $
 
 BLAKE2s (efreet-1.7.10.tar.bz2) = fa9a5159bd2a4f36e0baae0fc50e3064916a65c5cb241353a215902d482611da
 SHA512 (efreet-1.7.10.tar.bz2) = 2bfc79de3c6f4d61cd4dfab567bfecc207afd413248d1a1edd7cc21378ec670420d4ffef20ae7ba5e33c72e49da0ad3c810d0086431fb3c9909c361a12586698
 Size (efreet-1.7.10.tar.bz2) = 450761 bytes
+SHA1 (patch-src_lib_efreet__ini.c) = ca809b8ab94cec6d5d77c8d54ffc1d56812dccba

Added files:

Index: pkgsrc/sysutils/efreet/patches/patch-src_lib_efreet__ini.c
diff -u /dev/null pkgsrc/sysutils/efreet/patches/patch-src_lib_efreet__ini.c:1.1
--- /dev/null   Wed Oct 29 00:30:09 2025
+++ pkgsrc/sysutils/efreet/patches/patch-src_lib_efreet__ini.c  Wed Oct 29 00:30:08 2025
@@ -0,0 +1,34 @@
+$NetBSD: patch-src_lib_efreet__ini.c,v 1.1 2025/10/29 00:30:08 gutteridge Exp $
+
+Use ctype.h correctly.
+
+--- src/lib/efreet_ini.c.orig  2013-07-29 14:22:54.000000000 +0000
++++ src/lib/efreet_ini.c
+@@ -128,7 +128,7 @@ efreet_ini_parse(const char *file)
+             ;
+ 
+         /* check for all white space */
+-        while (isspace(line_start[0]) && (line_length > 0))
++        while (isspace((unsigned char)line_start[0]) && (line_length > 0))
+         {
+             line_start++;
+             line_length--;
+@@ -195,15 +195,15 @@ efreet_ini_parse(const char *file)
+ 
+             /* trim whitespace from end of key */
+             for (key_end = sep - 1;
+-                    (key_end > 0) && isspace(line_start[key_end]); --key_end)
++                    (key_end > 0) && isspace((unsigned char)line_start[key_end]); --key_end)
+                 ;
+ 
+-            if (!isspace(line_start[key_end])) key_end++;
++            if (!isspace((unsigned char)line_start[key_end])) key_end++;
+ 
+             /* trim whitespace from start of value */
+             for (value_start = sep + 1;
+                  (value_start < line_length) &&
+-                 isspace(line_start[value_start]); ++value_start)
++                 isspace((unsigned char)line_start[value_start]); ++value_start)
+                 ;
+ 
+             /* trim \n off of end of value */