Update nmap and add liblua for it

56 files changed, 169 insertions, 2 deletions

diff --git a/data/_lua5.3/_metadata/description b/data/_lua5.3/_metadata/description
new file mode 100644
index 000000000..15b2db921
--- /dev/null
+++ b/data/_lua5.3/_metadata/description
@@ -0,0 +1 @@
+Powerful, lightweight programming language
diff --git a/data/_lua5.3/_metadata/in.1443.00 b/data/_lua5.3/_metadata/in.1443.00
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/data/_lua5.3/_metadata/in.1443.00
diff --git a/data/_lua5.3/_metadata/license b/data/_lua5.3/_metadata/license
new file mode 120000
index 000000000..eea9de8d1
--- /dev/null
+++ b/data/_lua5.3/_metadata/license
@@ -0,0 +1 @@
+../../../licenses/bsd
\ No newline at end of file
diff --git a/data/_lua5.3/_metadata/maintainer b/data/_lua5.3/_metadata/maintainer
new file mode 120000
index 000000000..573d7ebef
--- /dev/null
+++ b/data/_lua5.3/_metadata/maintainer
@@ -0,0 +1 @@
+../../../people/sbingner
\ No newline at end of file
diff --git a/data/_lua5.3/_metadata/priority b/data/_lua5.3/_metadata/priority
new file mode 100644
index 000000000..134d9bc32
--- /dev/null
+++ b/data/_lua5.3/_metadata/priority
@@ -0,0 +1 @@
+optional
diff --git a/data/_lua5.3/_metadata/readline.dep b/data/_lua5.3/_metadata/readline.dep
new file mode 120000
index 000000000..f35c9185b
--- /dev/null
+++ b/data/_lua5.3/_metadata/readline.dep
@@ -0,0 +1 @@
+../../readline
\ No newline at end of file
diff --git a/data/_lua5.3/_metadata/role b/data/_lua5.3/_metadata/role
new file mode 100644
index 000000000..52b4d7301
--- /dev/null
+++ b/data/_lua5.3/_metadata/role
@@ -0,0 +1 @@
+hacker
diff --git a/data/_lua5.3/_metadata/section b/data/_lua5.3/_metadata/section
new file mode 100644
index 000000000..ddc7f1fd8
--- /dev/null
+++ b/data/_lua5.3/_metadata/section
@@ -0,0 +1 @@
+Scripting
diff --git a/data/_lua5.3/_metadata/tags b/data/_lua5.3/_metadata/tags
new file mode 100644
index 000000000..ad5d50831
--- /dev/null
+++ b/data/_lua5.3/_metadata/tags
@@ -0,0 +1 @@
+purpose::console
diff --git a/data/_lua5.3/_metadata/version b/data/_lua5.3/_metadata/version
new file mode 100644
index 000000000..e61ecd12d
--- /dev/null
+++ b/data/_lua5.3/_metadata/version
@@ -0,0 +1 @@
+5.3.5
diff --git a/data/_lua5.3/lua-5.3.5.tar.gz b/data/_lua5.3/lua-5.3.5.tar.gz
new file mode 100644
index 000000000..90c002729
--- /dev/null
+++ b/data/_lua5.3/lua-5.3.5.tar.gz
diff --git a/data/_lua5.3/make.sh b/data/_lua5.3/make.sh
new file mode 100644
index 000000000..f60bf86c5
--- /dev/null
+++ b/data/_lua5.3/make.sh
@@ -0,0 +1,4 @@
+pkg:setup
+export PREFIX="${PKG_TAPF}"
+pkg:make ios
+pkg:install
diff --git a/data/_lua5.3/toolchain.diff b/data/_lua5.3/toolchain.diff
new file mode 100644
index 000000000..6816cf8c1
--- /dev/null
+++ b/data/_lua5.3/toolchain.diff
@@ -0,0 +1,111 @@
+diff -ur lua-5.3.5/Makefile lua-5.3.5+iPhone/Makefile
+--- lua-5.3.5/Makefile	2016-12-20 06:26:08.000000000 -1000
++++ lua-5.3.5+iPhone/Makefile	2019-04-08 22:32:10.000000000 -1000
+@@ -10,7 +10,8 @@
+ # so take care if INSTALL_TOP is not an absolute path. See the local target.
+ # You may want to make INSTALL_LMOD and INSTALL_CMOD consistent with
+ # LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h.
+-INSTALL_TOP= /usr/local
++PREFIX= /usr
++INSTALL_TOP?= $(DESTDIR)/$(PREFIX)
+ INSTALL_BIN= $(INSTALL_TOP)/bin
+-INSTALL_INC= $(INSTALL_TOP)/include
++INSTALL_INC= $(INSTALL_TOP)/include/lua$(V)
+ INSTALL_LIB= $(INSTALL_TOP)/lib
+@@ -36,17 +37,21 @@
+ # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE =======
+ 
+ # Convenience platforms targets.
+-PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris
++PLATS= aix bsd c89 freebsd generic linux macosx ios mingw posix solaris
+ 
+ # What to install.
+-TO_BIN= lua luac
++TO_BIN= lua$(V) luac$(V)
+ TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp
+-TO_LIB= liblua.a
+ TO_MAN= lua.1 luac.1
++TO_LIB= liblua$(V).dylib
+ 
+ # Lua version and release.
+-V= 5.3
+-R= $V.4
++R= $V.5
++VERSION_MAJOR=$(word 1,$(subst ., ,$(PKG_VRSN)))
++VERSION_MINOR=$(word 2,$(subst ., ,$(PKG_VRSN)))
++V= $(VERSION_MAJOR).$(VERSION_MINOR)
++R=$(word 3,$(subst ., ,$(PKG_VRSN)))
++export VERSION_MAJOR VERSION_MINOR V R
+ 
+ # Targets start here.
+ all:	$(PLAT)
+diff -ur lua-5.3.5/src/Makefile lua-5.3.5+iPhone/src/Makefile
+--- lua-5.3.5/src/Makefile	2018-06-25 07:46:36.000000000 -1000
++++ lua-5.3.5+iPhone/src/Makefile	2019-04-08 22:32:23.000000000 -1000
+@@ -26,9 +26,10 @@
+ 
+ # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE =======
+ 
+-PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris
++PLATS= aix bsd c89 freebsd generic linux macosx ios mingw posix solaris
+ 
+ LUA_A=	liblua.a
++LUA_DYLIB= liblua$(V).dylib
+ CORE_O=	lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
+ 	lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \
+ 	ltm.o lundump.o lvm.o lzio.o
+@@ -36,15 +37,16 @@
+ 	lmathlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o loadlib.o linit.o
+ BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS)
+ 
+-LUA_T=	lua
++LUA_T=	lua$(V)
+ LUA_O=	lua.o
+ 
+-LUAC_T=	luac
++LUAC_T=	luac$(V)
+ LUAC_O=	luac.o
+ 
+ ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
+-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
++ALL_T= $(LUA_DYLIB) $(LUA_T) $(LUAC_T)
+ ALL_A= $(LUA_A)
++ALL_DYLIB= $(LUA_DYLIB)
+ 
+ # Targets start here.
+ default: $(PLAT)
+@@ -55,15 +57,20 @@
+ 
+ a:	$(ALL_A)
+ 
++dylib:	$(ALL_DYLIB)
++
+ $(LUA_A): $(BASE_O)
+ 	$(AR) $@ $(BASE_O)
+ 	$(RANLIB) $@
+ 
+-$(LUA_T): $(LUA_O) $(LUA_A)
+-	$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
++$(LUA_DYLIB): $(BASE_O)
++	$(CC) -dynamiclib -install_name $(PREFIX)/lib/$@ -compatibility_version $(V) -current_version $(V).$(R) -o $@ $^
++
++$(LUA_T): $(LUA_O) $(LUA_DYLIB)
++	$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_DYLIB) $(LIBS)
+ 
+-$(LUAC_T): $(LUAC_O) $(LUA_A)
+-	$(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
++$(LUAC_T): $(LUAC_O) $(LUA_DYLIB)
++	$(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_DYLIB) $(LIBS)
+ 
+ clean:
+ 	$(RM) $(ALL_T) $(ALL_O)
+@@ -112,6 +119,9 @@
+ macosx:
+ 	$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX" SYSLIBS="-lreadline"
+ 
++ios:
++	$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX" SYSLIBS="-lreadline"
++
+ mingw:
+ 	$(MAKE) "LUA_A=lua53.dll" "LUA_T=lua.exe" \
+ 	"AR=$(CC) -shared -o" "RANLIB=strip --strip-unneeded" \
diff --git a/data/liblua5.3-dev/_metadata/description b/data/liblua5.3-dev/_metadata/description
new file mode 100644
index 000000000..6c54f9437
--- /dev/null
+++ b/data/liblua5.3-dev/_metadata/description
@@ -0,0 +1 @@
+Development files for the Lua language version 5.3
diff --git a/data/liblua5.3-dev/_metadata/in.1443.00 b/data/liblua5.3-dev/_metadata/in.1443.00
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/data/liblua5.3-dev/_metadata/in.1443.00
diff --git a/data/liblua5.3-dev/_metadata/liblua5.3.dep b/data/liblua5.3-dev/_metadata/liblua5.3.dep
new file mode 120000
index 000000000..4cd0bd62e
--- /dev/null
+++ b/data/liblua5.3-dev/_metadata/liblua5.3.dep
@@ -0,0 +1 @@
+../../liblua5.3
\ No newline at end of file
diff --git a/data/liblua5.3-dev/_metadata/license b/data/liblua5.3-dev/_metadata/license
new file mode 120000
index 000000000..4bed09634
--- /dev/null
+++ b/data/liblua5.3-dev/_metadata/license
@@ -0,0 +1 @@
+../../_lua5.3/_metadata/license
\ No newline at end of file
diff --git a/data/liblua5.3-dev/_metadata/maintainer b/data/liblua5.3-dev/_metadata/maintainer
new file mode 120000
index 000000000..80bd81a10
--- /dev/null
+++ b/data/liblua5.3-dev/_metadata/maintainer
@@ -0,0 +1 @@
+../../_lua5.3/_metadata/maintainer
\ No newline at end of file
diff --git a/data/liblua5.3-dev/_metadata/priority b/data/liblua5.3-dev/_metadata/priority
new file mode 100644
index 000000000..134d9bc32
--- /dev/null
+++ b/data/liblua5.3-dev/_metadata/priority
@@ -0,0 +1 @@
+optional
diff --git a/data/liblua5.3-dev/_metadata/role b/data/liblua5.3-dev/_metadata/role
new file mode 100644
index 000000000..52b4d7301
--- /dev/null
+++ b/data/liblua5.3-dev/_metadata/role
@@ -0,0 +1 @@
+hacker
diff --git a/data/liblua5.3-dev/_metadata/section b/data/liblua5.3-dev/_metadata/section
new file mode 100644
index 000000000..ddc7f1fd8
--- /dev/null
+++ b/data/liblua5.3-dev/_metadata/section
@@ -0,0 +1 @@
+Scripting
diff --git a/data/liblua5.3-dev/_metadata/tags b/data/liblua5.3-dev/_metadata/tags
new file mode 100644
index 000000000..ad5d50831
--- /dev/null
+++ b/data/liblua5.3-dev/_metadata/tags
@@ -0,0 +1 @@
+purpose::console
diff --git a/data/liblua5.3-dev/_metadata/version b/data/liblua5.3-dev/_metadata/version
new file mode 120000
index 000000000..d3efbf44e
--- /dev/null
+++ b/data/liblua5.3-dev/_metadata/version
@@ -0,0 +1 @@
+../../_lua5.3/_metadata/version
\ No newline at end of file
diff --git a/data/liblua5.3-dev/make.sh b/data/liblua5.3-dev/make.sh
new file mode 100644
index 000000000..8ad96e6bc
--- /dev/null
+++ b/data/liblua5.3-dev/make.sh
@@ -0,0 +1,2 @@
+pkg: mkdir -p /usr/lib
+cp -a "$(PKG_DEST_ _lua5.3)"/usr/include "${PKG_DEST}"/usr/
diff --git a/data/liblua5.3/_metadata/_lua5.3.dep b/data/liblua5.3/_metadata/_lua5.3.dep
new file mode 120000
index 000000000..44bc4be16
--- /dev/null
+++ b/data/liblua5.3/_metadata/_lua5.3.dep
@@ -0,0 +1 @@
+../../_lua5.3
\ No newline at end of file
diff --git a/data/liblua5.3/_metadata/depends b/data/liblua5.3/_metadata/depends
new file mode 100644
index 000000000..0b5a58e27
--- /dev/null
+++ b/data/liblua5.3/_metadata/depends
@@ -0,0 +1 @@
+readline
diff --git a/data/liblua5.3/_metadata/description b/data/liblua5.3/_metadata/description
new file mode 100644
index 000000000..29a5abbfe
--- /dev/null
+++ b/data/liblua5.3/_metadata/description
@@ -0,0 +1 @@
+Shared library for the Lua interpreter version 5.3
diff --git a/data/liblua5.3/_metadata/in.1443.00 b/data/liblua5.3/_metadata/in.1443.00
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/data/liblua5.3/_metadata/in.1443.00
diff --git a/data/liblua5.3/_metadata/license b/data/liblua5.3/_metadata/license
new file mode 120000
index 000000000..4bed09634
--- /dev/null
+++ b/data/liblua5.3/_metadata/license
@@ -0,0 +1 @@
+../../_lua5.3/_metadata/license
\ No newline at end of file
diff --git a/data/liblua5.3/_metadata/maintainer b/data/liblua5.3/_metadata/maintainer
new file mode 120000
index 000000000..80bd81a10
--- /dev/null
+++ b/data/liblua5.3/_metadata/maintainer
@@ -0,0 +1 @@
+../../_lua5.3/_metadata/maintainer
\ No newline at end of file
diff --git a/data/liblua5.3/_metadata/priority b/data/liblua5.3/_metadata/priority
new file mode 100644
index 000000000..134d9bc32
--- /dev/null
+++ b/data/liblua5.3/_metadata/priority
@@ -0,0 +1 @@
+optional
diff --git a/data/liblua5.3/_metadata/role b/data/liblua5.3/_metadata/role
new file mode 100644
index 000000000..52b4d7301
--- /dev/null
+++ b/data/liblua5.3/_metadata/role
@@ -0,0 +1 @@
+hacker
diff --git a/data/liblua5.3/_metadata/section b/data/liblua5.3/_metadata/section
new file mode 100644
index 000000000..ddc7f1fd8
--- /dev/null
+++ b/data/liblua5.3/_metadata/section
@@ -0,0 +1 @@
+Scripting
diff --git a/data/liblua5.3/_metadata/tags b/data/liblua5.3/_metadata/tags
new file mode 100644
index 000000000..ad5d50831
--- /dev/null
+++ b/data/liblua5.3/_metadata/tags
@@ -0,0 +1 @@
+purpose::console
diff --git a/data/liblua5.3/_metadata/version b/data/liblua5.3/_metadata/version
new file mode 120000
index 000000000..d3efbf44e
--- /dev/null
+++ b/data/liblua5.3/_metadata/version
@@ -0,0 +1 @@
+../../_lua5.3/_metadata/version
\ No newline at end of file
diff --git a/data/liblua5.3/make.sh b/data/liblua5.3/make.sh
new file mode 100644
index 000000000..12195bab3
--- /dev/null
+++ b/data/liblua5.3/make.sh
@@ -0,0 +1,3 @@
+pkg: mkdir -p /usr/lib
+LIBNAME=${PKG_NAME#lib}
+cp -a "$(PKG_DEST_ _${LIBNAME})"/usr/lib/lib*.dylib "${PKG_DEST}"/usr/lib
diff --git a/data/lua5.3/_metadata/description b/data/lua5.3/_metadata/description
new file mode 100644
index 000000000..dc26f6eb5
--- /dev/null
+++ b/data/lua5.3/_metadata/description
@@ -0,0 +1 @@
+Simple, extensible, embeddable programming language
diff --git a/data/lua5.3/_metadata/in.1443.00 b/data/lua5.3/_metadata/in.1443.00
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/data/lua5.3/_metadata/in.1443.00
diff --git a/data/lua5.3/_metadata/liblua5.3.dep b/data/lua5.3/_metadata/liblua5.3.dep
new file mode 120000
index 000000000..4cd0bd62e
--- /dev/null
+++ b/data/lua5.3/_metadata/liblua5.3.dep
@@ -0,0 +1 @@
+../../liblua5.3
\ No newline at end of file
diff --git a/data/lua5.3/_metadata/license b/data/lua5.3/_metadata/license
new file mode 120000
index 000000000..4bed09634
--- /dev/null
+++ b/data/lua5.3/_metadata/license
@@ -0,0 +1 @@
+../../_lua5.3/_metadata/license
\ No newline at end of file
diff --git a/data/lua5.3/_metadata/maintainer b/data/lua5.3/_metadata/maintainer
new file mode 120000
index 000000000..80bd81a10
--- /dev/null
+++ b/data/lua5.3/_metadata/maintainer
@@ -0,0 +1 @@
+../../_lua5.3/_metadata/maintainer
\ No newline at end of file
diff --git a/data/lua5.3/_metadata/priority b/data/lua5.3/_metadata/priority
new file mode 100644
index 000000000..134d9bc32
--- /dev/null
+++ b/data/lua5.3/_metadata/priority
@@ -0,0 +1 @@
+optional
diff --git a/data/lua5.3/_metadata/provides b/data/lua5.3/_metadata/provides
new file mode 100644
index 000000000..5eaeb1c02
--- /dev/null
+++ b/data/lua5.3/_metadata/provides
@@ -0,0 +1 @@
+lua
diff --git a/data/lua5.3/_metadata/readline.dep b/data/lua5.3/_metadata/readline.dep
new file mode 120000
index 000000000..f35c9185b
--- /dev/null
+++ b/data/lua5.3/_metadata/readline.dep
@@ -0,0 +1 @@
+../../readline
\ No newline at end of file
diff --git a/data/lua5.3/_metadata/role b/data/lua5.3/_metadata/role
new file mode 100644
index 000000000..52b4d7301
--- /dev/null
+++ b/data/lua5.3/_metadata/role
@@ -0,0 +1 @@
+hacker
diff --git a/data/lua5.3/_metadata/section b/data/lua5.3/_metadata/section
new file mode 100644
index 000000000..ddc7f1fd8
--- /dev/null
+++ b/data/lua5.3/_metadata/section
@@ -0,0 +1 @@
+Scripting
diff --git a/data/lua5.3/_metadata/tags b/data/lua5.3/_metadata/tags
new file mode 100644
index 000000000..ad5d50831
--- /dev/null
+++ b/data/lua5.3/_metadata/tags
@@ -0,0 +1 @@
+purpose::console
diff --git a/data/lua5.3/_metadata/version b/data/lua5.3/_metadata/version
new file mode 120000
index 000000000..d3efbf44e
--- /dev/null
+++ b/data/lua5.3/_metadata/version
@@ -0,0 +1 @@
+../../_lua5.3/_metadata/version
\ No newline at end of file
diff --git a/data/lua5.3/make.sh b/data/lua5.3/make.sh
new file mode 100644
index 000000000..fb04fb40a
--- /dev/null
+++ b/data/lua5.3/make.sh
@@ -0,0 +1,2 @@
+pkg: mkdir -p /usr
+cp -a "$(PKG_DEST_ _${PKG_NAME})"/usr/bin "${PKG_DEST}"/usr
diff --git a/data/nmap/_metadata/in.1443.00 b/data/nmap/_metadata/in.1443.00
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/data/nmap/_metadata/in.1443.00
diff --git a/data/nmap/_metadata/liblua5.3.dep b/data/nmap/_metadata/liblua5.3.dep
new file mode 120000
index 000000000..4cd0bd62e
--- /dev/null
+++ b/data/nmap/_metadata/liblua5.3.dep
@@ -0,0 +1 @@
+../../liblua5.3
\ No newline at end of file
diff --git a/data/nmap/_metadata/libssh2.dep b/data/nmap/_metadata/libssh2.dep
new file mode 120000
index 000000000..e5424dba9
--- /dev/null
+++ b/data/nmap/_metadata/libssh2.dep
@@ -0,0 +1 @@
+../../libssh2
\ No newline at end of file
diff --git a/data/nmap/_metadata/libssl1.0.dep b/data/nmap/_metadata/libssl1.0.dep
new file mode 120000
index 000000000..a501d00a8
--- /dev/null
+++ b/data/nmap/_metadata/libssl1.0.dep
@@ -0,0 +1 @@
+../../libssl1.0
\ No newline at end of file
diff --git a/data/nmap/_metadata/pcre.dep b/data/nmap/_metadata/pcre.dep
new file mode 120000
index 000000000..f88da5e24
--- /dev/null
+++ b/data/nmap/_metadata/pcre.dep
@@ -0,0 +1 @@
+../../pcre
\ No newline at end of file
diff --git a/data/nmap/make.sh b/data/nmap/make.sh
index 482d0bad7..4735a954a 100644
--- a/data/nmap/make.sh
+++ b/data/nmap/make.sh
@@ -2,7 +2,9 @@ pkg:setup
 pushd libdnet-stripped
 autoconf
 popd
-pkg:configure --without-liblua --without-python --without-zenmap --enable-static=yes --without-openssl --without-pcre
-#make -j8 AR="${PKG_TARG}-ar"
+CPPFLAGS="-I$(PKG_DEST_ _lua5.3)/${PKG_TAPF}/include/lua5.3" \
+pkg:configure --without-python --without-zenmap --enable-static=yes --without-nmap-update --disable-universal --enable-ipv6
 pkg:make
 pkg:install
+#pkg: sed -ie 's|^#!.*|#!/usr/bin/env python|' /usr/bin/ndiff
+pkg: rm /usr/bin/ndiff
diff --git a/data/nmap/nmap-7.70.tar.bz2 b/data/nmap/nmap-7.70.tar.bz2
new file mode 100644
index 000000000..e8be9f77d
--- /dev/null
+++ b/data/nmap/nmap-7.70.tar.bz2