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 | |
| parent | 647762d2d92865254514f144be4c2be63cadcdc5 (diff) | |
Push luaposix to 5.1.4
Diffstat (limited to 'contrib/luaposix')
| -rw-r--r-- | contrib/luaposix/.gitignore | 1 | ||||
| -rw-r--r-- | contrib/luaposix/Makefile | 20 | ||||
| -rw-r--r-- | contrib/luaposix/patches/200-crypt.patch | 62 |
3 files changed, 4 insertions, 79 deletions
diff --git a/contrib/luaposix/.gitignore b/contrib/luaposix/.gitignore index c900421f8..1407d2387 100644 --- a/contrib/luaposix/.gitignore +++ b/contrib/luaposix/.gitignore @@ -1,2 +1,3 @@ luaposix-* +lua-posix_* patches/series diff --git a/contrib/luaposix/Makefile b/contrib/luaposix/Makefile index a91138de8..70d3c9c4c 100644 --- a/contrib/luaposix/Makefile +++ b/contrib/luaposix/Makefile @@ -1,10 +1,10 @@ include ../../build/config.mk include ../../build/gccconfig.mk -LUAPOSIX_VERSION = 5.1.3 +LUAPOSIX_VERSION = 5.1.4 LUAPOSIX_SITE = http://dev.luci.freifunk-halle.net/sources/ LUAPOSIX_DIR = luaposix-$(LUAPOSIX_VERSION) -LUAPOSIX_FILE = $(LUAPOSIX_DIR).tar.gz +LUAPOSIX_FILE = lua-posix_5.1.4.orig.tar.gz LUAPOSIX_URL = $(LUAPOSIX_SITE)/$(LUAPOSIX_FILE) LUAPOSIX_PATCHDIR = patches @@ -15,26 +15,12 @@ include ../../build/module.mk $(LUAPOSIX_FILE): wget -O $@ $(LUAPOSIX_URL) || rm -f $@ -$(LUAPOSIX_PATCHDIR)/series: - (cd $(LUAPOSIX_PATCHDIR); ls *.patch | sort > series) - $(LUAPOSIX_DIR)/.prepared: $(LUAPOSIX_FILE) rm -rf $(LUAPOSIX_DIR) tar xvfz $(LUAPOSIX_FILE) - ln -s ../$(LUAPOSIX_PATCHDIR) $(LUAPOSIX_DIR)/patches - touch $@ - -$(LUAPOSIX_DIR)/.patched: $(LUAPOSIX_DIR)/.prepared $(LUAPOSIX_PATCHDIR)/series - (cd $(LUAPOSIX_DIR); \ - if [ -x "$$(which quilt 2>/dev/null)" ]; then \ - quilt push -a; \ - else \ - cat patches/*.patch | patch -p1; \ - fi; \ - ) touch $@ -compile: $(LUAPOSIX_DIR)/.patched +compile: $(LUAPOSIX_DIR)/.prepared $(MAKE) -C $(LUAPOSIX_DIR) CC=$(CC) CFLAGS="$(CFLAGS) $(LUA_CFLAGS)" LDFLAGS="$(LDFLAGS) $(LUA_SHLIBS)" OS="$(OS)" mkdir -p dist$(LUA_LIBRARYDIR) cp $(LUAPOSIX_DIR)/posix.so dist$(LUA_LIBRARYDIR) diff --git a/contrib/luaposix/patches/200-crypt.patch b/contrib/luaposix/patches/200-crypt.patch deleted file mode 100644 index 6ceab5556..000000000 --- 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 - |