10 files changed, 50 insertions, 48 deletions

diff --git a/GNUmakefile b/GNUmakefile
index f4a6015f..cbb47996 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -14,9 +14,10 @@ luadir = $(datarootdir)/lua/$(LUA_VERSION)
 builddir = ./build
 buildbinarydir = ./build-binary
 
-
 LUAROCKS_FILES = $(shell find src/luarocks/ -type f -name '*.lua')
 
+LUA_ENV_VARS = LUA_PATH LUA_PATH_5_2 LUA_PATH_5_3 LUA_PATH_5_4 LUA_CPATH LUA_CPATH_5_2 LUA_CPATH_5_3 LUA_CPATH_5_4
+
 all: build
 
 # ----------------------------------------
@@ -51,7 +52,7 @@ luarocks: config.unix $(builddir)/config-$(LUA_VERSION).lua
         cp $(builddir)/config-$(LUA_VERSION).lua .luarocks/config-$(LUA_VERSION).lua
         rm -f src/luarocks/core/hardcoded.lua
         echo "#!/bin/sh" > luarocks
-        echo "unset LUA_PATH LUA_PATH_5_2 LUA_PATH_5_3 LUA_PATH_5_4 LUA_CPATH LUA_CPATH_5_2 LUA_CPATH_5_3 LUA_CPATH_5_4" >> luarocks
+        echo "unset $(LUA_ENV_VARS)" >> luarocks
         echo 'LUAROCKS_SYSCONFDIR="$(luarocksconfdir)" LUA_PATH="$(CURDIR)/src/?.lua;;" exec "$(LUA)" "$(CURDIR)/src/bin/luarocks" --project-tree="$(CURDIR)/lua_modules" "$$@"' >> luarocks
         chmod +rx ./luarocks
         ./luarocks init
@@ -59,7 +60,7 @@ luarocks: config.unix $(builddir)/config-$(LUA_VERSION).lua
 luarocks-admin: config.unix
         rm -f src/luarocks/core/hardcoded.lua
         echo "#!/bin/sh" > luarocks-admin
-        echo "unset LUA_PATH LUA_PATH_5_2 LUA_PATH_5_3 LUA_PATH_5_4 LUA_CPATH LUA_CPATH_5_2 LUA_CPATH_5_3 LUA_CPATH_5_4" >> luarocks-admin
+        echo "unset $(LUA_ENV_VARS)" >> luarocks-admin
         echo 'LUAROCKS_SYSCONFDIR="$(luarocksconfdir)" LUA_PATH="$(CURDIR)/src/?.lua;;" exec "$(LUA)" "$(CURDIR)/src/bin/luarocks-admin" --project-tree="$(CURDIR)/lua_modules" "$$@"' >> luarocks-admin
         chmod +rx ./luarocks-admin
 
diff --git a/binary/Makefile.windows b/binary/Makefile.windows
index e6ec26bf..8dbbc270 100644
--- a/binary/Makefile.windows
+++ b/binary/Makefile.windows
@@ -6,7 +6,7 @@ MINGW_SYSROOT=/usr/lib/mingw-w64-sysroot/$(MINGW_PREFIX)
 # "mingw" or "mingw64"
 OPENSSL_PLATFORM=mingw
 # Versions of dependencies
-LIBLUA_VERSION=5.3.4
+LIBLUA_VERSION=5.4.3
 OPENSSL_VERSION=1.0.2o
 ZLIB_VERSION=1.2.11
 BZIP2_VERSION=1.0.6
diff --git a/binary/all_in_one b/binary/all_in_one
index bfe9c974..34b84a2c 100755
--- a/binary/all_in_one
+++ b/binary/all_in_one
@@ -164,7 +164,7 @@ local function write_hardcoded_module(dir)
       LUA_BINDIR = if_platform("unix", cfg.variables.LUA_BINDIR),
       LUA_INTERPRETER = if_platform("unix", cfg.lua_interpreter),
    }
-   
+
    local name = dir .. "/luarocks/core/hardcoded.lua"
    persist.save_as_module(name, hardcoded)
    return name
@@ -335,7 +335,7 @@ static int pmain(lua_State *L) {
 /* error handler, from luac */
 static int msghandler (lua_State *L) {
    /* is error object not a string? */
-   const char *msg = lua_tostring(L, 1);            
+   const char *msg = lua_tostring(L, 1);
    if (msg == NULL) {
       /* does it have a metamethod that produces a string */
       if (luaL_callmeta(L, 1, "__tostring") && lua_type(L, -1) == LUA_TSTRING) {
@@ -393,7 +393,7 @@ local function generate(main_program, dir, skip)
    local program_name = main_program:gsub(".*/", "")
 
    local hardcoded = write_hardcoded_module(dir)
-   
+
    local out = {}
    table.insert(out, ([[static const char* progname = %q;]]):format(program_name))
    table.insert(out, c_preamble)
@@ -404,7 +404,7 @@ local function generate(main_program, dir, skip)
    table.insert(out, c_main)
 
    os.remove(hardcoded)
-   
+
    local c_filename = TARGET_DIR .. "/" .. program_name .. ".exe.c"
    local fd = io.open(c_filename, "w")
    fd:write(reindent_c(table.concat(out, "\n")))
@@ -412,7 +412,7 @@ local function generate(main_program, dir, skip)
 
    deps.check_lua_incdir(cfg.variables)
    deps.check_lua_libdir(cfg.variables)
-   
+
    cmd = table.concat(filter_in(nonnull, {
       CC, "-o", TARGET_DIR .. "/" .. program_name .. ".exe",
       "-I", cfg.variables.LUA_INCDIR,
@@ -426,6 +426,7 @@ local function generate(main_program, dir, skip)
       cfg.variables.LUA_LIBDIR .. "/" .. cfg.variables.LUALIB:gsub("%.so.*$", ".a"),
       if_platform("unix", "-ldl"),
       if_platform("unix", "-lpthread"),
+      if_platform("windows", "-mwindows"),
       "-lm"
    }), " ")
    print(cmd)
@@ -445,7 +446,7 @@ local function main()
    path.use_tree(LUA_MODULES)
 
    local CONFIG_FILE = CONFIG_DIR .. "/config-" .. cfg.lua_version .. ".lua"
-   
+
    fs.make_dir(CONFIG_DIR)
 
    persist.save_from_table(CONFIG_FILE, {
@@ -456,22 +457,23 @@ local function main()
          LD = fs.current_dir() .. "/binary/static-gcc",
          LIB_EXTENSION = "a",
          LIBFLAG = "-static",
+         PWD = "pwd",
       },
       platforms = if_platform("windows", { "windows", "win32", "mingw32" }),
       external_deps_dirs = if_platform("windows", { CROSSCOMPILER_SYSROOT, fs.current_dir() .. "/windows-deps-" .. TRIPLET }),
    })
-   
+
    local dependencies = {
       md5 = "md5",
-      luasec = "./binary/luasec-0.8.1-2.rockspec",
-      luaposix = if_platform("unix", "./binary/luaposix-34.0.4-1.rockspec"),
-      luasocket = "luasocket",
+      luasec = "./binary/luasec-1.0.2-1.rockspec",
       ["lua-zlib"] = "./binary/lua-zlib-1.2-0.rockspec",
-      ["lua-bz2"] = "./binary/lua-bz2-0.1.0-1.rockspec",
+      ["lua-bz2"] = "./binary/lua-bz2-0.2.1-1.rockspec",
+      luaposix = if_platform("unix", "./binary/luaposix-35.1-1.rockspec"),
+      luasocket = "luasocket",
       luafilesystem = "luafilesystem",
       dkjson = "dkjson",
    }
-   
+
    fs.make_dir(LUA_MODULES)
    for name, arg in pairs(dependencies) do
       print("----------------------------------------------------------------")
diff --git a/binary/lua-bz2-0.1.0-1.rockspec b/binary/lua-bz2-0.2.1-1.rockspec
index aa29293f..d5a73778 100644
--- a/binary/lua-bz2-0.1.0-1.rockspec
+++ b/binary/lua-bz2-0.2.1-1.rockspec
@@ -1,8 +1,8 @@
 package = "lua-bz2"
-version = "0.1.0-1"
+version = "0.2.1-1"
 source = {
    url = "git+ssh://git@github.com/hishamhm/lua-bz2.git",
-   tag = "0.1.0",
+   tag = "0.2.1",
 }
 description = {
    summary = "A Lua binding to Julian Seward's libbzip2",
diff --git a/binary/lua-zlib-1.2-0.rockspec b/binary/lua-zlib-1.2-0.rockspec
index dd0c4a15..4e32448f 100644
--- a/binary/lua-zlib-1.2-0.rockspec
+++ b/binary/lua-zlib-1.2-0.rockspec
@@ -16,7 +16,7 @@ description = {
    license = "MIT"
 }
 dependencies = {
-   "lua >= 5.1, <= 5.3"
+   "lua >= 5.1, <= 5.4"
 }
 external_dependencies = {
     ZLIB = {
diff --git a/binary/luaposix-34.0.4-1.rockspec b/binary/luaposix-35.1-1.rockspec
index 490715d5..1940c755 100644
--- a/binary/luaposix-34.0.4-1.rockspec
+++ b/binary/luaposix-35.1-1.rockspec
@@ -1,4 +1,4 @@
-local _MODREV, _SPECREV = '34.0.4', '-1'
+local _MODREV, _SPECREV = '35.1', '-1'
 
 package = 'luaposix'
 version = _MODREV .. _SPECREV
@@ -14,14 +14,20 @@ description = {
 }
 
 dependencies = {
-   'bit32',
-   'lua >= 5.1, < 5.4',
-   'std.normalize',
+   'lua >= 5.1, < 5.5',
 }
 
+do
+   -- We only want to install a bit32 module for Lua 5.1.
+   local _ENV={package=nil, dependencies=dependencies}
+   if package then
+      dependencies[#dependencies + 1] = 'bit32'
+   end
+end
+
 source = {
    url = 'http://github.com/luaposix/luaposix/archive/v' .. _MODREV .. '.zip',
-   dir = 'luaposix-' .. _MODREV,  
+   dir = 'luaposix-' .. _MODREV,
 }
 
 build = {
diff --git a/binary/luasec-0.8.1-2.rockspec b/binary/luasec-1.0.2-1.rockspec
index 510e88ef..b6741257 100644
--- a/binary/luasec-0.8.1-2.rockspec
+++ b/binary/luasec-1.0.2-1.rockspec
@@ -1,8 +1,8 @@
 package = "LuaSec"
-version = "0.8.1-2"
+version = "1.0.2-1"
 source = {
-   url = "https://github.com/brunoos/luasec/archive/luasec-0.8.1.tar.gz",
-   dir = "luasec-luasec-0.8.1"
+  url = "git://github.com/brunoos/luasec",
+  tag = "v1.0.2",
 }
 description = {
    summary = "A binding for OpenSSL library to provide TLS/SSL communication over LuaSocket.",
@@ -57,19 +57,10 @@ build = {
                   "ssl", "crypto"
                },
                sources = {
-                  "src/config.c", "src/ec.c", 
-                  "src/x509.c", "src/context.c", "src/ssl.c", 
+                  "src/options.c", "src/config.c", "src/ec.c",
+                  "src/x509.c", "src/context.c", "src/ssl.c",
                   "src/luasocket/buffer.c", "src/luasocket/io.c",
-                  "src/luasocket/timeout.c", "src/luasocket/usocket.c"
-               }
-            }
-         }
-      },
-      mingw32 = {
-         modules = {
-            ssl = {
-               libraries = {
-                  "ssl", "crypto", "ws2_32", "gdi32"
+                  "src/luasocket/usocket.c" -- , "src/luasocket/timeout.c"
                }
             }
          }
@@ -89,16 +80,16 @@ build = {
                   "$(OPENSSL_BINDIR)",
                },
                libraries = {
-                  "libssl32MD", "libcrypto32MD", "ws2_32"
+                  "ssl", "crypto", "ws2_32"
                },
                incdirs = {
                   "$(OPENSSL_INCDIR)", "src/", "src/luasocket"
                },
                sources = {
-                  "src/config.c", "src/ec.c", 
-                  "src/x509.c", "src/context.c", "src/ssl.c", 
+                  "src/options.c", "src/config.c", "src/ec.c",
+                  "src/x509.c", "src/context.c", "src/ssl.c",
                   "src/luasocket/buffer.c", "src/luasocket/io.c",
-                  "src/luasocket/timeout.c", "src/luasocket/wsocket.c"
+                  "src/luasocket/wsocket.c", "src/luasocket/timeout.c"
                }
             }
          },
@@ -110,12 +101,12 @@ index 95109c4..e5defa8 100644
 +++ b/src/ssl.c
 @@ -11,7 +11,7 @@
  #include <string.h>
- 
+
  #if defined(WIN32)
 -#include <Winsock2.h>
 +#include <winsock2.h>
  #endif
- 
+
  #include <openssl/ssl.h>
 ]]
          }
diff --git a/src/luarocks/fs/tools.lua b/src/luarocks/fs/tools.lua
index 623e5a90..0a154794 100644
--- a/src/luarocks/fs/tools.lua
+++ b/src/luarocks/fs/tools.lua
@@ -57,7 +57,7 @@ do
       local current = cache_pwd
       if not current then
          local pipe = io.popen(fs.quiet_stderr(vars.PWD))
-         current = pipe:read("*l"):gsub("%s*", "")
+         current = pipe:read("*a"):gsub("^%s*", ""):gsub("%s*$", "")
          pipe:close()
          cache_pwd = current
       end
diff --git a/src/luarocks/fs/unix.lua b/src/luarocks/fs/unix.lua
index 2c66eaa3..0065753e 100644
--- a/src/luarocks/fs/unix.lua
+++ b/src/luarocks/fs/unix.lua
@@ -90,7 +90,8 @@ function unix.wrap_script(script, target, deps_mode, name, version, ...)
    }
 
    local remove_interpreter = false
-   if target == "luarocks" or target == "luarocks-admin" then
+   local base = dir.base_name(target):gsub("%..*$", "")
+   if base == "luarocks" or base == "luarocks-admin" then
       if cfg.is_binary then
          remove_interpreter = true
       end
diff --git a/src/luarocks/fs/win32.lua b/src/luarocks/fs/win32.lua
index 1902a691..a3f42df7 100644
--- a/src/luarocks/fs/win32.lua
+++ b/src/luarocks/fs/win32.lua
@@ -167,7 +167,8 @@ function win32.wrap_script(script, target, deps_mode, name, version, ...)
    }
 
    local remove_interpreter = false
-   if target == "luarocks" or target == "luarocks-admin" then
+   local base = dir.base_name(target):gsub("%..*$", "")
+   if base == "luarocks" or base == "luarocks-admin" then
       if cfg.is_binary then
          remove_interpreter = true
       end