Update to 16.04 (#1331605).

4 files changed, 12 insertions, 29 deletions

diff --git a/.gitignore b/.gitignore
index 7776466..58ccdcc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ ejabberd-2.1.5.tar.gz
 /16.01.tar.gz
 /16.02.tar.gz
 /16.03.tar.gz
+/16.04.tar.gz
diff --git a/ejabberd-0005-Clean-up-false-security-measure.patch b/ejabberd-0005-Clean-up-false-security-measure.patch
deleted file mode 100644
index a6a99fd..0000000
--- a/ejabberd-0005-Clean-up-false-security-measure.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Peter Lemenkov <lemenkov@gmail.com>
-Date: Wed, 17 Jul 2013 14:56:09 +0400
-Subject: [PATCH] Clean up false security measure
-
-Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
-
-diff --git a/Makefile.in b/Makefile.in
-index 58d3486..de47be2 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -127,7 +127,7 @@ install: all
- 	#
- 	# Administration script
- 	[ -d $(SBINDIR) ] || $(INSTALL) -d -m 755 $(SBINDIR)
--	$(INSTALL) -m 550 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl
-+	$(INSTALL) -m 755 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl
- 	#
- 	# Init script
- 	$(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*" \
diff --git a/ejabberd.spec b/ejabberd.spec
index 21f6d46..118bae1 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -3,7 +3,7 @@
 
 
 Name:           ejabberd
-Version:        16.03
+Version:        16.04
 Release:        1%{?dist}
 
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
@@ -31,9 +31,6 @@ Patch1: ejabberd-0001-Fix-PAM-service-example-name-to-match-actual-one.patch
 # BZ# 439583, 452326, 451554, 465196, 502361 (fedora/epel-specific)
 # rbarlow: i'm not sure what this patch is for, but it does not apply cleanly
 #Patch3: ejabberd-0003-Fedora-specific-changes-to-ejabberdctl.patch
-# Fedora-specific
-# rbarlow: This patch fails to apply cleanly
-# Patch5: ejabberd-0005-Clean-up-false-security-measure.patch
 # polkit support
 Patch6: ejabberd-0006-Enable-polkit-support.patch
 # Fedora-specific
@@ -49,9 +46,9 @@ Patch13: 0013-Do-not-manage-deps-during-build.patch
 
 BuildRequires:  elixir >= 1.1.1
 BuildRequires:  erlang-cache_tab >= 1.0.2
-BuildRequires:  erlang-esip >= 1.0.2
+BuildRequires:  erlang-esip >= 1.0.4
 BuildRequires:  erlang-ezlib >= 1.0.1
-BuildRequires:  erlang-fast_tls >= 1.0.1
+BuildRequires:  erlang-fast_tls >= 1.0.3
 BuildRequires:  erlang-fast_xml >= 1.1.3
 BuildRequires:  erlang-fast_yaml >= 1.0.3
 BuildRequires:  erlang-iconv >= 1.0.0
@@ -63,12 +60,12 @@ BuildRequires:  erlang-p1_mysql >= 1.0.1
 BuildRequires:  erlang-p1_oauth2 >= 0.6.1
 BuildRequires:  erlang-p1_pam >= 1.0.0
 BuildRequires:  erlang-p1_pgsql >= 1.1.0
-BuildRequires:  erlang-p1_utils >= 1.0.3
+BuildRequires:  erlang-p1_utils >= 1.0.4
 BuildRequires:  erlang-p1_xmlrpc >= 1.15.1
 BuildRequires:  erlang-rebar
 BuildRequires:  erlang-riak_client
-BuildRequires:  erlang-stringprep >= 1.0.2
-BuildRequires:  erlang-stun >= 1.0.1
+BuildRequires:  erlang-stringprep >= 1.0.3
+BuildRequires:  erlang-stun >= 1.0.3
 BuildRequires:  expat-devel >= 1.95
 BuildRequires:  git
 BuildRequires:  libyaml-devel >= 0.1.4
@@ -278,6 +275,10 @@ fi)
 
 
 %changelog
+* Tue May 03 2016 Randy Barlow <rbarlow@redhat.coM> - 16.04-1
+- Update to 16.04.
+- Remove a commented patch.
+
 * Sun Apr 24 2016 Randy Barlow <rbarlow@redhat.com> - 16.03-1
 - Update to 16.03.
 - Use the new Erlang auto-requires abilities.
diff --git a/sources b/sources
index 8013b6c..0524497 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7ad2a9d1bd392cbe3f1b5b455bd27563  16.03.tar.gz
+b93d6f8ddc219f3ea7802478ec52bfd4  16.04.tar.gz