[6575] * tp/Texinfo/Convert/XSParagraph/configure.ac ( AC_CONFIG_HEADERS),

[Patrice Dumas]

Revision: 6575
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6575
Author:   pertusus
Date:     2015-08-25 20:49:10 +0000 (Tue, 25 Aug 2015)
Log Message:
-----------
        * tp/Texinfo/Convert/XSParagraph/configure.ac (AC_CONFIG_HEADERS),
        tp/Texinfo/Convert/XSParagraph/XSParagraph.xs,
        tp/Texinfo/Convert/XSParagraph/text.c,
        tp/Texinfo/Convert/XSParagraph/xspara.c: 
        Use xsparagraph_acconfig.h instead of config.h as the name for the
        header file generated by configure as an additional security against 
        using the config.h file in perl include directory.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Convert/XSParagraph/XSParagraph.xs
    trunk/tp/Texinfo/Convert/XSParagraph/configure.ac
    trunk/tp/Texinfo/Convert/XSParagraph/text.c
    trunk/tp/Texinfo/Convert/XSParagraph/xspara.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-08-25 16:28:36 UTC (rev 6574)
+++ trunk/ChangeLog     2015-08-25 20:49:10 UTC (rev 6575)
@@ -1,3 +1,13 @@
+2015-08-25  Patrice Dumas  <address@hidden>
+
+       * tp/Texinfo/Convert/XSParagraph/configure.ac (AC_CONFIG_HEADERS),
+       tp/Texinfo/Convert/XSParagraph/XSParagraph.xs,
+       tp/Texinfo/Convert/XSParagraph/text.c,
+       tp/Texinfo/Convert/XSParagraph/xspara.c: 
+       Use xsparagraph_acconfig.h instead of config.h as the name for the
+       header file generated by configure as an additional security against 
+       using the config.h file in perl include directory.
+
 2015-08-25  Gavin Smith  <address@hidden>
 
        * doc/texinfo.tex (\sortas): Expand to \eatspaces, to remove a 

Modified: trunk/tp/Texinfo/Convert/XSParagraph/XSParagraph.xs
===================================================================
--- trunk/tp/Texinfo/Convert/XSParagraph/XSParagraph.xs 2015-08-25 16:28:36 UTC 
(rev 6574)
+++ trunk/tp/Texinfo/Convert/XSParagraph/XSParagraph.xs 2015-08-25 20:49:10 UTC 
(rev 6575)
@@ -1,5 +1,6 @@
 #ifdef HAVE_CONFIG_H
-  #include <config.h>
+  /* configure generated header file */
+  #include <xsparagraph_acconfig.h>
 #endif
 
 #define PERL_NO_GET_CONTEXT

Modified: trunk/tp/Texinfo/Convert/XSParagraph/configure.ac
===================================================================
--- trunk/tp/Texinfo/Convert/XSParagraph/configure.ac   2015-08-25 16:28:36 UTC 
(rev 6574)
+++ trunk/tp/Texinfo/Convert/XSParagraph/configure.ac   2015-08-25 20:49:10 UTC 
(rev 6575)
@@ -102,7 +102,12 @@
 
 AC_PATH_PROG([XSUBPP], [xsubpp])
 
-AC_CONFIG_HEADERS([config.h:config.in])
+# we do not use config.h because there is already a config.h file in 
+# perl includes directory.  The header file in the build directory
+# should always be generated, so in principle there is no possibility
+# of including the one in perl directory.  Using another file name is
+# an extra security.
+AC_CONFIG_HEADERS([xsparagraph_acconfig.h:config.in])
 
 fi # not disable_xs
 

Modified: trunk/tp/Texinfo/Convert/XSParagraph/text.c
===================================================================
--- trunk/tp/Texinfo/Convert/XSParagraph/text.c 2015-08-25 16:28:36 UTC (rev 
6574)
+++ trunk/tp/Texinfo/Convert/XSParagraph/text.c 2015-08-25 20:49:10 UTC (rev 
6575)
@@ -2,7 +2,8 @@
 
 #define _GNU_SOURCE
 #ifdef HAVE_CONFIG_H
-  #include <config.h>
+  /* configure generated header file */
+  #include <xsparagraph_acconfig.h>
 #endif
 #include <stdlib.h>
 #include <string.h>

Modified: trunk/tp/Texinfo/Convert/XSParagraph/xspara.c
===================================================================
--- trunk/tp/Texinfo/Convert/XSParagraph/xspara.c       2015-08-25 16:28:36 UTC 
(rev 6574)
+++ trunk/tp/Texinfo/Convert/XSParagraph/xspara.c       2015-08-25 20:49:10 UTC 
(rev 6575)
@@ -3,7 +3,8 @@
 #define _GNU_SOURCE
 
 #ifdef HAVE_CONFIG_H
-  #include <config.h>
+  /* configure generated header file */
+  #include <xsparagraph_acconfig.h>
 #endif
 #include <stdlib.h>
 #include <stdio.h>