CVS commit: pkgsrc/x11/xephem

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/x11/xephem
From: "Greg Troxel" <gdt%netbsd.org@localhost>
Date: Sun, 28 Jun 2026 00:51:59 +0000

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sun Jun 28 00:51:59 UTC 2026

Modified Files:
        pkgsrc/x11/xephem: Makefile distinfo
        pkgsrc/x11/xephem/patches: patch-GUI_xephem_compiler.c
            patch-GUI_xephem_gallerymenu.c patch-GUI_xephem_homeio.c
            patch-GUI_xephem_indimenu.c patch-GUI_xephem_mainmenu.c
            patch-GUI_xephem_marsmenu.c patch-GUI_xephem_saveres.c
            patch-GUI_xephem_sites.c patch-GUI_xephem_skyip.c
            patch-GUI_xephem_skyviewmenu.c patch-GUI_xephem_tools_xedb_xedb.c
            patch-GUI_xephem_xmisc.c
Added Files:
        pkgsrc/x11/xephem/patches: patch-libastro_constel.c
            patch-libastro_dbfmt.c patch-liblilxml_base64.c

Log Message:
x11/xephem: Grab 3 more files of upstream pull request 126

Files outside of the old WRKSRC were not picked up by mkpatches.

Restore patch comments lost in BUILD_DIRS pivot.


To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 pkgsrc/x11/xephem/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/x11/xephem/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/x11/xephem/patches/patch-GUI_xephem_compiler.c \
    pkgsrc/x11/xephem/patches/patch-GUI_xephem_gallerymenu.c \
    pkgsrc/x11/xephem/patches/patch-GUI_xephem_homeio.c \
    pkgsrc/x11/xephem/patches/patch-GUI_xephem_indimenu.c \
    pkgsrc/x11/xephem/patches/patch-GUI_xephem_mainmenu.c \
    pkgsrc/x11/xephem/patches/patch-GUI_xephem_marsmenu.c \
    pkgsrc/x11/xephem/patches/patch-GUI_xephem_saveres.c \
    pkgsrc/x11/xephem/patches/patch-GUI_xephem_sites.c \
    pkgsrc/x11/xephem/patches/patch-GUI_xephem_skyip.c \
    pkgsrc/x11/xephem/patches/patch-GUI_xephem_skyviewmenu.c \
    pkgsrc/x11/xephem/patches/patch-GUI_xephem_tools_xedb_xedb.c \
    pkgsrc/x11/xephem/patches/patch-GUI_xephem_xmisc.c
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/xephem/patches/patch-libastro_constel.c \
    pkgsrc/x11/xephem/patches/patch-libastro_dbfmt.c \
    pkgsrc/x11/xephem/patches/patch-liblilxml_base64.c

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

Modified files:

Index: pkgsrc/x11/xephem/Makefile
diff -u pkgsrc/x11/xephem/Makefile:1.84 pkgsrc/x11/xephem/Makefile:1.85
--- pkgsrc/x11/xephem/Makefile:1.84     Sun Jun 28 00:44:25 2026
+++ pkgsrc/x11/xephem/Makefile  Sun Jun 28 00:51:58 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.84 2026/06/28 00:44:25 gdt Exp $
+# $NetBSD: Makefile,v 1.85 2026/06/28 00:51:58 gdt Exp $
 
 VERSION=       4.2.0
-PKGREVISION=   1
+PKGREVISION=   2
 DISTNAME=      XEphem-${VERSION}
 PKGNAME=       xephem-${VERSION}
 CATEGORIES=    x11

Index: pkgsrc/x11/xephem/distinfo
diff -u pkgsrc/x11/xephem/distinfo:1.21 pkgsrc/x11/xephem/distinfo:1.22
--- pkgsrc/x11/xephem/distinfo:1.21     Sun Jun 28 00:44:25 2026
+++ pkgsrc/x11/xephem/distinfo  Sun Jun 28 00:51:58 2026
@@ -1,18 +1,21 @@
-$NetBSD: distinfo,v 1.21 2026/06/28 00:44:25 gdt Exp $
+$NetBSD: distinfo,v 1.22 2026/06/28 00:51:58 gdt Exp $
 
 BLAKE2s (XEphem-4.2.0.tar.gz) = 28bfc97fcd86769c3e9926695e9c77ac19da95c2f5d162ad63bc928cb875b77a
 SHA512 (XEphem-4.2.0.tar.gz) = 97756bc299821e95cbc06facc3091795feb245db033193fdf587bcfd7a83142a15552a1f8aa53c040c87cb75021424b94bbed5a747fb9783f5a0cac6fb4ddb3e
 Size (XEphem-4.2.0.tar.gz) = 17317398 bytes
 SHA1 (patch-GUI_xephem_Makefile) = 4f89c84f08872f6c284e6c486c1e41bc35be7f62
-SHA1 (patch-GUI_xephem_compiler.c) = a2672b6121e178b210c8c50f44463a5736ed882f
-SHA1 (patch-GUI_xephem_gallerymenu.c) = 93bba67ed1fa0e59ad0494a3e1e208a7868e362c
-SHA1 (patch-GUI_xephem_homeio.c) = a0ede09206e13484335a5d039615e7bb884d4b6c
-SHA1 (patch-GUI_xephem_indimenu.c) = c27bdb68e5dced751f108b54b3b63983fd849121
-SHA1 (patch-GUI_xephem_mainmenu.c) = 283677708450f3be8cda7aec817bede314e69616
-SHA1 (patch-GUI_xephem_marsmenu.c) = e319707c91842b6513a767b2c4ddf2f8f6aac7f8
-SHA1 (patch-GUI_xephem_saveres.c) = 34901b4cd16f689872ce174e20020adaf26fe9d4
-SHA1 (patch-GUI_xephem_sites.c) = f2d522b6c162192879db32b9c2fbe605c5a45b56
-SHA1 (patch-GUI_xephem_skyip.c) = 4814cb9a274ffde6af07b003f02c22e716986737
-SHA1 (patch-GUI_xephem_skyviewmenu.c) = 3da04bc3af6b12613acd5940335d0060ca34ccf2
-SHA1 (patch-GUI_xephem_tools_xedb_xedb.c) = 7b4e7af2e29e211d459efde4ec2479d7114e3ac8
-SHA1 (patch-GUI_xephem_xmisc.c) = 6a7dc92483b417f394e049cab77feff4d6289dfb
+SHA1 (patch-GUI_xephem_compiler.c) = 23f55da2963f44eded971679b9c14da3863fb9d9
+SHA1 (patch-GUI_xephem_gallerymenu.c) = 513fbf4742b26ef54fdbe27abd2d719647a1e3eb
+SHA1 (patch-GUI_xephem_homeio.c) = 72efb030597fba36b20c6df3d4e4a435c940d4fe
+SHA1 (patch-GUI_xephem_indimenu.c) = b5e000d13b1a64755e4106dde39ea29e16533121
+SHA1 (patch-GUI_xephem_mainmenu.c) = 81ba3f5153e4598c94080caabbf2a9f8978874cf
+SHA1 (patch-GUI_xephem_marsmenu.c) = 8cde999adda36aceb8a18d6a5886032a9d910124
+SHA1 (patch-GUI_xephem_saveres.c) = b85cb930e4ed24da1f2b943a4e44b0e757907478
+SHA1 (patch-GUI_xephem_sites.c) = d4780dac06761614905de9ffb84fd28f03c36327
+SHA1 (patch-GUI_xephem_skyip.c) = fbb76d74418d1cd3f4c9e7e8e26568b78b94bfb0
+SHA1 (patch-GUI_xephem_skyviewmenu.c) = 40aa9c2d0f46277a5ef11ec2209df584e432ffe7
+SHA1 (patch-GUI_xephem_tools_xedb_xedb.c) = 0bcc5658f84edd8462b95f41e5cb20188086c92f
+SHA1 (patch-GUI_xephem_xmisc.c) = d476ead200112a0507ea83a26924daba5aa3ceea
+SHA1 (patch-libastro_constel.c) = b7dde8620fa262fc80b4a0c3077cd2a39db6ffec
+SHA1 (patch-libastro_dbfmt.c) = 6ab59159f09d871a463a62f384e1a1f8b20bf3d3
+SHA1 (patch-liblilxml_base64.c) = 9faeff6663c5d5b10e01f97b52531e6504ec98fd

Index: pkgsrc/x11/xephem/patches/patch-GUI_xephem_compiler.c
diff -u pkgsrc/x11/xephem/patches/patch-GUI_xephem_compiler.c:1.1 pkgsrc/x11/xephem/patches/patch-GUI_xephem_compiler.c:1.2
--- pkgsrc/x11/xephem/patches/patch-GUI_xephem_compiler.c:1.1   Sun Jun 28 00:44:25 2026
+++ pkgsrc/x11/xephem/patches/patch-GUI_xephem_compiler.c       Sun Jun 28 00:51:58 2026
@@ -1,4 +1,6 @@
-$NetBSD: patch-GUI_xephem_compiler.c,v 1.1 2026/06/28 00:44:25 gdt Exp $
+$NetBSD: patch-GUI_xephem_compiler.c,v 1.2 2026/06/28 00:51:58 gdt Exp $
+
+Fix ctype(3) UB.  Cherry-picked from https://github.com/XEphem/XEphem/pull/126
 
 --- GUI/xephem/compiler.c.orig 2024-02-13 14:35:36.000000000 +0000
 +++ GUI/xephem/compiler.c
Index: pkgsrc/x11/xephem/patches/patch-GUI_xephem_gallerymenu.c
diff -u pkgsrc/x11/xephem/patches/patch-GUI_xephem_gallerymenu.c:1.1 pkgsrc/x11/xephem/patches/patch-GUI_xephem_gallerymenu.c:1.2
--- pkgsrc/x11/xephem/patches/patch-GUI_xephem_gallerymenu.c:1.1        Sun Jun 28 00:44:25 2026
+++ pkgsrc/x11/xephem/patches/patch-GUI_xephem_gallerymenu.c    Sun Jun 28 00:51:58 2026
@@ -1,4 +1,6 @@
-$NetBSD: patch-GUI_xephem_gallerymenu.c,v 1.1 2026/06/28 00:44:25 gdt Exp $
+$NetBSD: patch-GUI_xephem_gallerymenu.c,v 1.2 2026/06/28 00:51:58 gdt Exp $
+
+Fix ctype(3) UB.  Cherry-picked from https://github.com/XEphem/XEphem/pull/126
 
 --- GUI/xephem/gallerymenu.c.orig      2024-02-13 14:35:36.000000000 +0000
 +++ GUI/xephem/gallerymenu.c
Index: pkgsrc/x11/xephem/patches/patch-GUI_xephem_homeio.c
diff -u pkgsrc/x11/xephem/patches/patch-GUI_xephem_homeio.c:1.1 pkgsrc/x11/xephem/patches/patch-GUI_xephem_homeio.c:1.2
--- pkgsrc/x11/xephem/patches/patch-GUI_xephem_homeio.c:1.1     Sun Jun 28 00:44:25 2026
+++ pkgsrc/x11/xephem/patches/patch-GUI_xephem_homeio.c Sun Jun 28 00:51:58 2026
@@ -1,5 +1,10 @@
-$NetBSD: patch-GUI_xephem_homeio.c,v 1.1 2026/06/28 00:44:25 gdt Exp $
+$NetBSD: patch-GUI_xephem_homeio.c,v 1.2 2026/06/28 00:51:58 gdt Exp $
 
+Move errno.h.  \todo File upstream after grasping
+
+Use pkgsrc share directory.  To be maybe filed upstream after figuring
+out if there is a bug, but I didn't understand this last time around.
+  
 --- GUI/xephem/homeio.c.orig   2024-02-13 14:35:36.000000000 +0000
 +++ GUI/xephem/homeio.c
 @@ -11,6 +11,9 @@
Index: pkgsrc/x11/xephem/patches/patch-GUI_xephem_indimenu.c
diff -u pkgsrc/x11/xephem/patches/patch-GUI_xephem_indimenu.c:1.1 pkgsrc/x11/xephem/patches/patch-GUI_xephem_indimenu.c:1.2
--- pkgsrc/x11/xephem/patches/patch-GUI_xephem_indimenu.c:1.1   Sun Jun 28 00:44:25 2026
+++ pkgsrc/x11/xephem/patches/patch-GUI_xephem_indimenu.c       Sun Jun 28 00:51:58 2026
@@ -1,4 +1,6 @@
-$NetBSD: patch-GUI_xephem_indimenu.c,v 1.1 2026/06/28 00:44:25 gdt Exp $
+$NetBSD: patch-GUI_xephem_indimenu.c,v 1.2 2026/06/28 00:51:58 gdt Exp $
+
+Fix ctype(3) UB.  Cherry-picked from https://github.com/XEphem/XEphem/pull/126
 
 --- GUI/xephem/indimenu.c.orig 2024-02-13 14:35:36.000000000 +0000
 +++ GUI/xephem/indimenu.c
Index: pkgsrc/x11/xephem/patches/patch-GUI_xephem_mainmenu.c
diff -u pkgsrc/x11/xephem/patches/patch-GUI_xephem_mainmenu.c:1.1 pkgsrc/x11/xephem/patches/patch-GUI_xephem_mainmenu.c:1.2
--- pkgsrc/x11/xephem/patches/patch-GUI_xephem_mainmenu.c:1.1   Sun Jun 28 00:44:25 2026
+++ pkgsrc/x11/xephem/patches/patch-GUI_xephem_mainmenu.c       Sun Jun 28 00:51:58 2026
@@ -1,4 +1,6 @@
-$NetBSD: patch-GUI_xephem_mainmenu.c,v 1.1 2026/06/28 00:44:25 gdt Exp $
+$NetBSD: patch-GUI_xephem_mainmenu.c,v 1.2 2026/06/28 00:51:58 gdt Exp $
+
+Fix ctype(3) UB.  Cherry-picked from https://github.com/XEphem/XEphem/pull/126
 
 --- GUI/xephem/mainmenu.c.orig 2024-02-13 14:35:36.000000000 +0000
 +++ GUI/xephem/mainmenu.c
Index: pkgsrc/x11/xephem/patches/patch-GUI_xephem_marsmenu.c
diff -u pkgsrc/x11/xephem/patches/patch-GUI_xephem_marsmenu.c:1.1 pkgsrc/x11/xephem/patches/patch-GUI_xephem_marsmenu.c:1.2
--- pkgsrc/x11/xephem/patches/patch-GUI_xephem_marsmenu.c:1.1   Sun Jun 28 00:44:25 2026
+++ pkgsrc/x11/xephem/patches/patch-GUI_xephem_marsmenu.c       Sun Jun 28 00:51:58 2026
@@ -1,4 +1,6 @@
-$NetBSD: patch-GUI_xephem_marsmenu.c,v 1.1 2026/06/28 00:44:25 gdt Exp $
+$NetBSD: patch-GUI_xephem_marsmenu.c,v 1.2 2026/06/28 00:51:58 gdt Exp $
+
+Fix ctype(3) UB.  Cherry-picked from https://github.com/XEphem/XEphem/pull/126
 
 --- GUI/xephem/marsmenu.c.orig 2024-02-13 14:35:36.000000000 +0000
 +++ GUI/xephem/marsmenu.c
Index: pkgsrc/x11/xephem/patches/patch-GUI_xephem_saveres.c
diff -u pkgsrc/x11/xephem/patches/patch-GUI_xephem_saveres.c:1.1 pkgsrc/x11/xephem/patches/patch-GUI_xephem_saveres.c:1.2
--- pkgsrc/x11/xephem/patches/patch-GUI_xephem_saveres.c:1.1    Sun Jun 28 00:44:25 2026
+++ pkgsrc/x11/xephem/patches/patch-GUI_xephem_saveres.c        Sun Jun 28 00:51:58 2026
@@ -1,4 +1,6 @@
-$NetBSD: patch-GUI_xephem_saveres.c,v 1.1 2026/06/28 00:44:25 gdt Exp $
+$NetBSD: patch-GUI_xephem_saveres.c,v 1.2 2026/06/28 00:51:58 gdt Exp $
+
+Fix ctype(3) UB.  Cherry-picked from https://github.com/XEphem/XEphem/pull/126
 
 --- GUI/xephem/saveres.c.orig  2024-02-13 14:35:36.000000000 +0000
 +++ GUI/xephem/saveres.c
Index: pkgsrc/x11/xephem/patches/patch-GUI_xephem_sites.c
diff -u pkgsrc/x11/xephem/patches/patch-GUI_xephem_sites.c:1.1 pkgsrc/x11/xephem/patches/patch-GUI_xephem_sites.c:1.2
--- pkgsrc/x11/xephem/patches/patch-GUI_xephem_sites.c:1.1      Sun Jun 28 00:44:25 2026
+++ pkgsrc/x11/xephem/patches/patch-GUI_xephem_sites.c  Sun Jun 28 00:51:58 2026
@@ -1,4 +1,6 @@
-$NetBSD: patch-GUI_xephem_sites.c,v 1.1 2026/06/28 00:44:25 gdt Exp $
+$NetBSD: patch-GUI_xephem_sites.c,v 1.2 2026/06/28 00:51:58 gdt Exp $
+
+Fix ctype(3) UB.  Cherry-picked from https://github.com/XEphem/XEphem/pull/126
 
 --- GUI/xephem/sites.c.orig    2024-02-13 14:35:36.000000000 +0000
 +++ GUI/xephem/sites.c
Index: pkgsrc/x11/xephem/patches/patch-GUI_xephem_skyip.c
diff -u pkgsrc/x11/xephem/patches/patch-GUI_xephem_skyip.c:1.1 pkgsrc/x11/xephem/patches/patch-GUI_xephem_skyip.c:1.2
--- pkgsrc/x11/xephem/patches/patch-GUI_xephem_skyip.c:1.1      Sun Jun 28 00:44:25 2026
+++ pkgsrc/x11/xephem/patches/patch-GUI_xephem_skyip.c  Sun Jun 28 00:51:58 2026
@@ -1,4 +1,6 @@
-$NetBSD: patch-GUI_xephem_skyip.c,v 1.1 2026/06/28 00:44:25 gdt Exp $
+$NetBSD: patch-GUI_xephem_skyip.c,v 1.2 2026/06/28 00:51:58 gdt Exp $
+
+Fix ctype(3) UB.  Cherry-picked from https://github.com/XEphem/XEphem/pull/126
 
 --- GUI/xephem/skyip.c.orig    2024-02-13 14:35:36.000000000 +0000
 +++ GUI/xephem/skyip.c
Index: pkgsrc/x11/xephem/patches/patch-GUI_xephem_skyviewmenu.c
diff -u pkgsrc/x11/xephem/patches/patch-GUI_xephem_skyviewmenu.c:1.1 pkgsrc/x11/xephem/patches/patch-GUI_xephem_skyviewmenu.c:1.2
--- pkgsrc/x11/xephem/patches/patch-GUI_xephem_skyviewmenu.c:1.1        Sun Jun 28 00:44:25 2026
+++ pkgsrc/x11/xephem/patches/patch-GUI_xephem_skyviewmenu.c    Sun Jun 28 00:51:58 2026
@@ -1,4 +1,6 @@
-$NetBSD: patch-GUI_xephem_skyviewmenu.c,v 1.1 2026/06/28 00:44:25 gdt Exp $
+$NetBSD: patch-GUI_xephem_skyviewmenu.c,v 1.2 2026/06/28 00:51:58 gdt Exp $
+
+Fix ctype(3) UB.  Cherry-picked from https://github.com/XEphem/XEphem/pull/126
 
 --- GUI/xephem/skyviewmenu.c.orig      2024-02-13 14:35:36.000000000 +0000
 +++ GUI/xephem/skyviewmenu.c
Index: pkgsrc/x11/xephem/patches/patch-GUI_xephem_tools_xedb_xedb.c
diff -u pkgsrc/x11/xephem/patches/patch-GUI_xephem_tools_xedb_xedb.c:1.1 pkgsrc/x11/xephem/patches/patch-GUI_xephem_tools_xedb_xedb.c:1.2
--- pkgsrc/x11/xephem/patches/patch-GUI_xephem_tools_xedb_xedb.c:1.1    Sun Jun 28 00:44:25 2026
+++ pkgsrc/x11/xephem/patches/patch-GUI_xephem_tools_xedb_xedb.c        Sun Jun 28 00:51:58 2026
@@ -1,4 +1,8 @@
-$NetBSD: patch-GUI_xephem_tools_xedb_xedb.c,v 1.1 2026/06/28 00:44:25 gdt Exp $
+$NetBSD: patch-GUI_xephem_tools_xedb_xedb.c,v 1.2 2026/06/28 00:51:58 gdt Exp $
+
+Use pkgsrc path, not upstream defaults.
+
+Not filed upstream because it is a pkgsrc accomodation.  
 
 --- GUI/xephem/tools/xedb/xedb.c.orig  2024-02-13 14:35:36.000000000 +0000
 +++ GUI/xephem/tools/xedb/xedb.c
Index: pkgsrc/x11/xephem/patches/patch-GUI_xephem_xmisc.c
diff -u pkgsrc/x11/xephem/patches/patch-GUI_xephem_xmisc.c:1.1 pkgsrc/x11/xephem/patches/patch-GUI_xephem_xmisc.c:1.2
--- pkgsrc/x11/xephem/patches/patch-GUI_xephem_xmisc.c:1.1      Sun Jun 28 00:44:25 2026
+++ pkgsrc/x11/xephem/patches/patch-GUI_xephem_xmisc.c  Sun Jun 28 00:51:59 2026
@@ -1,4 +1,6 @@
-$NetBSD: patch-GUI_xephem_xmisc.c,v 1.1 2026/06/28 00:44:25 gdt Exp $
+$NetBSD: patch-GUI_xephem_xmisc.c,v 1.2 2026/06/28 00:51:59 gdt Exp $
+
+Fix ctype(3) UB.  Cherry-picked from https://github.com/XEphem/XEphem/pull/126
 
 --- GUI/xephem/xmisc.c.orig    2024-02-13 14:35:36.000000000 +0000
 +++ GUI/xephem/xmisc.c

Added files:

Index: pkgsrc/x11/xephem/patches/patch-libastro_constel.c
diff -u /dev/null pkgsrc/x11/xephem/patches/patch-libastro_constel.c:1.1
--- /dev/null   Sun Jun 28 00:51:59 2026
+++ pkgsrc/x11/xephem/patches/patch-libastro_constel.c  Sun Jun 28 00:51:59 2026
@@ -0,0 +1,18 @@
+$NetBSD: patch-libastro_constel.c,v 1.1 2026/06/28 00:51:59 gdt Exp $
+
+Fix ctype(3) UB.  Cherry-picked from https://github.com/XEphem/XEphem/pull/126
+
+--- libastro/constel.c.orig    2024-02-13 14:35:36.000000000 +0000
++++ libastro/constel.c
+@@ -1665,9 +1665,9 @@ cns_loadfigs (FILE *fp, char *msg)
+           int code;
+ 
+           /* skip leading/trailing whitespace, blank lines and # lines */
+-          for (lp = line+strlen(line)-1; lp>=line && isspace(*lp); --lp)
++          for (lp = line+strlen(line)-1; lp>=line && isspace((unsigned char)*lp); --lp)
+               *lp = '\0';
+-          for (lp = line; isspace(*lp); lp++)
++          for (lp = line; isspace((unsigned char)*lp); lp++)
+               continue;
+           if (*lp == '#' || *lp == '\0')
+               continue;
Index: pkgsrc/x11/xephem/patches/patch-libastro_dbfmt.c
diff -u /dev/null pkgsrc/x11/xephem/patches/patch-libastro_dbfmt.c:1.1
--- /dev/null   Sun Jun 28 00:51:59 2026
+++ pkgsrc/x11/xephem/patches/patch-libastro_dbfmt.c    Sun Jun 28 00:51:59 2026
@@ -0,0 +1,70 @@
+$NetBSD: patch-libastro_dbfmt.c,v 1.1 2026/06/28 00:51:59 gdt Exp $
+
+Fix ctype(3) UB.  Cherry-picked from https://github.com/XEphem/XEphem/pull/126
+
+--- libastro/dbfmt.c.orig      2024-02-13 14:35:36.000000000 +0000
++++ libastro/dbfmt.c
+@@ -196,11 +196,11 @@ db_tle (char *name, char *l1, char *l2, 
+       /* check for correct line numbers, macthing satellite numbers and
+        * correct checksums.
+        */
+-      while (isspace(*l1))
++      while (isspace((unsigned char)*l1))
+           l1++;
+       if (*l1 != '1')
+           return (-1);
+-      while (isspace(*l2))
++      while (isspace((unsigned char)*l2))
+           l2++;
+       if (*l2 != '2')
+           return (-1);
+@@ -218,7 +218,7 @@ db_tle (char *name, char *l1, char *l2, 
+       op->o_type = EARTHSAT;
+ 
+       /* name, sans leading and trailing whitespace */
+-      while (isspace(*name))
++      while (isspace((unsigned char)*name))
+           name++;
+       i = strcspn (name, "\r\n");
+       while (i > 0 && name[i-1] == ' ')
+@@ -331,7 +331,7 @@ dbline_candidate (char *buf)
+ {
+       char c = buf[0];
+ 
+-      return (c == '#' || c == '!' || isspace(c) ? -1 : 0);
++      return (c == '#' || c == '!' || isspace((unsigned char)c) ? -1 : 0);
+ }
+ 
+ /* return 0 if TLE checksum is ok, else -1 */
+@@ -345,7 +345,7 @@ tle_sum (char *l)
+           char c = *l++;
+           if (c == '\0')
+               return (-1);
+-          if (isdigit(c))
++          if (isdigit((unsigned char)c))
+               sum += c - '0';
+           else if (c == '-')
+               sum++;
+@@ -492,11 +492,11 @@ crack_e (Obj *op, char *flds[MAXFLDS], i
+ 
+       /* magnitude model gk or HG(default). allow prefixes in either field */
+       op->e_mag.whichm = flds[11][0] == 'g' ? MAG_gk : MAG_HG;
+-      if (isdigit(flds[11][0]))
++      if (isdigit((unsigned char)flds[11][0]))
+           op->e_mag.m1 = (float) atod(&flds[11][0]);
+       else
+           op->e_mag.m1 = (float) atod(&flds[11][1]);
+-      if (isdigit(flds[12][0]))
++      if (isdigit((unsigned char)flds[12][0]))
+           op->e_mag.m2 = (float) atod(&flds[12][0]);
+       else
+           op->e_mag.m2 = (float) atod(&flds[12][1]);
+@@ -741,7 +741,7 @@ crack_B (Obj *op, char *flds[MAXFLDS], i
+               op->b_bo.bo_P /= 365.25;
+               break;
+           default:
+-              if (c != ' ' && !isdigit(c)) {
++              if (c != ' ' && !isdigit((unsigned char)c)) {
+                   if (whynot)
+                       sprintf (whynot,"%s: B period suffix not Y, D or H: %c",
+                                                               enm(flds), c);
Index: pkgsrc/x11/xephem/patches/patch-liblilxml_base64.c
diff -u /dev/null pkgsrc/x11/xephem/patches/patch-liblilxml_base64.c:1.1
--- /dev/null   Sun Jun 28 00:51:59 2026
+++ pkgsrc/x11/xephem/patches/patch-liblilxml_base64.c  Sun Jun 28 00:51:59 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-liblilxml_base64.c,v 1.1 2026/06/28 00:51:59 gdt Exp $
+
+Fix ctype(3) UB.  Cherry-picked from https://github.com/XEphem/XEphem/pull/126
+
+--- liblilxml/base64.c.orig    2024-02-13 14:35:36.000000000 +0000
++++ liblilxml/base64.c
+@@ -108,7 +108,7 @@ from64tobits(char *out, const char *in)
+                 ++len;
+             }
+         }
+-      while (isspace(*in))
++      while (isspace((unsigned char)*in))
+           in++;
+     } while (*in && digit4 != '=');
+

Prev by Date: CVS commit: pkgsrc/x11/xephem
Next by Date: CVS commit: pkgsrc/x11/xephem
Previous by Thread: CVS commit: pkgsrc/x11/xephem
Next by Thread: CVS commit: pkgsrc/x11/xephem
Indexes:

Home | Main Index | Thread Index | Old Index