summaryrefslogtreecommitdiff
path: root/user/prosody
diff options
context:
space:
mode:
Diffstat (limited to 'user/prosody')
-rw-r--r--user/prosody/luasec-0.6-fix.patch14
-rw-r--r--user/prosody/mallinfo.patch13
-rw-r--r--user/prosody/prosodyctl.patch11
3 files changed, 0 insertions, 38 deletions
diff --git a/user/prosody/luasec-0.6-fix.patch b/user/prosody/luasec-0.6-fix.patch
deleted file mode 100644
index c8e37d091..000000000
--- a/user/prosody/luasec-0.6-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/util/dependencies.lua b/util/dependencies.lua
-index 4d50cf6..9ea211d 100644
---- a/util/dependencies.lua
-+++ b/util/dependencies.lua
-@@ -99,6 +99,9 @@ function check_dependencies()
- ["luarocks"] = "luarocks install luasec";
- ["Source"] = "http://www.inf.puc-rio.br/~brunoos/luasec/";
- }, "SSL/TLS support will not be available");
-+ elseif not _G.ssl then
-+ _G.ssl = ssl;
-+ _G.ssl.context = require "ssl.context";
- end
-
- local encodings, err = softreq "util.encodings"
diff --git a/user/prosody/mallinfo.patch b/user/prosody/mallinfo.patch
deleted file mode 100644
index 4f9247c9b..000000000
--- a/user/prosody/mallinfo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/util-src/pposix.c b/util-src/pposix.c
-index e70a9d7..b9729ab 100644
---- a/util-src/pposix.c
-+++ b/util-src/pposix.c
-@@ -52,7 +52,7 @@
- #include <linux/falloc.h>
- #endif
-
--#if !defined(WITHOUT_MALLINFO) && defined(__linux__)
-+#ifdef __GLIBC__
- #include <malloc.h>
- #define WITH_MALLINFO
- #endif
diff --git a/user/prosody/prosodyctl.patch b/user/prosody/prosodyctl.patch
deleted file mode 100644
index 18333dd52..000000000
--- a/user/prosody/prosodyctl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- prosody-0.9.10.q/prosodyctl
-+++ prosody-0.9.10/prosodyctl
-@@ -244,7 +244,7 @@
- local modulemanager = require "core.modulemanager"
-
- local prosodyctl = require "util.prosodyctl"
--require "socket"
-+local socket = require "socket"
- -----------------------
-
- -- FIXME: Duplicate code waiting for util.startup