On Sun, Nov 19, 2006 at 06:47:30PM +0100, Matthias Kilian wrote:
> This new patch also fixes a use after realloc that caused stress.test
> to fail.
Please, could any one look at this one?
> diff -x CVS -rNu ../autogen.orig/Makefile ./Makefile
> --- ../autogen.orig/Makefile Fri Nov 17 23:39:12 2006
> +++ ./Makefile Fri Nov 17 23:48:39 2006
> @@ -3,10 +3,10 @@
> COMMENT='automatic text creation from templates'
> CATEGORIES=devel
>
> -DISTNAME= autogen-5.6.5
> -PKGNAME= ${DISTNAME}p1
> -SHARED_LIBS += opts 23.1 # .23.1
> -SHARED_LIBS += guileopts 0.1 # .0.1
> +DISTNAME= autogen-5.8.7
> +SHARED_LIBS += opts 27.5 # .27.5
> +SHARED_LIBS += guileopts 1.0 # .0.1
> +HOMEPAGE=http://autogen.sourceforge.net/
> MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=autogen/}
>
> # GPL
> diff -x CVS -rNu ../autogen.orig/distinfo ./distinfo
> --- ../autogen.orig/distinfo Fri Nov 17 23:39:12 2006
> +++ ./distinfo Fri Nov 17 19:01:41 2006
> @@ -1,4 +1,4 @@
> -MD5 (autogen-5.6.5.tar.gz) = 54a6cb0be7e6b526af9aba4a73013885
> -RMD160 (autogen-5.6.5.tar.gz) = 3ea4dc2cf5df7d90de8e7bdde44f4ab58cd96809
> -SHA1 (autogen-5.6.5.tar.gz) = 99292675ab68aa0dfde26db7923c6eee052933ce
> -SIZE (autogen-5.6.5.tar.gz) = 1144260
> +MD5 (autogen-5.8.7.tar.gz) = 53cf8e525d32cc5ac457e54e2327ea32
> +RMD160 (autogen-5.8.7.tar.gz) = 52c07b37c0ae9e82d91261568390a6b924e0f445
> +SHA1 (autogen-5.8.7.tar.gz) = 92e1a2e7f9782849062f7bca3b126d6a71ec26a4
> +SIZE (autogen-5.8.7.tar.gz) = 1279984
> diff -x CVS -rNu ../autogen.orig/patches/patch-agen5_defLoad_c
> ./patches/patch-agen5_defLoad_c
> --- ../autogen.orig/patches/patch-agen5_defLoad_c Thu Jan 1 01:00:00 1970
> +++ ./patches/patch-agen5_defLoad_c Sun Nov 19 18:36:23 2006
> @@ -0,0 +1,31 @@
> +$OpenBSD$
> +
> +# Fix use after realloc.
> +
> +--- agen5/defLoad.c.orig Sun Sep 24 04:58:59 2006
> ++++ agen5/defLoad.c Sun Nov 19 18:30:20 2006
> +@@ -418,6 +418,7 @@ readDefines( void )
> + */
> + if (sizeLeft == 0) {
> + tScanCtx* p;
> ++ char *oldPzData;
> +
> + /*
> + * IF it is a regular file, then we are done
> +@@ -430,6 +431,7 @@ readDefines( void )
> + * Try to reallocate our input buffer.
> + */
> + dataSize += (sizeLeft = 0x1000);
> ++ oldPzData = pBaseCtx->pzData;
> + p = (tScanCtx*)AGREALOC( (void*)pBaseCtx,
> + dataSize+4+sizeof( *pBaseCtx ),
> + "expanded file buffer" );
> +@@ -442,7 +444,7 @@ readDefines( void )
> + if (p != pBaseCtx) {
> + p->pzScan = \
> + p->pzData = (char*)(p+1);
> +- pzData = p->pzData + (pzData - pBaseCtx->pzData);
> ++ pzData = p->pzData + (pzData - oldPzData);
> + pBaseCtx = p;
> + }
> + }
> diff -x CVS -rNu ../autogen.orig/patches/patch-agen5_test_error_test
> ./patches/patch-agen5_test_error_test
> --- ../autogen.orig/patches/patch-agen5_test_error_test Thu Jan 1
> 01:00:00 1970
> +++ ./patches/patch-agen5_test_error_test Sat Nov 18 00:03:47 2006
> @@ -0,0 +1,15 @@
> +$OpenBSD$
> +
> +# Cope with the additional abort message (don't panic -- this test
> +# intentionally checks abort behaviour).
> +
> +--- agen5/test/error.test.orig Sun Sep 24 04:11:15 2006
> ++++ agen5/test/error.test Fri Nov 17 20:15:03 2006
> +@@ -103,6 +103,7 @@ AutoGen aborting on signal <text-varies>
> + processing template error2.tpl
> + on line 2
> + for function EXPR (11)
> ++Abort trap (core dumped)
> + _EOF_
> +
> + sed '/THIS TEXT/,/ESAC/d;s,this is never seen,<= `die testing death` =>,' \
> diff -x CVS -rNu ../autogen.orig/patches/patch-autoopts_test_enums_test
> ./patches/patch-autoopts_test_enums_test
> --- ../autogen.orig/patches/patch-autoopts_test_enums_test Thu Jan 1
> 01:00:00 1970
> +++ ./patches/patch-autoopts_test_enums_test Sat Nov 18 00:11:04 2006
> @@ -0,0 +1,17 @@
> +$OpenBSD$
> +
> +# There are some strange shells in the wild, but not on OpenBSD.
> +# Removing the tab from the closing line isn't an option since this
> +# would be unethical.
> +
> +--- autoopts/test/enums.test.orig Sat Sep 23 03:45:13 2006
> ++++ autoopts/test/enums.test Fri Nov 17 20:04:44 2006
> +@@ -190,7 +190,7 @@ cat > ${testname}.tpl <<- \__EOF
> + }
> + __EOF
> +
> +-cat >> ${testname}.tpl <<__EOF
> ++cat >> ${testname}.tpl <<- __EOF
> + int
> + main( int argc, char** argv )
> + {
> diff -x CVS -rNu ../autogen.orig/pkg/PLIST ./pkg/PLIST
> --- ../autogen.orig/pkg/PLIST Fri Nov 17 23:39:12 2006
> +++ ./pkg/PLIST Fri Nov 17 22:29:39 2006
> @@ -6,8 +6,9 @@
> bin/getdefs
> bin/xml2ag
> include/autogen/
> -include/autogen/options.h
> -include/autogen/usage-txt.h
> +include/autogen/autoopts/
> +include/autogen/autoopts/options.h
> +include/autogen/autoopts/usage-txt.h
> lib/libguileopts.a
> lib/libguileopts.la
> lib/libopts.a
> @@ -19,18 +20,34 @@
> @man man/man1/columns.1
> @man man/man1/getdefs.1
> @man man/man1/xml2ag.1
> [EMAIL PROTECTED] man/man3/ao_string_tokenize.3
> [EMAIL PROTECTED] man/man3/configFileLoad.3
> [EMAIL PROTECTED] man/man3/optionFileLoad.3
> [EMAIL PROTECTED] man/man3/optionFindNextValue.3
> [EMAIL PROTECTED] man/man3/optionFindValue.3
> @man man/man3/optionFree.3
> [EMAIL PROTECTED] man/man3/optionGetValue.3
> @man man/man3/optionLoadLine.3
> [EMAIL PROTECTED] man/man3/optionNextValue.3
> [EMAIL PROTECTED] man/man3/optionOnlyUsage.3
> @man man/man3/optionProcess.3
> @man man/man3/optionRestore.3
> @man man/man3/optionSaveFile.3
> @man man/man3/optionSaveState.3
> [EMAIL PROTECTED] man/man3/optionUnloadNested.3
> @man man/man3/optionVersion.3
> [EMAIL PROTECTED] man/man3/strequate.3
> [EMAIL PROTECTED] man/man3/streqvcmp.3
> [EMAIL PROTECTED] man/man3/streqvmap.3
> [EMAIL PROTECTED] man/man3/strneqvcmp.3
> [EMAIL PROTECTED] man/man3/strtransform.3
> share/aclocal/
> share/aclocal/autoopts.m4
> +share/aclocal/liboptschk.m4
> share/autogen/
> share/autogen/aginfo.tpl
> share/autogen/aginfo3.tpl
> +share/autogen/agman-lib.tpl
> share/autogen/agman1.tpl
> share/autogen/agman3.tpl
> share/autogen/autoopts.m4
> @@ -40,7 +57,7 @@
> share/autogen/fsm-trans.tpl
> share/autogen/fsm.tpl
> share/autogen/getopt.tpl
> -share/autogen/libopts-23.1.14.tar.gz
> +share/autogen/libopts-27.5.3.tar.gz
> share/autogen/optcode.tpl
> share/autogen/opthead.tpl
> share/autogen/options.tpl
