shtool/shtool.patch

Mon, 28 Jan 2013 17:37:18 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Mon, 28 Jan 2013 17:37:18 +0100
changeset 758
a2c6460cfb16
permissions
-rw-r--r--

Correct socket error reporting improvement with IPv6 portable code,
after helpful recommendation by Saúl Ibarra Corretgé on OSips devlist.

     1 diff -Nau ChangeLog.orig ChangeLog
     2 --- ChangeLog.orig	2008-07-18 09:57:29.000000000 +0200
     3 +++ ChangeLog	2009-01-06 01:29:18.000000000 +0100
     4 @@ -114,6 +114,9 @@
     6   Changes between 2.0.1 and 2.0.2 (11-Aug-2004 to 15-Jun-2005):
     8 +   *) Added ISO C++ language output to "shtool version".
     9 +      [Michael Schloh von Bennewitz <michael@schloh.com>]
    10 +
    11     *) Fix insecure temporary file handling (CAN-2005-1751, CAN-2005-1759).
    12        [Eric Romang <eromang@zataz.net>, Ralf S. Engelschall]
    14 diff -Nau RATIONAL.orig RATIONAL
    15 --- RATIONAL.orig	2008-04-02 22:10:17.000000000 +0200
    16 +++ RATIONAL	2009-01-06 01:30:19.000000000 +0100
    17 @@ -6,8 +6,8 @@
    19    GNU shtool -- The GNU Portable Shell Tool
    21 -  RATIONAL
    22 -  ========
    23 +  RATIONALE
    24 +  =========
    26    The Context
    28 diff -Nau sh.version.orig sh.version
    29 --- sh.version.orig	2008-04-02 22:10:17.000000000 +0200
    30 +++ sh.version	2009-01-06 01:32:32.000000000 +0100
    31 @@ -211,7 +211,7 @@
    32              ;;
    33          c )
    34              echo >>$file "/*"
    35 -            echo >>$file "**  ${file} -- Version Information for ${name} (syntax: C/C++)"
    36 +            echo >>$file "**  ${file} -- Version Information for ${name} (syntax: C)"
    37              echo >>$file "**  [automatically generated and maintained by GNU shtool]"
    38              echo >>$file "*/"
    39              echo >>$file ""
    40 @@ -257,6 +257,65 @@
    41              echo >>$file "#endif /* _${filestr}_AS_HEADER_ */"
    42              echo >>$file ""
    43              ;;
    44 +        cxx )
    45 +            echo >>$file "//"
    46 +            echo >>$file "//  ${file} -- Version Information for ${name} (syntax: ISO C++)"
    47 +            echo >>$file "//  [automatically generated and maintained by GNU shtool]"
    48 +            echo >>$file "//"
    49 +            echo >>$file ""
    50 +            echo >>$file "#ifdef _${filestr}_AS_HEADER_"
    51 +            echo >>$file ""
    52 +            echo >>$file "#ifndef _${filestr}_"
    53 +            echo >>$file "#define _${filestr}_"
    54 +            echo >>$file ""
    55 +            echo >>$file "#define ${prefixupper}VERSION ${vHex}"
    56 +            echo >>$file ""
    57 +            echo >>$file "typedef class ${prefix}version_class {"
    58 +            echo >>$file "private:"
    59 +            echo >>$file "    const int   v_hex;"
    60 +            echo >>$file "    const char *v_short;"
    61 +            echo >>$file "    const char *v_long;"
    62 +            echo >>$file "    const char *v_tex;"
    63 +            echo >>$file "    const char *v_gnu;"
    64 +            echo >>$file "    const char *v_web;"
    65 +            echo >>$file "    const char *v_sccs;"
    66 +            echo >>$file "    const char *v_rcs;"
    67 +            echo >>$file "public:"
    68 +            echo >>$file "    ${prefix}version_class(void) : \\"
    69 +            echo >>$file "        v_hex(${vHex}), \\"
    70 +            echo >>$file "        v_short(\"${vShort}\"), \\"
    71 +            echo >>$file "        v_long(\"${vLong}\"), \\"
    72 +            echo >>$file "        v_tex(\"${vTeX}\"), \\"
    73 +            echo >>$file "        v_gnu(\"${vGNU}\"), \\"
    74 +            echo >>$file "        v_web(\"${vWeb}\"), \\"
    75 +            echo >>$file "        v_sccs(\"${vSCCS}\"), \\"
    76 +            echo >>$file "        v_rcs(\"${vRCS}\") \\"
    77 +            echo >>$file "        {}"
    78 +            echo >>$file "    const int   getHex(void)   {return (v_hex);};"
    79 +            echo >>$file "    const char *getShort(void) {return (v_short);};"
    80 +            echo >>$file "    const char *getLong(void)  {return (v_long);};"
    81 +            echo >>$file "    const char *getTex(void)   {return (v_tex);};"
    82 +            echo >>$file "    const char *getGnu(void)   {return (v_gnu);};"
    83 +            echo >>$file "    const char *getWeb(void)   {return (v_web);};"
    84 +            echo >>$file "    const char *getSccs(void)  {return (v_sccs);};"
    85 +            echo >>$file "    const char *getRcs(void)   {return (v_rcs);};"
    86 +            echo >>$file "} ${prefix}version_t;"
    87 +            echo >>$file ""
    88 +            echo >>$file "extern ${prefix}version_t ${prefix}version;"
    89 +            echo >>$file ""
    90 +            echo >>$file "#endif // _${filestr}_"
    91 +            echo >>$file ""
    92 +            echo >>$file "#else // _${filestr}_AS_HEADER_"
    93 +            echo >>$file ""
    94 +            echo >>$file "#define _${filestr}_AS_HEADER_"
    95 +            echo >>$file "#include \"${file}\""
    96 +            echo >>$file "#undef  _${filestr}_AS_HEADER_"
    97 +            echo >>$file ""
    98 +            echo >>$file "${prefix}version_t ${prefix}version;"
    99 +            echo >>$file ""
   100 +            echo >>$file "#endif // _${filestr}_AS_HEADER_"
   101 +            echo >>$file ""
   102 +            ;;
   103          m4 )
   104              echo >>$file "##"
   105              echo >>$file "##  ${file} -- Version Information for ${name} (syntax: M4)"
   106 @@ -367,9 +426,9 @@
   108  =item B<-l>, B<--language> I<lang>
   110 -Choose format of version file I<file>. I<lang>="C<txt>", ANSI C
   111 -(I<lang>="c"), M4 (I<lang>="m4"), Perl (I<lang>="perl") or Python
   112 -(I<lang>="python"). Default is C<txt>.
   113 +Choose format of version file I<file>. I<lang>="C<txt>", ISO C
   114 +(I<lang>="c"), ISO C++ (I<lang>="cxx"), M4 (I<lang>="m4"), Perl
   115 +(I<lang>="perl") or Python (I<lang>="python"). Default is C<txt>.
   117  =item B<-n>, B<--name> I<name>
   119 diff -Nau shtool.pod.orig shtool.pod
   120 --- shtool.pod.orig	2008-04-02 22:10:17.000000000 +0200
   121 +++ shtool.pod	2009-01-06 01:32:54.000000000 +0100
   122 @@ -161,8 +161,8 @@
   124  =item B<version>
   126 -Maintain a version information file in either Text, C/C++, Perl or Python.
   127 -format.
   128 +Maintain a version information file in either Text, C, C++, M4, Perl or
   129 +Python.
   131  =item B<path>

mercurial