9 files changed, 9 insertions, 146 deletions

diff --git a/appveyor.yml b/appveyor.yml
index 81d0310f..b084cff5 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 3.9.2.{build}-test
+version: 3.0.0.{build}-test
 
 shallow_clone: true
 
@@ -6,7 +6,7 @@ matrix:
   fast_finish: true
 
 environment:
-  LUAROCKS_VER: 3.9.2
+  LUAROCKS_VER: 3.0.0
 
   matrix:
   # Lua 5.4 tests
diff --git a/binary/Makefile.windows b/binary/Makefile.windows
index 8d943ed1..3e540279 100644
--- a/binary/Makefile.windows
+++ b/binary/Makefile.windows
@@ -8,7 +8,7 @@ OPENSSL_PLATFORM=mingw
 # Versions of dependencies
 LIBLUA_VERSION=5.4.3
 OPENSSL_VERSION=1.0.2o
-ZLIB_VERSION=1.2.13
+ZLIB_VERSION=1.2.12
 BZIP2_VERSION=1.0.6
 
 WINDOWS_DEPS_DIR=windows-deps-$(MINGW_PREFIX)
diff --git a/binary/all_in_one b/binary/all_in_one
index eace5290..9db25bf8 100755
--- a/binary/all_in_one
+++ b/binary/all_in_one
@@ -470,7 +470,7 @@ local function main()
       ["lua-zlib"] = "./binary/lua-zlib-1.2-0.rockspec",
       ["lua-bz2"] = "./binary/lua-bz2-0.2.1-1.rockspec",
       luaposix = if_platform("unix", "./binary/luaposix-35.1-1.rockspec"),
-      luasocket = "./binary/luasocket-3.1.0-1.rockspec",
+      luasocket = "luasocket",
       luafilesystem = "luafilesystem",
       dkjson = "dkjson",
    }
diff --git a/binary/luasocket-3.1.0-1.rockspec b/binary/luasocket-3.1.0-1.rockspec
deleted file mode 100644
index f33080b0..00000000
--- a/binary/luasocket-3.1.0-1.rockspec
+++ /dev/null
@@ -1,136 +0,0 @@
-package = "LuaSocket"
-version = "3.1.0-1"
-source = {
-  url = "git+https://github.com/lunarmodules/luasocket.git",
-  tag = "v3.1.0"
-}
-description = {
-  summary = "Network support for the Lua language",
-  detailed = [[
-      LuaSocket is a Lua extension library composed of two parts: a set of C
-      modules that provide support for the TCP and UDP transport layers, and a
-      set of Lua modules that provide functions commonly needed by applications
-      that deal with the Internet.
-   ]],
-  homepage = "https://github.com/lunarmodules/luasocket",
-  license = "MIT"
-}
-dependencies = {
-  "lua >= 5.1"
-}
-
-local function make_plat(plat)
-  local defines = {
-    unix = {
-      "LUASOCKET_DEBUG"
-    },
-    macosx = {
-      "LUASOCKET_DEBUG",
-      "UNIX_HAS_SUN_LEN"
-    },
-    win32 = {
-      "LUASOCKET_DEBUG",
-      "NDEBUG"
-    },
-    mingw32 = {
-      "LUASOCKET_DEBUG",
-      "LUASOCKET_INET_PTON",
-      "WINVER=0x0501",
-    },
-  }
-  local modules = {
-    ["socket.core"] = {
-      sources = {
-        "src/luasocket.c"
-        , "src/timeout.c"
-        , "src/buffer.c"
-        , "src/io.c"
-        , "src/auxiliar.c"
-        , "src/options.c"
-        , "src/inet.c"
-        , "src/except.c"
-        , "src/select.c"
-        , "src/tcp.c"
-        , "src/udp.c"
-        , "src/compat.c" },
-      defines = defines[plat],
-      incdir = "/src"
-    },
-    ["mime.core"] = {
-      sources = { "src/mime.c", "src/compat.c" },
-      defines = defines[plat],
-      incdir = "/src"
-    },
-    ["socket.http"]    = "src/http.lua",
-    ["socket.url"]     = "src/url.lua",
-    ["socket.tp"]      = "src/tp.lua",
-    ["socket.ftp"]     = "src/ftp.lua",
-    ["socket.headers"] = "src/headers.lua",
-    ["socket.smtp"]    = "src/smtp.lua",
-    ltn12              = "src/ltn12.lua",
-    socket             = "src/socket.lua",
-    mime               = "src/mime.lua"
-  }
-  if plat == "unix"
-    or plat == "macosx"
-    or plat == "haiku"
-  then
-    modules["socket.core"].sources[#modules["socket.core"].sources+1] = "src/usocket.c"
-    if plat == "haiku" then
-      modules["socket.core"].libraries = {"network"}
-    end
-    modules["socket.unix"] = {
-      sources = {
-        "src/buffer.c"
-        , "src/compat.c"
-        , "src/auxiliar.c"
-        , "src/options.c"
-        , "src/timeout.c"
-        , "src/io.c"
-        , "src/usocket.c"
-        , "src/unix.c"
-        , "src/unixdgram.c"
-        , "src/unixstream.c" },
-      defines = defines[plat],
-      incdir = "/src"
-    }
-    modules["socket.serial"] = {
-      sources = {
-        "src/buffer.c"
-        , "src/compat.c"
-        , "src/auxiliar.c"
-        , "src/options.c"
-        , "src/timeout.c"
-        , "src/io.c"
-        , "src/usocket.c"
-        , "src/serial.c" },
-      defines = defines[plat],
-      incdir = "/src"
-    }
-  end
-  if  plat == "win32"
-    or plat == "mingw32"
-  then
-    modules["socket.core"].sources[#modules["socket.core"].sources+1] = "src/wsocket.c"
-    modules["socket.core"].libraries = { "ws2_32" }
-    modules["socket.core"].libdirs = {}
-  end
-  return { modules = modules }
-end
-
-build = {
-  type = "builtin",
-  platforms = {
-    unix = make_plat("unix"),
-    macosx = make_plat("macosx"),
-    haiku = make_plat("haiku"),
-    win32 = make_plat("win32"),
-    mingw32 = make_plat("mingw32"),
-    mingw64 = make_plat("mingw64")
-  },
-  copy_directories = {
-    "docs"
-    , "samples"
-    , "etc"
-    , "test" }
-}
diff --git a/configure b/configure
index a8bf8809..4a5542b9 100755
--- a/configure
+++ b/configure
@@ -320,7 +320,7 @@ do
 done
 
 echo
-BLUE "Configuring LuaRocks version 3.9.2..."
+BLUE "Configuring LuaRocks version dev..."
 echo
 echo
 
diff --git a/install.bat b/install.bat
index de8cb70b..7a5df9cd 100644
--- a/install.bat
+++ b/install.bat
@@ -6,7 +6,7 @@ local vars = {}
 

 

 vars.PREFIX = nil

-vars.VERSION = "3.9"

+vars.VERSION = "3.0"

 vars.SYSCONFDIR = nil

 vars.CONFBACKUPDIR = nil

 vars.SYSCONFFILENAME = nil

diff --git a/luarocks-3.9.2-1.rockspec b/luarocks-dev-1.rockspec
index c4fe644d..718ce338 100644
--- a/luarocks-3.9.2-1.rockspec
+++ b/luarocks-dev-1.rockspec
@@ -1,9 +1,8 @@
 rockspec_format = "3.0"
 package = "luarocks"
-version = "3.9.2-1"
+version = "dev-1"
 source = {
    url = "git+https://github.com/luarocks/luarocks",
-   tag = "v3.9.2"
 }
 description = {
    summary = "A package manager for Lua modules.",
diff --git a/makedist b/makedist
index 0ba46034..0cc247d3 100755
--- a/makedist
+++ b/makedist
@@ -150,7 +150,7 @@ if [ "$1" = "binary" ]
 then
    shift
 
-   ./configure --lua-version=5.4 --with-lua=${LUA_DIR:-/usr}
+   ./configure --lua-version=5.4
 
    make binary
    cd build-binary
diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua
index eb170f35..a5f27e27 100644
--- a/src/luarocks/core/cfg.lua
+++ b/src/luarocks/core/cfg.lua
@@ -20,7 +20,7 @@ local vers = require("luarocks.core.vers")
 
 --------------------------------------------------------------------------------
 
-local program_version = "3.9.2"
+local program_version = "dev"
 
 local is_windows = package.config:sub(1,1) == "\\"