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:02:53
Branch: HEAD Handle: 2008081818025200
Modified files:
lua Makefile.am
lua/shadow shadow_config.h strtoday.c
rpm CHANGES
Removed files:
lua/shadow getdate.c getdate.h
Log:
- WR: eliminate getdate.[ch], use same from rpmio instead.
- WR: eliminate dueling AutoFu defines from shadow_config.h, use RPM's
config.h (through system.h) instead.
Summary:
Revision Changes Path
1.23 +0 -2 lua/Makefile.am
1.3 +0 -2575 lua/shadow/getdate.c
1.3 +0 -14 lua/shadow/getdate.h
1.2 +0 -152 lua/shadow/shadow_config.h
1.3 +3 -2 lua/shadow/strtoday.c
1.2525 +3 -0 rpm/CHANGES
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: lua/Makefile.am
============================================================================
$ cvs diff -u -r1.22 -r1.23 Makefile.am
--- lua/Makefile.am 18 Aug 2008 17:27:43 -0000 1.22
+++ lua/Makefile.am 18 Aug 2008 18:02:52 -0000 1.23
@@ -72,8 +72,6 @@
shadow/defines.h \
shadow/faillog.h \
shadow/fputsx.c \
- shadow/getdate.h \
- shadow/getdate.c \
shadow/getdef.h \
shadow/getdef.c \
shadow/groupadd.c \
@@ .
rm -f lua/shadow/getdate.c <<'@@ .'
Index: lua/shadow/getdate.c
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
rm -f lua/shadow/getdate.h <<'@@ .'
Index: lua/shadow/getdate.h
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: lua/shadow/shadow_config.h
============================================================================
$ cvs diff -u -r1.1 -r1.2 shadow_config.h
--- lua/shadow/shadow_config.h 18 Aug 2008 17:27:43 -0000 1.1
+++ lua/shadow/shadow_config.h 18 Aug 2008 18:02:52 -0000 1.2
@@ -7,10 +7,6 @@
/* 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"
@@ -29,17 +25,6 @@
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
@@ -49,9 +34,6 @@
/* 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
@@ -64,9 +46,6 @@
/* 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
@@ -79,21 +58,12 @@
/* 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
@@ -106,33 +76,21 @@
/* 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
@@ -181,71 +139,27 @@
/* 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
@@ -255,18 +169,12 @@
/* 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
@@ -285,32 +193,9 @@
/* 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
@@ -335,15 +220,9 @@
/* 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 */
@@ -356,37 +235,15 @@
/* 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 */
@@ -396,15 +253,6 @@
/* 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 */
@@ .
patch -p0 <<'@@ .'
Index: lua/shadow/strtoday.c
============================================================================
$ cvs diff -u -r1.2 -r1.3 strtoday.c
--- lua/shadow/strtoday.c 18 Aug 2008 17:27:43 -0000 1.2
+++ lua/shadow/strtoday.c 18 Aug 2008 18:02:52 -0000 1.3
@@ -40,14 +40,15 @@
#include "system.h"
#include "shadow_config.h"
-#ident "$Id: strtoday.c,v 1.2 2008/08/18 17:27:43 jbj Exp $"
+#ident "$Id: strtoday.c,v 1.3 2008/08/18 18:02:52 jbj Exp $"
#include "defines.h"
#ifndef USE_GETDATE
#define USE_GETDATE 1
#endif
#if USE_GETDATE
-#include "getdate.h"
+extern time_t get_date (const char *, const time_t *);
+
/*
* strtoday() now uses get_date() (borrowed from GNU shellutils)
* which can handle many date formats, for example:
@@ .
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2524 -r1.2525 CHANGES
--- rpm/CHANGES 18 Aug 2008 17:27:42 -0000 1.2524
+++ rpm/CHANGES 18 Aug 2008 18:02:52 -0000 1.2525
@@ -1,5 +1,8 @@
5.1.0 -> 5.2a0:
+ - 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.
- 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
@@ .
Received on Mon Aug 18 20:02:53 2008