diff options
author | Steven Barth <steven@midlink.org> | 2008-09-25 09:57:32 +0000 |
---|---|---|
committer | Steven Barth <steven@midlink.org> | 2008-09-25 09:57:32 +0000 |
commit | 6373105b6ce8d55c41f9f6132e57f48b802a49e6 (patch) | |
tree | 908afff25c60a5d42c758c9e67b6dd8e2c95eb02 /contrib/luaposix/patches | |
parent | 647762d2d92865254514f144be4c2be63cadcdc5 (diff) |
Push luaposix to 5.1.4
Diffstat (limited to 'contrib/luaposix/patches')
-rw-r--r-- | contrib/luaposix/patches/200-crypt.patch | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/contrib/luaposix/patches/200-crypt.patch b/contrib/luaposix/patches/200-crypt.patch deleted file mode 100644 index 6ceab55567..0000000000 --- a/contrib/luaposix/patches/200-crypt.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- a/lposix.c -+++ b/lposix.c -@@ -1016,6 +1016,29 @@ - } - #endif - -+/* -+ * XXX: GNU and BSD handle the forward declaration of crypt() in different -+ * and annoying ways (especially GNU). Declare it here just to make sure -+ * that it's there -+ */ -+char *crypt(const char *, const char *); -+ -+static int Pcrypt(lua_State *L) -+{ -+ const char *str, *salt; -+ char *res; -+ -+ str = luaL_checkstring(L, 1); -+ salt = luaL_checkstring(L, 2); -+ if (strlen(salt) < 2) -+ luaL_error(L, "not enough salt"); -+ -+ res = crypt(str, salt); -+ lua_pushstring(L, res); -+ -+ return 1; -+} -+ - static const luaL_reg R[] = - { - {"access", Paccess}, -@@ -1023,6 +1046,7 @@ - {"chdir", Pchdir}, - {"chmod", Pchmod}, - {"chown", Pchown}, -+ {"crypt", Pcrypt}, - {"ctermid", Pctermid}, - {"dirname", Pdirname}, - {"dir", Pdir}, ---- a/Makefile -+++ b/Makefile -@@ -37,8 +37,10 @@ - OS=$(shell uname) - ifeq ($(OS),Darwin) - LDFLAGS_SHARED=-bundle -undefined dynamic_lookup -+ LIBS= - else - LDFLAGS_SHARED=-shared -+ LIBS=-lcrypt - endif - - # targets -@@ -50,7 +52,7 @@ - $(LUA) test.lua - - $T: $(OBJS) -- $(CC) $(LDFLAGS) -o $@ $(LDFLAGS_SHARED) $(OBJS) -+ $(CC) $(LDFLAGS) -o $@ $(LDFLAGS_SHARED) $(OBJS) $(LIBS) - - $(OBJS): modemuncher.c - |