From 5721c294bac645fcf26ce1e69b4f40f2b52e3dca Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Thu, 4 Jun 2009 15:17:39 +0100
Subject: Adding .hgignore

---
 .hgignore | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 .hgignore

diff --git a/.hgignore b/.hgignore
new file mode 100644
index 00000000..b7f3c20c
--- /dev/null
+++ b/.hgignore
@@ -0,0 +1,22 @@
+syntax: glob
+.hgignore
+data
+local
+www_files
+html/*
+prosody.lua
+prosody.cfg.lua
+config.unix
+*.patch
+*.orig
+*.rej
+*.save
+*~
+*.report
+*.o
+*.so
+*.install
+*.pid
+*.log
+*.err
+*.debug
-- 
cgit v1.2.3


From 8f7a737f08186fffef7c63c7d5dc98c7b9855dcb Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Thu, 4 Jun 2009 15:22:04 +0100
Subject: net.server: Display server port in error messages

---
 net/server.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/server.lua b/net/server.lua
index d7872f51..3491b190 100644
--- a/net/server.lua
+++ b/net/server.lua
@@ -653,13 +653,13 @@ addserver = function( listeners, port, addr, pattern, sslctx, maxconnections, st
         err = "luasec not found"
     end
     if err then
-        out_error( "server.lua: ", err )
+        out_error( "server.lua, port ", port, ": ", err )
         return nil, err
     end
     addr = addr or "*"
     local server, err = socket_bind( addr, port )
     if err then
-        out_error( "server.lua: ", err )
+        out_error( "server.lua, port ", port, ": ", err )
         return nil, err
     end
     local handler, err = wrapserver( listeners, server, addr, port, pattern, sslctx, maxconnections, startssl )    -- wrap new server socket
-- 
cgit v1.2.3


From aec90f68408ae3f8cd326733f4f29cccf27839c7 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Thu, 4 Jun 2009 15:24:43 +0100
Subject: prosody: Add support for general 'interface' option which is used as
 the default network interface

---
 prosody | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/prosody b/prosody
index f5f51bab..577dc178 100755
--- a/prosody
+++ b/prosody
@@ -179,7 +179,9 @@ function net_activate_ports(option, listener, default, conntype)
 				cl.start(listener, { 
 					ssl = conntype ~= "tcp" and global_ssl_ctx,
 					port = port,
-					interface = config.get("*", "core", option.."_interface"),
+					interface = config.get("*", "core", option.."_interface") 
+						or cl.get(listener).default_interface 
+						or config.get("*", "core", "interface"),
 					type = conntype
 				});
 			end
-- 
cgit v1.2.3


From e70d58ad08426aba21c8c7e39d2d6ca9ca58015d Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Thu, 4 Jun 2009 15:30:00 +0100
Subject: Makefile: Specify permissions on installed executables [thanks
 mhavela]

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index f030821c..f65e7f74 100644
--- a/Makefile
+++ b/Makefile
@@ -19,8 +19,8 @@ install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodin
 	install -d $(BIN) $(CONFIG) $(MODULES) $(SOURCE) $(DATA)
 	install -d $(CONFIG)/certs
 	install -d $(SOURCE)/core $(SOURCE)/net $(SOURCE)/util
-	install ./prosody.install $(BIN)/prosody
-	install ./prosodyctl.install $(BIN)/prosodyctl
+	install -m755 ./prosody.install $(BIN)/prosody
+	install -m755 ./prosodyctl.install $(BIN)/prosodyctl
 	install -m644 core/* $(SOURCE)/core
 	install -m644 net/* $(SOURCE)/net
 	install -m644 util/* $(SOURCE)/util
-- 
cgit v1.2.3


From a82a7d386ca2cbfb1db79e2cede363516f0a0f99 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Thu, 4 Jun 2009 15:46:05 +0100
Subject: Makefile: Set data directory permissions to 750 on install [thanks
 Dwayne Bent]

---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index f65e7f74..3a3ea9ef 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,8 @@ all: prosody.install prosodyctl.install prosody.cfg.lua.install
 	$(MAKE) -C util-src install
 
 install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodings.so util/encodings.so util/pposix.so util/signal.so
-	install -d $(BIN) $(CONFIG) $(MODULES) $(SOURCE) $(DATA)
+	install -d $(BIN) $(CONFIG) $(MODULES) $(SOURCE)
+	install -m750 -d $(DATA)
 	install -d $(CONFIG)/certs
 	install -d $(SOURCE)/core $(SOURCE)/net $(SOURCE)/util
 	install -m755 ./prosody.install $(BIN)/prosody
-- 
cgit v1.2.3