RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm lua Date: 08-Dec-2008 03:21:15
Branch: HEAD Handle: 2008120802211302
Modified files:
lua Makefile.am
lua/local lrexlib_algo.h lrexlib_common.c lrexlib_common.h
rpm configure.ac
rpm/rpmio rpmlua.c
Log:
- jbj: lua: disable embedded socket/crypto/xmlrpc modules. external
instead.
Summary:
Revision Changes Path
1.32 +133 -77 lua/Makefile.am
1.3 +3 -3 lua/local/lrexlib_algo.h
1.2 +1 -1 lua/local/lrexlib_common.c
1.2 +1 -1 lua/local/lrexlib_common.h
2.328 +4 -0 rpm/configure.ac
2.60 +10 -0 rpm/rpmio/rpmlua.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: lua/Makefile.am
============================================================================
$ cvs diff -u -r1.31 -r1.32 Makefile.am
--- lua/Makefile.am 2 Nov 2008 00:55:29 -0000 1.31
+++ lua/Makefile.am 8 Dec 2008 02:21:14 -0000 1.32
@@ -6,7 +6,97 @@
COPYRIGHT \
HISTORY \
local/lom.lua \
- local/llocal.lua \
+ local/llocal.lua
+
+AM_CPPFLAGS = \
+ -I$(top_srcdir) \
+ -I$(srcdir)/local \
+ -I$(builddir)/local
+if USE_LUA_CHKCONFIG
+AM_CPPFLAGS += \
+ -I$(srcdir)/chkconfig \
+ -I$(builddir)/chkconfig
+endif
+if USE_LUA_SHADOW
+AM_CPPFLAGS += \
+ -I$(srcdir)/shadow \
+ -I$(builddir)/shadow
+endif
+AM_CPPFLAGS += \
+ -I$(srcdir)
+
+rpmlua_SOURCES = lua.c
+rpmlua_CFLAGS =
+rpmlua_LDADD = liblua.la
+rpmluac_SOURCES = luac.c print.c
+rpmluac_CFLAGS =
+rpmluac_LDADD = liblua.la
+bin2c_SOURCES = bin2c.c
+bin2c_CFLAGS =
+bin2c_LDADD =
+
+liblua_la_CFLAGS = @WITH_LUA_SUBDIR_DEF@ -DLUA_USE_POSIX
+liblua_la_SOURCES =
+
+if USE_LUA_CRYPTO
+liblua_la_CFLAGS += \
+ -DCRYPTO_OPENSSL
+liblua_la_SOURCES += \
+ local/lcrypto.c \
+ local/lcrypto.h \
+ local/lxplib.c \
+ local/lxplib.h
+else
+EXTRA_DIST += \
+ local/lcrypto.c \
+ local/lcrypto.h \
+ local/lxplib.c \
+ local/lxplib.h
+endif
+
+if USE_LUA_SOCKET
+liblua_la_SOURCES += \
+ socket/auxiliar.c \
+ socket/auxiliar.h \
+ socket/buffer.c \
+ socket/buffer.h \
+ socket/except.c \
+ socket/except.h \
+ socket/ftp.lua \
+ socket/http.lua \
+ socket/inet.c \
+ socket/inet.h \
+ socket/io.c \
+ socket/io.h \
+ socket/ltn12.lua \
+ socket/luasocket.c \
+ socket/luasocket.h \
+ socket/mime.c \
+ socket/mime.h \
+ socket/mime.lua \
+ socket/options.c \
+ socket/options.h \
+ socket/select.c \
+ socket/select.h \
+ socket/smtp.lua \
+ socket/socket.h \
+ socket/socket.lua \
+ socket/tcp.c \
+ socket/tcp.h \
+ socket/timeout.c \
+ socket/timeout.h \
+ socket/tp.lua \
+ socket/udp.c \
+ socket/udp.h \
+ socket/unix.c \
+ socket/unix.h \
+ socket/url.lua \
+ socket/usocket.c \
+ socket/usocket.h \
+ socket/wsocket.c \
+ socket/wsocket.h
+else
+EXTRA_DIST += \
socket/auxiliar.c \
socket/auxiliar.h \
socket/buffer.c \
@@ -46,48 +136,41 @@
socket/usocket.h \
socket/wsocket.c \
socket/wsocket.h
-
-AM_CPPFLAGS = \
- -I$(top_srcdir) \
- -I$(srcdir)/local \
- -I$(builddir)/local
-if USE_LUA_CHKCONFIG
-AM_CPPFLAGS += \
- -I$(srcdir)/chkconfig \
- -I$(builddir)/chkconfig
-endif
-if USE_LUA_SHADOW
-AM_CPPFLAGS += \
- -I$(srcdir)/shadow \
- -I$(builddir)/shadow
endif
-AM_CPPFLAGS += \
- -I$(srcdir)
-
-rpmlua_SOURCES = lua.c
-rpmlua_CFLAGS =
-rpmlua_LDADD = liblua.la
-rpmluac_SOURCES = luac.c print.c
-rpmluac_CFLAGS =
-rpmluac_LDADD = liblua.la
-bin2c_SOURCES = bin2c.c
-bin2c_CFLAGS =
-bin2c_LDADD =
-
-liblua_la_CFLAGS = @WITH_LUA_SUBDIR_DEF@ -DLUA_USE_POSIX
-liblua_la_SOURCES =
-
-liblua_la_CFLAGS +=
- -DCRYPTO_OPENSSL
-liblua_la_SOURCES += \
- local/lcrypto.c \
- local/lcrypto.h \
- local/lxplib.c \
- local/lxplib.h
if USE_LUA_SHADOW
liblua_la_CFLAGS += \
-DUSE_LUA_SHADOW
+liblua_la_SOURCES += \
+ shadow/chkname.h \
+ shadow/commonio.h \
+ shadow/commonio.c \
+ shadow/shadow_config.h \
+ shadow/copydir.c \
+ shadow/defines.h \
+ shadow/faillog.h \
+ shadow/fputsx.c \
+ shadow/getdef.h \
+ shadow/getdef.c \
+ shadow/groupadd.c \
+ shadow/groupio.h \
+ shadow/groupio.c \
+ shadow/gshadow_.h \
+ shadow/gshadow.c \
+ shadow/list.c \
+ shadow/nscd.h \
+ shadow/prototypes.h \
+ shadow/pwauth.h \
+ shadow/pwio.h \
+ shadow/pwio.c \
+ shadow/sgroupio.h \
+ shadow/sgroupio.c \
+ shadow/sgetgrent.c \
+ shadow/sgetpwent.c \
+ shadow/shadowio.h \
+ shadow/shadowio.c \
+ shadow/strtoday.c \
+ shadow/useradd.c
else
EXTRA_DIST += \
shadow/chkname.h \
@@ -123,6 +206,10 @@
if USE_LUA_CHKCONFIG
liblua_la_CFLAGS += \
-DUSE_LUA_CHKCONFIG
+liblua_la_SOURCES += \
+ chkconfig/chkconfig.c \
+ chkconfig/leveldb.h \
+ chkconfig/leveldb.c
else
EXTRA_DIST += \
chkconfig/chkconfig.c \
@@ -149,44 +236,6 @@
local/luuid.c \
local/lwrs.h \
local/lwrs.c
-if USE_LUA_SHADOW
-liblua_la_SOURCES += \
- shadow/chkname.h \
- shadow/commonio.h \
- shadow/commonio.c \
- shadow/shadow_config.h \
- shadow/copydir.c \
- shadow/defines.h \
- shadow/faillog.h \
- shadow/fputsx.c \
- shadow/getdef.h \
- shadow/getdef.c \
- shadow/groupadd.c \
- shadow/groupio.h \
- shadow/groupio.c \
- shadow/gshadow_.h \
- shadow/gshadow.c \
- shadow/list.c \
- shadow/nscd.h \
- shadow/prototypes.h \
- shadow/pwauth.h \
- shadow/pwio.h \
- shadow/pwio.c \
- shadow/sgroupio.h \
- shadow/sgroupio.c \
- shadow/sgetgrent.c \
- shadow/sgetpwent.c \
- shadow/shadowio.h \
- shadow/shadowio.c \
- shadow/strtoday.c \
- shadow/useradd.c
-endif
-if USE_LUA_CHKCONFIG
-liblua_la_SOURCES += \
- chkconfig/chkconfig.c \
- chkconfig/leveldb.h \
- chkconfig/leveldb.c
-endif
liblua_la_SOURCES += \
linit.c \
@@ -246,9 +295,16 @@
$(liblua_la_LINK) $(liblua_la_OBJECTS) $(liblua_la_LIBADD)
$(builddir)/local/llocal.c: $(builddir)/local/llocal_lua.c
+
+if USE_LUA_CRYPTO
$(builddir)/local/llocal_lua.c: $(builddir)/bin2c $(srcdir)/local/llocal.lua
$(srcdir)/local/lom.lua
mkdir -p $(builddir)/local
- $(builddir)/bin2c $(srcdir)/local/llocal.lua $(srcdir)/local/lom.lua
>$(builddir)/local/llocal_lua.c
+ $(builddir)/bin2c $(srcdir)/local/llocal.lua $(srcdir)/local/lom.lua >
$(builddir)/local/llocal_lua.c
+else
+$(builddir)/local/llocal_lua.c: $(builddir)/bin2c $(srcdir)/local/llocal.lua
+ mkdir -p $(builddir)/local
+ $(builddir)/bin2c $(srcdir)/local/llocal.lua >
$(builddir)/local/llocal_lua.c
+endif
clean-local:
-rm -f $(builddir)/local/llocal_lua.c
@@ .
patch -p0 <<'@@ .'
Index: lua/local/lrexlib_algo.h
============================================================================
$ cvs diff -u -r1.2 -r1.3 lrexlib_algo.h
--- lua/local/lrexlib_algo.h 8 Jun 2008 10:09:12 -0000 1.2
+++ lua/local/lrexlib_algo.h 8 Dec 2008 02:21:15 -0000 1.3
@@ -186,16 +186,16 @@
freelist_init (&freelist);
/*------------------------------------------------------------------*/
if (argE.reptype == LUA_TSTRING) {
- buffer_init (&BufRep, 256, L, &freelist);
+ rex_buffer_init (&BufRep, 256, L, &freelist);
bufferZ_putrepstring (&BufRep, argE.funcpos, ALG_NSUB(ud));
}
/*------------------------------------------------------------------*/
if (argE.maxmatch == GSUB_CONDITIONAL) {
- buffer_init (&BufTemp, 1024, L, &freelist);
+ rex_buffer_init (&BufTemp, 1024, L, &freelist);
pBuf = &BufTemp;
}
/*------------------------------------------------------------------*/
- buffer_init (&BufOut, 1024, L, &freelist);
+ rex_buffer_init (&BufOut, 1024, L, &freelist);
SET_RETRY (retry, 0);
while ((argE.maxmatch < 0 || n_match < argE.maxmatch) && st <=
(int)argE.textlen) {
int from, to, res;
@@ .
patch -p0 <<'@@ .'
Index: lua/local/lrexlib_common.c
============================================================================
$ cvs diff -u -r1.1 -r1.2 lrexlib_common.c
--- lua/local/lrexlib_common.c 12 Jan 2008 12:33:33 -0000 1.1
+++ lua/local/lrexlib_common.c 8 Dec 2008 02:21:15 -0000 1.2
@@ -115,7 +115,7 @@
enum { ID_NUMBER, ID_STRING };
-void buffer_init (TBuffer *buf, size_t sz, lua_State *L, TFreeList *fl) {
+void rex_buffer_init (TBuffer *buf, size_t sz, lua_State *L, TFreeList *fl) {
buf->arr = (char*) malloc (sz);
if (!buf->arr) {
freelist_free (fl);
@@ .
patch -p0 <<'@@ .'
Index: lua/local/lrexlib_common.h
============================================================================
$ cvs diff -u -r1.1 -r1.2 lrexlib_common.h
--- lua/local/lrexlib_common.h 12 Jan 2008 12:33:33 -0000 1.1
+++ lua/local/lrexlib_common.h 8 Dec 2008 02:21:15 -0000 1.2
@@ -66,7 +66,7 @@
void freelist_add (TFreeList *fl, TBuffer *buf);
void freelist_free (TFreeList *fl);
-void buffer_init (TBuffer *buf, size_t sz, lua_State *L, TFreeList *fl);
+void rex_buffer_init (TBuffer *buf, size_t sz, lua_State *L, TFreeList *fl);
void buffer_free (TBuffer *buf);
void buffer_clear (TBuffer *buf);
void buffer_addbuffer (TBuffer *trg, TBuffer *src);
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.327 -r2.328 configure.ac
--- rpm/configure.ac 6 Dec 2008 10:50:59 -0000 2.327
+++ rpm/configure.ac 8 Dec 2008 02:21:13 -0000 2.328
@@ -1141,6 +1141,8 @@
WITH_LUA_SUBDIR_LIB=""
USE_LUA_SHADOW=no
USE_LUA_CHKCONFIG=no
+USE_LUA_CRYPTO=no
+USE_LUA_SOCKET=no
RPM_CHECK_LIB(
[Lua], [lua],
[lua], [lua_newstate], [lua.h],
@@ -1165,6 +1167,8 @@
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 ])
+AM_CONDITIONAL(USE_LUA_CRYPTO, [ test ".$USE_LUA_CRYPTO" = .yes ])
+AM_CONDITIONAL(USE_LUA_SOCKET, [ test ".$USE_LUA_SOCKET" = .yes ])
dnl # PCRE
RPM_CHECK_LIB(
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmlua.c
============================================================================
$ cvs diff -u -r2.59 -r2.60 rpmlua.c
--- rpm/rpmio/rpmlua.c 27 Oct 2008 04:05:21 -0000 2.59
+++ rpm/rpmio/rpmlua.c 8 Dec 2008 02:21:14 -0000 2.60
@@ -21,9 +21,14 @@
#include <lrexlib.h>
#include <luuid.h>
#include <lwrs.h>
+#ifdef USE_LUA_CRYPTO /* XXX external lua modules instead. */
#include <lcrypto.h>
#include <lxplib.h>
#endif
+#ifdef USE_LUA_SOCKET /* XXX external lua modules instead. */
+#include <luasocket.h>
+#endif
+#endif
#include <unistd.h>
#include <assert.h>
@@ -95,8 +100,13 @@
{"rex_pcre", luaopen_rex_pcre},
{"uuid", luaopen_uuid},
{"wrs", luaopen_wrs},
+#ifdef USE_LUA_CRYPTO /* XXX external lua modules instead. */
{"crypto", luaopen_crypto},
{"lxp", luaopen_lxp},
+#endif
+#ifdef USE_LUA_SOCKET /* XXX external lua modules instead. */
+ {"socket", luaopen_socket_core},
+#endif
{"local", luaopen_local},
#endif
{"rpm", luaopen_rpm},
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository [email protected]
