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 19:27:44
Branch: HEAD Handle: 2008081817274201
Added files:
lua/shadow shadow_config.h
Modified files:
lua Makefile.am
lua/shadow commonio.c copydir.c defines.h fputsx.c getdate.c
getdate.h getdef.c groupadd.c groupio.c gshadow.c
list.c prototypes.h pwio.c sgetgrent.c sgetpwent.c
sgroupio.c shadowio.c strtoday.c useradd.c
rpm CHANGES
Removed files:
lua/shadow config.h xmalloc.c
Log:
- jbj: WR: eliminate xmalloc.c, use system.h defines instead.
- jbj: WR: rename config.h to shadow_config.h, include "system.h" instead.
Summary:
Revision Changes Path
1.22 +1 -2 lua/Makefile.am
1.2 +3 -2 lua/shadow/commonio.c
1.2 +0 -412 lua/shadow/config.h
1.2 +3 -2 lua/shadow/copydir.c
1.2 +1 -14 lua/shadow/defines.h
1.2 +3 -2 lua/shadow/fputsx.c
1.2 +1 -1 lua/shadow/getdate.c
1.2 +1 -1 lua/shadow/getdate.h
1.2 +3 -2 lua/shadow/getdef.c
1.3 +3 -2 lua/shadow/groupadd.c
1.2 +3 -2 lua/shadow/groupio.c
1.2 +3 -2 lua/shadow/gshadow.c
1.2 +3 -2 lua/shadow/list.c
1.2 +1 -5 lua/shadow/prototypes.h
1.2 +3 -2 lua/shadow/pwio.c
1.2 +3 -2 lua/shadow/sgetgrent.c
1.2 +3 -2 lua/shadow/sgetpwent.c
1.2 +3 -2 lua/shadow/sgroupio.c
1.1 +412 -0 lua/shadow/shadow_config.h
1.2 +3 -2 lua/shadow/shadowio.c
1.2 +3 -2 lua/shadow/strtoday.c
1.3 +3 -2 lua/shadow/useradd.c
1.2 +0 -37 lua/shadow/xmalloc.c
1.2524 +2 -0 rpm/CHANGES
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: lua/Makefile.am
============================================================================
$ cvs diff -u -r1.21 -r1.22 Makefile.am
--- lua/Makefile.am 18 Aug 2008 15:30:17 -0000 1.21
+++ lua/Makefile.am 18 Aug 2008 17:27:43 -0000 1.22
@@ -94,8 +94,7 @@
shadow/shadowio.h \
shadow/shadowio.c \
shadow/strtoday.c \
- shadow/useradd.c \
- shadow/xmalloc.c
+ shadow/useradd.c
endif
if USE_LUA_CHKCONFIG
liblua_la_SOURCES += \
@@ .
patch -p0 <<'@@ .'
Index: lua/shadow/commonio.c
============================================================================
$ cvs diff -u -r1.1 -r1.2 commonio.c
--- lua/shadow/commonio.c 17 Aug 2008 18:31:35 -0000 1.1
+++ lua/shadow/commonio.c 18 Aug 2008 17:27:43 -0000 1.2
@@ -5,9 +5,10 @@
*/
-#include "config.h"
+#include "system.h"
+#include "shadow_config.h"
-#ident "$Id: commonio.c,v 1.1 2008/08/17 18:31:35 jbj Exp $"
+#ident "$Id: commonio.c,v 1.2 2008/08/18 17:27:43 jbj Exp $"
#include "defines.h"
#include <sys/stat.h>
@@ .
rm -f lua/shadow/config.h <<'@@ .'
Index: lua/shadow/config.h
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: lua/shadow/copydir.c
============================================================================
$ cvs diff -u -r1.1 -r1.2 copydir.c
--- lua/shadow/copydir.c 17 Aug 2008 18:31:35 -0000 1.1
+++ lua/shadow/copydir.c 18 Aug 2008 17:27:43 -0000 1.2
@@ -33,9 +33,10 @@
* SUCH DAMAGE.
*/
-#include "config.h"
+#include "system.h"
+#include "shadow_config.h"
-#ident "$Id: copydir.c,v 1.1 2008/08/17 18:31:35 jbj Exp $"
+#ident "$Id: copydir.c,v 1.2 2008/08/18 17:27:43 jbj Exp $"
#include <sys/stat.h>
#include <sys/types.h>
@@ .
patch -p0 <<'@@ .'
Index: lua/shadow/defines.h
============================================================================
$ cvs diff -u -r1.1 -r1.2 defines.h
--- lua/shadow/defines.h 17 Aug 2008 18:31:35 -0000 1.1
+++ lua/shadow/defines.h 18 Aug 2008 17:27:43 -0000 1.2
@@ -4,7 +4,7 @@
* in WRLinux for inclusion in rpm.
*/
-/* $Id: defines.h,v 1.1 2008/08/17 18:31:35 jbj Exp $ */
+/* $Id: defines.h,v 1.2 2008/08/18 17:27:43 jbj Exp $ */
/* some useful defines */
#ifndef _DEFINES_H_
@@ -21,19 +21,6 @@
#define gettext_noop(String) (String)
/* #define gettext_def(String) "#define String" */
-#if ENABLE_NLS
-# include <libintl.h>
-# define _(Text) gettext (Text)
-#else
-# undef bindtextdomain
-# define bindtextdomain(Domain, Directory) /* empty */
-# undef textdomain
-# define textdomain(Domain) /* empty */
-# define _(Text) Text
-# define ngettext(Msgid1, Msgid2, N) \
- ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
-#endif
-
#if STDC_HEADERS
# include <stdlib.h>
# include <string.h>
@@ .
patch -p0 <<'@@ .'
Index: lua/shadow/fputsx.c
============================================================================
$ cvs diff -u -r1.1 -r1.2 fputsx.c
--- lua/shadow/fputsx.c 17 Aug 2008 18:31:35 -0000 1.1
+++ lua/shadow/fputsx.c 18 Aug 2008 17:27:43 -0000 1.2
@@ -33,12 +33,13 @@
* SUCH DAMAGE.
*/
-#include "config.h"
+#include "system.h"
+#include "shadow_config.h"
#include <stdio.h>
#include "defines.h"
-#ident "$Id: fputsx.c,v 1.1 2008/08/17 18:31:35 jbj Exp $"
+#ident "$Id: fputsx.c,v 1.2 2008/08/18 17:27:43 jbj Exp $"
char *fgetsx (char *buf, int cnt, FILE * f)
@@ .
patch -p0 <<'@@ .'
Index: lua/shadow/getdate.c
============================================================================
$ cvs diff -u -r1.1 -r1.2 getdate.c
--- lua/shadow/getdate.c 17 Aug 2008 18:31:35 -0000 1.1
+++ lua/shadow/getdate.c 18 Aug 2008 17:27:43 -0000 1.2
@@ -116,7 +116,7 @@
*/
#ifdef HAVE_CONFIG_H
-# include "config.h"
+# include "shadow_config.h"
# ifdef FORCE_ALLOCA_H
# include <alloca.h>
# endif
@@ .
patch -p0 <<'@@ .'
Index: lua/shadow/getdate.h
============================================================================
$ cvs diff -u -r1.1 -r1.2 getdate.h
--- lua/shadow/getdate.h 17 Aug 2008 18:31:35 -0000 1.1
+++ lua/shadow/getdate.h 18 Aug 2008 17:27:43 -0000 1.2
@@ -7,7 +7,7 @@
#ifndef _GETDATE_H_
#define _GETDATE_H_
-#include <config.h>
+#include <shadow_config.h>
#include "defines.h"
time_t get_date (const char *, const time_t *);
@@ .
patch -p0 <<'@@ .'
Index: lua/shadow/getdef.c
============================================================================
$ cvs diff -u -r1.1 -r1.2 getdef.c
--- lua/shadow/getdef.c 17 Aug 2008 18:31:35 -0000 1.1
+++ lua/shadow/getdef.c 18 Aug 2008 17:27:43 -0000 1.2
@@ -33,9 +33,10 @@
* SUCH DAMAGE.
*/
-#include "config.h"
+#include "system.h"
+#include "shadow_config.h"
-#ident "$Id: getdef.c,v 1.1 2008/08/17 18:31:35 jbj Exp $"
+#ident "$Id: getdef.c,v 1.2 2008/08/18 17:27:43 jbj Exp $"
#include "prototypes.h"
#include "defines.h"
@@ .
patch -p0 <<'@@ .'
Index: lua/shadow/groupadd.c
============================================================================
$ cvs diff -u -r1.2 -r1.3 groupadd.c
--- lua/shadow/groupadd.c 17 Aug 2008 18:55:15 -0000 1.2
+++ lua/shadow/groupadd.c 18 Aug 2008 17:27:43 -0000 1.3
@@ -33,9 +33,10 @@
* SUCH DAMAGE.
*/
-#include "config.h"
+#include "system.h"
+#include "shadow_config.h"
-#ident "$Id: groupadd.c,v 1.2 2008/08/17 18:55:15 jbj Exp $"
+#ident "$Id: groupadd.c,v 1.3 2008/08/18 17:27:43 jbj Exp $"
#include <ctype.h>
#include <fcntl.h>
@@ .
patch -p0 <<'@@ .'
Index: lua/shadow/groupio.c
============================================================================
$ cvs diff -u -r1.1 -r1.2 groupio.c
--- lua/shadow/groupio.c 17 Aug 2008 18:31:35 -0000 1.1
+++ lua/shadow/groupio.c 18 Aug 2008 17:27:43 -0000 1.2
@@ -5,9 +5,10 @@
*/
-#include "config.h"
+#include "system.h"
+#include "shadow_config.h"
-#ident "$Id: groupio.c,v 1.1 2008/08/17 18:31:35 jbj Exp $"
+#ident "$Id: groupio.c,v 1.2 2008/08/18 17:27:43 jbj Exp $"
#include "prototypes.h"
#include "defines.h"
@@ .
patch -p0 <<'@@ .'
Index: lua/shadow/gshadow.c
============================================================================
$ cvs diff -u -r1.1 -r1.2 gshadow.c
--- lua/shadow/gshadow.c 17 Aug 2008 18:31:35 -0000 1.1
+++ lua/shadow/gshadow.c 18 Aug 2008 17:27:43 -0000 1.2
@@ -33,12 +33,13 @@
* SUCH DAMAGE.
*/
-#include "config.h"
+#include "system.h"
+#include "shadow_config.h"
/* Newer versions of Linux libc already have shadow support. */
#if defined(SHADOWGRP) && !defined(HAVE_SHADOWGRP) /*{ */
-#ident "$Id: gshadow.c,v 1.1 2008/08/17 18:31:35 jbj Exp $"
+#ident "$Id: gshadow.c,v 1.2 2008/08/18 17:27:43 jbj Exp $"
#include <stdio.h>
#include "prototypes.h"
@@ .
patch -p0 <<'@@ .'
Index: lua/shadow/list.c
============================================================================
$ cvs diff -u -r1.1 -r1.2 list.c
--- lua/shadow/list.c 17 Aug 2008 18:31:35 -0000 1.1
+++ lua/shadow/list.c 18 Aug 2008 17:27:43 -0000 1.2
@@ -36,9 +36,10 @@
/* Removed duplicated code from gpmain.c, useradd.c, userdel.c and
usermod.c. --marekm */
-#include "config.h"
+#include "system.h"
+#include "shadow_config.h"
-#ident "$Id: list.c,v 1.1 2008/08/17 18:31:35 jbj Exp $"
+#ident "$Id: list.c,v 1.2 2008/08/18 17:27:43 jbj Exp $"
#include "prototypes.h"
#include "defines.h"
@@ .
patch -p0 <<'@@ .'
Index: lua/shadow/prototypes.h
============================================================================
$ cvs diff -u -r1.1 -r1.2 prototypes.h
--- lua/shadow/prototypes.h 17 Aug 2008 18:31:35 -0000 1.1
+++ lua/shadow/prototypes.h 18 Aug 2008 17:27:43 -0000 1.2
@@ -12,7 +12,7 @@
* Juha Virtanen, <jiivee@hut.fi>; November 1995
*/
/*
- * $Id: prototypes.h,v 1.1 2008/08/17 18:31:35 jbj Exp $
+ * $Id: prototypes.h,v 1.2 2008/08/18 17:27:43 jbj Exp $
*
* Added a macro to work around ancient (non-ANSI) compilers, just in case
* someone ever tries to compile this with SunOS cc... --marekm
@@ -181,8 +181,4 @@
/* valid.c */
extern int valid (const char *, const struct passwd *);
-/* xmalloc.c */
-extern char *xmalloc (size_t);
-extern char *xstrdup (const char *);
-
#endif /* _PROTOTYPES_H */
@@ .
patch -p0 <<'@@ .'
Index: lua/shadow/pwio.c
============================================================================
$ cvs diff -u -r1.1 -r1.2 pwio.c
--- lua/shadow/pwio.c 17 Aug 2008 18:31:36 -0000 1.1
+++ lua/shadow/pwio.c 18 Aug 2008 17:27:43 -0000 1.2
@@ -5,9 +5,10 @@
*/
-#include "config.h"
+#include "system.h"
+#include "shadow_config.h"
-#ident "$Id: pwio.c,v 1.1 2008/08/17 18:31:36 jbj Exp $"
+#ident "$Id: pwio.c,v 1.2 2008/08/18 17:27:43 jbj Exp $"
#include "prototypes.h"
#include "defines.h"
@@ .
patch -p0 <<'@@ .'
Index: lua/shadow/sgetgrent.c
============================================================================
$ cvs diff -u -r1.1 -r1.2 sgetgrent.c
--- lua/shadow/sgetgrent.c 17 Aug 2008 18:31:36 -0000 1.1
+++ lua/shadow/sgetgrent.c 18 Aug 2008 17:27:43 -0000 1.2
@@ -33,9 +33,10 @@
* SUCH DAMAGE.
*/
-#include "config.h"
+#include "system.h"
+#include "shadow_config.h"
-#ident "$Id: sgetgrent.c,v 1.1 2008/08/17 18:31:36 jbj Exp $"
+#ident "$Id: sgetgrent.c,v 1.2 2008/08/18 17:27:43 jbj Exp $"
#include <stdio.h>
#include <grp.h>
@@ .
patch -p0 <<'@@ .'
Index: lua/shadow/sgetpwent.c
============================================================================
$ cvs diff -u -r1.1 -r1.2 sgetpwent.c
--- lua/shadow/sgetpwent.c 17 Aug 2008 18:31:36 -0000 1.1
+++ lua/shadow/sgetpwent.c 18 Aug 2008 17:27:43 -0000 1.2
@@ -33,9 +33,10 @@
* SUCH DAMAGE.
*/
-#include "config.h"
+#include "system.h"
+#include "shadow_config.h"
-#ident "$Id: sgetpwent.c,v 1.1 2008/08/17 18:31:36 jbj Exp $"
+#ident "$Id: sgetpwent.c,v 1.2 2008/08/18 17:27:43 jbj Exp $"
#include <sys/types.h>
#include "defines.h"
@@ .
patch -p0 <<'@@ .'
Index: lua/shadow/sgroupio.c
============================================================================
$ cvs diff -u -r1.1 -r1.2 sgroupio.c
--- lua/shadow/sgroupio.c 17 Aug 2008 18:31:36 -0000 1.1
+++ lua/shadow/sgroupio.c 18 Aug 2008 17:27:43 -0000 1.2
@@ -5,11 +5,12 @@
*/
-#include "config.h"
+#include "system.h"
+#include "shadow_config.h"
#ifdef SHADOWGRP
-#ident "$Id: sgroupio.c,v 1.1 2008/08/17 18:31:36 jbj Exp $"
+#ident "$Id: sgroupio.c,v 1.2 2008/08/18 17:27:43 jbj Exp $"
#include "prototypes.h"
#include "defines.h"
@@ .
patch -p0 <<'@@ .'
Index: lua/shadow/shadow_config.h
============================================================================
$ cvs diff -u -r0 -r1.1 shadow_config.h
--- /dev/null 2008-08-18 19:22:00 +0200
+++ shadow_config.h 2008-08-18 19:27:44 +0200
@@ -0,0 +1,412 @@
+/*
+ * This file was originally distributed as part of
+ * shadow-utils-4.0.17-12.fc6.src.rpm and has been modified
+ * in WRLinux for inclusion in rpm.
+ */
+
+/* config.h. Generated by configure. */
+/* config.h.in. Generated from configure.in by autoheader. */
+
+/* Define to 1 if translation of program messages to the user's native
+ language is requested. */
+#define ENABLE_NLS 1
+
+/* Path for faillog file. */
+#define FAILLOG_FILE "/var/log/faillog"
+
+/* Define to the type of elements in the array set by `getgroups'. Usually
+ this is either `int' or `gid_t'. */
+#define GETGROUPS_T gid_t
+
+/* Define to 1 if you have the `a64l' function. */
+#define HAVE_A64L 1
+
+/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
+ CoreFoundation framework. */
+/* #undef HAVE_CFLOCALECOPYCURRENT */
+
+/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
+ the CoreFoundation framework. */
+/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */
+
+/* Define if the GNU dcgettext() function is already present or preinstalled.
+ */
+#define HAVE_DCGETTEXT 1
+
+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+ */
+#define HAVE_DIRENT_H 1
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the <errno.h> header file. */
+#define HAVE_ERRNO_H 1
+
+/* Define to 1 if you have the `fchmod' function. */
+#define HAVE_FCHMOD 1
+
+/* Define to 1 if you have the `fchown' function. */
+#define HAVE_FCHOWN 1
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#define HAVE_FCNTL_H 1
+
+/* Define to 1 if you have the `fsync' function. */
+#define HAVE_FSYNC 1
+
+/* Define to 1 if you have the `getgroups' function. */
+#define HAVE_GETGROUPS 1
+
+/* Define to 1 if you have the `gethostname' function. */
+#define HAVE_GETHOSTNAME 1
+
+/* Define to 1 if you have the `getspnam' function. */
+#define HAVE_GETSPNAM 1
+
+/* Define if the GNU gettext() function is already present or preinstalled. */
+#define HAVE_GETTEXT 1
+
+/* Define to 1 if you have the `gettimeofday' function. */
+#define HAVE_GETTIMEOFDAY 1
+
+/* Define to 1 if you have the `getusershell' function. */
+#define HAVE_GETUSERSHELL 1
+
+/* Define to 1 if you have the `getutent' function. */
+#define HAVE_GETUTENT 1
+
+/* Define to 1 if you have the <gshadow.h> header file. */
+/* #undef HAVE_GSHADOW_H */
+
+/* Define if you have the iconv() function. */
+/* #undef HAVE_ICONV */
+
+/* Define to 1 if you have the `initgroups' function. */
+#define HAVE_INITGROUPS 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the <lastlog.h> header file. */
+#define HAVE_LASTLOG_H 1
+
+/* Define to 1 if you have the `lchown' function. */
+#define HAVE_LCHOWN 1
+
+/* Define to 1 if you have the `lckpwdf' function. */
+#define HAVE_LCKPWDF 1
+
+/* Defined if you have libcrack. */
+/* #undef HAVE_LIBCRACK */
+
+/* Defined if you have the ts&szs cracklib. */
+/* #undef HAVE_LIBCRACK_HIST */
+
+/* Defined if it includes *Pw functions. */
+/* #undef HAVE_LIBCRACK_PW */
+
+/* Define to 1 if you have the <limits.h> header file. */
+#define HAVE_LIMITS_H 1
+
+/* Define if struct lastlog has ll_host */
+#define HAVE_LL_HOST 1
+
+/* Define to 1 if you have the <locale.h> header file. */
+#define HAVE_LOCALE_H 1
+
+/* Define to 1 if you have the `lstat' function. */
+#define HAVE_LSTAT 1
+
+/* Define to 1 if you have the `memcpy' function. */
+#define HAVE_MEMCPY 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `memset' function. */
+#define HAVE_MEMSET 1
+
+/* Define to 1 if you have the `mkdir' function. */
+#define HAVE_MKDIR 1
+
+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+/* #undef HAVE_NDIR_H */
+
+/* Define to 1 if you have the <paths.h> header file. */
+#define HAVE_PATHS_H 1
+
+/* Define to 1 if you have the `putgrent' function. */
+#define HAVE_PUTGRENT 1
+
+/* Define to 1 if you have the `putpwent' function. */
+#define HAVE_PUTPWENT 1
+
+/* Define to 1 if you have the `putspent' function. */
+#define HAVE_PUTSPENT 1
+
+/* Define to 1 if you have the `rename' function. */
+#define HAVE_RENAME 1
+
+/* Define to 1 if you have the `rmdir' function. */
+#define HAVE_RMDIR 1
+
+/* Define to 1 if you have the <rpc/key_prot.h> header file. */
+#define HAVE_RPC_KEY_PROT_H 1
+
+/* Define to 1 if you have the <selinux/selinux.h> header file. */
+/* #undef HAVE_SELINUX_SELINUX_H */
+
+/* Define to 1 if you have the `setgroups' function. */
+#define HAVE_SETGROUPS 1
+
+/* Define to 1 if you have the `sgetgrent' function. */
+/* #undef HAVE_SGETGRENT */
+
+/* Define to 1 if you have the `sgetpwent' function. */
+/* #undef HAVE_SGETPWENT */
+
+/* Define to 1 if you have the `sgetspent' function. */
+#define HAVE_SGETSPENT 1
+
+/* Define to 1 if you have the <sgtty.h> header file. */
+#define HAVE_SGTTY_H 1
+
+/* Have working shadow group support in libc */
+/* #undef HAVE_SHADOWGRP */
+
+/* Define to 1 if you have the <shadow.h> header file. */
+#define HAVE_SHADOW_H 1
+
+/* Define to 1 if you have the `sigaction' function. */
+#define HAVE_SIGACTION 1
+
+/* Define to 1 if you have the `snprintf' function. */
+#define HAVE_SNPRINTF 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the `strcasecmp' function. */
+#define HAVE_STRCASECMP 1
+
+/* Define to 1 if you have the `strchr' function. */
+#define HAVE_STRCHR 1
+
+/* Define to 1 if you have the `strdup' function. */
+#define HAVE_STRDUP 1
+
+/* Define to 1 if you have the `strerror' function. */
+#define HAVE_STRERROR 1
+
+/* Define to 1 if you have the `strftime' function. */
+#define HAVE_STRFTIME 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the `strstr' function. */
+#define HAVE_STRSTR 1
+
+/* Define to 1 if `st_rdev' is member of `struct stat'. */
+#define HAVE_STRUCT_STAT_ST_RDEV 1
+
+/* Define to 1 if you have the <syslog.h> header file. */
+#define HAVE_SYSLOG_H 1
+
+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+ */
+/* #undef HAVE_SYS_DIR_H */
+
+/* Define to 1 if you have the <sys/ioctl.h> header file. */
+#define HAVE_SYS_IOCTL_H 1
+
+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+ */
+/* #undef HAVE_SYS_NDIR_H */
+
+/* Define to 1 if you have the <sys/resource.h> header file. */
+#define HAVE_SYS_RESOURCE_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#define HAVE_SYS_TIME_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
+#define HAVE_SYS_WAIT_H 1
+
+/* Define to 1 if you have the <termios.h> header file. */
+#define HAVE_TERMIOS_H 1
+
+/* Define to 1 if you have the <termio.h> header file. */
+#define HAVE_TERMIO_H 1
+
+/* Define to 1 if you have the <ulimit.h> header file. */
+#define HAVE_ULIMIT_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the `updwtmp' function. */
+#define HAVE_UPDWTMP 1
+
+/* Define to 1 if you have the `updwtmpx' function. */
+#define HAVE_UPDWTMPX 1
+
+/* Define to 1 if you have the <utime.h> header file. */
+#define HAVE_UTIME_H 1
+
+/* Define to 1 if `utime(file, NULL)' sets file's timestamp to the present. */
+#define HAVE_UTIME_NULL 1
+
+/* Define to 1 if you have the <utmpx.h> header file. */
+#define HAVE_UTMPX_H 1
+
+/* Define to 1 if you have the <utmp.h> header file. */
+#define HAVE_UTMP_H 1
+
+/* Path for lastlog file. */
+#define LASTLOG_FILE "/var/log/lastlog"
+
+/* Location of system mail spool directory. */
+#define MAIL_SPOOL_DIR "/var/mail"
+
+/* Name of user's mail spool file if stored in user's home directory. */
+/* #undef MAIL_SPOOL_FILE */
+
+#if 0
+/* Name of package */
+#define PACKAGE "shadow"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT ""
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME ""
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING ""
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION ""
+#endif
+
+/* Path to passwd program. */
+#define PASSWD_PROGRAM "/usr/bin/passwd"
+
+/* Define to 1 if the C compiler supports function prototypes. */
+#define PROTOTYPES 1
+
+/* Define as the return type of signal handlers (`int' or `void'). */
+#define RETSIGTYPE void
+
+/* Define if login should support the -r flag for rlogind. */
+#define RLOGIN 1
+
+/* Define to the ruserok() "success" return value (0 or 1). */
+#define RUSEROK 0
+
+/* Define to 1 if the `setpgrp' function takes no argument. */
+#define SETPGRP_VOID 1
+
+/* Define to support the shadow group file. */
+#define SHADOWGRP 1
+
+/* Define to support S/Key logins. */
+/* #undef SKEY */
+
+/* Define to support newer BSD S/Key API */
+/* #undef SKEY_BSD_STYLE */
+
+/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
+/* #undef STAT_MACROS_BROKEN */
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define to support /etc/suauth su access control. */
+#define SU_ACCESS 1
+
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#define TIME_WITH_SYS_TIME 1
+
+/* Define to 1 if your <sys/time.h> declares `struct tm'. */
+/* #undef TM_IN_SYS_TIME */
+
+/* Define to support Pluggable Authentication Modules */
+/* #undef USE_PAM */
+
+/* Define to use syslog(). */
+#define USE_SYSLOG 1
+
+/* Define if you have ut_host in struct utmp. */
+#define UT_HOST 1
+
+#if 0
+/* Version number of package */
+#define VERSION "4.0.17"
+#endif
+
+/* Define if you want to enable Audit messages */
+/* #undef WITH_AUDIT */
+
+/* Build shadow with SELinux support */
+/* #undef WITH_SELINUX */
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#define _FILE_OFFSET_BITS 64
+
+/* Enable GNU extensions on systems that have them. */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
+
+/* Define for large files, on AIX-style hosts. */
+/* #undef _LARGE_FILES */
+
+/* Path for utmp file. */
+#define _UTMP_FILE "/var/run/utmp"
+
+/* Path for wtmp file. */
+#define _WTMP_FILE "/var/log/wtmp"
+
+/* Define like PROTOTYPES; this can be used by system headers. */
+#define __PROTOTYPES 1
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
+/* Define to libshadow_getpass to use our own version of getpass(). */
+/* #undef getpass */
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+/* #undef gid_t */
+
+/* Define to `int' if <sys/types.h> does not define. */
+/* #undef mode_t */
+
+/* Define to `long' if <sys/types.h> does not define. */
+/* #undef off_t */
+
+/* Define to `int' if <sys/types.h> does not define. */
+/* #undef pid_t */
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+/* #undef uid_t */
+
+/* Define to ut_name if struct utmp has ut_name (not ut_user). */
+/* #undef ut_user */
@@ .
patch -p0 <<'@@ .'
Index: lua/shadow/shadowio.c
============================================================================
$ cvs diff -u -r1.1 -r1.2 shadowio.c
--- lua/shadow/shadowio.c 17 Aug 2008 18:31:36 -0000 1.1
+++ lua/shadow/shadowio.c 18 Aug 2008 17:27:43 -0000 1.2
@@ -5,9 +5,10 @@
*/
-#include "config.h"
+#include "system.h"
+#include "shadow_config.h"
-#ident "$Id: shadowio.c,v 1.1 2008/08/17 18:31:36 jbj Exp $"
+#ident "$Id: shadowio.c,v 1.2 2008/08/18 17:27:43 jbj Exp $"
#include "prototypes.h"
#include "defines.h"
@@ .
patch -p0 <<'@@ .'
Index: lua/shadow/strtoday.c
============================================================================
$ cvs diff -u -r1.1 -r1.2 strtoday.c
--- lua/shadow/strtoday.c 17 Aug 2008 18:31:36 -0000 1.1
+++ lua/shadow/strtoday.c 18 Aug 2008 17:27:43 -0000 1.2
@@ -37,9 +37,10 @@
#define _XOPEN_SOURCE 500
#endif
-#include "config.h"
+#include "system.h"
+#include "shadow_config.h"
-#ident "$Id: strtoday.c,v 1.1 2008/08/17 18:31:36 jbj Exp $"
+#ident "$Id: strtoday.c,v 1.2 2008/08/18 17:27:43 jbj Exp $"
#include "defines.h"
#ifndef USE_GETDATE
@@ .
patch -p0 <<'@@ .'
Index: lua/shadow/useradd.c
============================================================================
$ cvs diff -u -r1.2 -r1.3 useradd.c
--- lua/shadow/useradd.c 17 Aug 2008 18:55:15 -0000 1.2
+++ lua/shadow/useradd.c 18 Aug 2008 17:27:43 -0000 1.3
@@ -33,9 +33,10 @@
* SUCH DAMAGE.
*/
-#include "config.h"
+#include "system.h"
+#include "shadow_config.h"
-#ident "$Id: useradd.c,v 1.2 2008/08/17 18:55:15 jbj Exp $"
+#ident "$Id: useradd.c,v 1.3 2008/08/18 17:27:43 jbj Exp $"
#include <ctype.h>
#include <errno.h>
@@ .
rm -f lua/shadow/xmalloc.c <<'@@ .'
Index: lua/shadow/xmalloc.c
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2523 -r1.2524 CHANGES
--- rpm/CHANGES 18 Aug 2008 16:56:55 -0000 1.2523
+++ rpm/CHANGES 18 Aug 2008 17:27:42 -0000 1.2524
@@ -1,5 +1,7 @@
5.1.0 -> 5.2a0:
+ - jbj: WR: eliminate xmalloc.c, use system.h defines instead.
+ - jbj: WR: rename config.h to shadow_config.h, include "system.h" instead.
- at: rpmdb.c: enable/disable rpmsq signal handlers with respect to rpmdbRock
- jbj: WR: run-time discovered configuration goopiness, take 1.
- jbj: WR: rely on PATH to find pkg-config.
@@ .
Received on Mon Aug 18 19:27:44 2008