CVS commit: pkgsrc/multimedia/libtheora

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu May  1 07:57:24 UTC 2025

Modified Files:
        pkgsrc/multimedia/libtheora: Makefile distinfo
Added Files:
        pkgsrc/multimedia/libtheora/patches: patch-lib_info.c

Log Message:
libtheora: Avoid UB with ctype functions.

Patch was upstreamed.

bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/multimedia/libtheora/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/multimedia/libtheora/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/multimedia/libtheora/patches/patch-lib_info.c

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

Modified files:

Index: pkgsrc/multimedia/libtheora/Makefile
diff -u pkgsrc/multimedia/libtheora/Makefile:1.33 pkgsrc/multimedia/libtheora/Makefile:1.34
--- pkgsrc/multimedia/libtheora/Makefile:1.33   Wed Apr 30 07:52:37 2025
+++ pkgsrc/multimedia/libtheora/Makefile        Thu May  1 07:57:24 2025
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.33 2025/04/30 07:52:37 jklos Exp $
+# $NetBSD: Makefile,v 1.34 2025/05/01 07:57:24 nia Exp $
+
+PKGREVISION=   1
 
 .include "Makefile.common"
 

Index: pkgsrc/multimedia/libtheora/distinfo
diff -u pkgsrc/multimedia/libtheora/distinfo:1.21 pkgsrc/multimedia/libtheora/distinfo:1.22
--- pkgsrc/multimedia/libtheora/distinfo:1.21   Sat Apr 12 06:52:22 2025
+++ pkgsrc/multimedia/libtheora/distinfo        Thu May  1 07:57:24 2025
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.21 2025/04/12 06:52:22 wiz Exp $
+$NetBSD: distinfo,v 1.22 2025/05/01 07:57:24 nia Exp $
 
 BLAKE2s (libtheora-1.2.0.tar.xz) = d140e685d54cf169a6eda8eb845f50b2a05f1964f5c7cf5cab143071fff878f0
 SHA512 (libtheora-1.2.0.tar.xz) = 849db0c916f0f0b1237a4893594ff4b9e72d4ad1dca42f3f2979af5971f42c3fe77a75b181dfdd1c1353bbca4c832d6ab43f6d509c0650901c692e96ceab5f26
 Size (libtheora-1.2.0.tar.xz) = 1803124 bytes
+SHA1 (patch-lib_info.c) = 222d288044e021e7134cd31a474bb93424378446

Added files:

Index: pkgsrc/multimedia/libtheora/patches/patch-lib_info.c
diff -u /dev/null pkgsrc/multimedia/libtheora/patches/patch-lib_info.c:1.1
--- /dev/null   Thu May  1 07:57:24 2025
+++ pkgsrc/multimedia/libtheora/patches/patch-lib_info.c        Thu May  1 07:57:24 2025
@@ -0,0 +1,18 @@
+$NetBSD: patch-lib_info.c,v 1.1 2025/05/01 07:57:24 nia Exp $
+
+Avoid undefined behaviour with ctype functions.
+http://gitlab.xiph.org/xiph/theora/-/issues/2342
+
+--- lib/info.c.orig    2025-03-29 06:06:12.000000000 +0000
++++ lib/info.c
+@@ -29,7 +29,9 @@
+ static int oc_tagcompare(const char *_s1,const char *_s2,int _n){
+   int c;
+   for(c=0;c<_n;c++){
+-    if(toupper(_s1[c])!=toupper(_s2[c]))return !0;
++    if(toupper((unsigned char)_s1[c])!=toupper((unsigned char)_s2[c])){
++      return !0;
++    }
+   }
+   return _s1[c]!='=';
+ }