7203970 lua update breaks things
authorRich Burridge <rich.burridge@oracle.com>
Thu, 25 Oct 2012 13:35:55 -0700
changeset 1028 30d7999e80d9
parent 1027 ba55ae2d54aa
child 1029 6fa22a458187
7203970 lua update breaks things
components/apache2-modules/mod_security2/patches/fix_lua.patch
components/graphviz/patches/configure-lua.patch
components/graphviz/patches/fix_lua.patch
components/lighttpd/patches/fix_lua.patch
components/nmap/Makefile
components/nmap/nmap.p5m
components/wireshark/Makefile
components/wireshark/wireshark-common.p5m
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apache2-modules/mod_security2/patches/fix_lua.patch	Thu Oct 25 13:35:55 2012 -0700
@@ -0,0 +1,14 @@
+--- modsecurity-apache_2.5.9/apache2/msc_lua.c.orig	2012-10-22 05:18:52.549922682 -0700
++++ modsecurity-apache_2.5.9/apache2/msc_lua.c	2012-10-22 05:21:37.503228311 -0700
[email protected]@ -81,7 +81,11 @@
+     dumpr.script = script;
+     dumpr.index = 0;
+ 
++#if LUA_VERSION_NUM >= 502
++    return lua_load(L, dump_reader, &dumpr, script->name, NULL);
++#else
+     return lua_load(L, dump_reader, &dumpr, script->name);
++#endif
+ }
+ 
+ /**
--- a/components/graphviz/patches/configure-lua.patch	Thu Oct 25 03:14:30 2012 -0700
+++ b/components/graphviz/patches/configure-lua.patch	Thu Oct 25 13:35:55 2012 -0700
@@ -2,14 +2,24 @@
 autogen.sh, it blows up in various places, depending on how hard we try.  Simply
 patching configure is far simpler.
 
---- graphviz-2.28.0/configure	Fri May  6 20:27:36 2011
-+++ graphviz-2.28.0/configure	Fri May 27 15:30:42 2011
[email protected]@ -20679,7 +20679,7 @@
+--- graphviz-2.28.0/configure.orig	2012-10-22 05:49:36.151525827 -0700
++++ graphviz-2.28.0/configure	2012-10-22 05:55:46.475647464 -0700
[email protected]@ -20679,7 +20679,17 @@
  
          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Lua compiling and linking" >&5
  $as_echo_n "checking for Lua compiling and linking... " >&6; }
 -        LUA_TEST=`LT=luatest.c ; echo "#include <lua.h>" > $LT;  echo "#include <lualib.h>" >> $LT; echo "int main() { luaopen_base((lua_State *)lua_open()); return 0; }" >> $LT ; $CC -Wall $LT -o $LT.out $LUA_INCLUDES $LUA_LIBS $CFLAGS $LDFLAGS 1>/dev/null 2>&1 ; echo $?; rm -f $LT $LT.out 1>/dev/null 2>&1`
-+        LUA_TEST=`LT=luatest.c ; echo "#include <lua.h>" > $LT;  echo "#include <lualib.h>" >> $LT; echo "int main() { luaopen_base((lua_State *)lua_open()); return 0; }" >> $LT ; $CC $LT -o $LT.out $LUA_INCLUDES $LUA_LIBS $CFLAGS $LDFLAGS 1>/dev/null 2>&1 ; echo $?; rm -f $LT $LT.out 1>/dev/null 2>&1`
++        LUA_TEST=`LT=luatest.c ; \
++	    echo "#include <lua.h>" > $LT; \
++	    echo "#include <lualib.h>" >> $LT; \
++	    echo "#if LUA_VERSION_NUM >= 502" >> $LT; \
++	    echo "#include <lauxlib.h>" >> $LT; \
++	    echo "int main() { luaopen_base((lua_State *)luaL_newstate());" >> $LT; \
++	    echo "#else" >> $LT; \
++            echo "int main() { luaopen_base((lua_State *)lua_open());" >> $LT; \
++	    echo "#endif" >> $LT; \
++	    echo "return 0; }" >> $LT ; \
++	    $CC $LT -o $LT.out $LUA_INCLUDES $LUA_LIBS $CFLAGS $LDFLAGS 1>/dev/null 2>&1 ; echo $?; rm -f $LT $LT.out 1>/dev/null 2>&1`
          if test "x$LUA_TEST" != "x0" ; then
            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/graphviz/patches/fix_lua.patch	Thu Oct 25 13:35:55 2012 -0700
@@ -0,0 +1,16 @@
+--- graphviz-2.28.0/tclpkg/gv/Makefile.in.orig	2012-10-22 08:45:54.769848218 -0700
++++ graphviz-2.28.0/tclpkg/gv/Makefile.in	2012-10-22 11:28:30.216436995 -0700
[email protected]@ -3359,6 +3359,13 @@
+ 	$(SWIG) -c++ -lua -o gv_lua.cpp $(srcdir)/gv.i
+ 	mv [email protected] [email protected]
+ 	sed '/include/s/malloc\.h/cstdlib/' [email protected] > [email protected]
++	mv [email protected] [email protected]
++	(echo "#include <lua.h>\n\
++#if LUA_VERSION_NUM >= 502\n\
++#define LUA_GLOBALSINDEX LUA_REGISTRYINDEX\n\
++#define luaL_reg luaL_Reg\n\
++#endif\n" ; cat [email protected]) > [email protected]
++
+ gv.ml gv.mli: gv_ocaml.cpp
+ gv_ocaml.cpp: gv.i
+ 	$(SWIG) -c++ -ocaml -o gv_ocaml.cpp $(srcdir)/gv.i
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/lighttpd/patches/fix_lua.patch	Thu Oct 25 13:35:55 2012 -0700
@@ -0,0 +1,39 @@
+--- src/mod_cml_lua.c.orig	2012-10-22 06:17:17.418886286 -0700
++++ src/mod_cml_lua.c	2012-10-22 06:25:50.289753316 -0700
[email protected]@ -33,6 +33,10 @@
+ #include <lualib.h>
+ #include <lauxlib.h>
+ 
++#if LUA_VERSION_NUM >= 502
++#define LUA_GLOBALSINDEX LUA_REGISTRYINDEX
++#endif
++
+ typedef struct {
+ 	stream st;
+ 	int done;
[email protected]@ -290,7 +294,11 @@
+ 	lua_settable(L, LUA_GLOBALSINDEX);
+ 
+ 	/* load lua program */
++#if LUA_VERSION_NUM >= 502
++	if (lua_load(L, load_file, &rm, fn->ptr, NULL) || lua_pcall(L,0,1,0)) {
++#else
+ 	if (lua_load(L, load_file, &rm, fn->ptr) || lua_pcall(L,0,1,0)) {
++#endif
+ 		log_error_write(srv, __FILE__, __LINE__, "s",
+ 				lua_tostring(L,-1));
+ 
+--- src/mod_magnet.c.orig	2012-10-22 06:17:24.314956607 -0700
++++ src/mod_magnet.c	2012-10-22 06:19:25.001600796 -0700
[email protected]@ -785,7 +785,11 @@
+ 	lua_setfield(L, -2, "lighty"); /* lighty.*                   (sp -= 1) */
+ 
+ 	lua_newtable(L); /* the meta-table for the new env           (sp += 1) */
++#if LUA_VERSION_NUM >= 502
++	lua_pushvalue(L, LUA_REGISTRYINDEX);                      /* (sp += 1) */
++#else
+ 	lua_pushvalue(L, LUA_GLOBALSINDEX);                       /* (sp += 1) */
++#endif
+ 	lua_setfield(L, -2, "__index"); /* { __index = _G }          (sp -= 1) */
+ 	lua_setmetatable(L, -2); /* setmetatable({}, {__index = _G}) (sp -= 1) */
+ 
--- a/components/nmap/Makefile	Thu Oct 25 03:14:30 2012 -0700
+++ b/components/nmap/Makefile	Thu Oct 25 13:35:55 2012 -0700
@@ -58,7 +58,7 @@
 CONFIGURE_OPTIONS  +=   --with-openssl
 CONFIGURE_OPTIONS  +=   --with-libpcap
 CONFIGURE_OPTIONS  +=   --with-libpcre
-CONFIGURE_OPTIONS  +=   --with-liblua 
+CONFIGURE_OPTIONS  +=   --without-liblua 
 CONFIGURE_OPTIONS  +=   --with-ncat 
 CONFIGURE_OPTIONS  +=   --with-ndiff
 CONFIGURE_OPTIONS  +=   am_cv_python_pythondir=$(PYTHON_LIB)
--- a/components/nmap/nmap.p5m	Thu Oct 25 03:14:30 2012 -0700
+++ b/components/nmap/nmap.p5m	Thu Oct 25 13:35:55 2012 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -218,239 +218,243 @@
 file path=usr/share/nmap/nmap-services
 file path=usr/share/nmap/nmap.dtd
 file path=usr/share/nmap/nmap.xsl
-file path=usr/share/nmap/nse_main.lua
-file path=usr/share/nmap/nselib/afp.lua
-file path=usr/share/nmap/nselib/asn1.lua
-file path=usr/share/nmap/nselib/base64.lua
-file path=usr/share/nmap/nselib/brute.lua
-file path=usr/share/nmap/nselib/citrixxml.lua
-file path=usr/share/nmap/nselib/comm.lua
-file path=usr/share/nmap/nselib/datafiles.lua
-file path=usr/share/nmap/nselib/dhcp.lua
-file path=usr/share/nmap/nselib/dns.lua
-file path=usr/share/nmap/nselib/dnssd.lua
-file path=usr/share/nmap/nselib/drda.lua
-file path=usr/share/nmap/nselib/ftp.lua
-file path=usr/share/nmap/nselib/giop.lua
-file path=usr/share/nmap/nselib/http.lua
-file path=usr/share/nmap/nselib/imap.lua
-file path=usr/share/nmap/nselib/informix.lua
-file path=usr/share/nmap/nselib/ipOps.lua
-file path=usr/share/nmap/nselib/iscsi.lua
-file path=usr/share/nmap/nselib/json.lua
-file path=usr/share/nmap/nselib/ldap.lua
-file path=usr/share/nmap/nselib/listop.lua
-file path=usr/share/nmap/nselib/match.lua
-file path=usr/share/nmap/nselib/mongodb.lua
-file path=usr/share/nmap/nselib/msrpc.lua
-file path=usr/share/nmap/nselib/msrpcperformance.lua
-file path=usr/share/nmap/nselib/msrpctypes.lua
-file path=usr/share/nmap/nselib/mssql.lua
-file path=usr/share/nmap/nselib/mysql.lua
-file path=usr/share/nmap/nselib/netbios.lua
-file path=usr/share/nmap/nselib/nrpc.lua
-file path=usr/share/nmap/nselib/nsedebug.lua
-file path=usr/share/nmap/nselib/packet.lua
-file path=usr/share/nmap/nselib/pgsql.lua
-file path=usr/share/nmap/nselib/pop3.lua
-file path=usr/share/nmap/nselib/proxy.lua
-file path=usr/share/nmap/nselib/rmi.lua
-file path=usr/share/nmap/nselib/rpc.lua
-file path=usr/share/nmap/nselib/shortport.lua
-file path=usr/share/nmap/nselib/smb.lua
-file path=usr/share/nmap/nselib/smbauth.lua
-file path=usr/share/nmap/nselib/snmp.lua
-file path=usr/share/nmap/nselib/ssh1.lua
-file path=usr/share/nmap/nselib/ssh2.lua
-file path=usr/share/nmap/nselib/stdnse.lua
-file path=usr/share/nmap/nselib/strbuf.lua
-file path=usr/share/nmap/nselib/strict.lua
-file path=usr/share/nmap/nselib/tab.lua
-file path=usr/share/nmap/nselib/target.lua
-file path=usr/share/nmap/nselib/tns.lua
-file path=usr/share/nmap/nselib/unpwdb.lua
-file path=usr/share/nmap/nselib/upnp.lua
-file path=usr/share/nmap/nselib/url.lua
-file path=usr/share/nmap/nselib/vnc.lua
-file path=usr/share/nmap/nselib/wsdd.lua
-file path=usr/share/nmap/scripts/afp-brute.nse
-file path=usr/share/nmap/scripts/afp-path-vuln.nse
-file path=usr/share/nmap/scripts/afp-serverinfo.nse
-file path=usr/share/nmap/scripts/afp-showmount.nse
-file path=usr/share/nmap/scripts/asn-query.nse
-file path=usr/share/nmap/scripts/auth-owners.nse
-file path=usr/share/nmap/scripts/auth-spoof.nse
-file path=usr/share/nmap/scripts/banner.nse
-file path=usr/share/nmap/scripts/broadcast-dns-service-discovery.nse
-file path=usr/share/nmap/scripts/broadcast-dropbox-listener.nse
-file path=usr/share/nmap/scripts/broadcast-ms-sql-discover.nse
-file path=usr/share/nmap/scripts/broadcast-upnp-info.nse
-file path=usr/share/nmap/scripts/broadcast-wsdd-discover.nse
-file path=usr/share/nmap/scripts/citrix-brute-xml.nse
-file path=usr/share/nmap/scripts/citrix-enum-apps-xml.nse
-file path=usr/share/nmap/scripts/citrix-enum-apps.nse
-file path=usr/share/nmap/scripts/citrix-enum-servers-xml.nse
-file path=usr/share/nmap/scripts/citrix-enum-servers.nse
-file path=usr/share/nmap/scripts/couchdb-databases.nse
-file path=usr/share/nmap/scripts/couchdb-stats.nse
-file path=usr/share/nmap/scripts/daap-get-library.nse
-file path=usr/share/nmap/scripts/daytime.nse
-file path=usr/share/nmap/scripts/db2-das-info.nse
-file path=usr/share/nmap/scripts/db2-discover.nse
-file path=usr/share/nmap/scripts/dhcp-discover.nse
-file path=usr/share/nmap/scripts/dns-cache-snoop.nse
-file path=usr/share/nmap/scripts/dns-fuzz.nse
-file path=usr/share/nmap/scripts/dns-random-srcport.nse
-file path=usr/share/nmap/scripts/dns-random-txid.nse
-file path=usr/share/nmap/scripts/dns-recursion.nse
-file path=usr/share/nmap/scripts/dns-service-discovery.nse
-file path=usr/share/nmap/scripts/dns-update.nse
-file path=usr/share/nmap/scripts/dns-zone-transfer.nse
-file path=usr/share/nmap/scripts/domcon-brute.nse
-file path=usr/share/nmap/scripts/domcon-cmd.nse
-file path=usr/share/nmap/scripts/domino-enum-users.nse
-file path=usr/share/nmap/scripts/drda-brute.nse
-file path=usr/share/nmap/scripts/drda-info.nse
-file path=usr/share/nmap/scripts/finger.nse
-file path=usr/share/nmap/scripts/firewalk.nse
-file path=usr/share/nmap/scripts/ftp-anon.nse
-file path=usr/share/nmap/scripts/ftp-bounce.nse
-file path=usr/share/nmap/scripts/ftp-brute.nse
-file path=usr/share/nmap/scripts/ftp-libopie.nse
-file path=usr/share/nmap/scripts/ftp-proftpd-backdoor.nse
-file path=usr/share/nmap/scripts/giop-info.nse
-file path=usr/share/nmap/scripts/gopher-ls.nse
-file path=usr/share/nmap/scripts/hddtemp-info.nse
-file path=usr/share/nmap/scripts/hostmap.nse
-file path=usr/share/nmap/scripts/http-auth.nse
-file path=usr/share/nmap/scripts/http-brute.nse
-file path=usr/share/nmap/scripts/http-date.nse
-file path=usr/share/nmap/scripts/http-domino-enum-passwords.nse
-file path=usr/share/nmap/scripts/http-enum.nse
-file path=usr/share/nmap/scripts/http-favicon.nse
-file path=usr/share/nmap/scripts/http-form-brute.nse
-file path=usr/share/nmap/scripts/http-headers.nse
-file path=usr/share/nmap/scripts/http-iis-webdav-vuln.nse
-file path=usr/share/nmap/scripts/http-malware-host.nse
-file path=usr/share/nmap/scripts/http-methods.nse
-file path=usr/share/nmap/scripts/http-open-proxy.nse
-file path=usr/share/nmap/scripts/http-passwd.nse
-file path=usr/share/nmap/scripts/http-php-version.nse
-file path=usr/share/nmap/scripts/http-robots.txt.nse
-file path=usr/share/nmap/scripts/http-title.nse
-file path=usr/share/nmap/scripts/http-trace.nse
-file path=usr/share/nmap/scripts/http-userdir-enum.nse
-file path=usr/share/nmap/scripts/http-vhosts.nse
-file path=usr/share/nmap/scripts/http-vmware-path-vuln.nse
-file path=usr/share/nmap/scripts/iax2-version.nse
-file path=usr/share/nmap/scripts/imap-capabilities.nse
-file path=usr/share/nmap/scripts/informix-brute.nse
-file path=usr/share/nmap/scripts/informix-query.nse
-file path=usr/share/nmap/scripts/informix-tables.nse
-file path=usr/share/nmap/scripts/ipidseq.nse
-file path=usr/share/nmap/scripts/irc-info.nse
-file path=usr/share/nmap/scripts/irc-unrealircd-backdoor.nse
-file path=usr/share/nmap/scripts/iscsi-brute.nse
-file path=usr/share/nmap/scripts/iscsi-info.nse
-file path=usr/share/nmap/scripts/jdwp-version.nse
-file path=usr/share/nmap/scripts/ldap-brute.nse
-file path=usr/share/nmap/scripts/ldap-rootdse.nse
-file path=usr/share/nmap/scripts/ldap-search.nse
-file path=usr/share/nmap/scripts/lexmark-config.nse
-file path=usr/share/nmap/scripts/modbus-discover.nse
-file path=usr/share/nmap/scripts/mongodb-databases.nse
-file path=usr/share/nmap/scripts/mongodb-info.nse
-file path=usr/share/nmap/scripts/ms-sql-brute.nse
-file path=usr/share/nmap/scripts/ms-sql-config.nse
-file path=usr/share/nmap/scripts/ms-sql-empty-password.nse
-file path=usr/share/nmap/scripts/ms-sql-hasdbaccess.nse
-file path=usr/share/nmap/scripts/ms-sql-info.nse
-file path=usr/share/nmap/scripts/ms-sql-query.nse
-file path=usr/share/nmap/scripts/ms-sql-tables.nse
-file path=usr/share/nmap/scripts/ms-sql-xp-cmdshell.nse
-file path=usr/share/nmap/scripts/mysql-brute.nse
-file path=usr/share/nmap/scripts/mysql-databases.nse
-file path=usr/share/nmap/scripts/mysql-empty-password.nse
-file path=usr/share/nmap/scripts/mysql-info.nse
-file path=usr/share/nmap/scripts/mysql-users.nse
-file path=usr/share/nmap/scripts/mysql-variables.nse
-file path=usr/share/nmap/scripts/nat-pmp-info.nse
-file path=usr/share/nmap/scripts/nbstat.nse
-file path=usr/share/nmap/scripts/netbus-auth-bypass.nse
-file path=usr/share/nmap/scripts/netbus-brute.nse
-file path=usr/share/nmap/scripts/netbus-info.nse
-file path=usr/share/nmap/scripts/netbus-version.nse
-file path=usr/share/nmap/scripts/nfs-ls.nse
-file path=usr/share/nmap/scripts/nfs-showmount.nse
-file path=usr/share/nmap/scripts/nfs-statfs.nse
-file path=usr/share/nmap/scripts/nrpe-enum.nse
-file path=usr/share/nmap/scripts/ntp-info.nse
-file path=usr/share/nmap/scripts/ntp-monlist.nse
-file path=usr/share/nmap/scripts/oracle-brute.nse
-file path=usr/share/nmap/scripts/oracle-enum-users.nse
-file path=usr/share/nmap/scripts/oracle-sid-brute.nse
-file path=usr/share/nmap/scripts/p2p-conficker.nse
-file path=usr/share/nmap/scripts/path-mtu.nse
-file path=usr/share/nmap/scripts/pgsql-brute.nse
-file path=usr/share/nmap/scripts/pjl-ready-message.nse
-file path=usr/share/nmap/scripts/pop3-brute.nse
-file path=usr/share/nmap/scripts/pop3-capabilities.nse
-file path=usr/share/nmap/scripts/pptp-version.nse
-file path=usr/share/nmap/scripts/qscan.nse
-file path=usr/share/nmap/scripts/realvnc-auth-bypass.nse
-file path=usr/share/nmap/scripts/resolveall.nse
-file path=usr/share/nmap/scripts/rmi-dumpregistry.nse
-file path=usr/share/nmap/scripts/rpcinfo.nse
-file path=usr/share/nmap/scripts/script.db
-file path=usr/share/nmap/scripts/skypev2-version.nse
-file path=usr/share/nmap/scripts/smb-brute.nse
-file path=usr/share/nmap/scripts/smb-check-vulns.nse
-file path=usr/share/nmap/scripts/smb-enum-domains.nse
-file path=usr/share/nmap/scripts/smb-enum-groups.nse
-file path=usr/share/nmap/scripts/smb-enum-processes.nse
-file path=usr/share/nmap/scripts/smb-enum-sessions.nse
-file path=usr/share/nmap/scripts/smb-enum-shares.nse
-file path=usr/share/nmap/scripts/smb-enum-users.nse
-file path=usr/share/nmap/scripts/smb-flood.nse
-file path=usr/share/nmap/scripts/smb-os-discovery.nse
-file path=usr/share/nmap/scripts/smb-psexec.nse
-file path=usr/share/nmap/scripts/smb-security-mode.nse
-file path=usr/share/nmap/scripts/smb-server-stats.nse
-file path=usr/share/nmap/scripts/smb-system-info.nse
-file path=usr/share/nmap/scripts/smbv2-enabled.nse
-file path=usr/share/nmap/scripts/smtp-commands.nse
-file path=usr/share/nmap/scripts/smtp-enum-users.nse
-file path=usr/share/nmap/scripts/smtp-open-relay.nse
-file path=usr/share/nmap/scripts/smtp-strangeport.nse
-file path=usr/share/nmap/scripts/sniffer-detect.nse
-file path=usr/share/nmap/scripts/snmp-brute.nse
-file path=usr/share/nmap/scripts/snmp-interfaces.nse
-file path=usr/share/nmap/scripts/snmp-netstat.nse
-file path=usr/share/nmap/scripts/snmp-processes.nse
-file path=usr/share/nmap/scripts/snmp-sysdescr.nse
-file path=usr/share/nmap/scripts/snmp-win32-services.nse
-file path=usr/share/nmap/scripts/snmp-win32-shares.nse
-file path=usr/share/nmap/scripts/snmp-win32-software.nse
-file path=usr/share/nmap/scripts/snmp-win32-users.nse
-file path=usr/share/nmap/scripts/socks-open-proxy.nse
-file path=usr/share/nmap/scripts/sql-injection.nse
-file path=usr/share/nmap/scripts/ssh-hostkey.nse
-file path=usr/share/nmap/scripts/ssh2-enum-algos.nse
-file path=usr/share/nmap/scripts/sshv1.nse
-file path=usr/share/nmap/scripts/ssl-cert.nse
-file path=usr/share/nmap/scripts/ssl-enum-ciphers.nse
-file path=usr/share/nmap/scripts/sslv2.nse
-file path=usr/share/nmap/scripts/stuxnet-detect.nse
-file path=usr/share/nmap/scripts/svn-brute.nse
-file path=usr/share/nmap/scripts/targets-traceroute.nse
-file path=usr/share/nmap/scripts/telnet-brute.nse
-file path=usr/share/nmap/scripts/upnp-info.nse
-file path=usr/share/nmap/scripts/vnc-brute.nse
-file path=usr/share/nmap/scripts/vnc-info.nse
-file path=usr/share/nmap/scripts/wdb-version.nse
-file path=usr/share/nmap/scripts/whois.nse
-file path=usr/share/nmap/scripts/wsdd-discover.nse
-file path=usr/share/nmap/scripts/x11-access.nse
+# The current version of nmap doesn't support lua 5.2 (which was recently
+# integrated into S12). Until nmap has been updated to a newer version with
+# lua 5.2 support, it is being configured with --without-liblua and doesn't
+# include the .lua and .nse files.
+#file path=usr/share/nmap/nse_main.lua
+#file path=usr/share/nmap/nselib/afp.lua
+#file path=usr/share/nmap/nselib/asn1.lua
+#file path=usr/share/nmap/nselib/base64.lua
+#file path=usr/share/nmap/nselib/brute.lua
+#file path=usr/share/nmap/nselib/citrixxml.lua
+#file path=usr/share/nmap/nselib/comm.lua
+#file path=usr/share/nmap/nselib/datafiles.lua
+#file path=usr/share/nmap/nselib/dhcp.lua
+#file path=usr/share/nmap/nselib/dns.lua
+#file path=usr/share/nmap/nselib/dnssd.lua
+#file path=usr/share/nmap/nselib/drda.lua
+#file path=usr/share/nmap/nselib/ftp.lua
+#file path=usr/share/nmap/nselib/giop.lua
+#file path=usr/share/nmap/nselib/http.lua
+#file path=usr/share/nmap/nselib/imap.lua
+#file path=usr/share/nmap/nselib/informix.lua
+#file path=usr/share/nmap/nselib/ipOps.lua
+#file path=usr/share/nmap/nselib/iscsi.lua
+#file path=usr/share/nmap/nselib/json.lua
+#file path=usr/share/nmap/nselib/ldap.lua
+#file path=usr/share/nmap/nselib/listop.lua
+#file path=usr/share/nmap/nselib/match.lua
+#file path=usr/share/nmap/nselib/mongodb.lua
+#file path=usr/share/nmap/nselib/msrpc.lua
+#file path=usr/share/nmap/nselib/msrpcperformance.lua
+#file path=usr/share/nmap/nselib/msrpctypes.lua
+#file path=usr/share/nmap/nselib/mssql.lua
+#file path=usr/share/nmap/nselib/mysql.lua
+#file path=usr/share/nmap/nselib/netbios.lua
+#file path=usr/share/nmap/nselib/nrpc.lua
+#file path=usr/share/nmap/nselib/nsedebug.lua
+#file path=usr/share/nmap/nselib/packet.lua
+#file path=usr/share/nmap/nselib/pgsql.lua
+#file path=usr/share/nmap/nselib/pop3.lua
+#file path=usr/share/nmap/nselib/proxy.lua
+#file path=usr/share/nmap/nselib/rmi.lua
+#file path=usr/share/nmap/nselib/rpc.lua
+#file path=usr/share/nmap/nselib/shortport.lua
+#file path=usr/share/nmap/nselib/smb.lua
+#file path=usr/share/nmap/nselib/smbauth.lua
+#file path=usr/share/nmap/nselib/snmp.lua
+#file path=usr/share/nmap/nselib/ssh1.lua
+#file path=usr/share/nmap/nselib/ssh2.lua
+#file path=usr/share/nmap/nselib/stdnse.lua
+#file path=usr/share/nmap/nselib/strbuf.lua
+#file path=usr/share/nmap/nselib/strict.lua
+#file path=usr/share/nmap/nselib/tab.lua
+#file path=usr/share/nmap/nselib/target.lua
+#file path=usr/share/nmap/nselib/tns.lua
+#file path=usr/share/nmap/nselib/unpwdb.lua
+#file path=usr/share/nmap/nselib/upnp.lua
+#file path=usr/share/nmap/nselib/url.lua
+#file path=usr/share/nmap/nselib/vnc.lua
+#file path=usr/share/nmap/nselib/wsdd.lua
+#file path=usr/share/nmap/scripts/afp-brute.nse
+#file path=usr/share/nmap/scripts/afp-path-vuln.nse
+#file path=usr/share/nmap/scripts/afp-serverinfo.nse
+#file path=usr/share/nmap/scripts/afp-showmount.nse
+#file path=usr/share/nmap/scripts/asn-query.nse
+#file path=usr/share/nmap/scripts/auth-owners.nse
+#file path=usr/share/nmap/scripts/auth-spoof.nse
+#file path=usr/share/nmap/scripts/banner.nse
+#file path=usr/share/nmap/scripts/broadcast-dns-service-discovery.nse
+#file path=usr/share/nmap/scripts/broadcast-dropbox-listener.nse
+#file path=usr/share/nmap/scripts/broadcast-ms-sql-discover.nse
+#file path=usr/share/nmap/scripts/broadcast-upnp-info.nse
+#file path=usr/share/nmap/scripts/broadcast-wsdd-discover.nse
+#file path=usr/share/nmap/scripts/citrix-brute-xml.nse
+#file path=usr/share/nmap/scripts/citrix-enum-apps-xml.nse
+#file path=usr/share/nmap/scripts/citrix-enum-apps.nse
+#file path=usr/share/nmap/scripts/citrix-enum-servers-xml.nse
+#file path=usr/share/nmap/scripts/citrix-enum-servers.nse
+#file path=usr/share/nmap/scripts/couchdb-databases.nse
+#file path=usr/share/nmap/scripts/couchdb-stats.nse
+#file path=usr/share/nmap/scripts/daap-get-library.nse
+#file path=usr/share/nmap/scripts/daytime.nse
+#file path=usr/share/nmap/scripts/db2-das-info.nse
+#file path=usr/share/nmap/scripts/db2-discover.nse
+#file path=usr/share/nmap/scripts/dhcp-discover.nse
+#file path=usr/share/nmap/scripts/dns-cache-snoop.nse
+#file path=usr/share/nmap/scripts/dns-fuzz.nse
+#file path=usr/share/nmap/scripts/dns-random-srcport.nse
+#file path=usr/share/nmap/scripts/dns-random-txid.nse
+#file path=usr/share/nmap/scripts/dns-recursion.nse
+#file path=usr/share/nmap/scripts/dns-service-discovery.nse
+#file path=usr/share/nmap/scripts/dns-update.nse
+#file path=usr/share/nmap/scripts/dns-zone-transfer.nse
+#file path=usr/share/nmap/scripts/domcon-brute.nse
+#file path=usr/share/nmap/scripts/domcon-cmd.nse
+#file path=usr/share/nmap/scripts/domino-enum-users.nse
+#file path=usr/share/nmap/scripts/drda-brute.nse
+#file path=usr/share/nmap/scripts/drda-info.nse
+#file path=usr/share/nmap/scripts/finger.nse
+#file path=usr/share/nmap/scripts/firewalk.nse
+#file path=usr/share/nmap/scripts/ftp-anon.nse
+#file path=usr/share/nmap/scripts/ftp-bounce.nse
+#file path=usr/share/nmap/scripts/ftp-brute.nse
+#file path=usr/share/nmap/scripts/ftp-libopie.nse
+#file path=usr/share/nmap/scripts/ftp-proftpd-backdoor.nse
+#file path=usr/share/nmap/scripts/giop-info.nse
+#file path=usr/share/nmap/scripts/gopher-ls.nse
+#file path=usr/share/nmap/scripts/hddtemp-info.nse
+#file path=usr/share/nmap/scripts/hostmap.nse
+#file path=usr/share/nmap/scripts/http-auth.nse
+#file path=usr/share/nmap/scripts/http-brute.nse
+#file path=usr/share/nmap/scripts/http-date.nse
+#file path=usr/share/nmap/scripts/http-domino-enum-passwords.nse
+#file path=usr/share/nmap/scripts/http-enum.nse
+#file path=usr/share/nmap/scripts/http-favicon.nse
+#file path=usr/share/nmap/scripts/http-form-brute.nse
+#file path=usr/share/nmap/scripts/http-headers.nse
+#file path=usr/share/nmap/scripts/http-iis-webdav-vuln.nse
+#file path=usr/share/nmap/scripts/http-malware-host.nse
+#file path=usr/share/nmap/scripts/http-methods.nse
+#file path=usr/share/nmap/scripts/http-open-proxy.nse
+#file path=usr/share/nmap/scripts/http-passwd.nse
+#file path=usr/share/nmap/scripts/http-php-version.nse
+#file path=usr/share/nmap/scripts/http-robots.txt.nse
+#file path=usr/share/nmap/scripts/http-title.nse
+#file path=usr/share/nmap/scripts/http-trace.nse
+#file path=usr/share/nmap/scripts/http-userdir-enum.nse
+#file path=usr/share/nmap/scripts/http-vhosts.nse
+#file path=usr/share/nmap/scripts/http-vmware-path-vuln.nse
+#file path=usr/share/nmap/scripts/iax2-version.nse
+#file path=usr/share/nmap/scripts/imap-capabilities.nse
+#file path=usr/share/nmap/scripts/informix-brute.nse
+#file path=usr/share/nmap/scripts/informix-query.nse
+#file path=usr/share/nmap/scripts/informix-tables.nse
+#file path=usr/share/nmap/scripts/ipidseq.nse
+#file path=usr/share/nmap/scripts/irc-info.nse
+#file path=usr/share/nmap/scripts/irc-unrealircd-backdoor.nse
+#file path=usr/share/nmap/scripts/iscsi-brute.nse
+#file path=usr/share/nmap/scripts/iscsi-info.nse
+#file path=usr/share/nmap/scripts/jdwp-version.nse
+#file path=usr/share/nmap/scripts/ldap-brute.nse
+#file path=usr/share/nmap/scripts/ldap-rootdse.nse
+#file path=usr/share/nmap/scripts/ldap-search.nse
+#file path=usr/share/nmap/scripts/lexmark-config.nse
+#file path=usr/share/nmap/scripts/modbus-discover.nse
+#file path=usr/share/nmap/scripts/mongodb-databases.nse
+#file path=usr/share/nmap/scripts/mongodb-info.nse
+#file path=usr/share/nmap/scripts/ms-sql-brute.nse
+#file path=usr/share/nmap/scripts/ms-sql-config.nse
+#file path=usr/share/nmap/scripts/ms-sql-empty-password.nse
+#file path=usr/share/nmap/scripts/ms-sql-hasdbaccess.nse
+#file path=usr/share/nmap/scripts/ms-sql-info.nse
+#file path=usr/share/nmap/scripts/ms-sql-query.nse
+#file path=usr/share/nmap/scripts/ms-sql-tables.nse
+#file path=usr/share/nmap/scripts/ms-sql-xp-cmdshell.nse
+#file path=usr/share/nmap/scripts/mysql-brute.nse
+#file path=usr/share/nmap/scripts/mysql-databases.nse
+#file path=usr/share/nmap/scripts/mysql-empty-password.nse
+#file path=usr/share/nmap/scripts/mysql-info.nse
+#file path=usr/share/nmap/scripts/mysql-users.nse
+#file path=usr/share/nmap/scripts/mysql-variables.nse
+#file path=usr/share/nmap/scripts/nat-pmp-info.nse
+#file path=usr/share/nmap/scripts/nbstat.nse
+#file path=usr/share/nmap/scripts/netbus-auth-bypass.nse
+#file path=usr/share/nmap/scripts/netbus-brute.nse
+#file path=usr/share/nmap/scripts/netbus-info.nse
+#file path=usr/share/nmap/scripts/netbus-version.nse
+#file path=usr/share/nmap/scripts/nfs-ls.nse
+#file path=usr/share/nmap/scripts/nfs-showmount.nse
+#file path=usr/share/nmap/scripts/nfs-statfs.nse
+#file path=usr/share/nmap/scripts/nrpe-enum.nse
+#file path=usr/share/nmap/scripts/ntp-info.nse
+#file path=usr/share/nmap/scripts/ntp-monlist.nse
+#file path=usr/share/nmap/scripts/oracle-brute.nse
+#file path=usr/share/nmap/scripts/oracle-enum-users.nse
+#file path=usr/share/nmap/scripts/oracle-sid-brute.nse
+#file path=usr/share/nmap/scripts/p2p-conficker.nse
+#file path=usr/share/nmap/scripts/path-mtu.nse
+#file path=usr/share/nmap/scripts/pgsql-brute.nse
+#file path=usr/share/nmap/scripts/pjl-ready-message.nse
+#file path=usr/share/nmap/scripts/pop3-brute.nse
+#file path=usr/share/nmap/scripts/pop3-capabilities.nse
+#file path=usr/share/nmap/scripts/pptp-version.nse
+#file path=usr/share/nmap/scripts/qscan.nse
+#file path=usr/share/nmap/scripts/realvnc-auth-bypass.nse
+#file path=usr/share/nmap/scripts/resolveall.nse
+#file path=usr/share/nmap/scripts/rmi-dumpregistry.nse
+#file path=usr/share/nmap/scripts/rpcinfo.nse
+#file path=usr/share/nmap/scripts/script.db
+#file path=usr/share/nmap/scripts/skypev2-version.nse
+#file path=usr/share/nmap/scripts/smb-brute.nse
+#file path=usr/share/nmap/scripts/smb-check-vulns.nse
+#file path=usr/share/nmap/scripts/smb-enum-domains.nse
+#file path=usr/share/nmap/scripts/smb-enum-groups.nse
+#file path=usr/share/nmap/scripts/smb-enum-processes.nse
+#file path=usr/share/nmap/scripts/smb-enum-sessions.nse
+#file path=usr/share/nmap/scripts/smb-enum-shares.nse
+#file path=usr/share/nmap/scripts/smb-enum-users.nse
+#file path=usr/share/nmap/scripts/smb-flood.nse
+#file path=usr/share/nmap/scripts/smb-os-discovery.nse
+#file path=usr/share/nmap/scripts/smb-psexec.nse
+#file path=usr/share/nmap/scripts/smb-security-mode.nse
+#file path=usr/share/nmap/scripts/smb-server-stats.nse
+#file path=usr/share/nmap/scripts/smb-system-info.nse
+#file path=usr/share/nmap/scripts/smbv2-enabled.nse
+#file path=usr/share/nmap/scripts/smtp-commands.nse
+#file path=usr/share/nmap/scripts/smtp-enum-users.nse
+#file path=usr/share/nmap/scripts/smtp-open-relay.nse
+#file path=usr/share/nmap/scripts/smtp-strangeport.nse
+#file path=usr/share/nmap/scripts/sniffer-detect.nse
+#file path=usr/share/nmap/scripts/snmp-brute.nse
+#file path=usr/share/nmap/scripts/snmp-interfaces.nse
+#file path=usr/share/nmap/scripts/snmp-netstat.nse
+#file path=usr/share/nmap/scripts/snmp-processes.nse
+#file path=usr/share/nmap/scripts/snmp-sysdescr.nse
+#file path=usr/share/nmap/scripts/snmp-win32-services.nse
+#file path=usr/share/nmap/scripts/snmp-win32-shares.nse
+#file path=usr/share/nmap/scripts/snmp-win32-software.nse
+#file path=usr/share/nmap/scripts/snmp-win32-users.nse
+#file path=usr/share/nmap/scripts/socks-open-proxy.nse
+#file path=usr/share/nmap/scripts/sql-injection.nse
+#file path=usr/share/nmap/scripts/ssh-hostkey.nse
+#file path=usr/share/nmap/scripts/ssh2-enum-algos.nse
+#file path=usr/share/nmap/scripts/sshv1.nse
+#file path=usr/share/nmap/scripts/ssl-cert.nse
+#file path=usr/share/nmap/scripts/ssl-enum-ciphers.nse
+#file path=usr/share/nmap/scripts/sslv2.nse
+#file path=usr/share/nmap/scripts/stuxnet-detect.nse
+#file path=usr/share/nmap/scripts/svn-brute.nse
+#file path=usr/share/nmap/scripts/targets-traceroute.nse
+#file path=usr/share/nmap/scripts/telnet-brute.nse
+#file path=usr/share/nmap/scripts/upnp-info.nse
+#file path=usr/share/nmap/scripts/vnc-brute.nse
+#file path=usr/share/nmap/scripts/vnc-info.nse
+#file path=usr/share/nmap/scripts/wdb-version.nse
+#file path=usr/share/nmap/scripts/whois.nse
+#file path=usr/share/nmap/scripts/wsdd-discover.nse
+#file path=usr/share/nmap/scripts/x11-access.nse
 file path=usr/share/zenmap/config/scan_profile.usp
 file path=usr/share/zenmap/config/zenmap.conf
 file path=usr/share/zenmap/config/zenmap_version
--- a/components/wireshark/Makefile	Thu Oct 25 03:14:30 2012 -0700
+++ b/components/wireshark/Makefile	Thu Oct 25 13:35:55 2012 -0700
@@ -42,6 +42,7 @@
 CONFIGURE_OPTIONS +=	--disable-randpkt
 CONFIGURE_OPTIONS +=	--disable-dftest
 CONFIGURE_OPTIONS +=	--with-krb5
+CONFIGURE_OPTIONS +=	--with-lua=no
 CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS)" 
 CONFIGURE_OPTIONS +=	PATH="/usr/perl5/bin:/usr/gnu/bin:$(PATH)"
 
--- a/components/wireshark/wireshark-common.p5m	Thu Oct 25 03:14:30 2012 -0700
+++ b/components/wireshark/wireshark-common.p5m	Thu Oct 25 13:35:55 2012 -0700
@@ -88,7 +88,7 @@
 file path=usr/share/wireshark/capinfos.html
 file path=usr/share/wireshark/cfilters
 file path=usr/share/wireshark/colorfilters
-file path=usr/share/wireshark/console.lua
+#file path=usr/share/wireshark/console.lua
 file path=usr/share/wireshark/dfilters
 file path=usr/share/wireshark/dftest.html
 file path=usr/share/wireshark/diameter/AlcatelLucent.xml
@@ -111,7 +111,7 @@
 file path=usr/share/wireshark/diameter/nasreq.xml
 file path=usr/share/wireshark/diameter/sip.xml
 file path=usr/share/wireshark/diameter/sunping.xml
-file path=usr/share/wireshark/dtd_gen.lua
+#file path=usr/share/wireshark/dtd_gen.lua
 file path=usr/share/wireshark/dtds/dc.dtd
 file path=usr/share/wireshark/dtds/itunes.dtd
 file path=usr/share/wireshark/dtds/mscml.dtd
@@ -133,7 +133,7 @@
 file path=usr/share/wireshark/help/getting_started.txt
 file path=usr/share/wireshark/help/overview.txt
 file path=usr/share/wireshark/help/toc
-file path=usr/share/wireshark/init.lua
+#file path=usr/share/wireshark/init.lua
 file path=usr/share/wireshark/ipmap.html
 file path=usr/share/wireshark/manuf
 file path=usr/share/wireshark/mergecap.html