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

  Server: rpm5.org                         Name:   Anders F. Björklund
  Root:   /v/rpm/cvs                       Email:  afb@rpm5.org
  Module: rpm lua                          Date:   18-Aug-2008 17:30:18
  Branch: HEAD                             Handle: 2008081815301700

  Modified files:
    lua                     Makefile.am
    lua/local               lshadow.c lwrs.c
    rpm                     configure.ac

  Log:
    make lua/shadow and lua/chkconfig conditional to linux

  Summary:
    Revision    Changes     Path
    1.21        +28 -6      lua/Makefile.am
    1.2         +5  -1      lua/local/lshadow.c
    1.3         +5  -1      lua/local/lwrs.c
    2.309       +7  -0      rpm/configure.ac
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: lua/Makefile.am
  ============================================================================
  $ cvs diff -u -r1.20 -r1.21 Makefile.am
  --- lua/Makefile.am	17 Aug 2008 18:31:34 -0000	1.20
  +++ lua/Makefile.am	18 Aug 2008 15:30:17 -0000	1.21
  @@ -10,11 +10,18 @@
   AM_CPPFLAGS = \
   	-I$(top_srcdir) \
   	-I$(srcdir)/local \
  -	-I$(builddir)/local \
  +	-I$(builddir)/local
  +if USE_LUA_CHKCONFIG
  +AM_CPPFLAGS += \
   	-I$(srcdir)/chkconfig \
  -	-I$(builddir)/chkconfig \
  +	-I$(builddir)/chkconfig
  +endif
  +if USE_LUA_SHADOW
  +AM_CPPFLAGS += \
   	-I$(srcdir)/shadow \
  -	-I$(builddir)/shadow \
  +	-I$(builddir)/shadow
  +endif
  +AM_CPPFLAGS += \
   	-I$(srcdir)
   
   rpmlua_SOURCES = lua.c
  @@ -28,6 +35,14 @@
   bin2c_LDADD =
   
   liblua_la_CFLAGS = @WITH_LUA_SUBDIR_DEF@ -DLUA_USE_POSIX
  +if USE_LUA_SHADOW
  +liblua_la_CFLAGS += \
  +		-DUSE_LUA_SHADOW
  +endif
  +if USE_LUA_CHKCONFIG
  +liblua_la_CFLAGS += \
  +		-DUSE_LUA_CHKCONFIG
  +endif
   liblua_la_LIBADD = @WITH_LUA_SUBDIR_LIB@ -lm
   liblua_la_SOURCES = \
   		local/llocal.c \
  @@ -46,7 +61,9 @@
   		local/luuid.h \
   		local/luuid.c \
   		local/lwrs.h \
  -		local/lwrs.c \
  +		local/lwrs.c
  +if USE_LUA_SHADOW
  +liblua_la_SOURCES += \
   		shadow/chkname.h \
   		shadow/commonio.h \
   		shadow/commonio.c \
  @@ -78,10 +95,15 @@
   		shadow/shadowio.c \
   		shadow/strtoday.c \
   		shadow/useradd.c \
  -		shadow/xmalloc.c \
  +		shadow/xmalloc.c
  +endif
  +if USE_LUA_CHKCONFIG
  +liblua_la_SOURCES += \
   		chkconfig/chkconfig.c \
   		chkconfig/leveldb.h \
  -		chkconfig/leveldb.c \
  +		chkconfig/leveldb.c
  +endif
  +liblua_la_SOURCES += \
   		linit.c \
   		lauxlib.h \
   		lauxlib.c \
  @@ .
  patch -p0 <<'@@ .'
  Index: lua/local/lshadow.c
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 lshadow.c
  --- lua/local/lshadow.c	17 Aug 2008 18:31:35 -0000	1.1
  +++ lua/local/lshadow.c	18 Aug 2008 15:30:17 -0000	1.2
  @@ -1,5 +1,5 @@
   /*
  -** $Id: lshadow.c,v 1.1 2008/08/17 18:31:35 jbj Exp $
  +** $Id: lshadow.c,v 1.2 2008/08/18 15:30:17 afb Exp $
   ** Standard mathematical library
   ** See Copyright Notice in lua.h
   */
  @@ -124,9 +124,13 @@
   /*@unchecked@*/
   static const luaL_reg shadow[] = {
     {"version",   shadow_version},
  +#ifdef USE_LUA_SHADOW
     {"groupadd",  shadow_groupadd},
     {"useradd",  shadow_useradd},
  +#endif
  +#ifdef USE_LUA_CHKCONFIG
     {"chkconfig",  shadow_chkconfig},
  +#endif
     {NULL, NULL}
   };
   /*@=readonlytrans@*/
  @@ .
  patch -p0 <<'@@ .'
  Index: lua/local/lwrs.c
  ============================================================================
  $ cvs diff -u -r1.2 -r1.3 lwrs.c
  --- lua/local/lwrs.c	17 Aug 2008 18:55:15 -0000	1.2
  +++ lua/local/lwrs.c	18 Aug 2008 15:30:17 -0000	1.3
  @@ -1,5 +1,5 @@
   /*
  -** $Id: lwrs.c,v 1.2 2008/08/17 18:55:15 jbj Exp $
  +** $Id: lwrs.c,v 1.3 2008/08/18 15:30:17 afb Exp $
   ** WRLinux utilities
   */
   
  @@ -121,9 +121,13 @@
   /*@unchecked@*/
   static const luaL_reg wrs[] = {
     {"version",   wrs_version},
  +#ifdef USE_LUA_SHADOW
     {"groupadd",  wrs_groupadd},
     {"useradd",  wrs_useradd},
  +#endif
  +#ifdef USE_LUA_CHKCONFIG
     {"chkconfig",  wrs_chkconfig},
  +#endif
     {NULL, NULL}
   };
   /*@=readonlytrans@*/
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  ============================================================================
  $ cvs diff -u -r2.308 -r2.309 configure.ac
  --- rpm/configure.ac	1 Aug 2008 06:37:54 -0000	2.308
  +++ rpm/configure.ac	18 Aug 2008 15:30:17 -0000	2.309
  @@ -1113,6 +1113,8 @@
   dnl # Lua
   WITH_LUA_SUBDIR_DEF=""
   WITH_LUA_SUBDIR_LIB=""
  +USE_LUA_SHADOW=no
  +USE_LUA_CHKCONFIG=no
   RPM_CHECK_LIB(
       [Lua], [lua],
       [lua], [lua_newstate], [lua.h],
  @@ -1122,6 +1124,9 @@
             AC_CHECK_LIB(dl, dlopen)
             AC_CHECK_FUNC(dlopen, [ WITH_LUA_SUBDIR_DEF="$WITH_LUA_SUBDIR_DEF -DLUA_USE_DLOPEN" ])
             AC_CHECK_FUNC(regcomp, [ WITH_LUA_SUBDIR_DEF="$WITH_LUA_SUBDIR_DEF -DLUA_USE_POSIX" ])
  +          case "$host" in
  +              *-*-linux* ) USE_LUA_SHADOW=yes; USE_LUA_CHKCONFIG=yes; ;;
  +          esac
             AC_DEFINE(WITH_LUA_INTERNAL, 1, [Define if building with internal Lua])
             AC_CONFIG_FILES([lua/Makefile])
         else
  @@ -1132,6 +1137,8 @@
       ], [])
   AC_SUBST(WITH_LUA_SUBDIR_DEF)
   AC_SUBST(WITH_LUA_SUBDIR_LIB)
  +AM_CONDITIONAL(USE_LUA_SHADOW, [ test ".$USE_LUA_SHADOW" = .yes ])
  +AM_CONDITIONAL(USE_LUA_CHKCONFIG, [ test ".$USE_LUA_CHKCONFIG" = .yes ])
   
   dnl # PCRE
   RPM_CHECK_LIB(
  @@ .