Update to 20.07 (#1807271)

Signed-off-by: Randy Barlow <randy@electronsweatshop.com>

4 files changed, 31 insertions, 44 deletions

diff --git a/.gitignore b/.gitignore
index 531ab80..291e1ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,19 +1 @@
-/16.06.1.tar.gz
-/16.08.tar.gz
-/16.09.tar.gz
-/16.12.tar.gz
-/17.01.tar.gz
-/ejabberd-17.07.tar.gz
-/ejabberd-17.09.tar.gz
-/ejabberd-18.01.tar.gz
-/ejabberd-18.1.0.tar.gz
-/ejabberd-18.03.tar.gz
-/ejabberd-18.04.tar.gz
-/ejabberd-18.06.tar.gz
-/ejabberd-18.09.tar.gz
-/ejabberd-18.12.1.tar.gz
-/ejabberd-19.02.tar.gz
-/ejabberd-19.05.tar.gz
-/ejabberd-19.08.tar.gz
-/ejabberd-19.09.1.tar.gz
-/ejabberd-20.01.tar.gz
+/ejabberd-20.07.tar.gz
diff --git a/ejabberd.spec b/ejabberd.spec
index 7ce960c..24a11b8 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -4,28 +4,29 @@
 # Since we require the version in both BuildRequires and Requires, let's make these variables for
 # easier maintenance.
 %global base64url_ver 1.0
-%global cache_tab_ver 1.0.21
-%global eimp_ver 1.0.13
-%global epam_ver 1.0.6
-%global esip_ver 1.0.31
-%global ezlib_ver 1.0.6
-%global fast_tls_ver 1.1.3
-%global fast_xml_ver 1.1.38
-%global fast_yaml_ver 1.0.22
+%global cache_tab_ver 1.0.25
+%global eimp_ver 1.0.17
+%global epam_ver 1.0.9
+%global esip_ver 1.0.37
+%global ezlib_ver 1.0.8
+%global fast_tls_ver 1.1.8
+%global fast_xml_ver 1.1.43
+%global fast_yaml_ver 1.0.27
 %global idna_ver 6.0.0
+%global jiffy_ver 1.0.5
 %global jose_ver 1.9.0
 %global luerl_ver 0.3
-%global mqtree_ver 1.0.6
-%global p1_acme_ver 1.0.3
-%global p1_mysql_ver 1.0.12
-%global p1_oauth2_ver 0.6.5
-%global p1_pgsql_ver 1.1.8
-%global p1_utils_ver 1.0.17
-%global pkix_ver 1.0.4
-%global stringprep_ver 1.0.18
-%global stun_ver 1.0.30
-%global xmpp_ver 1.4.4
-%global yconf_ver 1.0.2
+%global mqtree_ver 1.0.10
+%global p1_acme_ver 1.0.8
+%global p1_mysql_ver 1.0.16
+%global p1_oauth2_ver 0.6.7
+%global p1_pgsql_ver 1.1.10
+%global p1_utils_ver 1.0.20
+%global pkix_ver 1.0.6
+%global stringprep_ver 1.0.22
+%global stun_ver 1.0.37
+%global xmpp_ver 1.4.9
+%global yconf_ver 1.0.7
 
 # Define SELinux policy variables
 %global selinuxtype targeted
@@ -35,8 +36,8 @@
 
 
 Name:           ejabberd
-Version:        20.01
-Release:        2%{?dist}
+Version:        20.07
+Release:        1%{?dist}
 BuildArch:      noarch
 
 License:        GPLv2+
@@ -79,7 +80,7 @@ BuildRequires:  erlang-fast_tls >= %{fast_tls_ver}
 BuildRequires:  erlang-fast_xml >= %{fast_xml_ver}
 BuildRequires:  erlang-fast_yaml >= %{fast_yaml_ver}
 BuildRequires:  erlang-idna >= %{idna_ver}
-BuildRequires:  erlang-jiffy >= 0.14.8
+BuildRequires:  erlang-jiffy >= %{jiffy_ver}
 BuildRequires:  erlang-jose >= %{jose_ver}
 BuildRequires:  erlang-lager >= 3.6
 BuildRequires:  erlang-luerl >= %{luerl_ver}
@@ -131,7 +132,7 @@ Requires:  erlang-fast_tls >= %{fast_tls_ver}
 Requires:  erlang-fast_xml >= %{fast_xml_ver}
 Requires:  erlang-fast_yaml >= %{fast_yaml_ver}
 Requires:  erlang-idna >= %{idna_ver}
-Requires:  erlang-jiffy >= 0.14.8
+Requires:  erlang-jiffy >= %{jiffy_ver}
 Requires:  erlang-jose >= %{jose_ver}
 Requires:  erlang-luerl >= %{luerl_ver}
 Requires:  erlang-mqtree >= %{mqtree_ver}
@@ -417,6 +418,10 @@ fi
 
 
 %changelog
+* Fri Jul 31 2020 Randy Barlow <bowlofeggs@fedoraproject.org> - 20.07-1
+- Update to 20.07 (#1807271).
+- https://www.process-one.net/blog/ejabberd-20-07/
+
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20.01-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
diff --git a/ejabberd.te b/ejabberd.te
index 56373ea..2d2a157 100644
--- a/ejabberd.te
+++ b/ejabberd.te
@@ -22,7 +22,7 @@ logging_log_file(ejabberd_var_log_t)
 
 
 # What will we allow
-allow ejabberd_t self:tcp_socket { accept bind connect create getattr getopt listen read setopt write };
+allow ejabberd_t self:tcp_socket { accept bind connect create getattr getopt listen name_bind read setopt write };
 allow ejabberd_t self:udp_socket { bind connect create getattr getopt read setopt write };
 allow ejabberd_t self:unix_dgram_socket { connect create getopt setopt write };
 
diff --git a/sources b/sources
index 3ec564b..e7d43df 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ejabberd-20.01.tar.gz) = f933ef7cc38264808e983b986b3c91d6c4e4ab3a619070939c27dce8979746f21d0653575157c82043ba3e034265309c994d6a0bc0cafb0e2e7883afab780294
+SHA512 (ejabberd-20.07.tar.gz) = 68a23cd0404d9f5cdf86585ec235663424c629d2145ff4e40efd35f70d934b2ec632b18797ea790791677429aa19ed3967744c2f774eb6d3d20795d84bdf0d4d