RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm lua                          Date:   18-Aug-2008 20:19:30
  Branch: HEAD                             Handle: 2008081818192901

  Modified files:
    lua/shadow              defines.h
    rpm                     CHANGES

  Log:
    - WR: eliminate duplicated AutoFu boilerplate, use system.h instead.

  Summary:
    Revision    Changes     Path
    1.3         +2  -55     lua/shadow/defines.h
    1.2526      +1  -0      rpm/CHANGES
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: lua/shadow/defines.h
  ============================================================================
  $ cvs diff -u -r1.2 -r1.3 defines.h
  --- lua/shadow/defines.h	18 Aug 2008 17:27:43 -0000	1.2
  +++ lua/shadow/defines.h	18 Aug 2008 18:19:30 -0000	1.3
  @@ -4,7 +4,7 @@
    * in WRLinux for inclusion in rpm.
    */
   
  -/* $Id: defines.h,v 1.2 2008/08/18 17:27:43 jbj Exp $ */
  +/* $Id: defines.h,v 1.3 2008/08/18 18:19:30 jbj Exp $ */
   /* some useful defines */
   
   #ifndef _DEFINES_H_
  @@ -12,24 +12,16 @@
   
   #define ISDIGIT_LOCALE(c) (IN_CTYPE_DOMAIN (c) && isdigit (c))
   
  -/* Take care of NLS matters.  */
  -
  -#if HAVE_LOCALE_H
  -# include <locale.h>
  -#endif
  -
   #define gettext_noop(String) (String)
   /* #define gettext_def(String) "#define String" */
   
   #if STDC_HEADERS
  -# include <stdlib.h>
  -# include <string.h>
   #else				/* not STDC_HEADERS */
   # ifndef HAVE_STRCHR
   #  define strchr index
   #  define strrchr rindex
  -# endif
   char *strchr (), *strrchr (), *strtok ();
  +# endif
   
   # ifndef HAVE_MEMCPY
   #  define memcpy(d, s, n) bcopy((s), (d), (n))
  @@ -40,11 +32,6 @@
   # include <errno.h>
   #endif
   
  -#include <sys/stat.h>
  -#include <sys/types.h>
  -#if HAVE_SYS_WAIT_H
  -# include <sys/wait.h>
  -#endif
   #ifndef WEXITSTATUS
   # define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
   #endif
  @@ -52,21 +39,6 @@
   # define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
   #endif
   
  -#if HAVE_UNISTD_H
  -# include <unistd.h>
  -#endif
  -
  -#if TIME_WITH_SYS_TIME
  -# include <sys/time.h>
  -# include <time.h>
  -#else				/* not TIME_WITH_SYS_TIME */
  -# if HAVE_SYS_TIME_H
  -#  include <sys/time.h>
  -# else
  -#  include <time.h>
  -# endif
  -#endif				/* not TIME_WITH_SYS_TIME */
  -
   #ifdef HAVE_MEMSET
   # define memzero(ptr, size) memset((void *)(ptr), 0, (size))
   #else
  @@ -75,18 +47,8 @@
   #define strzero(s) memzero(s, strlen(s))	/* warning: evaluates twice */
   
   #ifdef HAVE_DIRENT_H		/* DIR_SYSV */
  -# include <dirent.h>
   # define DIRECT dirent
   #else
  -# ifdef HAVE_SYS_NDIR_H		/* DIR_XENIX */
  -#  include <sys/ndir.h>
  -# endif
  -# ifdef HAVE_SYS_DIR_H		/* DIR_??? */
  -#  include <sys/dir.h>
  -# endif
  -# ifdef HAVE_NDIR_H		/* DIR_BSD */
  -#  include <ndir.h>
  -# endif
   # define DIRECT direct
   #endif
   
  @@ -108,8 +70,6 @@
   #endif
   #endif				/* not HAVE_SHADOW_H */
   
  -#include <limits.h>
  -
   #ifndef	NGROUPS_MAX
   #ifdef	NGROUPS
   #define	NGROUPS_MAX	NGROUPS
  @@ -182,19 +142,6 @@
   
   #define OPENLOG(progname) openlog(progname, SYSLOG_OPTIONS, SYSLOG_FACILITY)
   
  -#ifndef F_OK
  -# define F_OK 0
  -# define X_OK 1
  -# define W_OK 2
  -# define R_OK 4
  -#endif
  -
  -#ifndef SEEK_SET
  -# define SEEK_SET 0
  -# define SEEK_CUR 1
  -# define SEEK_END 2
  -#endif
  -
   #ifdef STAT_MACROS_BROKEN
   # define S_ISDIR(x) ((x) & S_IFMT) == S_IFDIR)
   # define S_ISREG(x) ((x) & S_IFMT) == S_IFREG)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2525 -r1.2526 CHANGES
  --- rpm/CHANGES	18 Aug 2008 18:02:52 -0000	1.2525
  +++ rpm/CHANGES	18 Aug 2008 18:19:29 -0000	1.2526
  @@ -1,5 +1,6 @@
   
   5.1.0 -> 5.2a0:
  +    - jbj: WR: eliminate duplicated AutoFu boilerplate, use system.h instead.
       - jbj: WR: eliminate getdate.[ch], use same from rpmio instead.
       - jbj: WR: eliminate dueling AutoFu defines from shadow_config.h, use RPM's
   	config.h (through system.h) instead.
  @@ .