From c85cca937fc2cccbe085529c76f0d236c56936bd Mon Sep 17 00:00:00 2001
From: mpeterv <mpeterval@gmail.com>
Date: Tue, 22 Dec 2015 14:45:39 +0300
Subject: Install luabitop from src rock on travis

Fixes Travis failure when attempting to fetch luabitop sources
from luajit.org, which has blocked downloads from travis recently.
---
 test/testing.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/testing.sh b/test/testing.sh
index 26bdde5f..70bd68b2 100755
--- a/test/testing.sh
+++ b/test/testing.sh
@@ -244,6 +244,7 @@ mkdir -p "$testing_server"
    get "$luarocks_repo/validate-args-1.5.4-1.rockspec"
    get "$luarocks_repo/luasec-0.5-2.rockspec"
    get "$luarocks_repo/luabitop-1.0.2-1.rockspec"
+   get "$luarocks_repo/luabitop-1.0.2-1.src.rock"
    get "$luarocks_repo/lpty-1.0.1-1.src.rock"
    get "$luarocks_repo/cprint-${verrev_cprint}.src.rock"
    get "$luarocks_repo/cprint-${verrev_cprint}.rockspec"
-- 
cgit v1.2.3-55-g6feb


From 26b6f6ce2945a667f21803446a73f03c07a8cff5 Mon Sep 17 00:00:00 2001
From: Thijs Schreijer <thijs@thijsschreijer.nl>
Date: Sat, 26 Dec 2015 23:29:16 +0100
Subject: fix missing variable expansion when using a self contained
 configuration

---
 install.bat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.bat b/install.bat
index 8e3df4d9..1929ab75 100644
--- a/install.bat
+++ b/install.bat
@@ -983,7 +983,7 @@ if FORCE_CONFIG then
 	f:write("site_config.LUAROCKS_FORCE_CONFIG=true\n")
 end
 if vars.SYSCONFFORCE then  -- only write this value when explcitly given, otherwise rely on defaults
-	f:write("site_config.LUAROCKS_SYSCONFIG=[[$CONFIG_FILE]]\n")
+	f:write(S("site_config.LUAROCKS_SYSCONFIG=[[$CONFIG_FILE]]\n"))
 end
 f:write("return site_config\n")
 f:close()
-- 
cgit v1.2.3-55-g6feb