pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/x11/xephem
Module Name: pkgsrc
Committed By: gdt
Date: Sat Jun 27 20:07:54 UTC 2026
Modified Files:
pkgsrc/x11/xephem: Makefile distinfo
Added Files:
pkgsrc/x11/xephem/patches: patch-compiler.c patch-gallerymenu.c
patch-indimenu.c patch-mainmenu.c patch-marsmenu.c patch-saveres.c
patch-sites.c patch-skyip.c patch-skyviewmenu.c patch-xmisc.c
Log Message:
x11/xephem: Apply ctype(3) UB patch from upstream PR
Taken from https://github.com/XEphem/XEphem/pull/126.
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 pkgsrc/x11/xephem/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/x11/xephem/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/xephem/patches/patch-compiler.c \
pkgsrc/x11/xephem/patches/patch-gallerymenu.c \
pkgsrc/x11/xephem/patches/patch-indimenu.c \
pkgsrc/x11/xephem/patches/patch-mainmenu.c \
pkgsrc/x11/xephem/patches/patch-marsmenu.c \
pkgsrc/x11/xephem/patches/patch-saveres.c \
pkgsrc/x11/xephem/patches/patch-sites.c \
pkgsrc/x11/xephem/patches/patch-skyip.c \
pkgsrc/x11/xephem/patches/patch-skyviewmenu.c \
pkgsrc/x11/xephem/patches/patch-xmisc.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.80 pkgsrc/x11/xephem/Makefile:1.81
--- pkgsrc/x11/xephem/Makefile:1.80 Sat Jun 27 13:21:12 2026
+++ pkgsrc/x11/xephem/Makefile Sat Jun 27 20:07:53 2026
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.80 2026/06/27 13:21:12 gdt Exp $
+# $NetBSD: Makefile,v 1.81 2026/06/27 20:07:53 gdt Exp $
VERSION= 4.2.0
+PKGREVISION= 1
DISTNAME= XEphem-${VERSION}
PKGNAME= xephem-${VERSION}
CATEGORIES= x11
Index: pkgsrc/x11/xephem/distinfo
diff -u pkgsrc/x11/xephem/distinfo:1.19 pkgsrc/x11/xephem/distinfo:1.20
--- pkgsrc/x11/xephem/distinfo:1.19 Sat Jan 31 18:10:10 2026
+++ pkgsrc/x11/xephem/distinfo Sat Jun 27 20:07:53 2026
@@ -1,8 +1,18 @@
-$NetBSD: distinfo,v 1.19 2026/01/31 18:10:10 gdt Exp $
+$NetBSD: distinfo,v 1.20 2026/06/27 20:07:53 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-aa) = f72467338392d2cfc6f9bfde07c3c4f1e0f259d0
+SHA1 (patch-compiler.c) = 6503330c37bc79fa9be3d5ee1754020fb237f2d1
+SHA1 (patch-gallerymenu.c) = b1aeff4f641df6fb9e222c62954177146baadf3c
SHA1 (patch-homeio.c) = b2891558c607b1e0a57a5a786b8e399c5f9102e8
+SHA1 (patch-indimenu.c) = 1f3cad50a8a3d039a2986dd3d9632671a42f3c6c
+SHA1 (patch-mainmenu.c) = 63ce07c5edc9233da3b7e9c810d486687049011c
+SHA1 (patch-marsmenu.c) = 164f486d1f22f9c354f026689fad487112260848
+SHA1 (patch-saveres.c) = eb7028c69bfe63817a90e825ec5d7ad10dd96c8f
+SHA1 (patch-sites.c) = 97828621e29d438d2ba6fcf426183c5cf76b1a60
+SHA1 (patch-skyip.c) = ea6a140647f1ff0756ba81db2f9499f3eac10a87
+SHA1 (patch-skyviewmenu.c) = a5eea432918629aba89005b6139b330762de97d8
SHA1 (patch-tools_xedb_xedb.c) = 3f1310401f5eb49d35f90a25f99d7bccc05cd79d
+SHA1 (patch-xmisc.c) = 7c5190ecce8919cffe06ad68719b6ca289fd13df
Added files:
Index: pkgsrc/x11/xephem/patches/patch-compiler.c
diff -u /dev/null pkgsrc/x11/xephem/patches/patch-compiler.c:1.1
--- /dev/null Sat Jun 27 20:07:54 2026
+++ pkgsrc/x11/xephem/patches/patch-compiler.c Sat Jun 27 20:07:53 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-compiler.c,v 1.1 2026/06/27 20:07:53 gdt Exp $
+
+Fix ctype(3) UB. Taken from https://github.com/XEphem/XEphem/pull/126
+
+--- compiler.c.orig 2024-02-13 14:35:36.000000000 +0000
++++ compiler.c
+@@ -212,7 +212,7 @@ next_token ()
+ int tok = ERR; /* just something illegal */
+ char c;
+
+- while (isspace(c = *cexpr))
++ while (isspace((unsigned char)(c = *cexpr)))
+ cexpr++;
+ lcexpr = cexpr++;
+
Index: pkgsrc/x11/xephem/patches/patch-gallerymenu.c
diff -u /dev/null pkgsrc/x11/xephem/patches/patch-gallerymenu.c:1.1
--- /dev/null Sat Jun 27 20:07:54 2026
+++ pkgsrc/x11/xephem/patches/patch-gallerymenu.c Sat Jun 27 20:07:53 2026
@@ -0,0 +1,24 @@
+$NetBSD: patch-gallerymenu.c,v 1.1 2026/06/27 20:07:53 gdt Exp $
+
+Fix ctype(3) UB. Taken from https://github.com/XEphem/XEphem/pull/126
+
+--- gallerymenu.c.orig 2024-02-13 14:35:36.000000000 +0000
++++ gallerymenu.c
+@@ -661,7 +661,7 @@ trimws (char *s)
+ {
+ char *s0;
+
+- while (isspace(*s))
++ while (isspace((unsigned char)*s))
+ s++;
+ s0 = s;
+
+@@ -670,7 +670,7 @@ trimws (char *s)
+
+ do
+ *s-- = '\0';
+- while (s >= s0 && isspace(*s));
++ while (s >= s0 && isspace((unsigned char)*s));
+
+ return (s0);
+ }
Index: pkgsrc/x11/xephem/patches/patch-indimenu.c
diff -u /dev/null pkgsrc/x11/xephem/patches/patch-indimenu.c:1.1
--- /dev/null Sat Jun 27 20:07:54 2026
+++ pkgsrc/x11/xephem/patches/patch-indimenu.c Sat Jun 27 20:07:53 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-indimenu.c,v 1.1 2026/06/27 20:07:53 gdt Exp $
+
+Fix ctype(3) UB. Taken from https://github.com/XEphem/XEphem/pull/126
+
+--- indimenu.c.orig 2024-02-13 14:35:36.000000000 +0000
++++ indimenu.c
+@@ -2520,7 +2520,7 @@ handleOneBLOB (XMLEle *root, IBLOB *bp,
+
+ /* rig up a file name from the timestamp and format */
+ for (i = 0, tsp = bvp->timestamp; *tsp != '\0'; tsp++)
+- if (isdigit(*tsp))
++ if (isdigit((unsigned char)*tsp))
+ fn[i++] = *tsp;
+ fn[i] = '\0';
+ strcat (fn, bp->format);
Index: pkgsrc/x11/xephem/patches/patch-mainmenu.c
diff -u /dev/null pkgsrc/x11/xephem/patches/patch-mainmenu.c:1.1
--- /dev/null Sat Jun 27 20:07:54 2026
+++ pkgsrc/x11/xephem/patches/patch-mainmenu.c Sat Jun 27 20:07:53 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-mainmenu.c,v 1.1 2026/06/27 20:07:53 gdt Exp $
+
+Fix ctype(3) UB. Taken from https://github.com/XEphem/XEphem/pull/126
+
+--- mainmenu.c.orig 2024-02-13 14:35:36.000000000 +0000
++++ mainmenu.c
+@@ -2241,7 +2241,7 @@ Field *fp;
+ char *txt0, *txt;
+
+ get_xmstring (fp->pb_w, XmNlabelString, &txt0);
+- for (txt = txt0; *txt && !isdigit(*txt); txt++)
++ for (txt = txt0; *txt && !isdigit((unsigned char)*txt); txt++)
+ continue;
+ set_xmstring (prompt_w, XmNtextString, txt);
+ XtFree (txt0);
Index: pkgsrc/x11/xephem/patches/patch-marsmenu.c
diff -u /dev/null pkgsrc/x11/xephem/patches/patch-marsmenu.c:1.1
--- /dev/null Sat Jun 27 20:07:54 2026
+++ pkgsrc/x11/xephem/patches/patch-marsmenu.c Sat Jun 27 20:07:53 2026
@@ -0,0 +1,24 @@
+$NetBSD: patch-marsmenu.c,v 1.1 2026/06/27 20:07:53 gdt Exp $
+
+Fix ctype(3) UB. Taken from https://github.com/XEphem/XEphem/pull/126
+
+--- marsmenu.c.orig 2024-02-13 14:35:36.000000000 +0000
++++ marsmenu.c
+@@ -998,7 +998,7 @@ m_create_mfform()
+ int j;
+
+ /* widget name is first word in type */
+- for (j = 0; isalpha(mfsp->type[j]); j++)
++ for (j = 0; isalpha((unsigned char)mfsp->type[j]); j++)
+ buf[j] = mfsp->type[j];
+ buf[j] = '\0';
+
+@@ -2222,7 +2222,7 @@ char *name;
+ {
+ int l;
+
+- for (l = strlen(name)-1; l >= 0 && isspace(name[l]); --l)
++ for (l = strlen(name)-1; l >= 0 && isspace((unsigned char)name[l]); --l)
+ name[l] = '\0';
+ }
+
Index: pkgsrc/x11/xephem/patches/patch-saveres.c
diff -u /dev/null pkgsrc/x11/xephem/patches/patch-saveres.c:1.1
--- /dev/null Sat Jun 27 20:07:54 2026
+++ pkgsrc/x11/xephem/patches/patch-saveres.c Sat Jun 27 20:07:53 2026
@@ -0,0 +1,19 @@
+$NetBSD: patch-saveres.c,v 1.1 2026/06/27 20:07:53 gdt Exp $
+
+Fix ctype(3) UB. Taken from https://github.com/XEphem/XEphem/pull/126
+
+--- saveres.c.orig 2024-02-13 14:35:36.000000000 +0000
++++ saveres.c
+@@ -1785,10 +1785,10 @@ char *from;
+ {
+ char *lastnwsp; /* last non w/s char in to not counting '\0' */
+
+- while (isspace(*from))
++ while (isspace((unsigned char)*from))
+ from++;
+ for (lastnwsp = NULL; (*to = *from) != '\0'; to++, from++)
+- if (!isspace(*to))
++ if (!isspace((unsigned char)*to))
+ lastnwsp = to;
+ if (lastnwsp)
+ *++lastnwsp = '\0';
Index: pkgsrc/x11/xephem/patches/patch-sites.c
diff -u /dev/null pkgsrc/x11/xephem/patches/patch-sites.c:1.1
--- /dev/null Sat Jun 27 20:07:54 2026
+++ pkgsrc/x11/xephem/patches/patch-sites.c Sat Jun 27 20:07:53 2026
@@ -0,0 +1,27 @@
+$NetBSD: patch-sites.c,v 1.1 2026/06/27 20:07:53 gdt Exp $
+
+Fix ctype(3) UB. Taken from https://github.com/XEphem/XEphem/pull/126
+
+--- sites.c.orig 2024-02-13 14:35:36.000000000 +0000
++++ sites.c
+@@ -183,9 +183,9 @@ int maxn;
+ * n is an index, not a count.
+ */
+ for (n = fl-1; n >= maxn-4; ) {
+- while (n > 0 && isalnum(full[n]))
++ while (n > 0 && isalnum((unsigned char)full[n]))
+ n--;
+- while (n > 0 && (ispunct(full[n]) || isspace(full[n])))
++ while (n > 0 && (ispunct((unsigned char)full[n]) || isspace((unsigned char)full[n])))
+ n--;
+ }
+ (void) sprintf (ab, "%.*s...", n+1, full);
+@@ -654,7 +654,7 @@ read_file (FILE *fp)
+
+ /* strip trailing blanks off name */
+ for (l = strlen (name); --l >= 0; )
+- if (isspace(name[l]))
++ if (isspace((unsigned char)name[l]))
+ name[l] = '\0';
+ else
+ break;
Index: pkgsrc/x11/xephem/patches/patch-skyip.c
diff -u /dev/null pkgsrc/x11/xephem/patches/patch-skyip.c:1.1
--- /dev/null Sat Jun 27 20:07:54 2026
+++ pkgsrc/x11/xephem/patches/patch-skyip.c Sat Jun 27 20:07:53 2026
@@ -0,0 +1,17 @@
+$NetBSD: patch-skyip.c,v 1.1 2026/06/27 20:07:53 gdt Exp $
+
+Fix ctype(3) UB. Taken from https://github.com/XEphem/XEphem/pull/126
+
+--- skyip.c.orig 2024-02-13 14:35:36.000000000 +0000
++++ skyip.c
+@@ -2573,8 +2573,8 @@ char msg[];
+
+ /* relax need for user to type in upper case */
+ for (bp = kw; *bp; bp++)
+- if (islower(*bp))
+- *bp = toupper(*bp);
++ if (islower((unsigned char)*bp))
++ *bp = toupper((unsigned char)*bp);
+
+ /* get from FITS header and copy to our value field */
+ if (getStringFITS (&fim, kw, valu) == 0) {
Index: pkgsrc/x11/xephem/patches/patch-skyviewmenu.c
diff -u /dev/null pkgsrc/x11/xephem/patches/patch-skyviewmenu.c:1.1
--- /dev/null Sat Jun 27 20:07:54 2026
+++ pkgsrc/x11/xephem/patches/patch-skyviewmenu.c Sat Jun 27 20:07:53 2026
@@ -0,0 +1,24 @@
+$NetBSD: patch-skyviewmenu.c,v 1.1 2026/06/27 20:07:53 gdt Exp $
+
+Fix ctype(3) UB. Taken from https://github.com/XEphem/XEphem/pull/126
+
+--- skyviewmenu.c.orig 2024-02-13 14:35:36.000000000 +0000
++++ skyviewmenu.c
+@@ -9703,7 +9703,7 @@ int d; /* diam of object we are labelin
+ if (sv_ggc && chk_greeklabel (name, &gl, &g)) {
+ XTextExtents (sv_gf, &g, 1, &dir, &asc, &des, &xcs);
+ gw = xcs.width;
+- if (isdigit(name[4+gl])) {
++ if (isdigit((unsigned char)name[4+gl])) {
+ /* don't crowd the superscript */
+ XTextExtents (sv_pf, name+gl+4, 1, &dir, &asc, &des, &xcs);
+ gw += 1;
+@@ -9802,7 +9802,7 @@ char *gcodep; /* code to use for drawing
+
+ /* find length of potentionally greek portion */
+ for (gl = 0; ; gl++)
+- if (!isalpha(name[4+gl]))
++ if (!isalpha((unsigned char)name[4+gl]))
+ break;
+ if (gl < 2) /* shortest greek name is 2 chars */
+ return (0);
Index: pkgsrc/x11/xephem/patches/patch-xmisc.c
diff -u /dev/null pkgsrc/x11/xephem/patches/patch-xmisc.c:1.1
--- /dev/null Sat Jun 27 20:07:54 2026
+++ pkgsrc/x11/xephem/patches/patch-xmisc.c Sat Jun 27 20:07:53 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-xmisc.c,v 1.1 2026/06/27 20:07:53 gdt Exp $
+
+Fix ctype(3) UB. Taken from https://github.com/XEphem/XEphem/pull/126
+
+--- xmisc.c.orig 2024-02-13 14:35:36.000000000 +0000
++++ xmisc.c
+@@ -1130,7 +1130,7 @@ strtolower (char *str)
+
+ /* actually faster to /not/ call isupper() first */
+ do
+- *s = tolower (*s);
++ *s = tolower ((unsigned char)*s);
+ while (*s++);
+
+ return (str);
Home |
Main Index |
Thread Index |
Old Index