From f4cb174ef63fb101b8580fc6c57d4be55b043885 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Jan 27 2016 23:59:35 +0000 Subject: Upgrade to 0.9.10 (#1302463) --- diff --git a/prosody-0.9.9-urandom.patch b/prosody-0.9.9-urandom.patch deleted file mode 100644 index b03b815..0000000 --- a/prosody-0.9.9-urandom.patch +++ /dev/null @@ -1,29 +0,0 @@ -Upstream: http://hg.prosody.im/0.9/rev/ad9e683b8f0b - -diff -r eed0632cd636 -r ad9e683b8f0b util/uuid.lua ---- a/util/uuid.lua Fri Jan 08 13:01:32 2016 +0000 -+++ b/util/uuid.lua Sun Jan 10 23:21:34 2016 +0100 -@@ -8,7 +8,7 @@ - - local error = error; - local round_up = math.ceil; --local urandom, urandom_err = io.open("/dev/urandom", "r+"); -+local urandom, urandom_err = io.open("/dev/urandom", "r"); - - module "uuid" - -@@ -30,9 +30,7 @@ - return get_nibbles(8).."-"..get_nibbles(4).."-4"..get_nibbles(3).."-"..(get_twobits())..get_nibbles(3).."-"..get_nibbles(12); - end - --function seed(x) -- urandom:write(x); -- urandom:flush(); -+function seed() - end - - return _M; - - - - diff --git a/prosody.spec b/prosody.spec index 69b649c..31f3e8e 100644 --- a/prosody.spec +++ b/prosody.spec @@ -4,8 +4,8 @@ Summary: Flexible communications server for Jabber/XMPP Name: prosody -Version: 0.9.9 -Release: 2%{?dist} +Version: 0.9.10 +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.9-urandom.patch BuildRequires: libidn-devel, openssl-devel Requires(pre): shadow-utils %if 0%{?rhel} > 6 || 0%{?fedora} > 17 @@ -61,7 +60,6 @@ added functionality, or prototype new protocols. %if 0%{?rhel} == 5 %patch1 -p1 -b .rhel5 %endif -%patch2 -p1 -b .urandom %build # CFLAG -D_GNU_SOURCE requires fallocate() which requires GLIBC >= 2.10 @@ -222,6 +220,9 @@ fi %{_mandir}/man1/%{name}*.1* %changelog +* Wed Jan 27 2016 Robert Scheck 0.9.10-1 +- Upgrade to 0.9.10 (#1302463) + * Tue Jan 12 2016 Robert Scheck 0.9.9-2 - Added upstream patch to open /dev/urandom read-only diff --git a/sources b/sources index c5414c5..502006e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8f7c529b072e78ab9e82ecbedfee7145 prosody-0.9.9.tar.gz +ef6d4a9e6dcae577eb52f7277d7beac5 prosody-0.9.10.tar.gz