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$

Apply the same fix to the option-format paths.

Still unfixed upstream.  Reported as Savannah sr #111450.

--- autoopts/tpl/cmd-doc.tlib.orig	2017-09-11 00:00:00.000000000 +0000
+++ autoopts/tpl/cmd-doc.tlib
@@@@ -151,7 +151,9 @@@@
         (define target-form   (if man-page "man" "mdoc"))
         (define source-form   (get "option-format" "texi"))
         (define converter     (string-append source-form "2" target-form ))
-        (set! tmp-str (find-file converter))
+        (if (= source-form target-form)
+            (set! tmp-str (shell "command -v cat"))
+            (set! tmp-str (find-file converter)) )
 
         (if (not (defined? 'tmp-str))
             (error (string-append "cannot locate " converter)))
@@@@ -586,7 +588,9 @@@@
 
 (if formatted-doc
     (shell (string-append
-    "fn='" (find-file cvt-cmd)
+    "fn='" (if (= (get "option-format") "mdoc")
+               (shell "command -v cat")
+               (find-file cvt-cmd))
     "'\ntest -f ${fn} || die '" cvt-cmd " not found'\n"
     "${fn} <<\\_EndOfMdoc_ || die ${fn} failed in $PWD\n"
     (out-pop #t)
@