GraphicsMagick: configure.ac: Do not search for TRIO by default....

GraphicsMagick Commits <[email protected]> Sat, 09 Dec 2023 14:11:50 -0600
Newsgroups gmane.comp.video.graphicsmagick.cvs
Message-ID <mailman.10848.1702152721.1716.graphicsmagick-commit@lists.sourceforge.net>
changeset 32ae2d8f103d in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=32ae2d8f103d
summary: configure.ac: Do not search for TRIO by default.  The user needs to specify --with-trio=yes in order to enable searching for TRIO.

diffstat:

 ChangeLog             |   5 +++--
 README.txt            |   7 ++++---
 configure             |  12 ++++++------
 configure.ac          |  10 +++++-----
 www/Changelog.html    |   5 +++--
 www/INSTALL-unix.html |   4 ++--
 www/INSTALL-unix.rst  |   4 ++--
 www/README.html       |   7 ++++---
 8 files changed, 29 insertions(+), 25 deletions(-)

diffs (153 lines):

diff -r 1547d047fd22 -r 32ae2d8f103d ChangeLog
--- a/ChangeLog	Sat Dec 09 13:58:32 2023 -0600
+++ b/ChangeLog	Sat Dec 09 14:11:47 2023 -0600
@@ -4,8 +4,9 @@
 	pkg-config is not present or misbehaves. If pkg-config is not
 	present, it may be necessary to manually set CPPFLAGs in order to
 	find the FreeType and libxml2 headers.  Also print any error
-	information that pkg-config produces.
-	jxl_threads is not a hard requirement.
+	information that pkg-config produces.  jxl_threads is not a hard
+	requirement.  Do not search for TRIO by default.  The user needs
+	to specify --with-trio=yes in order to enable searching for TRIO.
 
 2023-12-08  Bob Friesenhahn  <[email protected]>
 
diff -r 1547d047fd22 -r 32ae2d8f103d README.txt
--- a/README.txt	Sat Dec 09 13:58:32 2023 -0600
+++ b/README.txt	Sat Dec 09 14:11:47 2023 -0600
@@ -258,11 +258,12 @@
      http://sourceforge.net/projects/ctrio/
 
   to substitute for the vsnprintf function when the operating system
-  does not provide one. Older operating systems (e.g. Solaris 2.5)
-  may not provide a vsnprintf function. If vsnprintf (or the TRIO
+  does not provide one. Older operating systems (e.g. Solaris 2.5) may
+  not provide a vsnprintf function. If vsnprintf (or the TRIO
   replacement) is not used, then vsprintf is used instead, which
   decreases the security of GraphicsMagick due to possible buffer
-  overrun exploits.
+  overrun exploits.  It is highly unlikely that TRIO is useful on any
+  modern system.
 
 * GraphicsMagick may optionally use the 'tcmalloc' library provided as
   part of Google gperftools available from
diff -r 1547d047fd22 -r 32ae2d8f103d configure
--- a/configure	Sat Dec 09 13:58:32 2023 -0600
+++ b/configure	Sat Dec 09 14:11:47 2023 -0600
@@ -1863,7 +1863,7 @@
   --without-lzma          disable LZMA support
   --without-png           disable PNG support
   --without-tiff          disable TIFF support
-  --without-trio          disable TRIO support
+  --with-trio             enable TRIO support
   --without-ttf           disable TrueType support
   --with-tcmalloc         enable Google perftools tcmalloc (minimal) memory
                           allocation library support
@@ -19776,16 +19776,16 @@
     DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-tiff=$with_tiff "
 fi
 
-# Disable TRIO.
+# Enable TRIO.
 
 # Check whether --with-trio was given.
 if test "${with_trio+set}" = set; then :
   withval=$with_trio; with_trio=$withval
 else
-  with_trio='yes'
-fi
-
-if test "$with_trio" != 'yes' ; then
+  with_trio='no'
+fi
+
+if test "$with_trio" != 'no' ; then
     DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-trio=$with_trio "
 fi
 
diff -r 1547d047fd22 -r 32ae2d8f103d configure.ac
--- a/configure.ac	Sat Dec 09 13:58:32 2023 -0600
+++ b/configure.ac	Sat Dec 09 14:11:47 2023 -0600
@@ -791,13 +791,13 @@
     DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-tiff=$with_tiff "
 fi
 
-# Disable TRIO.
+# Enable TRIO.
 AC_ARG_WITH([trio],
-              AS_HELP_STRING([--without-trio],
-                             [disable TRIO support]),
+              AS_HELP_STRING([--with-trio],
+                             [enable TRIO support]),
               [with_trio=$withval],
-              [with_trio='yes'])
-if test "$with_trio" != 'yes' ; then
+              [with_trio='no'])
+if test "$with_trio" != 'no' ; then
     DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-trio=$with_trio "
 fi
 
diff -r 1547d047fd22 -r 32ae2d8f103d www/Changelog.html
--- a/www/Changelog.html	Sat Dec 09 13:58:32 2023 -0600
+++ b/www/Changelog.html	Sat Dec 09 14:11:47 2023 -0600
@@ -44,8 +44,9 @@
 pkg-config is not present or misbehaves. If pkg-config is not
 present, it may be necessary to manually set CPPFLAGs in order to
 find the FreeType and libxml2 headers.  Also print any error
-information that pkg-config produces.
-jxl_threads is not a hard requirement.</p></li>
+information that pkg-config produces.  jxl_threads is not a hard
+requirement.  Do not search for TRIO by default.  The user needs
+to specify --with-trio=yes in order to enable searching for TRIO.</p></li>
 </ul>
 </blockquote>
 <p>2023-12-08  Bob Friesenhahn  &lt;<a class="reference external" href="mailto:bfriesen&#37;&#52;&#48;simple&#46;dallas&#46;tx&#46;us">bfriesen<span>&#64;</span>simple<span>&#46;</span>dallas<span>&#46;</span>tx<span>&#46;</span>us</a>&gt;</p>
diff -r 1547d047fd22 -r 32ae2d8f103d www/INSTALL-unix.html
--- a/www/INSTALL-unix.html	Sat Dec 09 13:58:32 2023 -0600
+++ b/www/INSTALL-unix.html	Sat Dec 09 14:11:47 2023 -0600
@@ -338,8 +338,8 @@
 <dt><kbd><span class="option">--without-tiff</span></kbd></dt>
 <dd><p>disable TIFF support</p>
 </dd>
-<dt><kbd><span class="option">--without-trio</span></kbd></dt>
-<dd><p>disable TRIO library support</p>
+<dt><kbd><span class="option">--with-trio</span></kbd></dt>
+<dd><p>enable TRIO library support</p>
 </dd>
 <dt><kbd><span class="option">--without-ttf</span></kbd></dt>
 <dd><p>disable TrueType support</p>
diff -r 1547d047fd22 -r 32ae2d8f103d www/INSTALL-unix.rst
--- a/www/INSTALL-unix.rst	Sat Dec 09 13:58:32 2023 -0600
+++ b/www/INSTALL-unix.rst	Sat Dec 09 14:11:47 2023 -0600
@@ -343,9 +343,9 @@
 
     disable TIFF support
 
---without-trio
+--with-trio
 
-    disable TRIO library support
+    enable TRIO library support
 
 --without-ttf
 
diff -r 1547d047fd22 -r 32ae2d8f103d www/README.html
--- a/www/README.html	Sat Dec 09 13:58:32 2023 -0600
+++ b/www/README.html	Sat Dec 09 14:11:47 2023 -0600
@@ -289,11 +289,12 @@
 <p><a class="reference external" href="http://sourceforge.net/projects/ctrio/">http://sourceforge.net/projects/ctrio/</a></p>
 </blockquote>
 <p>to substitute for the vsnprintf function when the operating system
-does not provide one. Older operating systems (e.g. Solaris 2.5)
-may not provide a vsnprintf function. If vsnprintf (or the TRIO
+does not provide one. Older operating systems (e.g. Solaris 2.5) may
+not provide a vsnprintf function. If vsnprintf (or the TRIO
 replacement) is not used, then vsprintf is used instead, which
 decreases the security of GraphicsMagick due to possible buffer
-overrun exploits.</p>
+overrun exploits.  It is highly unlikely that TRIO is useful on any
+modern system.</p>
 </li>
 <li><p>GraphicsMagick may optionally use the 'tcmalloc' library provided as
 part of Google gperftools available from</p>