From 33ca1a111127363489483a8edd5252c45cb16f9a Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Fri, 20 Feb 2015 22:53:12 +0000
Subject: mod_admin_telnet: Require util.pposix (fixes #471)

---
 plugins/mod_admin_telnet.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index e4b5a045..437ded01 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -313,6 +313,7 @@ local function human(kb)
 end
 
 function def_env.server:memory()
+	local pposix = require("util.pposix");
 	if not pposix.meminfo then
 		return true, "Lua is using "..collectgarbage("count");
 	end
-- 
cgit v1.2.3


From 0ecfb4e79a16b0c703d995a43a5285aa33489b81 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Tue, 24 Feb 2015 15:19:20 +0000
Subject: configure: Fix for commit cd0088c73daf - update LIBDIR if --prefix is
 set and --libdir isn't (thanks Medics)

---
 configure | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/configure b/configure
index c27517fc..199f5fcf 100755
--- a/configure
+++ b/configure
@@ -139,6 +139,7 @@ do
       ;;
    --libdir=*)
       LIBDIR="$value"
+      LIBDIR_SET=yes
       ;;
    --datadir=*)
    	DATADIR="$value"
@@ -213,6 +214,11 @@ then
    fi
 fi
 
+if [ "$PREFIX_SET" = "yes" -a ! "$LIBDIR_SET" = "yes" ]
+then
+   LIBDIR=$PREFIX/lib
+fi
+
 find_program() {
    path="$PATH"
    item="`echo "$path" | sed 's/\([^:]*\):.*/\1/'`"
-- 
cgit v1.2.3