head	1.1;
access;
symbols
	pkgsrc-2026Q3:1.1.0.2
	pkgsrc-2026Q3-base:1.1;
locks; strict;
comment	@ * @;


1.1
date	2026.09.12.12.14.40;	author wiz;	state Exp;
branches;
next	;
commitid	47yFsrp5lLUPqkVG;


desc
@@


1.1
log
@autogen: add a couple upstream patches, merged and proposed.

Fix CVE-2025-8746.

Bump PKGREVISION.

From Showta Ishizaki in PR 60680.
@
text
@$NetBSD$

Bound the option name length used to build the vendor option format.

Upstream 58504a36, which has not appeared in a release.

--- autoopts/usage.c.orig	2018-08-25 00:00:00.000000000 +0000
+++ autoopts/usage.c
@@@@ -732,7 +732,8 @@@@
                 continue;
 
             l = strlen(od->pz_Name);
-            if (l > nmlen)  nmlen = l;
+            if ((l <= AO_NAME_LIMIT) && (l > nmlen))
+                nmlen = l;
         } while (od++, (--ct > 0));
 
         snprintf(vfmt, sizeof(vfmt), vfmtfmt, (unsigned int)nmlen + 4);
@