From 707c7f05f85d58373b6fc3d04c06d2f28da7094e Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert@fedoraproject.org>
Date: Jan 08 2016 18:20:37 +0000
Subject: Upgrade to 0.9.9 (#1296983, #1296984)


---

diff --git a/prosody-0.9.8-dns-ipv6.patch b/prosody-0.9.8-dns-ipv6.patch
deleted file mode 100644
index b8bf703..0000000
--- a/prosody-0.9.8-dns-ipv6.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-Backport of upstream ticket "DNS lacks IPv6 support" (https://prosody.im/issues/issue/352)
-using:
-
- - https://hg.prosody.im/0.10/rev/e108c3f97f26
- - https://hg.prosody.im/0.10/rev/0200945313c9
- - https://hg.prosody.im/0.10/rev/6eebd5808fbc
-
---- prosody-0.9.8/net/dns.lua				2015-03-24 20:18:04.000000000 +0100
-+++ prosody-0.9.8/net/dns.lua.dns-ipv6			2015-09-11 21:46:39.000000000 +0200
-@@ -14,6 +14,7 @@
- 
- local socket = require "socket";
- local timer = require "util.timer";
-+local new_ip = require "util.ip".new_ip;
- 
- local _, windows = pcall(require, "util.windows");
- local is_windows = (_ and windows) or os.getenv("WINDIR");
-@@ -599,11 +600,12 @@
- 		if resolv_conf then
- 			for line in resolv_conf:lines() do
- 				line = line:gsub("#.*$", "")
--					:match('^%s*nameserver%s+(.*)%s*$');
-+					:match('^%s*nameserver%s+([%x:%.]*)%s*$');
- 				if line then
--					line:gsub("%f[%d.](%d+%.%d+%.%d+%.%d+)%f[^%d.]", function (address)
--						self:addnameserver(address)
--					end);
-+					local ip = new_ip(line);
-+					if ip then
-+						self:addnameserver(ip.addr);
-+					end
- 				end
- 			end
- 		end
-@@ -623,7 +625,12 @@
- 	if sock then return sock; end
- 
- 	local ok, err;
--	sock, err = socket.udp();
-+	local peer = self.server[servernum];
-+	if peer:find(":") then
-+		sock, err = socket.udp6();
-+	else
-+		sock, err = socket.udp();
-+	end
- 	if sock and self.socket_wrapper then sock, err = self.socket_wrapper(sock, self); end
- 	if not sock then
- 		return nil, err;
-@@ -636,7 +643,7 @@
- 	-- if so, try the next server
- 	ok, err = sock:setsockname('*', 0);
- 	if not ok then return self:servfail(sock, err); end
--	ok, err = sock:setpeername(self.server[servernum], 53);
-+	sock:setpeername(peer, 53);
- 	if not ok then return self:servfail(sock, err); end
- 	return sock;
- end
---- prosody-0.9.8/util/ip.lua				2015-03-24 20:18:04.000000000 +0100
-+++ prosody-0.9.8/util/ip.lua.dns-ipv6			2015-09-11 21:42:26.000000000 +0200
-@@ -12,7 +12,17 @@
- local hex2bits = { ["0"] = "0000", ["1"] = "0001", ["2"] = "0010", ["3"] = "0011", ["4"] = "0100", ["5"] = "0101", ["6"] = "0110", ["7"] = "0111", ["8"] = "1000", ["9"] = "1001", ["A"] = "1010", ["B"] = "1011", ["C"] = "1100", ["D"] = "1101", ["E"] = "1110", ["F"] = "1111" };
- 
- local function new_ip(ipStr, proto)
--	if proto ~= "IPv4" and proto ~= "IPv6" then
-+	if not proto then
-+		local sep = ipStr:match("^%x+(.)");
-+		if sep == ":" or (not(sep) and ipStr:sub(1,1) == ":") then
-+			proto = "IPv6"
-+		elseif sep == "." then
-+			proto = "IPv4"
-+		end
-+		if not proto then
-+			return nil, "invalid address";
-+		end
-+	elseif proto ~= "IPv4" and proto ~= "IPv6" then
- 		return nil, "invalid protocol";
- 	end
- 	if proto == "IPv6" and ipStr:find('.', 1, true) then
diff --git a/prosody.spec b/prosody.spec
index b1fa51b..8be9ded 100644
--- a/prosody.spec
+++ b/prosody.spec
@@ -4,8 +4,8 @@
 
 Summary:           Flexible communications server for Jabber/XMPP
 Name:              prosody
-Version:           0.9.8
-Release:           6%{?dist}
+Version:           0.9.9
+Release:           1%{?dist}
 License:           MIT
 Group:             System Environment/Daemons
 URL:               https://prosody.im/
@@ -19,7 +19,6 @@ Source6:           prosody-localhost.cfg.lua
 Source7:           prosody-example.com.cfg.lua
 Patch0:            prosody-0.9.8-config.patch
 Patch1:            prosody-0.9.8-rhel5.patch
-Patch2:            prosody-0.9.8-dns-ipv6.patch
 BuildRequires:     libidn-devel, openssl-devel
 Requires(pre):     shadow-utils
 %if 0%{?rhel} > 6 || 0%{?fedora} > 17
@@ -61,8 +60,6 @@ added functionality, or prototype new protocols.
 %if 0%{?rhel} == 5
 %patch1 -p1
 %endif
-%patch2 -p1
-rm -f core/certmanager.lua.config
 
 %build
 # CFLAG -D_GNU_SOURCE requires fallocate() which requires GLIBC >= 2.10
@@ -223,6 +220,9 @@ fi
 %{_mandir}/man1/%{name}*.1*
 
 %changelog
+* Fri Jan 08 2016 Robert Scheck <robert@fedoraproject.org> 0.9.9-1
+- Upgrade to 0.9.9 (#1296983, #1296984)
+
 * Sun Sep 27 2015 Robert Scheck <robert@fedoraproject.org> 0.9.8-6
 - Fixed shebang for ejabberd2prosody
 - Backported support for IPv6 DNS servers (#1256677)
diff --git a/sources b/sources
index 766e6c4..c5414c5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5144cd832a1860443e21e336dc560ee7  prosody-0.9.8.tar.gz
+8f7c529b072e78ab9e82ecbedfee7145  prosody-0.9.9.tar.gz