Skip to contentSkip to conversation

devel/toolchain recipe upgrades

PATCH New Nitin A Kamble 1 participant 7 messages Dec 13, 2010

lore
Share & tools
lore
#0 lore raw

cover devel/toolchain recipe upgrades

Saul,
Here are the upgrades for remaining devel/toolchain recipes. The commits
related to autoconf are dropped from this branch, as I was seeing rpm packaging issue after upgrading autoconf.

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: nitin/upgrades
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/upgrades

Thanks,
Nitin A Kamble <[email protected]>
---

Nitin A Kamble (6):
patch_2.5.9: clean up the recipe
patch-2.6.1: implement new patch recipe with latest upstream
fstests: upgrade to svn revision #426
gnu-config: upgrade recipe to the latest repo head
python-pygobject: upgrade from 2.21.1 to 2.27.0
distro_tracking: update status for upgraded recipes

 .../conf/distro/include/distro_tracking_fields.inc |   21 +-
 .../conf/distro/include/poky-default-revisions.inc |    2 +-
 .../gnu-config/config-guess-uclibc.patch           |  130 +-
 .../gnu-config/gnu-config_20080123.bb              |   38 -
 meta/recipes-devtools/gnu-config/gnu-config_git.bb |   48 +
 .../recipes-devtools/patch/patch-2.5.9/2.5.9.patch |27399 --------------------
 .../global-reject-file.diff                        |  137 +-
 meta/recipes-devtools/patch/patch.inc              |    1 -
 .../patch/{patch-2.5.9 => patch}/debian.patch      |    0
 .../{patch-2.5.9 => patch}/global-reject-file.diff |    0
 .../patch/{patch-2.5.9 => patch}/install.patch     |    0
 .../unified-reject-files.diff                      |    0
 meta/recipes-devtools/patch/patch_2.5.9.bb         |   13 +-
 meta/recipes-devtools/patch/patch_2.6.1.bb         |   14 +
 ...2.21.1.bb => python-pygobject-native_2.27.0.bb} |    0
 ...object_2.21.1.bb => python-pygobject_2.27.0.bb} |    2 +-
 meta/recipes-graphics/fstests/fstests_svn.bb       |    6 +-
 17 files changed, 204 insertions(+), 27607 deletions(-)
 delete mode 100644 meta/recipes-devtools/gnu-config/gnu-config_20080123.bb
 create mode 100644 meta/recipes-devtools/gnu-config/gnu-config_git.bb
 delete mode 100644 meta/recipes-devtools/patch/patch-2.5.9/2.5.9.patch
 copy meta/recipes-devtools/patch/{patch-2.5.9 => patch-2.6.1}/global-reject-file.diff (57%)
 rename meta/recipes-devtools/patch/{patch-2.5.9 => patch}/debian.patch (100%)
 rename meta/recipes-devtools/patch/{patch-2.5.9 => patch}/global-reject-file.diff (100%)
 rename meta/recipes-devtools/patch/{patch-2.5.9 => patch}/install.patch (100%)
 rename meta/recipes-devtools/patch/{patch-2.5.9 => patch}/unified-reject-files.diff (100%)
 create mode 100644 meta/recipes-devtools/patch/patch_2.6.1.bb
 rename meta/recipes-devtools/python/{python-pygobject-native_2.21.1.bb => python-pygobject-native_2.27.0.bb} (100%)
 rename meta/recipes-devtools/python/{python-pygobject_2.21.1.bb => python-pygobject_2.27.0.bb} (98%)
Signature · 1 line
1.7.2.2
#1 lore raw

PATCH 1/6 patch_2.5.9: clean up the recipe

Earlier the recipe was using 2.5.4 tar ball and a patch for upgrading to 2.5.9. Replaces these with pointer to 2.5.9 tarball.

Also noted that both 2.5.4 & 2.5.9 are GPLv2 sources.

Updated checksums and license of the recipe

---
 .../recipes-devtools/patch/patch-2.5.9/2.5.9.patch |27399 --------------------
 meta/recipes-devtools/patch/patch.inc              |    1 -
 .../patch/{patch-2.5.9 => patch}/debian.patch      |    0
 .../{patch-2.5.9 => patch}/global-reject-file.diff |    0
 .../patch/{patch-2.5.9 => patch}/install.patch     |    0
 .../unified-reject-files.diff                      |    0
 meta/recipes-devtools/patch/patch_2.5.9.bb         |   13 +-
 7 files changed, 6 insertions(+), 27407 deletions(-)
 delete mode 100644 meta/recipes-devtools/patch/patch-2.5.9/2.5.9.patch
 rename meta/recipes-devtools/patch/{patch-2.5.9 => patch}/debian.patch (100%)
 rename meta/recipes-devtools/patch/{patch-2.5.9 => patch}/global-reject-file.diff (100%)
 rename meta/recipes-devtools/patch/{patch-2.5.9 => patch}/install.patch (100%)
 rename meta/recipes-devtools/patch/{patch-2.5.9 => patch}/unified-reject-files.diff (100%)
meta/recipes-devtools/patch/patch-2.5.9/2.5.9.patch deleted +0 -27399
deleted file mode 100644
index 7b64ecd..0000000
@@ -1,27399 +0,0 @@
-diff -urNd -urNd patch-2.5.4/aclocal.m4 patch-2.5.9/aclocal.m4
---- patch-2.5.4/aclocal.m4	1999-08-29 09:09:30.000000000 -0400
-+++ patch-2.5.9/aclocal.m4	2003-05-19 02:30:52.000000000 -0400
-@@ -1,106 +1,34 @@
--# The following is taken from automake 1.4,
--# except that it prefers the compiler option -Ae to "-Aa -D_HPUX_SOURCE"
--# because only the former supports 64-bit integral types on HP-UX 10.20.
--
--## ----------------------------------------- ##
--## ANSIfy the C compiler whenever possible.  ##
--## From Franc,ois Pinard                     ##
--## ----------------------------------------- ##
--
--# serial 2
-+# backupfile.m4 serial 1
-+dnl Copyright (C) 2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
- 
--# @defmac AC_PROG_CC_STDC
--# @maindex PROG_CC_STDC
--# @ovindex CC
--# If the C compiler in not in ANSI C mode by default, try to add an option
--# to output variable @code{CC} to make it so.  This macro tries various
--# options that select ANSI C on some system or another.  It considers the
--# compiler to be in ANSI C mode if it handles function prototypes correctly.
--#
--# If you use this macro, you should check after calling it whether the C
--# compiler has been set to accept ANSI C; if not, the shell variable
--# @code{am_cv_prog_cc_stdc} is set to @samp{no}.  If you wrote your source
--# code in ANSI C, you can make an un-ANSIfied copy of it by using the
--# program @code{ansi2knr}, which comes with Ghostscript.
--# @end defmac
-+AC_DEFUN([gl_BACKUPFILE],
-+[
-+  dnl Prerequisites of lib/backupfile.c.
-+  AC_REQUIRE([AC_HEADER_DIRENT])
-+  AC_REQUIRE([AC_FUNC_CLOSEDIR_VOID])
-+  AC_CHECK_HEADERS_ONCE(limits.h stdlib.h string.h)
-+  AC_CHECK_DECLS_ONCE(getenv malloc)
-+  jm_CHECK_TYPE_STRUCT_DIRENT_D_INO
- 
--AC_DEFUN(AM_PROG_CC_STDC,
--[AC_REQUIRE([AC_PROG_CC])
--AC_BEFORE([$0], [AC_C_INLINE])
--AC_BEFORE([$0], [AC_C_CONST])
--dnl Force this before AC_PROG_CPP.  Some cpp's, eg on HPUX, require
--dnl a magic option to avoid problems with ANSI preprocessor commands
--dnl like #elif.
--dnl FIXME: can't do this because then AC_AIX won't work due to a
--dnl circular dependency.
--dnl AC_BEFORE([$0], [AC_PROG_CPP])
--AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C)
--AC_CACHE_VAL(am_cv_prog_cc_stdc,
--[am_cv_prog_cc_stdc=no
--ac_save_CC="$CC"
--# Don't try gcc -ansi; that turns off useful extensions and
--# breaks some systems' header files.
--# AIX			-qlanglvl=ansi
--# Ultrix and OSF/1	-std1
--# HP-UX			-Aa -D_HPUX_SOURCE
--# SVR4			-Xc -D__EXTENSIONS__
--for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
--do
--  CC="$ac_save_CC $ac_arg"
--  AC_TRY_COMPILE(
--[#include <stdarg.h>
--#include <stdio.h>
--#include <sys/types.h>
--#include <sys/stat.h>
--/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
--struct buf { int x; };
--FILE * (*rcsopen) (struct buf *, struct stat *, int);
--static char *e (p, i)
--     char **p;
--     int i;
--{
--  return p[i];
--}
--static char *f (char * (*g) (char **, int), char **p, ...)
--{
--  char *s;
--  va_list v;
--  va_start (v,p);
--  s = g (p, va_arg (v,int));
--  va_end (v);
--  return s;
--}
--int test (int i, double x);
--struct s1 {int (*f) (int a);};
--struct s2 {int (*f) (double a);};
--int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
--int argc;
--char **argv;
--], [
--return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
--],
--[am_cv_prog_cc_stdc="$ac_arg"; break])
--done
--CC="$ac_save_CC"
--])
--if test -z "$am_cv_prog_cc_stdc"; then
--  AC_MSG_RESULT([none needed])
--else
--  AC_MSG_RESULT($am_cv_prog_cc_stdc)
--fi
--case "x$am_cv_prog_cc_stdc" in
--  x|xno) ;;
--  *) CC="$CC $am_cv_prog_cc_stdc" ;;
--esac
-+  dnl Prerequisites of lib/addext.c.
-+  AC_REQUIRE([jm_AC_DOS])
-+  AC_SYS_LONG_FILE_NAMES
-+  AC_CHECK_HEADERS_ONCE(limits.h string.h unistd.h)
-+  AC_CHECK_FUNCS(pathconf)
- ])
--#serial 2
-+#serial 5
- 
- dnl From Jim Meyering.
- dnl
- dnl Check whether struct dirent has a member named d_ino.
- dnl
- 
--AC_DEFUN(jm_STRUCT_DIRENT_D_INO,
-+AC_DEFUN([jm_CHECK_TYPE_STRUCT_DIRENT_D_INO],
-   [AC_REQUIRE([AC_HEADER_DIRENT])dnl
-    AC_CACHE_CHECK([for d_ino member in directory struct],
- 		  jm_cv_struct_dirent_d_ino,
-@@ -130,244 +58,548 @@
-    )
-    if test $jm_cv_struct_dirent_d_ino = yes; then
-      AC_DEFINE(D_INO_IN_DIRENT, 1,
--  [Define if there is a member named d_ino in the struct describing
--   directory headers.])
-+       [Define if there is a member named d_ino in the struct describing
-+        directory headers.])
-    fi
-   ]
- )
--#serial 3
-+# dirname.m4 serial 1
-+dnl Copyright (C) 2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
- 
--dnl From Paul Eggert.
-+AC_DEFUN([gl_DIRNAME],
-+[
-+  dnl Prerequisites of lib/dirname.h.
-+  AC_REQUIRE([jm_AC_DOS])
- 
--# Define HAVE_INTTYPES_H if <inttypes.h> exists,
--# doesn't clash with <sys/types.h>, and declares uintmax_t.
-+  dnl Prerequisites of lib/dirname.c.
-+  AC_REQUIRE([AC_HEADER_STDC])
-+  AC_CHECK_HEADERS_ONCE(string.h)
- 
--AC_DEFUN(jm_AC_HEADER_INTTYPES_H,
--[
--  AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h,
--  [AC_TRY_COMPILE(
--    [#include <sys/types.h>
--#include <inttypes.h>],
--    [uintmax_t i = (uintmax_t) -1;],
--    jm_ac_cv_header_inttypes_h=yes,
--    jm_ac_cv_header_inttypes_h=no)])
--  if test $jm_ac_cv_header_inttypes_h = yes; then
--    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
--[Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
--   and declares uintmax_t. ])
--  fi
-+  dnl Prerequisites of lib/basename.c.
-+  AC_REQUIRE([AC_HEADER_STDC])
-+  AC_CHECK_HEADERS_ONCE(string.h)
-+
-+  dnl Prerequisites of lib/stripslash.c.
-+  AC_REQUIRE([AC_HEADER_STDC])
-+  AC_CHECK_HEADERS_ONCE(string.h)
- ])
- #serial 5
- 
--dnl By default, many hosts won't let programs access large files;
--dnl one must use special compiler options to get large-file access to work.
--dnl For more details about this brain damage please see:
--dnl http://www.sas.com/standards/large.file/x_open.20Mar96.html
-+# Define some macros required for proper operation of code in lib/*.c
-+# on MSDOS/Windows systems.
- 
--dnl Written by Paul Eggert <[email protected]>.
-+# From Jim Meyering.
- 
--dnl Internal subroutine of AC_SYS_LARGEFILE.
--dnl AC_SYS_LARGEFILE_FLAGS(FLAGSNAME)
--AC_DEFUN(AC_SYS_LARGEFILE_FLAGS,
--  [AC_CACHE_CHECK([for $1 value to request large file support],
--     ac_cv_sys_largefile_$1,
--     [ac_cv_sys_largefile_$1=`($GETCONF LFS_$1) 2>/dev/null` || {
--	ac_cv_sys_largefile_$1=no
--	ifelse($1, CFLAGS,
--	  [case "$host_os" in
--	   # IRIX 6.2 and later require cc -n32.
--changequote(, )dnl
--	   irix6.[2-9]* | irix6.1[0-9]* | irix[7-9].* | irix[1-9][0-9]*)
--changequote([, ])dnl
--	     if test "$GCC" != yes; then
--	       ac_cv_sys_largefile_CFLAGS=-n32
--	     fi
--	     ac_save_CC="$CC"
--	     CC="$CC $ac_cv_sys_largefile_CFLAGS"
--	     AC_TRY_LINK(, , , ac_cv_sys_largefile_CFLAGS=no)
--	     CC="$ac_save_CC"
--	   esac])
--      }])])
-+AC_DEFUN([jm_AC_DOS],
-+  [
-+    AC_CACHE_CHECK([whether system is Windows or MSDOS], [ac_cv_win_or_dos],
-+      [
-+        AC_TRY_COMPILE([],
-+        [#if !defined _WIN32 && !defined __WIN32__ && !defined __MSDOS__
-+neither MSDOS nor Windows
-+#endif],
-+        [ac_cv_win_or_dos=yes],
-+        [ac_cv_win_or_dos=no])
-+      ])
- 
--dnl Internal subroutine of AC_SYS_LARGEFILE.
--dnl AC_SYS_LARGEFILE_SPACE_APPEND(VAR, VAL)
--AC_DEFUN(AC_SYS_LARGEFILE_SPACE_APPEND,
--  [case $2 in
--   no) ;;
--   ?*)
--     case "[$]$1" in
--     '') $1=$2 ;;
--     *) $1=[$]$1' '$2 ;;
--     esac ;;
--   esac])
-+    if test x"$ac_cv_win_or_dos" = xyes; then
-+      ac_fs_accepts_drive_letter_prefix=1
-+      ac_fs_backslash_is_file_name_separator=1
-+    else
-+      ac_fs_accepts_drive_letter_prefix=0
-+      ac_fs_backslash_is_file_name_separator=0
-+    fi
- 
--dnl Internal subroutine of AC_SYS_LARGEFILE.
--dnl AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, CACHE-VAR, COMMENT, CODE-TO-SET-DEFAULT)
--AC_DEFUN(AC_SYS_LARGEFILE_MACRO_VALUE,
--  [AC_CACHE_CHECK([for $1], $2,
--     [$2=no
--changequote(, )dnl
--      $4
--      for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do
--	case "$ac_flag" in
--	-D$1)
--	  $2=1 ;;
--	-D$1=*)
--	  $2=`expr " $ac_flag" : '[^=]*=\(.*\)'` ;;
--	esac
--      done
--changequote([, ])dnl
--      ])
--   if test "[$]$2" != no; then
--     AC_DEFINE_UNQUOTED([$1], [$]$2, [$3])
--   fi])
-+    AH_VERBATIM(FILESYSTEM_PREFIX_LEN,
-+    [#if FILESYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX
-+# define FILESYSTEM_PREFIX_LEN(Filename) \
-+  ((Filename)[0] && (Filename)[1] == ':' ? 2 : 0)
-+#else
-+# define FILESYSTEM_PREFIX_LEN(Filename) 0
-+#endif])
- 
--AC_DEFUN(AC_SYS_LARGEFILE,
--  [AC_REQUIRE([AC_CANONICAL_HOST])
--   AC_ARG_ENABLE(largefile,
--     [  --disable-largefile     omit support for large files])
--   if test "$enable_largefile" != no; then
--     AC_CHECK_TOOL(GETCONF, getconf)
--     AC_SYS_LARGEFILE_FLAGS(CFLAGS)
--     AC_SYS_LARGEFILE_FLAGS(LDFLAGS)
--     AC_SYS_LARGEFILE_FLAGS(LIBS)
-+    AC_DEFINE_UNQUOTED([FILESYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX],
-+      $ac_fs_accepts_drive_letter_prefix,
-+      [Define on systems for which file names may have a so-called
-+       `drive letter' prefix, define this to compute the length of that
-+       prefix, including the colon.])
- 
--     for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do
--       case "$ac_flag" in
--       no) ;;
--       -D_FILE_OFFSET_BITS=*) ;;
--       -D_LARGEFILE_SOURCE | -D_LARGEFILE_SOURCE=*) ;;
--       -D_LARGE_FILES | -D_LARGE_FILES=*) ;;
--       -D?* | -I?*)
--	 AC_SYS_LARGEFILE_SPACE_APPEND(CPPFLAGS, "$ac_flag") ;;
--       *)
--	 AC_SYS_LARGEFILE_SPACE_APPEND(CFLAGS, "$ac_flag") ;;
--       esac
--     done
--     AC_SYS_LARGEFILE_SPACE_APPEND(LDFLAGS, "$ac_cv_sys_largefile_LDFLAGS")
--     AC_SYS_LARGEFILE_SPACE_APPEND(LIBS, "$ac_cv_sys_largefile_LIBS")
--     AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS,
--       ac_cv_sys_file_offset_bits,
--       [Number of bits in a file offset, on hosts where this is settable.],
--       [case "$host_os" in
--	# HP-UX 10.20 and later
--	hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*)
--	  ac_cv_sys_file_offset_bits=64 ;;
--	esac])
--     AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE,
--       ac_cv_sys_largefile_source,
--       [Define to make fseeko etc. visible, on some hosts.],
--       [case "$host_os" in
--	# HP-UX 10.20 and later
--	hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*)
--	  ac_cv_sys_largefile_source=1 ;;
--	esac])
--     AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES,
--       ac_cv_sys_large_files,
--       [Define for large files, on AIX-style hosts.],
--       [case "$host_os" in
--	# AIX 4.2 and later
--	aix4.[2-9]* | aix4.1[0-9]* | aix[5-9].* | aix[1-9][0-9]*)
--	  ac_cv_sys_large_files=1 ;;
--	esac])
--   fi
-+    AH_VERBATIM(ISSLASH,
-+    [#if FILESYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR
-+# define ISSLASH(C) ((C) == '/' || (C) == '\\')
-+#else
-+# define ISSLASH(C) ((C) == '/')
-+#endif])
-+
-+    AC_DEFINE_UNQUOTED([FILESYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR],
-+      $ac_fs_backslash_is_file_name_separator,
-+      [Define if the backslash character may also serve as a file name
-+       component separator.])
-   ])
--#serial 3
-+#serial 7
-+
-+AC_DEFUN([gl_ERROR],
-+[
-+  AC_FUNC_ERROR_AT_LINE
-+  dnl Note: AC_FUNC_ERROR_AT_LINE does AC_LIBSOURCES([error.h, error.c]).
-+  jm_PREREQ_ERROR
-+])
-+
-+# Prerequisites of lib/error.c.
-+AC_DEFUN([jm_PREREQ_ERROR],
-+[
-+  AC_REQUIRE([AC_HEADER_STDC])
-+  AC_REQUIRE([AC_FUNC_VPRINTF])
-+  AC_CHECK_FUNCS(strerror)
-+  AC_CHECK_DECLS([strerror])
-+  AC_FUNC_STRERROR_R
-+])
-+# getopt.m4 serial 1
-+dnl Copyright (C) 2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+AC_DEFUN([gl_GETOPT],
-+[
-+  dnl Prerequisites of lib/getopt.c.
-+  AC_CHECK_HEADERS_ONCE(string.h)
-+])
-+# malloc.m4 serial 7
-+dnl Copyright (C) 2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
- 
- dnl From Jim Meyering.
- dnl Determine whether malloc accepts 0 as its argument.
- dnl If it doesn't, arrange to use the replacement function.
--dnl
- 
--AC_DEFUN(jm_FUNC_MALLOC,
-+AC_DEFUN([jm_FUNC_MALLOC],
- [
-- dnl xmalloc.c requires that this symbol be defined so it doesn't
-- dnl mistakenly use a broken malloc -- as it might if this test were omitted.
-- AC_DEFINE_UNQUOTED(HAVE_DONE_WORKING_MALLOC_CHECK, 1,
--                    [Define if the malloc check has been performed. ])
-+  AC_REQUIRE([AC_FUNC_MALLOC])
-+  dnl autoconf < 2.57 used the symbol ac_cv_func_malloc_works.
-+  if test X"$ac_cv_func_malloc_0_nonnull" = Xno || test X"$ac_cv_func_malloc_works" = Xno; then
-+    gl_PREREQ_MALLOC
-+  fi
-+])
- 
-- AC_CACHE_CHECK([for working malloc], jm_cv_func_working_malloc,
--  [AC_TRY_RUN([
--    char *malloc ();
--    int
--    main ()
--    {
--      exit (malloc (0) ? 0 : 1);
--    }
-+# Prerequisites of lib/malloc.c.
-+AC_DEFUN([gl_PREREQ_MALLOC], [
-+  :
-+])
-+# mbrtowc.m4 serial 5
-+dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Paul Eggert
-+
-+dnl This file can be removed, and jm_FUNC_MBRTOWC replaced with
-+dnl AC_FUNC_MBRTOWC, when autoconf 2.57 can be assumed everywhere.
-+
-+AC_DEFUN([jm_FUNC_MBRTOWC],
-+[
-+  AC_CACHE_CHECK([whether mbrtowc and mbstate_t are properly declared],
-+    jm_cv_func_mbrtowc,
-+    [AC_TRY_LINK(
-+       [#include <wchar.h>],
-+       [mbstate_t state; return ! (sizeof state && mbrtowc);],
-+       jm_cv_func_mbrtowc=yes,
-+       jm_cv_func_mbrtowc=no)])
-+  if test $jm_cv_func_mbrtowc = yes; then
-+    AC_DEFINE(HAVE_MBRTOWC, 1,
-+      [Define to 1 if mbrtowc and mbstate_t are properly declared.])
-+  fi
-+])
-+# mbstate_t.m4 serial 9
-+dnl Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+# From Paul Eggert.
-+
-+# BeOS 5 has <wchar.h> but does not define mbstate_t,
-+# so you can't declare an object of that type.
-+# Check for this incompatibility with Standard C.
-+
-+# AC_TYPE_MBSTATE_T
-+# -----------------
-+AC_DEFUN([AC_TYPE_MBSTATE_T],
-+  [AC_CACHE_CHECK([for mbstate_t], ac_cv_type_mbstate_t,
-+     [AC_COMPILE_IFELSE(
-+	[AC_LANG_PROGRAM(
-+	   [AC_INCLUDES_DEFAULT
-+#	    include <wchar.h>],
-+	   [mbstate_t x; return sizeof x;])],
-+	[ac_cv_type_mbstate_t=yes],
-+	[ac_cv_type_mbstate_t=no])])
-+   if test $ac_cv_type_mbstate_t = yes; then
-+     AC_DEFINE([HAVE_MBSTATE_T], 1,
-+	       [Define to 1 if <wchar.h> declares mbstate_t.])
-+   else
-+     AC_DEFINE([mbstate_t], int,
-+	       [Define to a type if <wchar.h> does not define.])
-+   fi])
-+# memchr.m4 serial 1
-+dnl Copyright (C) 2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+AC_DEFUN([gl_FUNC_MEMCHR],
-+[
-+  AC_REPLACE_FUNCS(memchr)
-+  if test $ac_cv_func_memchr = no; then
-+    jm_PREREQ_MEMCHR
-+  fi
-+])
-+
-+# Prerequisites of lib/memchr.c.
-+AC_DEFUN([jm_PREREQ_MEMCHR], [
-+  AC_CHECK_HEADERS_ONCE(limits.h stdlib.h)
-+  AC_CHECK_HEADERS(bp-sym.h)
-+])
-+#serial 1
-+
-+dnl From Mumit Khan and Paul Eggert
-+dnl Determine whether mkdir accepts only one argument instead of the usual two.
-+
-+AC_DEFUN([PATCH_FUNC_MKDIR_TAKES_ONE_ARG],
-+  [AC_CHECK_FUNCS(mkdir)
-+   AC_CACHE_CHECK([whether mkdir takes only one argument],
-+     patch_cv_mkdir_takes_one_arg,
-+     [patch_cv_mkdir_takes_one_arg=no
-+      if test $ac_cv_func_mkdir = yes; then
-+        AC_TRY_COMPILE([
-+#include <sys/types.h>
-+#include <sys/stat.h>
- 	  ],
--	 jm_cv_func_working_malloc=yes,
--	 jm_cv_func_working_malloc=no,
--	 dnl When crosscompiling, assume malloc is broken.
--	 jm_cv_func_working_malloc=no)
-+	  [mkdir (".", 0);],
-+	  ,
-+	  [AC_TRY_COMPILE([
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+	     ],
-+	     [mkdir (".");],
-+	     patch_cv_mkdir_takes_one_arg=yes
-+	  )]
-+	)
-+      fi
-+     ]
-+   )
-+   if test $patch_cv_mkdir_takes_one_arg = yes; then
-+     AC_DEFINE([MKDIR_TAKES_ONE_ARG], 1,
-+       [Define if mkdir takes only one argument.])
-+   fi
-+  ]
-+)
-+# onceonly.m4 serial 3
-+dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl This file defines some "once only" variants of standard autoconf macros.
-+dnl   AC_CHECK_HEADERS_ONCE         like  AC_CHECK_HEADERS
-+dnl   AC_CHECK_FUNCS_ONCE           like  AC_CHECK_FUNCS
-+dnl   AC_CHECK_DECLS_ONCE           like  AC_CHECK_DECLS
-+dnl   AC_REQUIRE([AC_HEADER_STDC])  like  AC_HEADER_STDC
-+dnl The advantage is that the check for each of the headers/functions/decls
-+dnl will be put only once into the 'configure' file. It keeps the size of
-+dnl the 'configure' file down, and avoids redundant output when 'configure'
-+dnl is run.
-+dnl The drawback is that the checks cannot be conditionalized. If you write
-+dnl   if some_condition; then gl_CHECK_HEADERS(stdlib.h); fi
-+dnl inside an AC_DEFUNed function, the gl_CHECK_HEADERS macro call expands to
-+dnl empty, and the check will be inserted before the body of the AC_DEFUNed
-+dnl function.
-+
-+dnl Autoconf version 2.57 or newer is recommended.
-+AC_PREREQ(2.54)
-+
-+# AC_CHECK_HEADERS_ONCE(HEADER1 HEADER2 ...) is a once-only variant of
-+# AC_CHECK_HEADERS(HEADER1 HEADER2 ...).
-+AC_DEFUN([AC_CHECK_HEADERS_ONCE], [
-+  :
-+  AC_FOREACH([gl_HEADER_NAME], [$1], [
-+    AC_DEFUN([gl_CHECK_HEADER_]m4_quote(translit(m4_defn([gl_HEADER_NAME]),
-+                                                 [-./], [___])), [
-+      AC_CHECK_HEADERS(gl_HEADER_NAME)
-+    ])
-+    AC_REQUIRE([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME,
-+                                                   [-./], [___])))
-   ])
--  if test $jm_cv_func_working_malloc = no; then
--    AC_SUBST(LIBOBJS)
--    LIBOBJS="$LIBOBJS malloc.$ac_objext"
--    AC_DEFINE_UNQUOTED(malloc, rpl_malloc,
--      [Define to rpl_malloc if the replacement function should be used.])
--  fi
- ])
--## ------------------------------- ##
--## Check for function prototypes.  ##
--## From Franc,ois Pinard           ##
--## ------------------------------- ##
- 
--# serial 1
-+# AC_CHECK_FUNCS_ONCE(FUNC1 FUNC2 ...) is a once-only variant of
-+# AC_CHECK_FUNCS(FUNC1 FUNC2 ...).
-+AC_DEFUN([AC_CHECK_FUNCS_ONCE], [
-+  :
-+  AC_FOREACH([gl_FUNC_NAME], [$1], [
-+    AC_DEFUN([gl_CHECK_FUNC_]m4_defn([gl_FUNC_NAME]), [
-+      AC_CHECK_FUNCS(m4_defn([gl_FUNC_NAME]))
-+    ])
-+    AC_REQUIRE([gl_CHECK_FUNC_]m4_defn([gl_FUNC_NAME]))
-+  ])
-+])
- 
--AC_DEFUN(AM_C_PROTOTYPES,
--[AC_REQUIRE([AM_PROG_CC_STDC])
--AC_REQUIRE([AC_PROG_CPP])
--AC_MSG_CHECKING([for function prototypes])
--if test "$am_cv_prog_cc_stdc" != no; then
--  AC_MSG_RESULT(yes)
--  AC_DEFINE(PROTOTYPES,1,[Define if compiler has function prototypes])
--  U= ANSI2KNR=
--else
--  AC_MSG_RESULT(no)
--  U=_ ANSI2KNR=./ansi2knr
--  # Ensure some checks needed by ansi2knr itself.
--  AC_HEADER_STDC
--  AC_CHECK_HEADERS(string.h)
--fi
--AC_SUBST(U)dnl
--AC_SUBST(ANSI2KNR)dnl
-+# AC_CHECK_DECLS_ONCE(DECL1 DECL2 ...) is a once-only variant of
-+# AC_CHECK_DECLS(DECL1, DECL2, ...).
-+AC_DEFUN([AC_CHECK_DECLS_ONCE], [
-+  :
-+  AC_FOREACH([gl_DECL_NAME], [$1], [
-+    AC_DEFUN([gl_CHECK_DECL_]m4_defn([gl_DECL_NAME]), [
-+      AC_CHECK_DECLS(m4_defn([gl_DECL_NAME]))
-+    ])
-+    AC_REQUIRE([gl_CHECK_DECL_]m4_defn([gl_DECL_NAME]))
-+  ])
- ])
--#serial 3
-+# quote.m4 serial 1
-+dnl Copyright (C) 2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+AC_DEFUN([gl_QUOTE],
-+[
-+  dnl Prerequisites of lib/quote.c.
-+  AC_CHECK_HEADERS_ONCE(stddef.h)
-+])
-+# quotearg.m4 serial 1
-+dnl Copyright (C) 2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+AC_DEFUN([gl_QUOTEARG],
-+[
-+  dnl Prerequisites of lib/quotearg.c.
-+  AC_CHECK_HEADERS_ONCE(wchar.h wctype.h)
-+  AC_CHECK_FUNCS_ONCE(iswprint mbsinit)
-+  AC_TYPE_MBSTATE_T
-+  jm_FUNC_MBRTOWC
-+])
-+# realloc.m4 serial 7
-+dnl Copyright (C) 2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
- 
- dnl From Jim Meyering.
- dnl Determine whether realloc works when both arguments are 0.
- dnl If it doesn't, arrange to use the replacement function.
--dnl
- 
--AC_DEFUN(jm_FUNC_REALLOC,
-+AC_DEFUN([jm_FUNC_REALLOC],
- [
-- dnl xmalloc.c requires that this symbol be defined so it doesn't
-- dnl mistakenly use a broken realloc -- as it might if this test were omitted.
-- AC_DEFINE_UNQUOTED(HAVE_DONE_WORKING_REALLOC_CHECK, 1,
--                    [Define if the realloc check has been performed. ])
-+  AC_REQUIRE([AC_FUNC_REALLOC])
-+  dnl autoconf < 2.57 used the symbol ac_cv_func_realloc_works.
-+  if test X"$ac_cv_func_realloc_0_nonnull" = Xno || test X"$ac_cv_func_realloc_works" = Xno; then
-+    gl_PREREQ_REALLOC
-+  fi
-+])
- 
-- AC_CACHE_CHECK([for working realloc], jm_cv_func_working_realloc,
--  [AC_TRY_RUN([
--    char *realloc ();
--    int
--    main ()
--    {
--      exit (realloc (0, 0) ? 0 : 1);
--    }
--	  ],
--	 jm_cv_func_working_realloc=yes,
--	 jm_cv_func_working_realloc=no,
--	 dnl When crosscompiling, assume realloc is broken.
--	 jm_cv_func_working_realloc=no)
--  ])
--  if test $jm_cv_func_working_realloc = no; then
--    AC_SUBST(LIBOBJS)
--    LIBOBJS="$LIBOBJS realloc.$ac_objext"
--    AC_DEFINE_UNQUOTED(realloc, rpl_realloc,
--      [Define to rpl_realloc if the replacement function should be used.])
-+# Prerequisites of lib/realloc.c.
-+AC_DEFUN([gl_PREREQ_REALLOC], [
-+  :
-+])
-+# rmdir.m4 serial 1
-+dnl Copyright (C) 2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+AC_DEFUN([gl_FUNC_RMDIR],
-+[
-+  AC_REPLACE_FUNCS(rmdir)
-+  if test $ac_cv_func_rmdir = no; then
-+    gl_PREREQ_RMDIR
-   fi
- ])
--#serial 2
-+
-+# Prerequisites of lib/rmdir.c.
-+AC_DEFUN([gl_PREREQ_RMDIR], [
-+  AC_REQUIRE([AC_HEADER_STAT])
-+  :
-+])
-+
-+# Check for setmode, DOS style.
-+
-+# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
-+AC_DEFUN([AC_FUNC_SETMODE_DOS],
-+  [AC_CHECK_HEADERS(fcntl.h unistd.h)
-+   AC_CACHE_CHECK([for DOS-style setmode],
-+     [ac_cv_func_setmode_dos],
-+     [AC_TRY_LINK(
-+	[#include <io.h>
-+	 #if HAVE_FCNTL_H
-+	 # include <fcntl.h>
-+	 #endif
-+	 #if HAVE_UNISTD_H
-+	 # include <unistd.h>
-+	 #endif],
-+	[int ret = setmode && setmode (1, O_BINARY);],
-+	[ac_cv_func_setmode_dos=yes],
-+	[ac_cv_func_setmode_dos=no])])
-+   if test $ac_cv_func_setmode_dos = yes; then
-+     AC_DEFINE(HAVE_SETMODE_DOS, 1,
-+       [Define to 1 if you have the DOS-style `setmode' function.])
-+   fi])
-+# Check for stdbool.h that conforms to C99.
-+
-+# Copyright (C) 2002-2003 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
-+# Prepare for substituting <stdbool.h> if it is not supported.
-+
-+AC_DEFUN([AM_STDBOOL_H],
-+[
-+  AC_REQUIRE([AC_HEADER_STDBOOL])
-+
-+  # Define two additional variables used in the Makefile substitution.
-+
-+  if test "$ac_cv_header_stdbool_h" = yes; then
-+    STDBOOL_H=''
-+  else
-+    STDBOOL_H='stdbool.h'
-+  fi
-+  AC_SUBST([STDBOOL_H])
-+
-+  if test "$ac_cv_type__Bool" = yes; then
-+    HAVE__BOOL=1
-+  else
-+    HAVE__BOOL=0
-+  fi
-+  AC_SUBST([HAVE__BOOL])
-+])
-+
-+# This macro is only needed in autoconf <= 2.54.  Newer versions of autoconf
-+# have this macro built-in.
-+
-+AC_DEFUN([AC_HEADER_STDBOOL],
-+  [AC_CACHE_CHECK([for stdbool.h that conforms to C99],
-+     [ac_cv_header_stdbool_h],
-+     [AC_TRY_COMPILE(
-+	[
-+	  #include <stdbool.h>
-+	  #ifndef bool
-+	   "error: bool is not defined"
-+	  #endif
-+	  #ifndef false
-+	   "error: false is not defined"
-+	  #endif
-+	  #if false
-+	   "error: false is not 0"
-+	  #endif
-+	  #ifndef true
-+	   "error: false is not defined"
-+	  #endif
-+	  #if true != 1
-+	   "error: true is not 1"
-+	  #endif
-+	  #ifndef __bool_true_false_are_defined
-+	   "error: __bool_true_false_are_defined is not defined"
-+	  #endif
-+
-+	  struct s { _Bool s: 1; _Bool t; } s;
-+
-+	  char a[true == 1 ? 1 : -1];
-+	  char b[false == 0 ? 1 : -1];
-+	  char c[__bool_true_false_are_defined == 1 ? 1 : -1];
-+	  char d[(bool) -0.5 == true ? 1 : -1];
-+	  bool e = &s;
-+	  char f[(_Bool) -0.0 == false ? 1 : -1];
-+	  char g[true];
-+	  char h[sizeof (_Bool)];
-+	  char i[sizeof s.t];
-+	],
-+	[ return !a + !b + !c + !d + !e + !f + !g + !h + !i; ],
-+	[ac_cv_header_stdbool_h=yes],
-+	[ac_cv_header_stdbool_h=no])])
-+   AC_CHECK_TYPES([_Bool])
-+   if test $ac_cv_header_stdbool_h = yes; then
-+     AC_DEFINE(HAVE_STDBOOL_H, 1, [Define to 1 if stdbool.h conforms to C99.])
-+   fi])
-+#serial 7 -*- autoconf -*-
-+
-+dnl From Jim Meyering.
-+dnl
-+dnl See if the glibc *_unlocked I/O macros or functions are available.
-+dnl Use only those *_unlocked macros or functions that are declared
-+dnl (because some of them were declared in Solaris 2.5.1 but were removed
-+dnl in Solaris 2.6, whereas we want binaries built on Solaris 2.5.1 to run
-+dnl on Solaris 2.6).
-+
-+AC_DEFUN([jm_FUNC_GLIBC_UNLOCKED_IO],
-+[
-+  dnl Persuade glibc <stdio.h> to declare fgets_unlocked(), fputs_unlocked()
-+  dnl etc.
-+  AC_REQUIRE([AC_GNU_SOURCE])
-+
-+  AC_CHECK_DECLS_ONCE(
-+     [clearerr_unlocked feof_unlocked ferror_unlocked
-+      fflush_unlocked fgets_unlocked fputc_unlocked fputs_unlocked
-+      fread_unlocked fwrite_unlocked getc_unlocked
-+      getchar_unlocked putc_unlocked putchar_unlocked])
-+])
-+#serial 5
- 
- dnl From Jim Meyering
- 
-@@ -375,9 +607,9 @@
- dnl usually in <utime.h>.
- dnl Some systems have utime.h but don't declare the struct anywhere.
- 
--AC_DEFUN(jm_STRUCT_UTIMBUF,
-+AC_DEFUN([jm_CHECK_TYPE_STRUCT_UTIMBUF],
- [
--  AC_CHECK_HEADERS(utime.h)
-+  AC_CHECK_HEADERS_ONCE(sys/time.h utime.h)
-   AC_REQUIRE([AC_HEADER_TIME])
-   AC_CACHE_CHECK([for struct utimbuf], fu_cv_sys_struct_utimbuf,
-     [AC_TRY_COMPILE(
-@@ -402,8 +634,34 @@
-     ])
- 
-   if test $fu_cv_sys_struct_utimbuf = yes; then
--    AC_DEFINE_UNQUOTED(HAVE_STRUCT_UTIMBUF, 1,
--[Define if struct utimbuf is declared -- usually in <utime.h>.
--   Some systems have utime.h but don't declare the struct anywhere. ])
-+    AC_DEFINE(HAVE_STRUCT_UTIMBUF, 1,
-+      [Define if struct utimbuf is declared -- usually in <utime.h>.
-+       Some systems have utime.h but don't declare the struct anywhere. ])
-   fi
- ])
-+# xalloc.m4 serial 1
-+dnl Copyright (C) 2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+AC_DEFUN([gl_XALLOC],
-+[
-+  gl_PREREQ_XMALLOC
-+  gl_PREREQ_XSTRDUP
-+])
-+
-+# Prerequisites of lib/xmalloc.c.
-+AC_DEFUN([gl_PREREQ_XMALLOC], [
-+  AC_REQUIRE([AC_HEADER_STDC])
-+  AC_REQUIRE([jm_FUNC_MALLOC])
-+  AC_REQUIRE([jm_FUNC_REALLOC])
-+])
-+
-+# Prerequisites of lib/xstrdup.c.
-+AC_DEFUN([gl_PREREQ_XSTRDUP], [
-+  AC_REQUIRE([AC_HEADER_STDC])
-+  AC_CHECK_HEADERS_ONCE(string.h)
-+])
-diff -urNd -urNd patch-2.5.4/addext.c patch-2.5.9/addext.c
---- patch-2.5.4/addext.c	1999-01-18 12:02:28.000000000 -0500
-+++ patch-2.5.9/addext.c	2003-05-18 01:30:52.000000000 -0400
-@@ -1,5 +1,7 @@
- /* addext.c -- add an extension to a file name
--   Copyright (C) 1990, 1997, 1998, 1999 Free Software Foundation, Inc.
-+
-+   Copyright (C) 1990, 1997, 1998, 1999, 2001, 2003 Free Software
-+   Foundation, Inc.
- 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-@@ -29,8 +31,6 @@
- # define HAVE_LONG_FILE_NAMES 0
- #endif
- 
--#include <backupfile.h>
--
- #if HAVE_LIMITS_H
- # include <limits.h>
- #endif
-@@ -49,7 +49,13 @@
- # include <unistd.h>
- #endif
- 
--char *base_name PARAMS ((char const *));
-+#include <errno.h>
-+#ifndef errno
-+extern int errno;
-+#endif
-+
-+#include "backupfile.h"
-+#include "dirname.h"
- 
- /* Append to FILENAME the extension EXT, unless the result would be too long,
-    in which case just append the character E.  */
-@@ -58,25 +64,34 @@
- addext (char *filename, char const *ext, int e)
- {
-   char *s = base_name (filename);
--  size_t slen = strlen (s), extlen = strlen (ext);
--  long slen_max = -1;
-+  size_t slen = base_len (s);
-+  size_t extlen = strlen (ext);
-+  size_t slen_max = HAVE_LONG_FILE_NAMES ? 255 : _POSIX_NAME_MAX;
- 
- #if HAVE_PATHCONF && defined _PC_NAME_MAX
--  if (slen + extlen <= _POSIX_NAME_MAX && ! HAVE_DOS_FILE_NAMES)
--    /* The file name is so short there's no need to call pathconf.  */
--    slen_max = _POSIX_NAME_MAX;
--  else if (s == filename)
--    slen_max = pathconf (".", _PC_NAME_MAX);
--  else
-+  if (_POSIX_NAME_MAX < slen + extlen || HAVE_DOS_FILE_NAMES)
-     {
--      char c = *s;
--      *s = 0;
--      slen_max = pathconf (filename, _PC_NAME_MAX);
--      *s = c;
-+      /* The new base name is long enough to require a pathconf check.  */
-+      long name_max;
-+      errno = 0;
-+      if (s == filename)
-+	name_max = pathconf (".", _PC_NAME_MAX);
-+      else
-+	{
-+	  char c = *s;
-+	  if (! ISSLASH (c))
-+	    *s = 0;
-+	  name_max = pathconf (filename, _PC_NAME_MAX);
-+	  *s = c;
-+	}
-+      if (0 <= name_max || errno == 0)
-+	{
-+	  long size = slen_max = name_max;
-+	  if (name_max != size)
-+	    slen_max = -1;
-+	}
-     }
- #endif
--  if (slen_max < 0)
--    slen_max = HAVE_LONG_FILE_NAMES ? 255 : 14;
- 
-   if (HAVE_DOS_FILE_NAMES && slen_max <= 12)
-     {
-diff -urNd -urNd patch-2.5.4/ansi2knr.1 patch-2.5.9/ansi2knr.1
---- patch-2.5.4/ansi2knr.1	1997-07-04 15:39:00.000000000 -0400
-+++ patch-2.5.9/ansi2knr.1	1969-12-31 19:00:00.000000000 -0500
-@@ -1,36 +0,0 @@
--.TH ANSI2KNR 1 "19 Jan 1996"
--.SH NAME
--ansi2knr \- convert ANSI C to Kernighan & Ritchie C
--.SH SYNOPSIS
--.I ansi2knr
--[--varargs] input_file [output_file]
--.SH DESCRIPTION
--If no output_file is supplied, output goes to stdout.
--.br
--There are no error messages.
--.sp
--.I ansi2knr
--recognizes function definitions by seeing a non-keyword identifier at the left
--margin, followed by a left parenthesis, with a right parenthesis as the last
--character on the line, and with a left brace as the first token on the
--following line (ignoring possible intervening comments).  It will recognize a
--multi-line header provided that no intervening line ends with a left or right
--brace or a semicolon.  These algorithms ignore whitespace and comments, except
--that the function name must be the first thing on the line.
--.sp
--The following constructs will confuse it:
--.br
--     - Any other construct that starts at the left margin and follows the
--above syntax (such as a macro or function call).
--.br
--     - Some macros that tinker with the syntax of the function header.
--.sp
--The --varargs switch is obsolete, and is recognized only for
--backwards compatibility.  The present version of
--.I ansi2knr
--will always attempt to convert a ... argument to va_alist and va_dcl.
--.SH AUTHOR
--L. Peter Deutsch <[email protected]> wrote the original ansi2knr and
--continues to maintain the current version; most of the code in the current
--version is his work.  ansi2knr also includes contributions by Francois
--Pinard <[email protected]> and Jim Avera <[email protected]>.
-diff -urNd -urNd patch-2.5.4/ansi2knr.c patch-2.5.9/ansi2knr.c
---- patch-2.5.4/ansi2knr.c	1999-04-13 10:44:41.000000000 -0400
-+++ patch-2.5.9/ansi2knr.c	1969-12-31 19:00:00.000000000 -0500
-@@ -1,678 +0,0 @@
--/* Copyright (C) 1989, 1997, 1998, 1999 Aladdin Enterprises.  All rights reserved. */
--
--/*$Id: ansi2knr.c,v 1.14 1999/04/13 14:44:33 meyering Exp $*/
--/* Convert ANSI C function definitions to K&R ("traditional C") syntax */
--
--/*
--ansi2knr is distributed in the hope that it will be useful, but WITHOUT ANY
--WARRANTY.  No author or distributor accepts responsibility to anyone for the
--consequences of using it or for whether it serves any particular purpose or
--works at all, unless he says so in writing.  Refer to the GNU General Public
--License (the "GPL") for full details.
--
--Everyone is granted permission to copy, modify and redistribute ansi2knr,
--but only under the conditions described in the GPL.  A copy of this license
--is supposed to have been given to you along with ansi2knr so you can know
--your rights and responsibilities.  It should be in a file named COPYLEFT,
--or, if there is no file named COPYLEFT, a file named COPYING.  Among other
--things, the copyright notice and this notice must be preserved on all
--copies.
--
--We explicitly state here what we believe is already implied by the GPL: if
--the ansi2knr program is distributed as a separate set of sources and a
--separate executable file which are aggregated on a storage medium together
--with another program, this in itself does not bring the other program under
--the GPL, nor does the mere fact that such a program or the procedures for
--constructing it invoke the ansi2knr executable bring any other part of the
--program under the GPL.
--*/
--
--/*
-- * Usage:
--	ansi2knr [--filename FILENAME] [INPUT_FILE [OUTPUT_FILE]]
-- * --filename provides the file name for the #line directive in the output,
-- * overriding input_file (if present).
-- * If no input_file is supplied, input is read from stdin.
-- * If no output_file is supplied, output goes to stdout.
-- * There are no error messages.
-- *
-- * ansi2knr recognizes function definitions by seeing a non-keyword
-- * identifier at the left margin, followed by a left parenthesis,
-- * with a right parenthesis as the last character on the line,
-- * and with a left brace as the first token on the following line
-- * (ignoring possible intervening comments), except that a line
-- * consisting of only
-- *	identifier1(identifier2)
-- * will not be considered a function definition unless identifier2 is
-- * the word "void", and a line consisting of
-- *	identifier1(identifier2, <<arbitrary>>)
-- * will not be considered a function definition.
-- * ansi2knr will recognize a multi-line header provided
-- * that no intervening line ends with a left or right brace or a semicolon.
-- * These algorithms ignore whitespace and comments, except that
-- * the function name must be the first thing on the line.
-- * The following constructs will confuse it:
-- *	- Any other construct that starts at the left margin and
-- *	    follows the above syntax (such as a macro or function call).
-- *	- Some macros that tinker with the syntax of function headers.
-- */
--
--/*
-- * The original and principal author of ansi2knr is L. Peter Deutsch
-- * <[email protected]>.  Other authors are noted in the change history
-- * that follows (in reverse chronological order):
--	lpd 1999-04-12 added minor fixes from Pavel Roskin
--		<[email protected]> for clean compilation with
--		gcc -W -Wall
--	lpd 1999-03-22 added hack to recognize lines consisting of
--		identifier1(identifier2, xxx) as *not* being procedures
--	lpd 1999-02-03 made indentation of preprocessor commands consistent
--	lpd 1999-01-28 fixed two bugs: a '/' in an argument list caused an
--		endless loop; quoted strings within an argument list
--		confused the parser
--	lpd 1999-01-24 added a check for write errors on the output,
--		suggested by Jim Meyering <[email protected]>
--	lpd 1998-11-09 added further hack to recognize identifier(void)
--		as being a procedure
--	lpd 1998-10-23 added hack to recognize lines consisting of
--		identifier1(identifier2) as *not* being procedures
--	lpd 1997-12-08 made input_file optional; only closes input and/or
--		output file if not stdin or stdout respectively; prints
--		usage message on stderr rather than stdout; adds
--		--filename switch (changes suggested by
--		<[email protected]>)
--	lpd 1996-01-21 added code to cope with not HAVE_CONFIG_H and with
--		compilers that don't understand void, as suggested by
--		Tom Lane
--	lpd 1996-01-15 changed to require that the first non-comment token
--		on the line following a function header be a left brace,
--		to reduce sensitivity to macros, as suggested by Tom Lane
--		<[email protected]>
--	lpd 1995-06-22 removed #ifndefs whose sole purpose was to define
--		undefined preprocessor symbols as 0; changed all #ifdefs
--		for configuration symbols to #ifs
--	lpd 1995-04-05 changed copyright notice to make it clear that
--		including ansi2knr in a program does not bring the entire
--		program under the GPL
--	lpd 1994-12-18 added conditionals for systems where ctype macros
--		don't handle 8-bit characters properly, suggested by
--		Francois Pinard <[email protected]>;
--		removed --varargs switch (this is now the default)
--	lpd 1994-10-10 removed CONFIG_BROKETS conditional
--	lpd 1994-07-16 added some conditionals to help GNU `configure',
--		suggested by Francois Pinard <[email protected]>;
--		properly erase prototype args in function parameters,
--		contributed by Jim Avera <[email protected]>;
--		correct error in writeblanks (it shouldn't erase EOLs)
--	lpd 1989-xx-xx original version
-- */
--
--/* Most of the conditionals here are to make ansi2knr work with */
--/* or without the GNU configure machinery. */
--
--#if HAVE_CONFIG_H
--# include <config.h>
--#endif
--
--#include <stdio.h>
--#include <ctype.h>
--
--#if HAVE_CONFIG_H
--
--/*
--   For properly autoconfiguring ansi2knr, use AC_CONFIG_HEADER(config.h).
--   This will define HAVE_CONFIG_H and so, activate the following lines.
-- */
--
--# if STDC_HEADERS || HAVE_STRING_H
--#  include <string.h>
--# else
--#  include <strings.h>
--# endif
--
--#else /* not HAVE_CONFIG_H */
--
--/* Otherwise do it the hard way */
--
--# ifdef BSD
--#  include <strings.h>
--# else
--#  ifdef VMS
--    extern int strlen(), strncmp();
--#  else
--#   include <string.h>
--#  endif
--# endif
--
--#endif /* not HAVE_CONFIG_H */
--
--#if STDC_HEADERS
--# include <stdlib.h>
--#else
--/*
--   malloc and free should be declared in stdlib.h,
--   but if you've got a K&R compiler, they probably aren't.
-- */
--# ifdef MSDOS
--#  include <malloc.h>
--# else
--#  ifdef VMS
--     extern char *malloc();
--     extern void free();
--#  else
--     extern char *malloc();
--     extern int free();
--#  endif
--# endif
--
--#endif
--
--/* Define NULL (for *very* old compilers). */
--#ifndef NULL
--# define NULL (0)
--#endif
--
--/*
-- * The ctype macros don't always handle 8-bit characters correctly.
-- * Compensate for this here.
-- */
--#ifdef isascii
--# undef HAVE_ISASCII		/* just in case */
--# define HAVE_ISASCII 1
--#else
--#endif
--#if STDC_HEADERS || !HAVE_ISASCII
--# define is_ascii(c) 1
--#else
--# define is_ascii(c) isascii(c)
--#endif
--
--#define is_space(c) (is_ascii(c) && isspace(c))
--#define is_alpha(c) (is_ascii(c) && isalpha(c))
--#define is_alnum(c) (is_ascii(c) && isalnum(c))
--
--/* Scanning macros */
--#define isidchar(ch) (is_alnum(ch) || (ch) == '_')
--#define isidfirstchar(ch) (is_alpha(ch) || (ch) == '_')
--
--/* Forward references */
--char *skipspace();
--char *scanstring();
--int writeblanks();
--int test1();
--int convert1();
--
--/* The main program */
--int
--main(argc, argv)
--    int argc;
--    char *argv[];
--{	FILE *in = stdin;
--	FILE *out = stdout;
--	char *filename = 0;
--	char *program_name = argv[0];
--	char *output_name = 0;
--#define bufsize 5000			/* arbitrary size */
--	char *buf;
--	char *line;
--	char *more;
--	char *usage =
--	  "Usage: ansi2knr [--filename FILENAME] [INPUT_FILE [OUTPUT_FILE]]\n";
--	/*
--	 * In previous versions, ansi2knr recognized a --varargs switch.
--	 * If this switch was supplied, ansi2knr would attempt to convert
--	 * a ... argument to va_alist and va_dcl; if this switch was not
--	 * supplied, ansi2knr would simply drop any such arguments.
--	 * Now, ansi2knr always does this conversion, and we only
--	 * check for this switch for backward compatibility.
--	 */
--	int convert_varargs = 1;
--	int output_error;
--
--	while ( argc > 1 && argv[1][0] == '-' ) {
--	  if ( !strcmp(argv[1], "--varargs") ) {
--	    convert_varargs = 1;
--	    argc--;
--	    argv++;
--	    continue;
--	  }
--	  if ( !strcmp(argv[1], "--filename") && argc > 2 ) {
--	    filename = argv[2];
--	    argc -= 2;
--	    argv += 2;
--	    continue;
--	  }
--	  fprintf(stderr, "%s: Unrecognized switch: %s\n", program_name,
--		  argv[1]);
--	  fprintf(stderr, usage);
--	  exit(1);
--	}
--	switch ( argc )
--	   {
--	default:
--		fprintf(stderr, usage);
--		exit(0);
--	case 3:
--		output_name = argv[2];
--		out = fopen(output_name, "w");
--		if ( out == NULL ) {
--		  fprintf(stderr, "%s: Cannot open output file %s\n",
--			  program_name, output_name);
--		  exit(1);
--		}
--		/* falls through */
--	case 2:
--		in = fopen(argv[1], "r");
--		if ( in == NULL ) {
--		  fprintf(stderr, "%s: Cannot open input file %s\n",
--			  program_name, argv[1]);
--		  exit(1);
--		}
--		if ( filename == 0 )
--		  filename = argv[1];
--		/* falls through */
--	case 1:
--		break;
--	   }
--	if ( filename )
--	  fprintf(out, "#line 1 \"%s\"\n", filename);
--	buf = malloc(bufsize);
--	if ( buf == NULL )
--	   {
--		fprintf(stderr, "Unable to allocate read buffer!\n");
--		exit(1);
--	   }
--	line = buf;
--	while ( fgets(line, (unsigned)(buf + bufsize - line), in) != NULL )
--	   {
--test:		line += strlen(line);
--		switch ( test1(buf) )
--		   {
--		case 2:			/* a function header */
--			convert1(buf, out, 1, convert_varargs);
--			break;
--		case 1:			/* a function */
--			/* Check for a { at the start of the next line. */
--			more = ++line;
--f:			if ( line >= buf + (bufsize - 1) ) /* overflow check */
--			  goto wl;
--			if ( fgets(line, (unsigned)(buf + bufsize - line), in) == NULL )
--			  goto wl;
--			switch ( *skipspace(more, 1) )
--			  {
--			  case '{':
--			    /* Definitely a function header. */
--			    convert1(buf, out, 0, convert_varargs);
--			    fputs(more, out);
--			    break;
--			  case 0:
--			    /* The next line was blank or a comment: */
--			    /* keep scanning for a non-comment. */
--			    line += strlen(line);
--			    goto f;
--			  default:
--			    /* buf isn't a function header, but */
--			    /* more might be. */
--			    fputs(buf, out);
--			    strcpy(buf, more);
--			    line = buf;
--			    goto test;
--			  }
--			break;
--		case -1:		/* maybe the start of a function */
--			if ( line != buf + (bufsize - 1) ) /* overflow check */
--			  continue;
--			/* falls through */
--		default:		/* not a function */
--wl:			fputs(buf, out);
--			break;
--		   }
--		line = buf;
--	   }
--	if ( line != buf )
--	  fputs(buf, out);
--	free(buf);
--	if ( output_name ) {
--	  output_error = ferror(out);
--	  output_error |= fclose(out);
--	} else {		/* out == stdout */
--	  fflush(out);
--	  output_error = ferror(out);
--	}
--	if ( output_error ) {
--	  fprintf(stderr, "%s: error writing to %s\n", program_name,
--		  (output_name ? output_name : "stdout"));
--	  exit(1);
--	}
--	if ( in != stdin )
--	  fclose(in);
--	return 0;
--}
--
--/* Skip over whitespace and comments, in either direction. */
--char *
--skipspace(p, dir)
--    register char *p;
--    register int dir;			/* 1 for forward, -1 for backward */
--{	for ( ; ; )
--	   {	while ( is_space(*p) )
--		  p += dir;
--		if ( !(*p == '/' && p[dir] == '*') )
--		  break;
--		p += dir;  p += dir;
--		while ( !(*p == '*' && p[dir] == '/') )
--		   {	if ( *p == 0 )
--			  return p;	/* multi-line comment?? */
--			p += dir;
--		   }
--		p += dir;  p += dir;
--	   }
--	return p;
--}
--
--/* Scan over a quoted string, in either direction. */
--char *
--scanstring(p, dir)
--    register char *p;
--    register int dir;
--{
--    for (p += dir; ; p += dir)
--	if (*p == '"' && p[-dir] != '\\')
--	    return p + dir;
--}
--
--/*
-- * Write blanks over part of a string.
-- * Don't overwrite end-of-line characters.
-- */
--int
--writeblanks(start, end)
--    char *start;
--    char *end;
--{	char *p;
--	for ( p = start; p < end; p++ )
--	  if ( *p != '\r' && *p != '\n' )
--	    *p = ' ';
--	return 0;
--}
--
--/*
-- * Test whether the string in buf is a function definition.
-- * The string may contain and/or end with a newline.
-- * Return as follows:
-- *	0 - definitely not a function definition;
-- *	1 - definitely a function definition;
-- *	2 - definitely a function prototype (NOT USED);
-- *	-1 - may be the beginning of a function definition,
-- *		append another line and look again.
-- * The reason we don't attempt to convert function prototypes is that
-- * Ghostscript's declaration-generating macros look too much like
-- * prototypes, and confuse the algorithms.
-- */
--int
--test1(buf)
--    char *buf;
--{	register char *p = buf;
--	char *bend;
--	char *endfn;
--	int contin;
--
--	if ( !isidfirstchar(*p) )
--	  return 0;		/* no name at left margin */
--	bend = skipspace(buf + strlen(buf) - 1, -1);
--	switch ( *bend )
--	   {
--	   case ';': contin = 0 /*2*/; break;
--	   case ')': contin = 1; break;
--	   case '{': return 0;		/* not a function */
--	   case '}': return 0;		/* not a function */
--	   default: contin = -1;
--	   }
--	while ( isidchar(*p) )
--	  p++;
--	endfn = p;
--	p = skipspace(p, 1);
--	if ( *p++ != '(' )
--	  return 0;		/* not a function */
--	p = skipspace(p, 1);
--	if ( *p == ')' )
--	  return 0;		/* no parameters */
--	/* Check that the apparent function name isn't a keyword. */
--	/* We only need to check for keywords that could be followed */
--	/* by a left parenthesis (which, unfortunately, is most of them). */
--	   {	static char *words[] =
--		   {	"asm", "auto", "case", "char", "const", "double",
--			"extern", "float", "for", "if", "int", "long",
--			"register", "return", "short", "signed", "sizeof",
--			"static", "switch", "typedef", "unsigned",
--			"void", "volatile", "while", 0
--		   };
--		char **key = words;
--		char *kp;
--		unsigned len = endfn - buf;
--
--		while ( (kp = *key) != 0 )
--		   {	if ( strlen(kp) == len && !strncmp(kp, buf, len) )
--			  return 0;	/* name is a keyword */
--			key++;
--		   }
--	   }
--	   {
--	       char *id = p;
--	       int len;
--	       /*
--		* Check for identifier1(identifier2) and not
--		* identifier1(void), or identifier1(identifier2, xxxx).
--		*/
--
--	       while ( isidchar(*p) )
--		   p++;
--	       len = p - id;
--	       p = skipspace(p, 1);
--	       if (*p == ',' ||
--		   (*p == ')' && (len != 4 || strncmp(id, "void", 4)))
--		   )
--		   return 0;	/* not a function */
--	   }
--	/*
--	 * If the last significant character was a ), we need to count
--	 * parentheses, because it might be part of a formal parameter
--	 * that is a procedure.
--	 */
--	if (contin > 0) {
--	    int level = 0;
--
--	    for (p = skipspace(buf, 1); *p; p = skipspace(p + 1, 1))
--		level += (*p == '(' ? 1 : *p == ')' ? -1 : 0);
--	    if (level > 0)
--		contin = -1;
--	}
--	return contin;
--}
--
--/* Convert a recognized function definition or header to K&R syntax. */
--int
--convert1(buf, out, header, convert_varargs)
--    char *buf;
--    FILE *out;
--    int header;			/* Boolean */
--    int convert_varargs;	/* Boolean */
--{	char *endfn;
--	register char *p;
--	/*
--	 * The breaks table contains pointers to the beginning and end
--	 * of each argument.
--	 */
--	char **breaks;
--	unsigned num_breaks = 2;	/* for testing */
--	char **btop;
--	char **bp;
--	char **ap;
--	char *vararg = 0;
--
--	/* Pre-ANSI implementations don't agree on whether strchr */
--	/* is called strchr or index, so we open-code it here. */
--	for ( endfn = buf; *(endfn++) != '('; )
--	  ;
--top:	p = endfn;
--	breaks = (char **)malloc(sizeof(char *) * num_breaks * 2);
--	if ( breaks == NULL )
--	   {	/* Couldn't allocate break table, give up */
--		fprintf(stderr, "Unable to allocate break table!\n");
--		fputs(buf, out);
--		return -1;
--	   }
--	btop = breaks + num_breaks * 2 - 2;
--	bp = breaks;
--	/* Parse the argument list */
--	do
--	   {	int level = 0;
--		char *lp = NULL;
--		char *rp = NULL;
--		char *end = NULL;
--
--		if ( bp >= btop )
--		   {	/* Filled up break table. */
--			/* Allocate a bigger one and start over. */
--			free((char *)breaks);
--			num_breaks <<= 1;
--			goto top;
--		   }
--		*bp++ = p;
--		/* Find the end of the argument */
--		for ( ; end == NULL; p++ )
--		   {	switch(*p)
--			   {
--			   case ',':
--				if ( !level ) end = p;
--				break;
--			   case '(':
--				if ( !level ) lp = p;
--				level++;
--				break;
--			   case ')':
--				if ( --level < 0 ) end = p;
--				else rp = p;
--				break;
--			   case '/':
--				if (p[1] == '*')
--				    p = skipspace(p, 1) - 1;
--				break;
--			   case '"':
--			       p = scanstring(p, 1) - 1;
--			       break;
--			   default:
--				;
--			   }
--		   }
--		/* Erase any embedded prototype parameters. */
--		if ( lp && rp )
--		  writeblanks(lp + 1, rp);
--		p--;			/* back up over terminator */
--		/* Find the name being declared. */
--		/* This is complicated because of procedure and */
--		/* array modifiers. */
--		for ( ; ; )
--		   {	p = skipspace(p - 1, -1);
--			switch ( *p )
--			   {
--			   case ']':	/* skip array dimension(s) */
--			   case ')':	/* skip procedure args OR name */
--			   {	int level = 1;
--				while ( level )
--				 switch ( *--p )
--				   {
--				   case ']': case ')':
--				       level++;
--				       break;
--				   case '[': case '(':
--				       level--;
--				       break;
--				   case '/':
--				       if (p > buf && p[-1] == '*')
--					   p = skipspace(p, -1) + 1;
--				       break;
--				   case '"':
--				       p = scanstring(p, -1) + 1;
--				       break;
--				   default: ;
--				   }
--			   }
--				if ( *p == '(' && *skipspace(p + 1, 1) == '*' )
--				   {	/* We found the name being declared */
--					while ( !isidfirstchar(*p) )
--					  p = skipspace(p, 1) + 1;
--					goto found;
--				   }
--				break;
--			   default:
--				goto found;
--			   }
--		   }
--found:		if ( *p == '.' && p[-1] == '.' && p[-2] == '.' )
--		  {	if ( convert_varargs )
--			  {	*bp++ = "va_alist";
--				vararg = p-2;
--			  }
--			else
--			  {	p++;
--				if ( bp == breaks + 1 )	/* sole argument */
--				  writeblanks(breaks[0], p);
--				else
--				  writeblanks(bp[-1] - 1, p);
--				bp--;
--			  }
--		   }
--		else
--		   {	while ( isidchar(*p) ) p--;
--			*bp++ = p+1;
--		   }
--		p = end;
--	   }
--	while ( *p++ == ',' );
--	*bp = p;
--	/* Make a special check for 'void' arglist */
--	if ( bp == breaks+2 )
--	   {	p = skipspace(breaks[0], 1);
--		if ( !strncmp(p, "void", 4) )
--		   {	p = skipspace(p+4, 1);
--			if ( p == breaks[2] - 1 )
--			   {	bp = breaks;	/* yup, pretend arglist is empty */
--				writeblanks(breaks[0], p + 1);
--			   }
--		   }
--	   }
--	/* Put out the function name and left parenthesis. */
--	p = buf;
--	while ( p != endfn ) putc(*p, out), p++;
--	/* Put out the declaration. */
--	if ( header )
--	  {	fputs(");", out);
--		for ( p = breaks[0]; *p; p++ )
--		  if ( *p == '\r' || *p == '\n' )
--		    putc(*p, out);
--	  }
--	else
--	  {	for ( ap = breaks+1; ap < bp; ap += 2 )
--		  {	p = *ap;
--			while ( isidchar(*p) )
--			  putc(*p, out), p++;
--			if ( ap < bp - 1 )
--			  fputs(", ", out);
--		  }
--		fputs(")  ", out);
--		/* Put out the argument declarations */
--		for ( ap = breaks+2; ap <= bp; ap += 2 )
--		  (*ap)[-1] = ';';
--		if ( vararg != 0 )
--		  {	*vararg = 0;
--			fputs(breaks[0], out);		/* any prior args */
--			fputs("va_dcl", out);		/* the final arg */
--			fputs(bp[0], out);
--		  }
--		else
--		  fputs(breaks[0], out);
--	  }
--	free((char *)breaks);
--	return 0;
--}
-diff -urNd -urNd patch-2.5.4/argmatch.c patch-2.5.9/argmatch.c
---- patch-2.5.4/argmatch.c	1999-08-09 19:09:13.000000000 -0400
-+++ patch-2.5.9/argmatch.c	2003-03-10 02:31:50.000000000 -0500
-@@ -1,5 +1,7 @@
- /* argmatch.c -- find a match for a string in an array
--   Copyright (C) 1990, 1998, 1999 Free Software Foundation, Inc.
-+
-+   Copyright (C) 1990, 1998, 1999, 2001, 2002, 2003 Free Software
-+   Foundation, Inc.
- 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-@@ -18,26 +20,24 @@
- /* Written by David MacKenzie <[email protected]>
-    Modified by Akim Demaille <[email protected]> */
- 
-+#if HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+/* Specification.  */
- #include "argmatch.h"
- 
- #include <stdio.h>
--#ifdef STDC_HEADERS
--# include <string.h>
--#endif
--
--#if HAVE_LOCALE_H
--# include <locale.h>
--#endif
-+#include <stdlib.h>
-+#include <string.h>
- 
--#if ENABLE_NLS
--# include <libintl.h>
--# define _(Text) gettext (Text)
--#else
--# define _(Text) Text
--#endif
-+#include "gettext.h"
-+#define _(msgid) gettext (msgid)
- 
- #include "error.h"
- #include "quotearg.h"
-+#include "quote.h"
-+#include "unlocked-io.h"
- 
- /* When reporting an invalid argument, show nonprinting characters
-    by using the quoting style ARGMATCH_QUOTING_STYLE.  Do not use
-@@ -46,11 +46,7 @@
- # define ARGMATCH_QUOTING_STYLE locale_quoting_style
- #endif
- 
--/* The following test is to work around the gross typo in
--   systems like Sony NEWS-OS Release 4.0C, whereby EXIT_FAILURE
--   is defined to 0, not 1.  */
--#if !EXIT_FAILURE
--# undef EXIT_FAILURE
-+#ifndef EXIT_FAILURE
- # define EXIT_FAILURE 1
- #endif
- 
-@@ -78,7 +74,6 @@
-    null-terminated array ARGLIST, return the index in ARGLIST
-    of the matched element, else -1 if it does not match any element
-    or -2 if it is ambiguous (is a prefix of more than one element).
--   If SENSITIVE, comparison is case sensitive.
- 
-    If VALLIST is none null, use it to resolve ambiguities limited to
-    synonyms, i.e., for
-@@ -86,10 +81,9 @@
-      "no", "nope" -> 1
-    "y" is a valid argument, for `0', and "n" for `1'.  */
- 
--static int
--__argmatch_internal (const char *arg, const char *const *arglist,
--		     const char *vallist, size_t valsize,
--		     int case_sensitive)
-+int
-+argmatch (const char *arg, const char *const *arglist,
-+	  const char *vallist, size_t valsize)
- {
-   int i;			/* Temporary index in ARGLIST.  */
-   size_t arglen;		/* Length of ARG.  */
-@@ -101,9 +95,7 @@
-   /* Test all elements for either exact match or abbreviated matches.  */
-   for (i = 0; arglist[i]; i++)
-     {
--      if (case_sensitive
--	  ? !strncmp (arglist[i], arg, arglen)
--	  : !strncasecmp (arglist[i], arg, arglen))
-+      if (!strncmp (arglist[i], arg, arglen))
- 	{
- 	  if (strlen (arglist[i]) == arglen)
- 	    /* Exact match found.  */
-@@ -131,22 +123,6 @@
-     return matchind;
- }
- 
--/* argmatch - case sensitive version */
--int
--argmatch (const char *arg, const char *const *arglist,
--	  const char *vallist, size_t valsize)
--{
--  return __argmatch_internal (arg, arglist, vallist, valsize, 1);
--}
--
--/* argcasematch - case insensitive version */
--int
--argcasematch (const char *arg, const char *const *arglist,
--	      const char *vallist, size_t valsize)
--{
--  return __argmatch_internal (arg, arglist, vallist, valsize, 0);
--}
--
- /* Error reporting for argmatch.
-    CONTEXT is a description of the type of entity that was being matched.
-    VALUE is the invalid value that was given.
-@@ -156,10 +132,11 @@
- argmatch_invalid (const char *context, const char *value, int problem)
- {
-   char const *format = (problem == -1
--			? _("invalid argument %s for `%s'")
--			: _("ambiguous argument %s for `%s'"));
-+			? _("invalid argument %s for %s")
-+			: _("ambiguous argument %s for %s"));
- 
--  error (0, 0, format, quotearg_style (ARGMATCH_QUOTING_STYLE, value), context);
-+  error (0, 0, format, quotearg_n_style (0, ARGMATCH_QUOTING_STYLE, value),
-+	 quote_n (1, context));
- }
- 
- /* List the valid arguments for argmatch.
-@@ -200,12 +177,9 @@
- __xargmatch_internal (const char *context,
- 		      const char *arg, const char *const *arglist,
- 		      const char *vallist, size_t valsize,
--		      int case_sensitive,
- 		      argmatch_exit_fn exit_fn)
- {
--  int res = __argmatch_internal (arg, arglist,
--				 vallist, valsize,
--				 case_sensitive);
-+  int res = argmatch (arg, arglist, vallist, valsize);
-   if (res >= 0)
-     /* Success. */
-     return res;
-@@ -291,12 +265,12 @@
-     }
- 
-   if ((cp = getenv ("VERSION_CONTROL")))
--    backup_type = XARGCASEMATCH ("$VERSION_CONTROL", cp,
--				 backup_args, backup_vals);
-+    backup_type = XARGMATCH ("$VERSION_CONTROL", cp,
-+			     backup_args, backup_vals);
- 
-   if (argc == 2)
--    backup_type = XARGCASEMATCH (program_name, argv[1],
--				 backup_args, backup_vals);
-+    backup_type = XARGMATCH (program_name, argv[1],
-+			     backup_args, backup_vals);
- 
-   printf ("The version control is `%s'\n",
- 	  ARGMATCH_TO_ARGUMENT (backup_type, backup_args, backup_vals));
-diff -urNd -urNd patch-2.5.4/argmatch.h patch-2.5.9/argmatch.h
---- patch-2.5.4/argmatch.h	1999-01-25 09:57:22.000000000 -0500
-+++ patch-2.5.9/argmatch.h	2002-11-21 15:15:39.000000000 -0500
-@@ -1,5 +1,5 @@
- /* argmatch.h -- definitions and prototypes for argmatch.c
--   Copyright (C) 1990, 1998, 1999 Free Software Foundation, Inc.
-+   Copyright (C) 1990, 1998, 1999, 2001, 2002 Free Software Foundation, Inc.
- 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-@@ -21,109 +21,89 @@
- #ifndef ARGMATCH_H_
- # define ARGMATCH_H_ 1
- 
--# if HAVE_CONFIG_H
--#  include <config.h>
--# endif
-+# include <stddef.h>
- 
--# include <sys/types.h>
-+# define ARRAY_CARDINALITY(Array) (sizeof (Array) / sizeof *(Array))
- 
--# ifndef PARAMS
--#  if PROTOTYPES || (defined (__STDC__) && __STDC__)
--#   define PARAMS(args) args
--#  else
--#   define PARAMS(args) ()
--#  endif  /* GCC.  */
--# endif  /* Not PARAMS.  */
-+# define ARGMATCH_CONSTRAINT(Arglist, Vallist) \
-+  (ARRAY_CARDINALITY (Arglist) == ARRAY_CARDINALITY (Vallist) + 1)
- 
- /* Assert there are as many real arguments as there are values
--   (argument list ends with a NULL guard).  There is no execution
--   cost, since it will be statically evalauted to `assert (0)' or
--   `assert (1)'.  Unfortunately there is no -Wassert-0. */
-+   (argument list ends with a NULL guard).  ARGMATCH_VERIFY is
-+   preferred, since it is guaranteed to be checked at compile-time.
-+   ARGMATCH_ASSERT is for backward compatibility only.  */
- 
--# undef ARRAY_CARDINALITY
--# define ARRAY_CARDINALITY(Array) (sizeof ((Array)) / sizeof (*(Array)))
-+# define ARGMATCH_VERIFY(Arglist, Vallist)				  \
-+  struct argmatch_verify						  \
-+  {									  \
-+    char argmatch_verify[ARGMATCH_CONSTRAINT(Arglist, Vallist) ? 1 : -1]; \
-+  }
- 
--# define ARGMATCH_ASSERT(Arglist, Vallist)      \
--  assert (ARRAY_CARDINALITY ((Arglist)) == ARRAY_CARDINALITY ((Vallist)) + 1)
-+# define ARGMATCH_ASSERT(Arglist, Vallist) \
-+  assert (ARGMATCH_CONSTRAINT (Arglist, Vallist))
- 
- /* Return the index of the element of ARGLIST (NULL terminated) that
-    matches with ARG.  If VALLIST is not NULL, then use it to resolve
-    false ambiguities (i.e., different matches of ARG but corresponding
-    to the same values in VALLIST).  */
- 
--int argmatch
--  PARAMS ((const char *arg, const char *const *arglist,
--	   const char *vallist, size_t valsize));
--int argcasematch
--  PARAMS ((const char *arg, const char *const *arglist,
--	   const char *vallist, size_t valsize));
-+int argmatch (char const *arg, char const *const *arglist,
-+	      char const *vallist, size_t valsize);
- 
- # define ARGMATCH(Arg, Arglist, Vallist) \
--  argmatch ((Arg), (Arglist), (const char *) (Vallist), sizeof (*(Vallist)))
--
--# define ARGCASEMATCH(Arg, Arglist, Vallist) \
--  argcasematch ((Arg), (Arglist), (const char *) (Vallist), sizeof (*(Vallist)))
-+  argmatch (Arg, Arglist, (char const *) (Vallist), sizeof *(Vallist))
- 
- /* xargmatch calls this function when it fails.  This function should not
-    return.  By default, this is a function that calls ARGMATCH_DIE which
-    in turn defaults to `exit (EXIT_FAILURE)'.  */
--typedef void (*argmatch_exit_fn) PARAMS ((void));
-+typedef void (*argmatch_exit_fn) (void);
- extern argmatch_exit_fn argmatch_die;
- 
- /* Report on stderr why argmatch failed.  Report correct values. */
- 
--void argmatch_invalid
--  PARAMS ((const char *context, const char *value, int problem));
-+void argmatch_invalid (char const *context, char const *value, int problem);
- 
- /* Left for compatibility with the old name invalid_arg */
- 
- # define invalid_arg(Context, Value, Problem) \
--  argmatch_invalid ((Context), (Value), (Problem))
-+  argmatch_invalid (Context, Value, Problem)
- 
- 
- 
- /* Report on stderr the list of possible arguments.  */
- 
--void argmatch_valid
--  PARAMS ((const char *const *arglist,
--	   const char *vallist, size_t valsize));
-+void argmatch_valid (char const *const *arglist,
-+		     char const *vallist, size_t valsize);
- 
- # define ARGMATCH_VALID(Arglist, Vallist) \
--  argmatch_valid (Arglist, (const char *) Vallist, sizeof (*(Vallist)))
-+  argmatch_valid (Arglist, (char const *) (Vallist), sizeof *(Vallist))
- 
- 
- 
- /* Same as argmatch, but upon failure, reports a explanation on the
-    failure, and exits using the function EXIT_FN. */
- 
--int __xargmatch_internal
--  PARAMS ((const char *context,
--	   const char *arg, const char *const *arglist,
--	   const char *vallist, size_t valsize,
--	   int case_sensitive, argmatch_exit_fn exit_fn));
-+int __xargmatch_internal (char const *context,
-+			  char const *arg, char const *const *arglist,
-+			  char const *vallist, size_t valsize,
-+			  argmatch_exit_fn exit_fn);
- 
- /* Programmer friendly interface to __xargmatch_internal. */
- 
--# define XARGMATCH(Context, Arg, Arglist, Vallist)			\
--  (Vallist [__xargmatch_internal ((Context), (Arg), (Arglist),	\
--                                  (const char *) (Vallist),	\
--				  sizeof (*(Vallist)),		\
--				  1, argmatch_die)])
--
--# define XARGCASEMATCH(Context, Arg, Arglist, Vallist)		\
--  (Vallist [__xargmatch_internal ((Context), (Arg), (Arglist),	\
--                                  (const char *) (Vallist),	\
--				  sizeof (*(Vallist)),		\
--				  0, argmatch_die)])
-+# define XARGMATCH(Context, Arg, Arglist, Vallist)		\
-+  ((Vallist) [__xargmatch_internal (Context, Arg, Arglist,	\
-+				    (char const *) (Vallist),	\
-+				    sizeof *(Vallist),		\
-+				    argmatch_die)])
- 
- /* Convert a value into a corresponding argument. */
- 
--const char *argmatch_to_argument
--  PARAMS ((char const *value, const char *const *arglist,
--	   const char *vallist, size_t valsize));
-+char const *argmatch_to_argument (char const *value,
-+				  char const *const *arglist,
-+				  char const *vallist, size_t valsize);
- 
- # define ARGMATCH_TO_ARGUMENT(Value, Arglist, Vallist)			\
--  argmatch_to_argument ((char const *) &(Value), (Arglist), 		\
--		        (const char *) (Vallist), sizeof (*(Vallist)))
-+  argmatch_to_argument (Value, Arglist,					\
-+			(char const *) (Vallist), sizeof *(Vallist))
- 
- #endif /* ARGMATCH_H_ */
-diff -urNd -urNd patch-2.5.4/backupfile.c patch-2.5.9/backupfile.c
---- patch-2.5.4/backupfile.c	1999-01-18 12:02:28.000000000 -0500
-+++ patch-2.5.9/backupfile.c	2002-01-16 17:44:24.000000000 -0500
-@@ -1,5 +1,6 @@
- /* backupfile.c -- make Emacs style backup file names
--   Copyright (C) 1990-1997, 1998, 1999 Free Software Foundation, Inc.
-+   Copyright (C) 1990,91,92,93,94,95,96,97,98,99,2000, 2001, 2002 Free Software
-+   Foundation, Inc.
- 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-@@ -23,9 +24,6 @@
- # include <config.h>
- #endif
- 
--#include <argmatch.h>
--#include <backupfile.h>
--
- #include <stdio.h>
- #include <sys/types.h>
- #if HAVE_STRING_H
-@@ -58,17 +56,23 @@
- # define CLOSEDIR(d) closedir (d)
- #endif
- 
--#if STDC_HEADERS
-+#if HAVE_STDLIB_H
- # include <stdlib.h>
--#else
--char *malloc ();
- #endif
- 
- #ifndef HAVE_DECL_GETENV
-+"this configure-time declaration test was not run"
-+#endif
-+#if !HAVE_DECL_GETENV
- char *getenv ();
- #endif
- 
--char *base_name PARAMS ((char const *));
-+#ifndef HAVE_DECL_MALLOC
-+"this configure-time declaration test was not run"
-+#endif
-+#if !HAVE_DECL_MALLOC
-+char *malloc ();
-+#endif
- 
- #if HAVE_DIRENT_H || HAVE_NDIR_H || HAVE_SYS_DIR_H || HAVE_SYS_NDIR_H
- # define HAVE_DIR 1
-@@ -91,10 +95,9 @@
-    - Its arg may be any int or unsigned int; it need not be an unsigned char.
-    - It's guaranteed to evaluate its argument exactly once.
-    - It's typically faster.
--   Posix 1003.2-1992 section 2.5.2.1 page 50 lines 1556-1558 says that
--   only '0' through '9' are digits.  Prefer ISDIGIT to isdigit unless
--   it's important to use the locale's definition of `digit' even when the
--   host does not conform to Posix.  */
-+   POSIX says that only '0' through '9' are digits.  Prefer ISDIGIT to
-+   ISDIGIT_LOCALE unless it's important to use the locale's definition
-+   of `digit' even when the host does not conform to POSIX.  */
- #define ISDIGIT(c) ((unsigned) (c) - '0' <= 9)
- 
- #if D_INO_IN_DIRENT
-@@ -103,6 +106,10 @@
- # define REAL_DIR_ENTRY(dp) 1
- #endif
- 
-+#include "argmatch.h"
-+#include "backupfile.h"
-+#include "dirname.h"
-+
- /* The extension added to file names to produce a simple (as opposed
-    to numbered) backup file name. */
- const char *simple_backup_suffix = "~";
-@@ -129,29 +136,31 @@
-   if (HAVE_DIR && backup_suffix_size_max < numbered_suffix_size_max)
-     backup_suffix_size_max = numbered_suffix_size_max;
- 
--  s = malloc (file_len + backup_suffix_size_max + numbered_suffix_size_max);
-+  s = malloc (file_len + 1
-+	      + backup_suffix_size_max + numbered_suffix_size_max);
-   if (s)
-     {
--      strcpy (s, file);
--
- #if HAVE_DIR
-       if (backup_type != simple)
- 	{
- 	  int highest_backup;
--	  size_t dir_len = base_name (s) - s;
-+	  size_t dirlen = dir_len (file);
- 
--	  strcpy (s + dir_len, ".");
--	  highest_backup = max_backup_version (file + dir_len, s);
-+	  memcpy (s, file, dirlen);
-+	  if (dirlen == FILESYSTEM_PREFIX_LEN (file))
-+	    s[dirlen++] = '.';
-+	  s[dirlen] = '\0';
-+	  highest_backup = max_backup_version (base_name (file), s);
- 	  if (! (backup_type == numbered_existing && highest_backup == 0))
- 	    {
- 	      char *numbered_suffix = s + (file_len + backup_suffix_size_max);
- 	      sprintf (numbered_suffix, ".~%d~", highest_backup + 1);
- 	      suffix = numbered_suffix;
- 	    }
--	  strcpy (s, file);
- 	}
- #endif /* HAVE_DIR */
- 
-+      strcpy (s, file);
-       addext (s, suffix, '~');
-     }
-   return s;
-@@ -178,7 +187,7 @@
-     return 0;
- 
-   highest_version = 0;
--  file_name_length = strlen (file);
-+  file_name_length = base_len (file);
- 
-   while ((dp = readdir (dirp)) != 0)
-     {
-diff -urNd -urNd patch-2.5.4/basename.c patch-2.5.9/basename.c
---- patch-2.5.4/basename.c	1999-03-18 11:56:34.000000000 -0500
-+++ patch-2.5.9/basename.c	2001-05-12 11:39:45.000000000 -0400
-@@ -1,5 +1,5 @@
- /* basename.c -- return the last element in a path
--   Copyright (C) 1990, 1998, 1999 Free Software Foundation, Inc.
-+   Copyright (C) 1990, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
- 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-@@ -19,37 +19,61 @@
- # include <config.h>
- #endif
- 
--#ifndef FILESYSTEM_PREFIX_LEN
--# define FILESYSTEM_PREFIX_LEN(Filename) 0
--#endif
--
--#ifndef ISSLASH
--# define ISSLASH(C) ((C) == '/')
-+#if STDC_HEADERS || HAVE_STRING_H
-+# include <string.h>
- #endif
-+#include "dirname.h"
- 
- /* In general, we can't use the builtin `basename' function if available,
-    since it has different meanings in different environments.
-    In some environments the builtin `basename' modifies its argument.
--   If NAME is all slashes, be sure to return `/'.  */
-+
-+   Return the address of the last file name component of NAME.  If
-+   NAME has no file name components because it is all slashes, return
-+   NAME if it is empty, the address of its last slash otherwise.  */
- 
- char *
- base_name (char const *name)
- {
--  char const *base = name += FILESYSTEM_PREFIX_LEN (name);
--  int all_slashes = 1;
-+  char const *base = name + FILESYSTEM_PREFIX_LEN (name);
-   char const *p;
- 
--  for (p = name; *p; p++)
-+  for (p = base; *p; p++)
-     {
-       if (ISSLASH (*p))
--	base = p + 1;
--      else
--	all_slashes = 0;
--    }
-+	{
-+	  /* Treat multiple adjacent slashes like a single slash.  */
-+	  do p++;
-+	  while (ISSLASH (*p));
- 
--  /* If NAME is all slashes, arrange to return `/'.  */
--  if (*base == '\0' && ISSLASH (*name) && all_slashes)
--    --base;
-+	  /* If the file name ends in slash, use the trailing slash as
-+	     the basename if no non-slashes have been found.  */
-+	  if (! *p)
-+	    {
-+	      if (ISSLASH (*base))
-+		base = p - 1;
-+	      break;
-+	    }
-+
-+	  /* *P is a non-slash preceded by a slash.  */
-+	  base = p;
-+	}
-+    }
- 
-   return (char *) base;
- }
-+
-+/* Return the length of of the basename NAME.  Typically NAME is the
-+   value returned by base_name.  Act like strlen (NAME), except omit
-+   redundant trailing slashes.  */
-+
-+size_t
-+base_len (char const *name)
-+{
-+  size_t len;
-+
-+  for (len = strlen (name);  1 < len && ISSLASH (name[len - 1]);  len--)
-+    continue;
-+
-+  return len;
-+}
-diff -urNd -urNd patch-2.5.4/basename.h patch-2.5.9/basename.h
---- patch-2.5.4/basename.h	1999-07-07 14:06:40.000000000 -0400
-+++ patch-2.5.9/basename.h	1969-12-31 19:00:00.000000000 -0500
-@@ -1,9 +0,0 @@
--#ifndef PARAMS
--# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
--#  define PARAMS(Args) Args
--# else
--#  define PARAMS(Args) ()
--# endif
--#endif
--
--char *base_name PARAMS ((char const *name));
-diff -urNd -urNd patch-2.5.4/ChangeLog patch-2.5.9/ChangeLog
---- patch-2.5.4/ChangeLog	1999-08-30 02:38:49.000000000 -0400
-+++ patch-2.5.9/ChangeLog	2003-05-20 12:16:31.000000000 -0400
-@@ -1,3 +1,359 @@
-+2003-05-20  Paul Eggert  <[email protected]>
-+
-+	* NEWS, configure.ac (AC_INIT): Version 2.5.9 released.
-+
-+	* Makefile.in (HDRS): Add gettext.h.
-+
-+	Use bool, not int, for booleans.
-+
-+	* pch.c (pch_says_nonexistent): Returns int, not bool.
-+
-+	* configure.ac: Add AM_STDBOOL_H.
-+
-+	* Makefile.in (MISC): Add stdbool.h.in.
-+	(stdbool.h): New rule.
-+	(ACINCLUDE_INPUTS): Add stdbool.m4.
-+	(mostlyclean): Remove stdbool.h.
-+	(COMMON): New macro; use it instead of common.h for dependencies.
-+
-+	* common.h: Include <stdbool.h>.
-+	Remove TRUE, FALSE, bool.  All uses changed to standard names.
-+
-+	* common.h (reverse, set_time, set_utc):
-+	Use bool, not int, for booleans.
-+	* pch.c (p_strip_trailing_cr, p_pass_comments_through,
-+	prefix_components, pget_line, re_patch,
-+	there_is_another_patch, intuit_diff_type, scan_linenum,
-+	another_hunk, pget_line, pch_timestamp): Likewise.
-+	* inp.h (ifetch): Likewise.
-+	* util.c (move_file, version_controller, version_get, ok_to_reverse,
-+	set_signals): Likewise.
-+	* inp.c (report_revision, get_input_file, plan_a, plan_b, ifetch):
-+	Likewise.
-+	* util.h (ok_to_reverse, version_controller, version_get,
-+	move_file, set_signals): Likewise.
-+	* pch.h (another_hunk, pch_says_nonexistent, pch_timestamp):
-+	Likewise.
-+	* patch.c (struct outstate, numeric_string, make_backups,
-+	backup_if_mismatch, remove_empty_files,
-+	reverse_flag_specified, main, reinitialize_almost_everything,
-+	get_some_switches, apply_hunk, init_output, copy_till):
-+	Likewise.
-+
-+2003-05-18  Paul Eggert  <[email protected]>
-+
-+	* pch.c (p_pass_comments_through): New var.
-+	(pget_line): Accept new arg for pass_comments_through.
-+	All callers changed.
-+	(there_is_another_patch): Do not suggest -p for ed diffs.
-+	(intuit_diff_type): Check ed command for correct syntax.
-+	Do not set p_strip_trailing_cr merely because a -p line contains a CR.
-+	(get_ed_command_letter): New function.
-+	(do_ed_script): Use it.  Do not treat '#' data lines as comments in ed
-+	scripts.
-+
-+	* util.c (move_file):
-+	Don't assume that when 'rename(A,B)' succeeds then A no
-+	longer exists.  This is not true of POSIX 1003.1-2001 rename when A
-+	and B are links to the same file.
-+	(fetchname): Fix test for file names with internal spaces.
-+
-+	* version.c: Don't include patchlevel.h.
-+	(version): Use PACKAGE_NAME and PACKAGE_VERSION instead of obsolete
-+	PROGRAM_NAME and PATCH_VERSION.
-+	(copyright_string): Bump to 2003.
-+
-+	* common.h (FILESYSTEM_PREFIX_LEN, ISSLASH):
-+	Remove; now done by 'configure'.
-+	(PROGRAM_NAME): Remove; now done by 'configure' as PACKAGE_NAME.
-+
-+	* patch.c: Do not include <exitfail.h>.
-+	(main): Set xalloc_exit_failure, not exit_failure.
-+	Add "&& !skip_rest_of_patch" when deciding to continue ed scripts.
-+	(option_help): Use PACKAGE_BUGREPORT rather than hardcoding.
-+
-+	* configure.ac (AC_PREREQ): Bump to 2.57.
-+	(AC_GNU_SOURCE): Add, early on.
-+	(gl_BACKUPFILE, gl_DIRNAME, gl_ERROR, gl_FUNC_MEMCHR, gl_FUNC_RMDIR,
-+	gl_GETOPT, gl_PREREQ_XMALLOC, gl_QUOTE, gl_QUOTEARG): Add.
-+	(jm_PREREQ_ADDEXT): Add, with definition.
-+	(jm_PREREQ_DIRNAME, jm_PREREQ_ERROR, jm_PREREQ_MEMCHR,
-+	jm_PREREQ_QUOTEARG): Remove.
-+	(AC_REPLACE_FUNCS): Remove memchr, rename, rmdir).
-+	(jm_FUNC_GLIBC_UNLOCKED_IO, jm_AC_DOS): Add.
-+	(jm_CHECK_TYPE_STRUCT_DIRENT_D_INO): Do not call directly.
-+	(AC_OUTPUT): Use new style, with AC_CONFIG_FILES.
-+
-+	Update to current CVS gnulib.
-+
-+	* exitfail.c, exitfail.h, patchlevel.h, rename.c, m4/c-bs-a.m4,
-+	m4/jm-glibc-io.m4, m4/prereq.m4: Remove.
-+	* m4/backupfile.m4, m4/dirname.m4, m4/dos.m4, m4/getopt.m4,
-+	m4/memchr.m4, m4/onceonly.m4, m4/quote.m4, m4/quotearg.m4,
-+	m4/rmdir.m4, m4/unlocked-io.m4, m4/xalloc.m4: New files.
-+	* Makefile.in (LIBSRCS): Move error.c here from SRCS.
-+	Remove rename.c.
-+	(OBJS): Remove error.$(OBJEXT).
-+	(HDRS): Remove exitfail.h, patchlevel.h.
-+	(ACINCLUDE_INPUTS): Remove c-bs-a.m4, jm-glibc-io.m4, prereq.m4.
-+	Add backupfile.m4, dirname.m4, dos.m4, getopt.m4, memchr.m4,
-+	onceonly.m4, quote.m4, quotearg.m4, rmdir.m4, unlocked-io.m4,
-+	xalloc.m4.
-+	(patchlevel.h): Remove.  All uses removed.
-+	(argmatch.$(OBJEXT), error.$(OBJEXT), quotesys.$(OBJEXT)),
-+	xmalloc.$(OBJEXT)): Depend on gettext.h.
-+	(dirname.$(OBJEXT), quote.$(OBJEXT), strncasecmp.$(OBJEXT)): New rules.
-+	(patch.$(OBJEXT), xmalloc.$(OBJEXT)): Remove exitfail.h.
-+	(rename.$(OBJEXT)): Remove.
-+	(version.$(OBJEXT)): Remove util.h.
-+	(xmalloc.$(OBJEXT)): Add error.h.
-+
-+2002-11-23  Paul Eggert  <[email protected]>
-+
-+	* patch.c (main): Don't check for zero-sized file after 'ed'
-+	when skipping patch.  From Michael Fedrowitz.
-+
-+2002-06-03  Paul Eggert  <[email protected]>
-+
-+	* configure.ac (AC_OUTPUT): Use new form, with AC_CONFIG_FILES,
-+	instead of obsolescent form.  Patch from Art Haas.
-+
-+	* pch.c (intuit_diff_type): Do not warn about trailing white space
-+	after Prereq: word.  Bug reported by Mike Castle.
-+
-+2002-06-02  Paul Eggert  <[email protected]>
-+
-+	* NEWS, configure.ac (AC_INIT): Version 2.5.8 released.
-+
-+	* README: POSIX.2 -> POSIX.
-+	* inp.c (report_revision): Don't modify 'revision', since
-+	it gets freed later.  Bug reported by Mike Castle.
-+
-+2002-05-30  Paul Eggert  <[email protected]>
-+
-+	* NEWS, configure.ac (AC_INIT): Version 2.5.7 released.
-+
-+	* Makefile.in (MISC): Remove README-alpha.
-+	(patchlevel.h): Depend on configure, not configure.ac.
-+
-+	* INSTALL: Upgrade to Autoconf 2.53 version.
-+
-+2002-05-28  Paul Eggert  <[email protected]>
-+
-+	* patch.c (end_defined, apply_hunk): Output #endif without
-+	the comment, as POSIX 1003.1-2001 requires.
-+
-+	* pch.c (there_is_another_patch): Flush stderr after perror.
-+
-+	* NEWS, configure.ac (AC_INIT): Version 2.5.6 released.
-+
-+	* strcasecmp.c, strncasecmp.c: New files, taken from fileutils.
-+	* config.guess, config.sub: Remove.
-+	* Makefile.in (LIBSRCS): Add strcasecmp.c, strncasecmp.c.
-+	(MISC): Remove config.guess, config.sub.
-+
-+	The code already assumes C89 or better, so remove K&R stuff.
-+	* common.h (volatile): Remove.
-+	(GENERIC_OBJECT): Remove; all uses changed to 'void'.
-+	(PARAMS): Remove; all uses changed to prototypes.
-+	* configure.ac (AC_PROG_CC_STDC): Add.
-+	* util.c (vararg_start): Remove.  All uses changed to va_start.
-+	Always include <stdarg.h>.
-+	
-+	* configure.ac (AC_CANONICAL_HOST): Remove.
-+	(AC_REPLACE_FUNCS): Add strncasecmp.
-+	(AC_CHECK_DECLS): Add mktemp.
-+	
-+	* patch.c (main): Remove useless prototype decl.
-+	(mktemp): Don't declare if HAVE_DECL_MKTEMP || defined mktemp.
-+	(make_temp): Now accepts char, not int.
-+	
-+2002-05-26  Paul Eggert  <[email protected]>
-+
-+	* patch.c (not_defined): Prepend newline.  All uses changed.
-+	(apply_hunk): Fix bug: -D was outputting #ifdef when it should
-+	have been outputting #ifndef.  Bug report and partial fix by
-+	Jason Short.
-+
-+	* pch.c (intuit_diff_type): When reading an ed diff, don't use
-+	indent and trailing-CR-ness of "." line; instead, use that of the
-+	command.  Bug reported by Anthony Towns; partial fix by Michael
-+	Fedrowitz.
-+	(intuit_diff_type): If the index line exists, don't report a
-+	missing header.  Fix by Chip Salzenberg.
-+
-+2002-05-26  Alessandro Rubini  <[email protected]>
-+
-+	* patch.c (locate_hunk): Fixed updating of last_offset.
-+
-+2002-05-25  Paul Eggert  <[email protected]>
-+
-+	* NEWS, README: Diffutils doc is up to date now.
-+	Bug reporting address is now <[email protected]>.
-+	* README: Describe '--disable-largefile'.
-+
-+	* NEWS-alpha, dirname.c, dirname.h, exitfail.c, exitfail.h,
-+	quote.c, quote.h, unlocked-io.h: New files, taken from diffutils
-+	and fileutils.
-+
-+	* argmatch.c: [STDC_HEADERS]: Include stdlib.h, for 'exit'.
-+
-+	* addext.c, argmatch.c, argmatch.h, backupfile.c, basename.c:
-+	Update from diffutils and fileutils.
-+
-+	* ansi2knr.1, ansi2knr.c: Remove.
-+
-+	* common.h: HAVE_SETMODE && O_BINARY -> HAVE_SETMODE_DOS.
-+	* patch.c (usage): Likewise.
-+	* pch.c (open_patch_file): Likewise.
-+
-+	* configure.ac: Renamed from configure.in.  Add copyright notice.
-+	(AC_PREREQ): Bump to 2.53.
-+	(AC_INIT): Use 2.5x style.
-+	(AC_CONFIG_SRCDIR): Add.
-+	(PACKAGE, VERSION): Remove.
-+	(AC_C_PROTOTYPES): Use this instead of AM_C_PROTOTYPES.
-+	(jm_CHECK_TYPE_STRUCT_UTIMBUF): Use this instead of jm_STRUCT_UTIMBUF.
-+	(jm_PREREQ_ADDEXT, jm_PREREQ_DIRNAME, jm_PREREQ_ERROR,
-+	jm_PREREQ_MEMCHR, jm_PREREQ_QUOTEARG): Add.
-+	(AC_CHECK_DECLS): Add free, getenv, malloc.
-+	(AC_CHECK_FUNCS): Remove setmode.
-+	(AC_FUNC_SETMODE_DOS): Add.
-+	(jm_CHECK_TYPE_STRUCT_DIRENT_D_INO): Use this instead of
-+	jm_STRUCT_DIRENT_D_INO.
-+
-+	* Makefile.in (OBJEXT): New var.
-+	(PACKAGE_NAME): Renamed from PACKAGE.  All uses changed.
-+	(PACKAGE_VERSION): Renamed from VERSION.  All uses changed.
-+	(U): Remove.  All uses of "$U.o" changed to ".$(OBJEXT)".
-+	(LIBSRCS): REmove getopt.c getopt1.c.  Add mkdir.c, rmdir.c.
-+	(SRCS): Add dirname.c, exitfail.c, getopt.c, getopt1.c, quote.c.
-+	Remove mkdir.c.
-+	(OBJS): Keep in sync with SRCS.
-+	(HDRS): Remove basename.h.
-+	Add dirname.h, exitfail.h, quote.h, unlocked-io.h.
-+	(MISC, configure, config.hin, patchlevel.h):
-+	configure.ac renamed from configure.in.
-+	(MISC): Add README-alpha. Remove ansi2knr.1, ansi2knr.c.
-+	(.c.$(OBJEXT)): Renamed from .c.o.
-+	(ACINCLUDE_INPUTS): Add c-bs-a.m4, error.m4, jm-glibc-io.m4,
-+	mbstate_t.m4, mkdir.m4, mbrtowc.m4, prereq.m4, setmode.m4.
-+	Remove ccstdc.m4, inttypes_h.m4, largefile.m4, protos.m4.
-+	(mostlyclean): Don't clean ansi2knr.
-+	(ansi2knr.o, ansi2knr): Remove.
-+	Redo dependencies.
-+
-+	* patch.c: Include <exitfail.h>.
-+	(main): Initialize exit_failure.
-+
-+	* patch.man: Update copyright notice.
-+
-+	* pch.c, util.c: Include <dirname.h>, not <basename.h>.
-+
-+	* version.c (copyright_string): Update copyright notice.
-+
-+2002-02-17  Paul Eggert  <[email protected]>
-+
-+	* partime.c (parse_pattern_letter): Don't overrun buffer if it
-+	contains only alphanumerics.  Bug reported by Winni
-+	<[email protected]>.
-+
-+2001-07-28  Paul Eggert  <[email protected]>
-+
-+	* util.c (fetchname), NEWS:
-+	Allow file names with internal spaces, so long as they
-+	don't contain tabs.
-+
-+	* pch.c (intuit_diff_type): Do not allow Prereq with multiple words.
-+
-+	* configure.in (AC_PREREQ): Bump to 2.50.
-+	(AC_CHECK_FUNCS): Remove fseeko.
-+	(AC_FUNC_FSEEKO): Add.
-+	* Makefile.in (ACINCLUDE_INPUTS):
-+	Remove largefile.m4; no longer needed with Autoconf 2.50.
-+
-+2001-02-07  "Tony E. Bennett" <[email protected]>
-+
-+	* util.c (PERFORCE_CO): New var.
-+	(version_controller): Support Perforce.
-+	* patch.man: Document this.
-+
-+2000-06-30  Paul Eggert  <[email protected]>
-+
-+	* patch.man: Ignore comment lines.
-+
-+	* NEWS, pch.c: Ignore lines beginning with "#".
-+
-+1999-10-24  Paul Eggert  <[email protected]>
-+
-+	* pch.c (another_hunk): Report a fatal error if a regular
-+	context hunk's pattern has a different number of unchanged
-+	lines than the replacement.
-+
-+1999-10-18  Paul Eggert  <[email protected]>
-+
-+	* patch.c (main): If we skipped an ed patch, exit with nonzero status.
-+
-+1999-10-17  Paul Eggert  <[email protected]>
-+
-+	* patch.c (main): Apply do_ed_script even if dry_run, because
-+	we need to make progress on the patch file.
-+	* pch.c (do_ed_script): If skip_rest_of_patch is nonzero,
-+	gobble up the patch without any other side effect.
-+
-+1999-10-12  Paul Eggert  <[email protected]>
-+
-+	* NEWS, README: New bug reporting address.
-+	* NEWS: Report change in 2.5.4 that we forgot to document.
-+	* README: Document `configure --disable-largefile'.
-+
-+	* basename.c, COPYING, getopt.c, getopt.h, getopt1.c, m4/largefile.m4:
-+	Update to latest version.
-+	* Makefile.in (basename$U.o): Depend on basename.h.
-+	(config.hin): Depend on $(srcdir)/aclocal.m4.
-+
-+	* ansi2knr.c, maketime.c, mkinstalldirs, partime.c: Fix $Id.
-+
-+	FreeBSD has an unrelated setmode function; work around this.
-+	* common.h (binary_transput): Don't declare unless O_BINARY.
-+	* patch.c (option_help, get_some_switches):
-+	Don't use setmode unless O_BINARY.
-+	* pch.c (open_patch_file): Don't invoke setmode unless O_BINARY.
-+
-+	Fix incompatiblities with error.c.
-+	* common.h (program_name): Now XTERN char *, for compatibility
-+	with error.c.  All uses changed.
-+	(PROGRAM_NAME): New macro.
-+	(PARAMS): Use ANSI C version only if defined PROTOTYPES
-+	|| (defined __STDC__ && __STDC__), for compatibilty with error.c.
-+	* util.c (vararg_start): Likewise.
-+	* patch.c (program_name): Remove.
-+	(main): Initialize program_name.
-+	* version.c (version): Print PROGRAM_NAME, not program_name.
-+
-+	Accommodate mingw32 port, which has one-argument mkdir (yuck!)
-+	and no geteuid.
-+	* m4/mkdir.m4: New file.
-+	* Makefile.in (ACINCLUDE_INPUTS): Add $(M4DIR)/mkdir.m4.
-+	* configure.in (AC_CHECK_FUNCS): Add geteuid, getuid.
-+	(PATCH_FUNC_MKDIR_TAKES_ONE_ARG): Add.
-+	* common.h (mkdir): Define if mkdir takes one arg.
-+	(geteuid): New macro, if not already defined.
-+
-+1999-10-11  Christopher R. Gabriel  <[email protected]>
-+
-+	* patch.c (option_help): Updated bug report address
-+	* configure.in (VERSION): Version 2.5.5 released.
-+
-+1999-09-01  Paul Eggert  <[email protected]>
-+
-+	* patch.c (main): Default simple_backup_suffix to ".orig".
-+
-+1999-10-08  Paul Eggert  <[email protected]>
-+
-+	* patch.man: Make it clear that `patch -o F' should not be
-+	used if F is one of the files to be patched.
-+
- 1999-08-30  Paul Eggert  <[email protected]>
- 
- 	Version 2.5.4 fixes a few minor bugs, converts C sources to
-@@ -1910,9 +2266,26 @@
- 
- 1984-11-09  Larry Wall  <sdcrdcf!lwall>
- 	* patch.c: Initial revision
--
--Local Variables:
--mode: indented-text
--left-margin: 8
--version-control: never
--end:
-+
-+
-+Copyright (C) 1984, 1985, 1986, 1987, 1988 Larry Wall.
-+
-+Copyright (C) 1989, 1990, 1991, 1992, 1993, 1997, 1998, 1999, 2000, 2001,
-+2002 Free Software Foundation, Inc.
-+
-+This file is part of GNU Patch.
-+
-+This program is free software; you can redistribute it and/or modify
-+it under the terms of the GNU General Public License as published by
-+the Free Software Foundation; either version 2, or (at your option)
-+any later version.
-+
-+This program is distributed in the hope that they will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with this program; see the file COPYING.  If not, write to
-+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+Boston, MA 02111-1307, USA.
-diff -urNd -urNd patch-2.5.4/common.h patch-2.5.9/common.h
---- patch-2.5.4/common.h	1999-08-30 02:20:08.000000000 -0400
-+++ patch-2.5.9/common.h	2003-05-19 02:57:36.000000000 -0400
-@@ -1,9 +1,11 @@
- /* common definitions for `patch' */
- 
--/* $Id: common.h,v 1.20 1999/08/30 06:20:08 eggert Exp $ */
-+/* $Id: common.h,v 1.34 2003/05/19 06:57:36 eggert Exp $ */
- 
--/* Copyright 1986, 1988 Larry Wall
--   Copyright 1990, 1991-1993, 1997-1998, 1999 Free Software Foundation, Inc.
-+/* Copyright (C) 1986, 1988 Larry Wall
-+
-+   Copyright (C) 1990, 1991, 1992, 1993, 1997, 1998, 1999, 2002, 2003
-+   Free Software Foundation, Inc.
- 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-@@ -24,17 +26,10 @@
- #define DEBUGGING 1
- #endif
- 
--/* We must define `volatile' and `const' first (the latter inside config.h),
--   so that they're used consistently in all system includes.  */
--#ifndef __STDC__
--# ifndef volatile
--# define volatile
--# endif
--#endif
--
- #include <config.h>
- 
- #include <assert.h>
-+#include <stdbool.h>
- #include <stdio.h>
- #include <sys/types.h>
- #include <time.h>
-@@ -73,6 +68,9 @@
- #ifndef S_IRUSR
- #define S_IRUSR (S_IROTH << 6)
- #endif
-+#ifdef MKDIR_TAKES_ONE_ARG
-+# define mkdir(name, mode) ((mkdir) (name))
-+#endif
- 
- #if HAVE_LIMITS_H
- # include <limits.h>
-@@ -123,27 +121,6 @@
- #endif
- 
- 
--#ifndef FILESYSTEM_PREFIX_LEN
--#define FILESYSTEM_PREFIX_LEN(f) 0
--#endif
--
--#ifndef ISSLASH
--#define ISSLASH(c) ((c) == '/')
--#endif
--
--
--/* constants */
--
--/* AIX predefines these.  */
--#ifdef TRUE
--#undef TRUE
--#endif
--#ifdef FALSE
--#undef FALSE
--#endif
--#define TRUE 1
--#define FALSE 0
--
- /* handy definitions */
- 
- #define strEQ(s1,s2) (!strcmp(s1, s2))
-@@ -151,12 +128,11 @@
- 
- /* typedefs */
- 
--typedef int bool;			/* must promote to itself */
- typedef off_t LINENUM;			/* must be signed */
- 
- /* globals */
- 
--extern char const program_name[];
-+XTERN char *program_name;	/* The name this program was run with. */
- 
- XTERN char *buf;			/* general purpose buffer */
- XTERN size_t bufsize;			/* allocated size of buf */
-@@ -190,14 +166,14 @@
- XTERN bool force;
- XTERN bool batch;
- XTERN bool noreverse;
--XTERN int reverse;
-+XTERN bool reverse;
- XTERN enum { DEFAULT_VERBOSITY, SILENT, VERBOSE } verbosity;
- XTERN bool skip_rest_of_patch;
- XTERN int strippath;
- XTERN bool canonicalize;
- XTERN int patch_get;
--XTERN int set_time;
--XTERN int set_utc;
-+XTERN bool set_time;
-+XTERN bool set_utc;
- 
- enum diff
-   {
-@@ -213,25 +189,11 @@
- 
- XTERN char *revision;			/* prerequisite revision, if any */
- 
--#ifdef __STDC__
--# define GENERIC_OBJECT void
--#else
--# define GENERIC_OBJECT char
--#endif
--
- #if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 6) || __STRICT_ANSI__
- # define __attribute__(x)
- #endif
- 
--#ifndef PARAMS
--# ifdef __STDC__
--#  define PARAMS(args) args
--# else
--#  define PARAMS(args) ()
--# endif
--#endif
--
--void fatal_exit PARAMS ((int)) __attribute__ ((noreturn));
-+void fatal_exit (int) __attribute__ ((noreturn));
- 
- #include <errno.h>
- #if !STDC_HEADERS && !defined errno
-@@ -244,7 +206,7 @@
- # if !HAVE_MEMCHR
- #  define memcmp(s1, s2, n) bcmp (s1, s2, n)
- #  define memcpy(d, s, n) bcopy (s, d, n)
--GENERIC_OBJECT *memchr ();
-+void *memchr ();
- # endif
- #endif
- 
-@@ -252,8 +214,8 @@
- # include <stdlib.h>
- #else
- char *getenv ();
--GENERIC_OBJECT *malloc ();
--GENERIC_OBJECT *realloc ();
-+void *malloc ();
-+void *realloc ();
- #endif
- 
- #if HAVE_UNISTD_H
-@@ -284,6 +246,13 @@
- # define file_seek fseek
- # define file_tell ftell
- #endif
-+#if ! (HAVE_GETEUID || defined geteuid)
-+# if ! (HAVE_GETUID || defined getuid)
-+#  define geteuid() (-1)
-+# else
-+#  define geteuid() getuid ()
-+# endif
-+#endif
- 
- #if HAVE_FCNTL_H
- # include <fcntl.h>
-@@ -313,7 +282,7 @@
- #define O_TRUNC 0
- #endif
- 
--#if HAVE_SETMODE
-+#if HAVE_SETMODE_DOS
-   XTERN int binary_transput;	/* O_BINARY if binary i/o is desired */
- #else
- # define binary_transput 0
-diff -urNd -urNd patch-2.5.4/config.guess patch-2.5.9/config.guess
---- patch-2.5.4/config.guess	1999-08-05 08:55:17.000000000 -0400
-+++ patch-2.5.9/config.guess	1969-12-31 19:00:00.000000000 -0500
-@@ -1,1088 +0,0 @@
--#! /bin/sh
--# Attempt to guess a canonical system name.
--#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
--#   Free Software Foundation, Inc.
--#
--# This file is free software; you can redistribute it and/or modify it
--# under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2 of the License, or
--# (at your option) any later version.
--#
--# This program is distributed in the hope that it will be useful, but
--# WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--# General Public License for more details.
--#
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
--#
--# As a special exception to the GNU General Public License, if you
--# distribute this file as part of a program that contains a
--# configuration script generated by Autoconf, you may include it under
--# the same distribution terms that you use for the rest of that program.
--
--# Written by Per Bothner <[email protected]>.
--# The master version of this file is at the FSF in /home/gd/gnu/lib.
--# Please send patches to <[email protected]>.
--#
--# This script attempts to guess a canonical system name similar to
--# config.sub.  If it succeeds, it prints the system name on stdout, and
--# exits with 0.  Otherwise, it exits with 1.
--#
--# The plan is that this can be called by configure scripts if you
--# don't specify an explicit system type (host/target name).
--#
--# Only a few systems have been added to this list; please add others
--# (but try to keep the structure clean).
--#
--
--# Use $HOST_CC if defined. $CC may point to a cross-compiler
--if test x"$CC_FOR_BUILD" = x; then
--  if test x"$HOST_CC" != x; then
--    CC_FOR_BUILD="$HOST_CC"
--  else
--    if test x"$CC" != x; then
--      CC_FOR_BUILD="$CC"
--    else
--      CC_FOR_BUILD=cc
--    fi
--  fi
--fi
--
--
--# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
--# ([email protected] 8/24/94.)
--if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
--	PATH=$PATH:/.attbin ; export PATH
--fi
--
--UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
--UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
--UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
--UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
--
--dummy=dummy-$$
--trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15
--
--# Note: order is significant - the case branches are not exclusive.
--
--case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
--    alpha:OSF1:*:*)
--	if test $UNAME_RELEASE = "V4.0"; then
--		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
--	fi
--	# A Vn.n version is a released version.
--	# A Tn.n version is a released field test version.
--	# A Xn.n version is an unreleased experimental baselevel.
--	# 1.2 uses "1.2" for uname -r.
--	cat <<EOF >$dummy.s
--	.globl main
--	.ent main
--main:
--	.frame \$30,0,\$26,0
--	.prologue 0
--	.long 0x47e03d80 # implver $0
--	lda \$2,259
--	.long 0x47e20c21 # amask $2,$1
--	srl \$1,8,\$2
--	sll \$2,2,\$2
--	sll \$0,3,\$0
--	addl \$1,\$0,\$0
--	addl \$2,\$0,\$0
--	ret \$31,(\$26),1
--	.end main
--EOF
--	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
--	if test "$?" = 0 ; then
--		./$dummy
--		case "$?" in
--			7)
--				UNAME_MACHINE="alpha"
--				;;
--			15)
--				UNAME_MACHINE="alphaev5"
--				;;
--			14)
--				UNAME_MACHINE="alphaev56"
--				;;
--			10)
--				UNAME_MACHINE="alphapca56"
--				;;
--			16)
--				UNAME_MACHINE="alphaev6"
--				;;
--		esac
--	fi
--	rm -f $dummy.s $dummy
--	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
--	exit 0 ;;
--    Alpha\ *:Windows_NT*:*)
--	# How do we know it's Interix rather than the generic POSIX subsystem?
--	# Should we change UNAME_MACHINE based on the output of uname instead
--	# of the specific Alpha model?
--	echo alpha-pc-interix
--	exit 0 ;;
--    21064:Windows_NT:50:3)
--	echo alpha-dec-winnt3.5
--	exit 0 ;;
--    Amiga*:UNIX_System_V:4.0:*)
--	echo m68k-cbm-sysv4
--	exit 0;;
--    amiga:NetBSD:*:*)
--      echo m68k-cbm-netbsd${UNAME_RELEASE}
--      exit 0 ;;
--    amiga:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    *:[Aa]miga[Oo][Ss]:*:*)
--	echo ${UNAME_MACHINE}-unknown-amigaos
[… more lines in the raw message]

Lines of this file are not shown. View the raw message.

meta/recipes-devtools/patch/patch.inc +0 -1
index 4ce5170..d9769d0 100644

Lines of this file are not shown. View the raw message.

meta/recipes-devtools/patch/patch/debian.patch renamed from meta/recipes-devtools/patch/patch-2.5.9/debian.patch +0 -0
similarity index 100%
rename from meta/recipes-devtools/patch/patch-2.5.9/debian.patch
rename to meta/recipes-devtools/patch/patch/debian.patch
meta/recipes-devtools/patch/patch/global-reject-file.diff renamed from meta/recipes-devtools/patch/patch-2.5.9/global-reject-file.diff +0 -0
similarity index 100%
rename from meta/recipes-devtools/patch/patch-2.5.9/global-reject-file.diff
rename to meta/recipes-devtools/patch/patch/global-reject-file.diff
meta/recipes-devtools/patch/patch/install.patch renamed from meta/recipes-devtools/patch/patch-2.5.9/install.patch +0 -0
similarity index 100%
rename from meta/recipes-devtools/patch/patch-2.5.9/install.patch
rename to meta/recipes-devtools/patch/patch/install.patch
meta/recipes-devtools/patch/patch/unified-reject-files.diff renamed from meta/recipes-devtools/patch/patch-2.5.9/unified-reject-files.diff +0 -0
similarity index 100%
rename from meta/recipes-devtools/patch/patch-2.5.9/unified-reject-files.diff
rename to meta/recipes-devtools/patch/patch/unified-reject-files.diff
meta/recipes-devtools/patch/patch_2.5.9.bb +6 -7
index 4b4511f..285b42a 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
1.7.2.2

Part of the diff is not shown here. View the raw message.

#2 lore raw

PATCH 2/6 patch-2.6.1: implement new patch recipe with latest upstream

In reply to Nitin A Kamble

This commit patch recipe based on latest upstream code. This is GPLv3 code based. Hence the earlier patch-2.5.9 recipe is left intact for GPLv2 needs.

Patches from 2.5.9 patch recipe are rebased to this new recipe except these exceptions:

unified-reject-files.diff: dropped
This patch implements this new parameter:

     "  --unified-reject-files  Create unified reject files."

And upstream has implemented very similar parameter like this:
" --reject-format=FORMAT Create 'context' or 'unified' rejects."
Hence this patch is dropped for the 2.6.1 recipe.

global-reject-file.diff: rebased
This patch is rebased to the newer upstream codebase.

install.patch: dropped
Newer upstream code now includes code form this patch.

debian.patch: dropped
This huge (10k lines) patch was specific for 2.5.9 version of GPLv2 patch.

---
 .../patch/patch-2.6.1/global-reject-file.diff      |  186 ++++++++++++++++++++
 meta/recipes-devtools/patch/patch_2.6.1.bb         |   14 ++
 2 files changed, 200 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-devtools/patch/patch-2.6.1/global-reject-file.diff
 create mode 100644 meta/recipes-devtools/patch/patch_2.6.1.bb
meta/recipes-devtools/patch/patch-2.6.1/global-reject-file.diff new file +186 -0
new file mode 100644
index 0000000..cd3a600
@@ -0,0 +1,186 @@
+Index: patch-2.6.1/patch.man
+===================================================================
+--- patch-2.6.1.orig/patch.man
++++ patch-2.6.1/patch.man
+@@ -557,6 +557,15 @@ instead of the default
+ .B \&.rej
+ file.  When \fIrejectfile\fP is \fB\-\fP, discard rejects.
+ .TP
++.BI \*=global\-reject\-file= rejectfile
++Put all rejects into
++.I rejectfile
++instead of creating separate reject files for all files that have rejects. The
++.I rejectfile
++will contain headers that identify which file each reject refers to. Note that
++the global reject file is created even if \-\-dry\-run is specified (while
++non-global reject files will only be created without \-\-dry\-run).
++.TP
+ \fB\-R\fP  or  \fB\*=reverse\fP
+ Assume that this patch was created with the old and new files swapped.
+ (Yes, I'm afraid that does happen occasionally, human nature being what it
+Index: patch-2.6.1/src/patch.c
+===================================================================
+--- patch-2.6.1.orig/src/patch.c
++++ patch-2.6.1/src/patch.c
+@@ -52,6 +52,7 @@ static void reinitialize_almost_everythi
+ static void remove_if_needed (char const *, int volatile *);
+ static void usage (FILE *, int) __attribute__((noreturn));
+ 
++static void reject_header (const char *filename);
+ static void abort_hunk (bool, bool);
+ static void abort_hunk_context (bool, bool);
+ static void abort_hunk_unified (bool, bool);
+@@ -83,6 +84,7 @@ static int Argc;
+ static char * const *Argv;
+ 
+ static FILE *rejfp;  /* reject file pointer */
++static char *global_reject;
+ 
+ static char const *patchname;
+ static char *rejname;
+@@ -159,6 +161,10 @@ main (int argc, char **argv)
+     /* Make sure we clean up in case of disaster.  */
+     set_signals (false);
+ 
++    /* initialize global reject file */
++    if (global_reject)
++      init_reject ();
++
+     if (inname && outfile)
+       {
+ 	apply_empty_patch = true;
+@@ -205,8 +211,9 @@ main (int argc, char **argv)
+ 	    init_output (TMPOUTNAME, exclusive, &outstate);
+ 	  }
+ 
+-	/* initialize reject file */
+-	init_reject ();
++	/* initialize per-patch reject file */
++	if (!global_reject)
++	  init_reject ();
+ 
+ 	/* find out where all the lines are */
+ 	if (!skip_rest_of_patch)
+@@ -295,6 +302,8 @@ main (int argc, char **argv)
+ 			|| ! where
+ 			|| ! apply_hunk (&outstate, where))))
+ 	      {
++		if (!failed)
++		  reject_header(outname);
+ 		abort_hunk (! failed, reverse);
+ 		failed++;
+ 		if (verbosity == VERBOSE ||
+@@ -331,7 +340,8 @@ main (int argc, char **argv)
+ 		    fclose (outstate.ofp);
+ 		    outstate.ofp = 0;
+ 		  }
+-		fclose (rejfp);
++		if (!global_reject)
++		  fclose (rejfp);
+ 		continue;
+ 	      }
+ 
+@@ -430,13 +440,13 @@ main (int argc, char **argv)
+ 	struct stat rejst;
+ 
+ 	if ((failed && fstat (fileno (rejfp), &rejst) != 0)
+-	    || fclose (rejfp) != 0)
++	    || (( !global_reject && fclose (rejfp) != 0)))
+ 	    write_fatal ();
+ 	if (failed) {
+ 	    somefailed = true;
+ 	    say ("%d out of %d hunk%s %s", failed, hunk, "s" + (hunk == 1),
+ 		 skip_rest_of_patch ? "ignored" : "FAILED");
+-	    if (outname && (! rejname || strcmp (rejname, "-") != 0)) {
++	    if (!global_reject && outname && (! rejname || strcmp (rejname, "-") != 0)) {
+ 		char *rej = rejname;
+ 		if (!rejname) {
+ 		    /* FIXME: This should really be done differnely!  */
+@@ -485,6 +495,23 @@ main (int argc, char **argv)
+       }
+       set_signals (true);
+     }
++    if (global_reject)
++      {
++	struct stat rejst;
++
++	if ((somefailed && fstat (fileno (rejfp), &rejst) != 0)
++	    || fclose (rejfp) != 0)
++	  write_fatal ();
++	if (somefailed)
++	  {
++	  say (" -- saving rejects to file %s\n", quotearg (global_reject));
++	  /*if (! dry_run)
++	    {*/
++	      move_file (TMPREJNAME, &TMPREJNAME_needs_removal,
++			 &rejst, global_reject, 0644, false);
++	    /*}*/
++	  }
++      }
+     if (outstate.ofp && (ferror (outstate.ofp) || fclose (outstate.ofp) != 0))
+       write_fatal ();
+     cleanup ();
+@@ -572,6 +599,7 @@ static struct option const longopts[] =
+   {"posix", no_argument, NULL, CHAR_MAX + 7},
+   {"quoting-style", required_argument, NULL, CHAR_MAX + 8},
+   {"reject-format", required_argument, NULL, CHAR_MAX + 9},
++  {"global-reject-file", required_argument, NULL, CHAR_MAX + 10},
+   {NULL, no_argument, NULL, 0}
+ };
+ 
+@@ -636,6 +664,7 @@ static char const *const option_help[] =
+ "",
+ "  -d DIR  --directory=DIR  Change the working directory to DIR first.",
+ "  --reject-format=FORMAT  Create 'context' or 'unified' rejects.",
++"  --global-reject-file=file  Put all rejects into one file.",
+ "  --binary  Read and write data in binary mode.",
+ "",
+ "  -v  --version  Output version info.",
+@@ -852,6 +881,9 @@ get_some_switches (void)
+ 		else
+ 		  usage (stderr, 2);
+ 		break;
++	    case CHAR_MAX + 10:
++		global_reject = savestr (optarg);
++		break;
+ 	    default:
+ 		usage (stderr, 2);
+ 	}
+@@ -1512,6 +1544,37 @@ similar (register char const *a, registe
+     }
+ }
+ 
++ static char *
++format_timestamp (char timebuf[37], bool which)
++{
++  time_t ts = pch_timestamp(which);
++  if (ts != -1)
++    {
++      struct tm *tm = localtime(&ts);
++      strftime(timebuf, 37, "\t%Y-%m-%d %H:%M:%S.000000000 %z", tm);
++    }
++  else
++    timebuf[0] = 0;
++  return timebuf;
++}
++
++/* Write a header in a reject file that combines multiple hunks. */
++static void
++reject_header (const char *outname)
++{
++    char timebuf0[37], timebuf1[37];
++    if (!global_reject)
++      return;
++    if (diff_type == UNI_DIFF)
++	fprintf(rejfp, "--- %s.orig%s\n+++ %s%s\n",
++		outname, format_timestamp(timebuf0, reverse),
++		outname, format_timestamp(timebuf1, !reverse));
++    else
++	fprintf(rejfp, "*** %s.orig%s\n--- %s%s\n",
++		outname, format_timestamp(timebuf0, reverse),
++		outname, format_timestamp(timebuf1, !reverse));
++}
++
+ /* Make a temporary file.  */
+ 
+ #if HAVE_MKTEMP && ! HAVE_DECL_MKTEMP && ! defined mktemp
meta/recipes-devtools/patch/patch_2.6.1.bb new file +14 -0
new file mode 100644
index 0000000..8d07a78
@@ -0,0 +1,14 @@
+require patch.inc
+LICENSE = "GPLv3"
+
+PR = "r0"
+
+SRC_URI += " file://global-reject-file.diff;patch=1 "
+
+SRC_URI[md5sum] = "d758eb96d3f75047efc004a720d33daf"
+SRC_URI[sha256sum] = "ecb5c6469d732bcf01d6ec1afe9e64f1668caba5bfdb103c28d7f537ba3cdb8a"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+
+acpaths = "-I ${S}/gl/m4 -I ${S}/m4 "
+
Signature · 1 line
1.7.2.2
#3 lore raw

PATCH 3/6 fstests: upgrade to svn revision #426

In reply to Nitin A Kamble

Also add license checksums, update PR & license fields

---
 .../conf/distro/include/poky-default-revisions.inc |    2 +-
 meta/recipes-graphics/fstests/fstests_svn.bb       |    6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)
meta/conf/distro/include/poky-default-revisions.inc +1 -1
index 81c39ab..1e74fb7 100644
@@ -43,7 +43,7 @@ SRCREV_pn-eglibc-initial ??= "${EGLIBCREV}"
 SRCREV_pn-eglibc-nativesdk ??= "${EGLIBCREV}"
 SRCREV_pn-eglibc-initial-nativesdk ??= "${EGLIBCREV}"
 SRCREV_pn-exmap-console ??= "405"
-SRCREV_pn-fstests ??= "266"
+SRCREV_pn-fstests ??= "426"
 SRCREV_pn-gaku ??= "399"
 SRCREV_pn-gconf-dbus ??= "705"
 SRCREV_pn-gconf-dbus-native ??= "705"
meta/recipes-graphics/fstests/fstests_svn.bb +4 -2
index 241d6b9..9d26e07 100644
@@ -2,10 +2,9 @@ DESCRIPTION = "Various benchmarning tests for X"
 HOMEPAGE = "http://www.o-hand.com"
 SECTION = "devel"
 LICENSE = "ZLIB"
-LIC_FILES_CHKSUM = "file://test-pango-gdk.c;endline=24;md5=1ee74ec851ecda57eb7ac6cc180f7655"
 DEPENDS = "pango libxext libxft virtual/libx11 gtk+"
 PV = "0.0+svnr${SRCREV}"
-PR = "r1"
+PR = "r0"
 
 inherit autotools
 
@@ -17,3 +16,6 @@ do_install() {
     install -d ${D}${bindir}
     find . -name "test-*" -type f -perm -755 -exec install -m 0755 {} ${D}${bindir} \;   
 }
+
+
+LIC_FILES_CHKSUM = "file://test-pango-gdk.c;endline=24;md5=1ee74ec851ecda57eb7ac6cc180f7655"
Signature · 1 line
1.7.2.2
#4 lore raw

PATCH 4/6 gnu-config: upgrade recipe to the latest repo head

In reply to Nitin A Kamble

gnu-config recipe was using cvs repo for sources, and now the upstream has changed and is using git to export the repo. Using git repo for src_uri, was causing circular dependancy for bitbake. Hence using a tarball exported by the web git interface.

Currently the http fetcher can not handle the web git url properly, hence temporarily relying on the autobuilder, with the hope that new bitbake fetchers would fix the issue. A bug has been opened for the fetcher issue: http://bugzilla.pokylinux.org/show_bug.cgi?id=573

for example the git web url of the tarball is :
http://git.savannah.gnu.org/gitweb/?p=config.git;a=snapshot;h=3155524d0410c37b6286465249264c7981ab8cba;sf=tgz

---
 .../gnu-config/config-guess-uclibc.patch           |  130 +++++++++-----------
 .../gnu-config/gnu-config_20080123.bb              |   38 ------
 meta/recipes-devtools/gnu-config/gnu-config_git.bb |   48 +++++++
 3 files changed, 107 insertions(+), 109 deletions(-)
 delete mode 100644 meta/recipes-devtools/gnu-config/gnu-config_20080123.bb
 create mode 100644 meta/recipes-devtools/gnu-config/gnu-config_git.bb
meta/recipes-devtools/gnu-config/gnu-config/config-guess-uclibc.patch +59 -71
index f820cef..4f10adb 100644
@@ -3,11 +3,11 @@ Patch courtesy gentoo-portage/sys-devel/gnuconfig/files/automake-1.8.5-config-gu
 updated to 20050516 by Marcin 'Hrw' Juszkiewicz (by hand)
 updated to 20080123 by Nitin A Kamble (by hand)
 
-Index: config/config.guess
+Index: config-1a0cbc1/config.guess
 ===================================================================
---- config.orig/config.guess
-+++ config/config.guess
-@@ -139,6 +139,19 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` |
+--- config-1a0cbc1.orig/config.guess
++++ config-1a0cbc1/config.guess
+@@ -140,6 +140,19 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` |
  UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
  UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
  
@@ -27,7 +27,24 @@ Index: config/config.guess
  # Note: order is significant - the case branches are not exclusive.
  
  case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-@@ -840,13 +853,13 @@ EOF
+@@ -191,7 +204,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ 	# suitable tag, in the style of linux-gnu.
+ 	case "${UNAME_VERSION}" in
+ 	    Debian*)
+-		release='-gnu'
++		release='-${LIBC}'
+ 		;;
+ 	    *)
+ 		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+@@ -870,29 +883,29 @@ EOF
+         esac
+ 	objdump --private-headers /bin/sh | grep -q ld.so.1
+ 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     arm*:Linux:*:*)
+ 	eval $set_cc_for_build
  	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
  	    | grep -q __ARM_EABI__
  	then
@@ -42,14 +59,22 @@ Index: config/config.guess
 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  	exit ;;
      cris:Linux:*:*)
- 	echo cris-axis-linux-gnu
-@@ -855,16 +868,16 @@ EOF
- 	echo crisv32-axis-linux-gnu
+-	echo cris-axis-linux-gnu
++	echo cris-axis-linux-${LIBC}
+ 	exit ;;
+     crisv32:Linux:*:*)
+-	echo crisv32-axis-linux-gnu
++	echo crisv32-axis-linux-${LIBC}
  	exit ;;
      frv:Linux:*:*)
 -    	echo frv-unknown-linux-gnu
 +    	echo frv-unknown-linux-${LIBC}
  	exit ;;
+     i*86:Linux:*:*)
+ 	LIBC=gnu
+@@ -906,13 +919,13 @@ EOF
+ 	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ 	exit ;;
      ia64:Linux:*:*)
 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
@@ -62,21 +87,12 @@ Index: config/config.guess
 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  	exit ;;
-     mips:Linux:*:*)
+     mips:Linux:*:* | mips64:Linux:*:*)
  	eval $set_cc_for_build
-@@ -887,7 +900,7 @@ EOF
- 		s: ::g
- 		p
- 	    }'`"
--	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
- 	;;
-     mips64:Linux:*:*)
- 	eval $set_cc_for_build
-@@ -910,16 +923,16 @@ EOF
- 		s: ::g
- 		p
- 	    }'`"
+@@ -931,54 +944,54 @@ EOF
+ 	#endif
+ EOF
+ 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 -	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 +	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
  	;;
@@ -84,24 +100,13 @@ Index: config/config.guess
 -	echo or32-unknown-linux-gnu
 +	echo or32-unknown-linux-${LIBC}
  	exit ;;
-     ppc:Linux:*:*)
--	echo powerpc-unknown-linux-gnu
-+	echo powerpc-unknown-linux-${LIBC}
- 	exit ;;
-     ppc64:Linux:*:*)
--	echo powerpc64-unknown-linux-gnu
-+	echo powerpc64-unknown-linux-${LIBC}
+     padre:Linux:*:*)
+-	echo sparc-unknown-linux-gnu
++	echo sparc-unknown-linux-${LIBC}
  	exit ;;
-     alpha:Linux:*:*)
- 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-@@ -932,40 +945,40 @@ EOF
- 	  EV68*) UNAME_MACHINE=alphaev68 ;;
-         esac
- 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
--	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
--	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-+	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+     parisc64:Linux:*:* | hppa64:Linux:*:*)
+-	echo hppa64-unknown-linux-gnu
++	echo hppa64-unknown-linux-${LIBC}
  	exit ;;
      parisc:Linux:*:* | hppa:Linux:*:*)
  	# Look for CPU level
@@ -114,9 +119,13 @@ Index: config/config.guess
 +	  *)    echo hppa-unknown-linux-${LIBC} ;;
  	esac
  	exit ;;
-     parisc64:Linux:*:* | hppa64:Linux:*:*)
--	echo hppa64-unknown-linux-gnu
-+	echo hppa64-unknown-linux-${LIBC}
+     ppc64:Linux:*:*)
+-	echo powerpc64-unknown-linux-gnu
++	echo powerpc64-unknown-linux-${LIBC}
+ 	exit ;;
+     ppc:Linux:*:*)
+-	echo powerpc-unknown-linux-gnu
++	echo powerpc-unknown-linux-${LIBC}
  	exit ;;
      s390:Linux:*:* | s390x:Linux:*:*)
  	echo ${UNAME_MACHINE}-ibm-linux
@@ -133,8 +142,13 @@ Index: config/config.guess
 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  	exit ;;
+     tile*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-tilera-linux-gnu
++	echo ${UNAME_MACHINE}-tilera-linux-${LIBC}
+ 	exit ;;
      vax:Linux:*:*)
- 	echo ${UNAME_MACHINE}-dec-linux-gnu
+-	echo ${UNAME_MACHINE}-dec-linux-gnu
++	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
  	exit ;;
      x86_64:Linux:*:*)
 -	echo x86_64-unknown-linux-gnu
@@ -144,31 +158,5 @@ Index: config/config.guess
 -    	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +    	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
  	exit ;;
-     i*86:Linux:*:*)
- 	# The BFD linker knows what the default object file format is, so
-@@ -980,20 +993,21 @@ EOF
- 				    p'`
-         case "$ld_supported_targets" in
- 	  elf32-i386)
--		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-+		TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}"
- 		;;
- 	  a.out-i386-linux)
--		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout"
- 		exit ;;
- 	  coff-i386)
--		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}coff"
- 		exit ;;
- 	  "")
- 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
- 		# one that does not give us useful --help.
--		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld"
- 		exit ;;
- 	esac
-+	if [ $LIBC != "gnu" -o $LIBC != "gnulibc1" ];then echo "$TENTATIVE" && exit; fi
- 	# Determine whether the default compiler is a.out or elf
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
+     i*86:DYNIX/ptx:4*:*)
+ 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
meta/recipes-devtools/gnu-config/gnu-config_20080123.bb deleted +0 -38
deleted file mode 100644
index 5d7d646..0000000
@@ -1,38 +0,0 @@
-DESCRIPTION = "gnu-configize"
-SECTION = "devel"
-LICENSE = "GPLv1+"
-LIC_FILES_CHKSUM = "file://config.guess;endline=39;md5=a089987af4a25cb0419d1c2fd6d495e3"
-DEPENDS = ""
-INHIBIT_DEFAULT_DEPS = "1"
-
-FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
-PV = "0.1+cvs${FIXEDSRCDATE}"
-PR = "r1"
-
-SRC_URI = "cvs://[email protected]/cvsroot/config;module=config;method=pserver;date=${FIXEDSRCDATE} \
-	   file://config-guess-uclibc.patch \
-           file://gnu-configize.in"
-S = "${WORKDIR}/config"
-
-do_compile() {
-	:
-}
-
-do_install () {
-	install -d ${D}${datadir}/gnu-config \
-		   ${D}${bindir}
-	cat ${WORKDIR}/gnu-configize.in | \
-		sed -e 's,@gnu-configdir@,${datadir}/gnu-config,g' \
-		    -e 's,@autom4te_perllibdir@,${datadir}/autoconf,g' > ${D}${bindir}/gnu-configize
-	# In the native case we want the system perl as perl-native can't have built yet
-	if [ "${BUILD_ARCH}" != "${TARGET_ARCH}" ]; then
-		sed -i -e 's,/usr/bin/perl,${bindir}/perl,g' ${D}${bindir}/gnu-configize
-	fi
-	chmod 755 ${D}${bindir}/gnu-configize
-	install -m 0644 config.guess config.sub ${D}${datadir}/gnu-config/
-}
-
-PACKAGES = "${PN}"
-FILES_${PN} = "${bindir} ${datadir}/gnu-config"
-
-BBCLASSEXTEND = "native"
meta/recipes-devtools/gnu-config/gnu-config_git.bb new file +48 -0

48 lines not on this page · raw message

Signature · 1 line
1.7.2.2
#6 lore raw

PATCH 6/6 distro_tracking: update status for upgraded recipes

In reply to Nitin A Kamble

distro_tracking: chaning owner of python-pygtk
As the python-pygtk's version is tightly connected to the gtk+ recipe version. changing the recipe ower to Edwin who is the gtk+ recipe owner.

---
 .../conf/distro/include/distro_tracking_fields.inc |   21 +++++++++----------
 1 files changed, 10 insertions(+), 11 deletions(-)
meta/conf/distro/include/distro_tracking_fields.inc +10 -11
index 7a88447..5ba28d1 100644
@@ -79,7 +79,7 @@ RECIPE_STATUS_pn-moblin-proto = "red"
 RECIPE_LATEST_VERIONS_pn-moblin-proto = "check"
 RECIPE_MAINTAINER_pn-moblin-proto = "Dexuan Cui <[email protected]>"
 
-RECIPE_STATUS_pn-patch = "red"
+RECIPE_STATUS_pn-patch = "green"
 RECIPE_LATEST_VERIONS_pn-patch = "2.6.1"
 RECIPE_MAINTAINER_pn-patch = "Nitin A Kamble <[email protected]>"
 
@@ -2602,7 +2602,7 @@ RECIPE_STATUS_pn-gcc="green"
 RECIPE_LATEST_VERSION_pn-gcc="4.5.1"
 RECIPE_MAINTAINER_pn-gcc = "Nitin A Kamble <[email protected]>"
 
-RECIPE_STATUS_pn-autoconf="red" 
+RECIPE_STATUS_pn-autoconf="green" 
 RECIPE_LATEST_VERSION_pn-autoconf="2.68"
 RECIPE_MAINTAINER_pn-autoconf = "Nitin A Kamble <[email protected]>"
 
@@ -2631,8 +2631,7 @@ RECIPE_STATUS_pn-flex="green"
 RECIPE_LATEST_VERSION_pn-flex="2.5.35"
 RECIPE_MAINTAINER_pn-flex = "Nitin A Kamble <[email protected]>"
 
-RECIPE_STATUS_pn-fstests="red"  
-RECIPE_NO_UPDATE_REASON_pn-fstests="svnr266 is poky default"
+RECIPE_STATUS_pn-fstests="green"  
 RECIPE_LATEST_VERSION_pn-fstests="0.0+svnr426"
 DISTRO_PN_ALIAS_pn-fstests = "OpenedHand"
 RECIPE_MAINTAINER_pn-fstests = "Nitin A Kamble <[email protected]>"
@@ -2695,15 +2694,15 @@ RECIPE_STATUS_pn-python-pycurl="green"
 RECIPE_LATEST_VERSION_pn-python-pycurl="7.19.0"
 RECIPE_MAINTAINER_pn-python-pycurl = "Nitin A Kamble <[email protected]>"
 
-RECIPE_STATUS_pn-python-pygobject="red"
+RECIPE_STATUS_pn-python-pygobject="green"
 DISTRO_PN_ALIAS_pn-python-pygobject = "Meego=pygobject2 Fedora=pygobject2 Ubuntu=pygobject Debian=pygobject"
-RECIPE_LATEST_VERSION_pn-python-pygobject="2.21.1"
+RECIPE_LATEST_VERSION_pn-python-pygobject="2.27.0"
 RECIPE_MAINTAINER_pn-python-pygobject = "Nitin A Kamble <[email protected]>"
 
 RECIPE_STATUS_pn-python-pygtk="red"
 DISTRO_PN_ALIAS_pn-python-pygtk = "Debian=python-gtk2 Fedora=pygtk2 OpenSuSE=python-gtk"
 RECIPE_LATEST_VERSION_pn-python-pygtk="2.17.0"
-RECIPE_MAINTAINER_pn-python-pygtk = "Nitin A Kamble <[email protected]>"
+RECIPE_MAINTAINER_pn-python-pygtk = "Zhai Edwin <[email protected]>"
 
 RECIPE_STATUS_pn-python-pyrex="green"
 RECIPE_LATEST_VERSION_pn-python-pyrex="0.9.9"
@@ -2734,8 +2733,8 @@ RECIPE_STATUS_pn-unifdef="green" # poky local source files
 RECIPE_LATEST_VERSION_pn-unifdef="2.6.18+git"
 RECIPE_MAINTAINER_pn-unifdef = "Nitin A Kamble <[email protected]>"
 
-RECIPE_STATUS_pn-gnu-config="red" 
-RECIPE_LATEST_VERSION_pn-gnu-config="0.1+cvs20080123"
+RECIPE_STATUS_pn-gnu-config="green" 
+RECIPE_LATEST_VERSION_pn-gnu-config="0.0+git3155524"
 DISTRO_PN_ALIAS_pn-gnu-config = "OpenedHand"
 RECIPE_MAINTAINER_pn-gnu-config = "Nitin A Kamble <[email protected]>"
 
@@ -2756,11 +2755,11 @@ RECIPE_STATUS_pn-byacc="green"
 RECIPE_LATEST_VERSION_pn-byacc="20100610"
 RECIPE_MAINTAINER_pn-byacc = "Nitin A Kamble <[email protected]>"
 
-RECIPE_STATUS_pn-libconvert-asn1-perl="red" # 0.22 version does not build, so created a recipe for version 0.21
+RECIPE_STATUS_pn-libconvert-asn1-perl="green" # 0.22 version does not build, so created a recipe for version 0.21
 RECIPE_LATEST_VERSION_pn-libconvert-asn1-perl="0.22"
 RECIPE_MAINTAINER_pn-libconvert-asn1-perl = "Nitin A Kamble <[email protected]>"
 
-RECIPE_STATUS_pn-libxml-parser-perl="red" 
+RECIPE_STATUS_pn-libxml-parser-perl="green" 
 RECIPE_LATEST_VERSION_pn-libxml-parser-perl="2.36"
 RECIPE_MAINTAINER_pn-libxml-parser-perl = "Nitin A Kamble <[email protected]>"
 
Signature · 1 line
1.7.2.2
#5 lore raw

PATCH 5/6 python-pygobject: upgrade from 2.21.1 to 2.27.0

In reply to Nitin A Kamble
---
 ...2.21.1.bb => python-pygobject-native_2.27.0.bb} |    0
 ...object_2.21.1.bb => python-pygobject_2.27.0.bb} |    2 +-
 2 files changed, 1 insertions(+), 1 deletions(-)
 rename meta/recipes-devtools/python/{python-pygobject-native_2.21.1.bb => python-pygobject-native_2.27.0.bb} (100%)
 rename meta/recipes-devtools/python/{python-pygobject_2.21.1.bb => python-pygobject_2.27.0.bb} (98%)
meta/recipes-devtools/python/python-pygobject-native_2.27.0.bb renamed from meta/recipes-devtools/python/python-pygobject-native_2.21.1.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/python/python-pygobject-native_2.21.1.bb
rename to meta/recipes-devtools/python/python-pygobject-native_2.27.0.bb
meta/recipes-devtools/python/python-pygobject_2.27.0.bb renamed from meta/recipes-devtools/python/python-pygobject_2.21.1.bb +1 -1
similarity index 98%
rename from meta/recipes-devtools/python/python-pygobject_2.21.1.bb
rename to meta/recipes-devtools/python/python-pygobject_2.27.0.bb
index ca93c68..4356108 100644
@@ -3,7 +3,7 @@ SECTION = "devel/python"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7"
 DEPENDS = "python-pygobject-native-${PV} glib-2.0"
-PR = "ml0"
+PR = "r0"
 
 MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
 
Signature · 1 line
1.7.2.2