[rpms/ejabberd] rawhide: ejabberd ver. 26.07

[Peter Lemenkov <lemenkov@gmail.com>]

            A new commit has been pushed.

            Repo   : rpms/ejabberd
            Branch : rawhide
            Commit : 6f5d776077218117d9662afbb7c03255de59456f
            Author : Peter Lemenkov <lemenkov@gmail.com>
            Date   : 2026-09-23T20:18:06+02:00
            Stats  : +767/-286 in 8 file(s)
            URL    : https://src.fedoraproject.org/rpms/ejabberd/c/6f5d776077218117d9662afbb7c03255de59456f?branch=rawhide

            Log:
            ejabberd ver. 26.07

- Switch to rebar3 and the Fedora erlang3 macros
- Build against system deps (--enable-system-deps)
- Drop erlang-lager, erlang-base64url, erlang-jiffy, erlang-sd_notify and
  elixir which are no longer needed
- Drop all patches (systemd notification is now upstream, ASN.1 is
  pre-generated, ejabberdctl is installed manually)
- Update systemd unit to run ejabberdctl in foreground mode
- Disable redis and sqlite backends (erlang-eredis and erlang-sqlite3 are
  not packaged)
- Use SPDX license identifier, rpmautospec release and changelog

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>

---
diff --git a/.gitignore b/.gitignore
index 291e1ff..7328e0c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/ejabberd-20.07.tar.gz
+/ejabberd-26.07.tar.gz

diff --git a/changelog b/changelog
new file mode 100644
index 0000000..d9ef69f
--- /dev/null
+++ b/changelog
@@ -0,0 +1,670 @@
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 20.07-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 20.07-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Sat Aug 07 2021 Randy Barlow <bowlofeggs@fedoraproject.org> - 20.07-5
+- Allow to bind to name_bind on udp (#1901466).
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20.07-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 20.07-3
+- Rebuilt for updated systemd-rpm-macros
+  See https://pagure.io/fesco/issue/2583.
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20.07-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* 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
+
+* Fri Feb 14 2020 Randy Barlow <bowlofeggs@fedoraproject.org> - 20.01-1
+- Update to 20.01 (#1792572).
+- https://blog.process-one.net/ejabberd-20-01/
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 19.09.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Nov 14 2019 Randy Barlow <bowlofeggs@fedoraproject.org> - 19.09.1-1
+- Update to 19.09.1 (#1742538).
+- https://blog.process-one.net/ejabberd-19-08/
+- https://blog.process-one.net/ejabberd-19-09/
+- https://blog.process-one.net/ejabberd-19-09-1/
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 19.05-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Wed Jun 05 2019 Randy Barlow <bowlofeggs@fedoraproject.org> - 19.05-1
+- Update to 19.05.
+- https://blog.process-one.net/ejabberd-19-05/
+
+* Sat Apr 13 2019 Randy Barlow <bowlofeggs@fedoraproject.org> - 19.02-1
+- Update to 19.02 (#1683310).
+- https://blog.process-one.net/ejabberd-19-02-the-mqtt-edition/
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 18.12.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Dec 28 2018 Randy Barlow <bowlofeggs@fedoraproject.org> - 18.12.1-1
+- Update to 18.12.1.
+- https://blog.process-one.net/ejabberd-18-12-1/
+
+* Sun Dec 09 2018 Randy Barlow <bowlofeggs@fedoraproject.org> - 18.09-3
+- Include CSS, image, JavaScript, and Lua files (#1651809).
+
+* Tue Dec 04 2018 Xavier Bachelot <xavier@bachelot.org> - 18.09-2
+- Add upstream patch to fix missing stun module options in conf validator.
+
+* Sun Oct 14 2018 Randy Barlow <bowlofeggs@fedoraproject.org> - 18.09-1
+- Upgrade to 18.09.
+- https://blog.process-one.net/ejabberd-18-09/
+
+* Thu Sep 06 2018 Randy Barlow <bowlofeggs@fedoraproject.org> - 18.06-3
+- Refactor to use Fedora SELinux macros documented at
+  https://fedoraproject.org/wiki/SELinux/IndependentPolicy.
+
+* Fri Aug 31 2018 Randy Barlow <bowlofeggs@fedoraproject.org> - 18.06-2
+- Use erl and epmd symlinks from bindir instead of trying to use the archful ones (#1573006).
+
+* Sun Jul 29 2018 Randy Barlow <bowlofeggs@fedoraproject.org> - 18.06-1
+- Update to 18.06 (#1596197).
+- https://blog.process-one.net/ejabberd-18-06/
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 18.04-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Sat Jun 09 2018 Randy Barlow <bowlofeggs@fedoraproject.org> - 18.04-2
+- Correct a typo in the oauth2 requires macro.
+
+* Sat Jun 09 2018 Randy Barlow <bowlofeggs@fedoraproject.org> - 18.04-1
+- Upgrade to 18.04 (#1571775).
+- Use TLS for the URL.
+- https://blog.process-one.net/ejabberd-18-04/
+
+* Mon Jun 04 2018 Randy Barlow <bowlofeggs@fedoraproject.org> - 18.03-3
+- Use the correct path to epmd in ejabberdctl (#1573006).
+
+* Sat Mar 31 2018 Jeremy Cline <jeremy@jcline.org> - 18.03-2
+- Allow PostgreSQL and MySQL database connections in SELinux policy
+
+* Mon Mar 26 2018 Randy Barlow <bowlofeggs@fedoraproject.org> - 18.03-1
+- Update to 18.03 (#1560117).
+- https://blog.process-one.net/ejabberd-18-03/
+
+* Sun Mar 25 2018 Randy Barlow <bowlofeggs@fedoraproject.org> - 18.1.0-2
+- Convert to a noarch package.
+
+* Tue Feb 13 2018 Randy Barlow <bowlofeggs@fedoraproject.org> - 18.1.0-1
+- Update to 18.1.0 (#1537324).
+- Require erlang-os_mon (#1542927).
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 18.01-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Sat Jan 13 2018 Randy Barlow <bowlofeggs@fedoraproject.org> - 18.01-1
+- Update to 18.01 (#1516062).
+- https://blog.process-one.net/ejabberd-17-11-happy-birthday-ejabberd/
+- https://blog.process-one.net/ejabberd-17-12/
+- https://blog.process-one.net/ejabberd-18-01/
+- Require the selinux policy to be installed.
+- Allow port 5281 in the SELinux policy (#1494854).
+
+* Mon Dec 11 2017 Randy Barlow <bowlofeggs@fedoraproject.org> - 17.09-2
+- Fix three issues that prevented ejabberd from starting (#1524199).
+
+* Fri Nov 10 2017 Randy Barlow <bowlofeggs@fedoraproject.org> - 17.09-1
+- Update to 17.09 (#1427123).
+- https://blog.process-one.net/ejabberd-17-09/
+
+* Sun Oct 22 2017 Randy Barlow <bowlofeggs@fedoraproject.org> - 17.07-2
+- In 17.07-1 I had accidentally reverted my patch to depend on epam
+  instead of p1_pam. This build fixes that again.
+
+* Sun Oct 22 2017 Randy Barlow <bowlofeggs@fedoraproject.org> - 17.07-1
+- Update to 17.07 (#1427123).
+- https://blog.process-one.net/ejabberd-17-07/
+- Add an SELinux policy subpackage.
+
+* Mon Oct 02 2017 Randy Barlow <bowlofeggs@fedoraproject.org> - 17.01-6
+- Depend on epam instead of p1_pam (#1494988).
+
+* Sat Sep 23 2017 Randy Barlow <bowlofeggs@fedoraproject.org> - 17.01-5
+- Run ejabberd directly in the unit file so it gets the correct SELinux context (#1424823).
+- Don't run ejabberdctl through polkit, as it doesn't play nice with the SELinux policy.
+
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 17.01-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 17.01-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sun Feb 19 2017 Randy Barlow <bowlofeggs@fedoraproject.org> - 17.01-2
+- Stop shipping the unneeded /usr/lib/tmpfiles.d/ejabberd.conf (#1186674).
+- Stop putting a folder in /var/lock since that's a tmpfs.
+
+* Sun Feb 12 2017 Randy Barlow <bowlofeggs@fedoraproject.org> - 17.01-1
+- Update to 17.01 (#1416391).
+- https://blog.process-one.net/ejabberd-17-01/
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 16.12-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Fri Dec 30 2016 Randy Barlow <bowlofeggs@fedoraproject.org> - 16.12-1
+- Update to 16.12 (#1400097).
+- Rebase two patches.
+- Add new erlang-xmpp dependency.
+- Use sed to fix include statements on fast_xml and xmpp so they can be
+  found from the system.
+- Run the test suite.
+
+* Sun Dec 25 2016 Randy Barlow <bowlofeggs@fedoraproject.org> - 16.09-5
+- Use auth_admin for all polkit default rules (#1094143).
+- Drop unused BuildRequires on hevea and texlive-comment.
+- Add a Requires on logrotate since we install a logrotate.d file.
+
+* Thu Dec 01 2016 Randy Barlow <bowlofeggs@fedoraproject.org> - 16.09-4
+- Drop the use of -set-cookie since it is unsafe.
+- Configure the ejabberdctl script to set INSTALLUSER so it uses su to be ejabberd (#1163812).
+
+* Sun Nov 27 2016 Randy Barlow <bowlofeggs@fedoraproject.org> - 16.09-3
+- Use -set-cookie in ejabberdctl so root can attach to the node (#1163812).
+- Mark ejabberdctl as executable.
+- Dropped unnecessary gcc-g++ BuildRequires
+
+* Thu Nov 10 2016 Randy Barlow <bowlofeggs@fedoraproject.org> - 16.09-2
+- Use the correct path for erl in ejabberdctl (#1393652).
+- Drop NoNewPrivileges=true from the unit file (#1393587).
+
+* Mon Oct 17 2016 Randy Barlow <randy@electronsweatshop.com> - 16.09-1
+- Update to 16.09 (#1376238).
+
+* Mon Oct 17 2016 Peter Lemenkov <lemenkov@gmail.com> - 16.08-3
+- Fix FTBFS in Rawhide
+
+* Thu Aug 18 2016 Peter Lemenkov <lemenkov@gmail.com> - 16.08-2
+- Reenable systemd notification
+- Drop outdated dependency - p1_xmlrpc
+- Add missing dependency - erlang-odbc
+- Rearrange patches
+
+* Sun Aug 07 2016 Randy Barlow <randy@electronsweatshop.com> - 16.08-1
+- Update to 16.08.
+- Drop the R19 patch since it is included upstream now.
+
+* Sat Jul 30 2016 Randy Barlow <randy@electronsweatshop.com> - 16.06.1-1
+- Update to 16.01.1 (#1351186).
+- Backport commit 0737958b to build on Erlang 19.
+- Remove commented make edoc, since upstream no longer ships docs in this source.
+
+* Wed Jul 06 2016 Jeremy Cline <jeremy@jcline.org> - 16.06-1
+- Update to 16.06 (#1351186)
+
+* 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.
+- Remove some commented code.
+- Fixed mixed spaces and tabs (used spaces).
+- Fixed use of macro in changelog.
+- Add the READMEs as docs.
+- Remove dependencies on NIF and DRV since this package no longer ships C code.
+
+* Fri Apr 15 2016 Randy Barlow <rbarlow@redhat.com> - 16.02-2
+- Remove the filter_provides statement. It is no longer needed, and it is suspected to cause
+  problems with ARM dependencies.
+- Remove some unused commented patches.
+
+* Sun Mar 06 2016 Randy Barlow <rbarlow@redhat.com> - 16.02-1
+- Update to 16.02
+
+* Sun Mar 06 2016 Randy Barlow <rbarlow@redhat.com> - 16.01-4
+- Run ejabberdctl with bash when stopping in the unit file (#1314753).
+
+* Sun Feb 28 2016 Randy Barlow <rbarlow@redhat.com> - 16.01-3
+- Set permissions to 755 on ejabberdctl so the ejabberd user can start the daemon (#1312709).
+- Drop the commented deps source, as it is not used.
+
+* Tue Feb 16 2016 Randy Barlow <rbarlow@redhat.com> - 16.01-2
+- Clean up the requirements, adding versions where they are known.
+
+* Tue Feb 16 2016 Randy Barlow <rbarlow@redhat.com> - 16.01-1
+- Raise the version to 16.01.
+
+* Fri Feb 12 2016 Randy Barlow <rbarlow@redhat.com> - 15.11-1
+- Raise the version to 15.11.
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 14.07-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Fri Nov 14 2014 Dan Horák <dan[at]danny.cz> - 14.07-6
+- increase stack size for hevea on ppc64* (#1164209)
+
+* Fri Nov 14 2014 Dan Horák <dan[at]danny.cz> - 14.07-5
+- hevea exists for all relevant arches, enables build on s390(x) and ppc64(le) (#1161098)
+
+* Wed Nov 12 2014 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> - 14.07-4
+- add aarch64 support
+
+* Tue Nov 04 2014 Peter Lemenkov <lemenkov@gmail.com> - 14.07-3
+- Rebuild with Erlang 17.3.3
+
+* Sun Aug 31 2014 Peter Lemenkov <lemenkov@gmail.com> - 14.07-2
+- Temporarily disable external http support (--with-http)
+- Temporarily disable systemd notify
+- Add missing BuildRequires: git
+
+* Sat Aug 30 2014 Peter Lemenkov <lemenkov@gmail.com> - 14.07-1
+- Ver. 14.07
+- Dropped support for EPEL5, EPEL6
+- Dropped initial untested support for GSSAPI - nobody is interested in testing
+  and further developing this
+- Fixed https://bugzilla.redhat.com/1089475
+- Fixed https://bugzilla.redhat.com/1117450
+
+* Thu Aug 28 2014 Peter Lemenkov <lemenkov@gmail.com> - 2.1.13-10
+- Rebuild with Erlang 17.2.1
+
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.13-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.13-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sun Oct 27 2013 Peter Lemenkov <lemenkov@gmail.com> - 2.1.13-7
+- Fixed systemd service-file
+
+* Sat Oct 26 2013 Peter Lemenkov <lemenkov@gmail.com> - 2.1.13-6
+- Fix polkit again
+- Add dependency on Erlang's driver version
+
+* Fri Sep 27 2013 Peter Lemenkov <lemenkov@gmail.com> - 2.1.13-5
+- Fix wrong polkit policy (rhbz #1009408)
+
+* Sun Sep 15 2013 Peter Lemenkov <lemenkov@gmail.com> - 2.1.13-4
+- Use polkit instead of usermode on modern systems
+- Restore user/group provides
+
+* Thu Sep 05 2013 Peter Lemenkov <lemenkov@gmail.com> - 2.1.13-3
+- TEMPORARY disable hevea - it's broken in F19+
+- Fix building with unversioned docdir
+- Move away from fedora-usermgmt
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.13-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Sat Jun 29 2013 Peter Lemenkov <lemenkov@gmail.com> - 2.1.13-1
+- Ver. 2.1.13
+- Don't install or use /etc/sysconfig/ejabberd on systemd-enabled systems
+- Build with PIE (if available)
+- Re-generate configure scripts
+
+* Fri Mar 15 2013 Peter Lemenkov <lemenkov@gmail.com> - 2.1.12-1
+- Ver. 2.1.12
+
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.11-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Sun Oct 28 2012 Peter Lemenkov <lemenkov@gmail.com> - 2.1.11-6
+- Fixed rhbz #846856
+
+* Mon Sep 10 2012 Peter Lemenkov <lemenkov@gmail.com> - 2.1.11-5
+- Cherry-picked three new patches from upstream trunk
+
+* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.11-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sun Jul 15 2012 Peter Lemenkov <lemenkov@gmail.com> - 2.1.11-3
+- Fixed rhbz #758601 (no /etc/pam.d/password-auth in EL5)
+
+* Sun Jul 15 2012 Peter Lemenkov <lemenkov@gmail.com> - 2.1.11-2
+- Updated mod_admin_extra to work with R15B (see rhbz #840039)
+- Updated list of arches where we don't have hevea
+- Dropped abandonded and not working modules
+
+* Sun May 06 2012 Peter Lemenkov <lemenkov@gmail.com> - 2.1.11-1
+- Ver. 2.1.11
+- Fixed systemd installation
+
+* Sun Jan 15 2012 Peter Lemenkov <lemenkov@gmail.com> - 2.1.10-3
+- Fixed systemd unit file
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.10-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Wed Dec 28 2011 Peter Lemenkov <lemenkov@gmail.com> - 2.1.10-1
+- Ver. 2.1.10
+- Works with systemd (closes rhbz #767793)
+
+* Sun Dec 18 2011 Dan Horák <dan[at]danny.cz> - 2.1.9-2
+- pdf docs require hevea, they are not prebuilt
+
+* Tue Nov 22 2011 Peter Lemenkov <lemenkov@gmail.com> - 2.1.9-1
+- Ver. 2.1.9
+- Fix for CVE-2011-4320
+
+* Mon Jul 11 2011 Peter Lemenkov <lemenkov@gmail.com> - 2.1.8-3
+- Fix for systemd (F15+ only, see rhbz #656581)
+
+* Sat Jun 18 2011 Peter Lemenkov <lemenkov@gmail.com> - 2.1.8-2
+- Fix ejabberdctl again
+
+* Fri Jun 03 2011 Peter Lemenkov <lemenkov@gmail.com> - 2.1.8-1
+- Ver. 2.1.8 (very urgent bugfix for 2.1.7)
+
+* Wed Jun 01 2011 Peter Lemenkov <lemenkov@gmail.com> - 2.1.7-1
+- Ver. 2.1.7 (bugfixes and security)
+
+* Wed Jun 01 2011 Paul Whalen <paul.whalen@senecac.on.ca> - 2.1.6-5
+- Added arm to conditional to build without hevea.
+
+* Thu Feb 24 2011 Peter Lemenkov <lemenkov@gmail.com> - 2.1.6-4
+- Updated @online@ patch
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Tue Jan 25 2011 Martin Langhoff <martin@laptop.org> 2.1.6-2
+- Apply rebased @online@ patch from OLPC - EJAB-1391
+
+* Tue Dec 14 2010 Peter Lemenkov <lemenkov@gmail.com> 2.1.6-1
+- Ver. 2.1.6 (Bugfix release)
+
+* Thu Aug 26 2010 Peter Lemenkov <lemenkov@gmail.com> 2.1.5-6
+- More patches from trunk
+- Rebased patches
+
+* Thu Aug 26 2010 Peter Lemenkov <lemenkov@gmail.com> 2.1.5-5
+- Backported %%patch11 from upstream (fixes LDAP)
+
+* Wed Aug 18 2010 Peter Lemenkov <lemenkov@gmail.com> 2.1.5-4
+- Add accidentally forgotten changes to ejabberd.logrotate
+
+* Wed Aug 18 2010 Peter Lemenkov <lemenkov@gmail.com> 2.1.5-3
+- Fixed http-poll (BOSH)
+- New version of GSSAPI patch (backported from upstream)
+- Fixed logrotate rule
+
+* Wed Aug  4 2010 Peter Lemenkov <lemenkov@gmail.com> 2.1.5-2
+- Don't require dos2unix for building anymore
+
+* Wed Aug  4 2010 Peter Lemenkov <lemenkov@gmail.com> 2.1.5-1
+- Ver. 2.1.5
+- OpenSSL >= 0.9.8
+- Doc-file features.* dropped (just a part of guide.*)
+- Dropped upstreamed patches
+- Don't use autoreconf
+
+* Fri Jul 16 2010 Peter Lemenkov <lemenkov@gmail.com> 2.1.4-3
+- Fix for Erlang/OTP R14A
+- Added BR: autoconf
+
+* Fri Jun 18 2010 Peter Lemenkov <lemenkov@gmail.com> 2.1.4-2
+- No hevea for EL-6
+- No hevea for s390 and s390x
+
+* Fri Jun  4 2010 Peter Lemenkov <lemenkov@gmail.com> 2.1.4-1
+- Ver. 2.1.4
+- Rebased patches
+
+* Mon Mar 29 2010 Peter Lemenkov <lemenkov@gmail.com> 2.1.3-6
+- File permissions for captcha.sh were fixed
+
+* Thu Mar 18 2010 Peter Lemenkov <lemenkov@gmail.com> 2.1.3-5
+- Init-script fixed
+
+* Thu Mar 18 2010 Peter Lemenkov <lemenkov@gmail.com> 2.1.3-4
+- Really fix issue with "File operation error: eacces".
+
+* Thu Mar 18 2010 Peter Lemenkov <lemenkov@gmail.com> 2.1.3-3
+- Relax access rights of /usr/sbin/ejabberdctl (from 0550 to 0755)
+- Invoke symlinked consolehelper instead of /usr/sbin/ejabberdctl
+  in init-script
+- Fixed "File operation error: eacces" issue. See rhbz #564686.
+
+* Thu Mar 18 2010 Peter Lemenkov <lemenkov@gmail.com> 2.1.3-2
+- Init-script enhancements
+
+* Fri Mar 12 2010 Peter Lemenkov <lemenkov@gmail.com> 2.1.3-1
+- Ver. 2.1.3
+- Patches rebased
+
+* Fri Mar  5 2010 Peter Lemenkov <lemenkov@gmail.com> 2.1.2-4
+- Fixed issue with {erorr,nxdomain}
+
+* Tue Feb 16 2010 Peter Lemenkov <lemenkov@gmail.com> 2.1.2-3
+- Do not try to backup DB on every fresh install
+- Do not force copying old erlang cookie file
+- Add missing release notes for ver. 2.1.2
+- Require erlang-esasl for krb5 support
+- No such %%configure option - --enable-debug
+- Patches were rebased and renumbered
+- Add new BR util-linux(-ng)
+
+* Fri Jan 29 2010 Peter Lemenkov <lemenkov@gmail.com> 2.1.2-2
+- Fixed BZ #559925 (EJAB-1173)
+- Changed order of rpmbuild targets in this spec to more natural one.
+
+* Mon Jan 18 2010 Peter Lemenkov <lemenkov@gmail.com> 2.1.2-1
+- Ver. 2.1.2
+
+* Thu Dec 24 2009 Peter Lemenkov <lemenkov@gmail.com> 2.1.1-1
+- Ver. 2.1.1
+- Dropped patches 9,11,12,13 (accepted upstream)
+
+* Thu Dec 10 2009 Peter Lemenkov <lemenkov@gmail.com> 2.1.0-2
+- DB backups are made on every upgrade/uninstall
+- Fixed installation of captcha.sh example helper
+- Added patches 9,10,11,12,13 from Debian's package
+
+* Fri Nov 20 2009 Peter Lemenkov <lemenkov@gmail.com> 2.1.0-1
+- Ver. 2.1.0
+- Upstream no longer providing ChangeLog
+- Dropped ejabberd-build.patch (upstreamed)
+- Dropped ejabberd-captcha.patch (upstreamed)
+- Dropped ejabberd-decrease_buffers_in_mod_proxy65.patch (upstreamed)
+- Dropped ejabberd-dynamic_compile_loglevel.patch (upstreamed)
+- Dropped ejabberd-turn_off_error_messages_in_mod_caps.patch (upstreamed)
+- Docs reorganized and added ability to rebuild them if possible
+- Added back ppc64 target
+- SQL-scripts moved to %%{_datadir}/%%{name} from %%doc
+
+* Thu Nov  5 2009 Peter Lemenkov <lemenkov@gmail.com> 2.0.5-10
+- mod_ctlextra was updated from r873 to r1020
+- Fix for BZ# 533021
+
+* Wed Sep 16 2009 Tomas Mraz <tmraz@redhat.com> - 2.0.5-9
+- Use password-auth common PAM configuration instead of system-auth
+
+* Wed Sep  9 2009 Peter Lemenkov <lemenkov@gmail.com> 2.0.5-8
+- Fixed possible issue in the config file for logrotate
+- Fixed possible issue while creating dummy certificate
+- Added patches #5,6,7,8 from Debian
+
+* Thu Aug 27 2009 Tomas Mraz <tmraz@redhat.com> - 2.0.5-7
+- rebuilt with new openssl
+
+* Tue Aug 25 2009 Peter Lemenkov <lemenkov@gmail.com> 2.0.5-6
+- Since now, we using only ejabberdctl in the init-script (bz# 502361)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Apr 21 2009 Peter Lemenkov <lemenkov@gmail.com> 2.0.5-3
+- CAPTCHA is back - let's test it.
+
+* Sat Apr  4 2009 Peter Lemenkov <lemenkov@gmail.com> 2.0.5-2
+- Really disable CAPTCHA
+
+* Fri Apr  3 2009 Peter Lemenkov <lemenkov@gmail.com> 2.0.5-1
+- Ver. 2.0.5
+- Temporarily disabled CAPTCHA support
+
+* Sun Mar 15 2009 Peter Lemenkov <lemenkov@gmail.com> 2.0.4-2
+- Support for CAPTCHA (XEP-0158)
+- Updated mod_ctlextra.erl (fixed EJAB-789, EJAB-864)
+
+* Sun Mar 15 2009 Peter Lemenkov <lemenkov@gmail.com> 2.0.4-1
+- Ver. 2.0.4
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Jan 26 2009 Peter Lemenkov <lemenkov@gmail.com> 2.0.3-1
+- Ver. 2.0.3
+- Merged some stuff from git://dev.laptop.org/users/martin/ejabberd-xs.git
+
+* Fri Jan 16 2009 Tomas Mraz <tmraz@redhat.com> 2.0.2-4
+- rebuild with new openssl
+
+* Thu Oct  2 2008 Peter Lemenkov <lemenkov@gmail.com> 2.0.2-3
+- Fixed broken ejabberdctl (BZ# 465196)
+
+* Sat Aug 30 2008 Peter Lemenkov <lemenkov@gmail.com> 2.0.2-2
+- Added missing Requires
+
+* Fri Aug 29 2008 Peter Lemenkov <lemenkov@gmail.com> 2.0.2-1
+- Ver. 2.0.2
+
+* Sat Aug  9 2008 Peter Lemenkov <lemenkov@gmail.com> 2.0.2-0.3.beta1
+- PAM support (BZ# 452803)
+
+* Sat Aug  9 2008 Peter Lemenkov <lemenkov@gmail.com> 2.0.2-0.2.beta1
+- Fix build with --fuzz=0
+
+* Sat Aug  9 2008 Peter Lemenkov <lemenkov@gmail.com> 2.0.2-0.1.beta1
+- Version 2.0.2-beta1
+- Fixed BZ# 452326
+- Fixed BZ# 227270
+
+* Sun Jun 22 2008 Peter Lemenkov <lemenkov@gmail.com> 2.0.1-4
+- Last minute fix (issue with shortnames/fqdn)
+
+* Sun Jun 22 2008 Peter Lemenkov <lemenkov@gmail.com> 2.0.1-3
+-Fixed BZ# 439583, 452326, 451554
+
+* Thu May 29 2008 Peter Lemenkov <lemenkov@gmail.com> 2.0.1-2
+- Fixed BZ# 439583
+
+* Sat May 24 2008 Peter Lemenkov <lemenkov@gmail.com> 2.0.1-1
+- Ver. 2.0.1
+- Upstreamed patches dropped
+- No longer uses versioned libdir (/usr/lib/ejabberd-x.x.x)
+- Added sql-scripts in docs-directory
+
+* Mon May  5 2008 Peter Lemenkov <lemenkov@gmail.com> 2.0.0-3
+- Fix build against R11B-2
+
+* Sat Feb 23 2008 Peter Lemenkov <lemenkov@gmail.com> 2.0.0-2
+- Disable docs again for EPEL (we haven't hevea for EPEL)
+
+* Sat Feb 23 2008 Peter Lemenkov <lemenkov@gmail.com> 2.0.0-1
+- Version 2.0.0
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 2.0.0-0.4.rc1
+- Autorebuild for GCC 4.3
+
+* Wed Jan 23 2008 Peter Lemenkov <lemenkov@gmail.com> 2.0.0-0.3.rc1
+- Really enabled some previously disabled modules
+
+* Wed Jan 23 2008 Peter Lemenkov <lemenkov@gmail.com> 2.0.0-0.2.rc1
+- Enabled some previously disabled modules
+
+* Sat Jan 19 2008 Matej Cepl <mcepl@redhat.com> 2.0.0-0.1.rc1
+- Upgrade to the current upsteram version.
+- Make ejabberd.init LSB compliant (missing Provides: tag)
+
+* Thu Dec 27 2007 Matej Cepl <mcepl@redhat.com> 2.0.0-0.beta1.mc.1
+- Experimental build from the upstream betaversion.
+
+* Tue Dec 11 2007 Matej Cepl <mcepl@redhat.com> 1.1.4-2.fc9
+- rebuild against new ssl library.
+- rebuild against the newest erlang (see Patch
+- fix %%changelog
+
+* Wed Sep  5 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.1.4-1
+- Drop LDAP patch
+- Update mod_ctlextra
+- Update to 1.1.4
+
+* Tue Sep  4 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.1.3-11
+- Fix ejabberdctl wrapper script - #276071
+
+* Wed Aug 22 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.1.3-10
+- Re-exclude ppc64
+
+* Wed Aug 22 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.1.3-9
+- Fix license
+- Don't exclude ppc64
+
+* Wed Aug 22 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.1.3-8
+- Bump & rebuild to build against latest erlang package.
+
+* Tue Jul 31 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.1.3-7
+- Bump release and rebuild due to Koji hiccups.
+
+* Tue Jul 31 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.1.3-6
+- Don't try building on PPC64 since hevea isn't available on PPC64.
+
+* Tue Jul 31 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.1.3-5
+- Sigh...
+
+* Tue Jul 31 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.1.3-4
+- Don't forget to add patch.
+
+* Thu Jul 26 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.1.3-3
+- Add ejabberdctl (#199873)
+- Add patch to fix LDAP authentication. (#248268)
+- Add a sleep in init script between stop/start when restarting.
+- LSB compliance cleanups for init script. (#246917)
+- Don't mention "reload" in the init script usage string. (#227254)
+
+* Tue Jul 24 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.1.3-2
+- Update mod_ctlextra
+
+* Fri Feb  2 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.1.3-1
+- Update to 1.1.3
+
+* Wed Oct 11 2006 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.1.2-2
+- Fix logrotate script (BZ#210366)
+
+* Mon Aug 28 2006 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.1.1-10
+- Bump release and rebuild.
+
+* Mon Jul 3 2006 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.1.1-9
+- Updated init script - should hopefully fix some problems with status & stop commands.
+
+* Mon Jun 26 2006 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.1.1-8
+- Bump release to that tagging works on FC-5.
+
+* Thu Jun 22 2006 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.1.1-7
+- Oops drop bad patch.
+
+* Thu Jun 22 2006 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.1.1-6
+- Split documentation off to a subpackage.
+- Own _libdir/ejabberd-version
+- Mark %%{_sysconfdir}/logrotate.d/ejabberd as %%config
+
+* Thu Jun  8 2006 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.1.1-5
+- Patch the makefile so that it adds a soname to shared libs.
+
+* Fri May 26 2006 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.1.1-4
+- Modify AD modules not to check for group membership.
+
+* Thu May 25 2006 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.1.1-3
+- Add some extra modules
+
+* Wed May 24 2006 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.1.1-2
+- Munge Makefile.in a bit more...
+- Change ownership/permissions - not *everything* needs to be owned by ejabberd
+
+* Wed May 24 2006 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.1.1-1
+- First version for Fedora Extras

diff --git a/ejabberd-0003-Install-into-BINDIR-instead-of-SBINDIR.patch b/ejabberd-0003-Install-into-BINDIR-instead-of-SBINDIR.patch
deleted file mode 100644
index edb32f7..0000000
--- a/ejabberd-0003-Install-into-BINDIR-instead-of-SBINDIR.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 81d881318ed7e4966ed9f9f00521066660ed7191 Mon Sep 17 00:00:00 2001
-From: Randy Barlow <randy@electronsweatshop.com>
-Date: Tue, 8 Jan 2019 11:56:28 -0500
-Subject: [PATCH] Install to bindir instead of sbindir.
-
-Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
----
- Makefile.in | 13 +++++--------
- 1 file changed, 5 insertions(+), 8 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index d3bcb282..ffd89c2a 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -14,9 +14,6 @@ ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd
- # /bin/
- BINDIR = $(DESTDIR)@bindir@
- 
--# /sbin/
--SBINDIR = $(DESTDIR)@sbindir@
--
- # /lib/
- LIBDIR =  $(DESTDIR)@libdir@
- 
-@@ -221,8 +218,8 @@ install: all copy-files
- 	$(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc
- 	#
- 	# Administration script
--	[ -d $(SBINDIR) ] || $(INSTALL) -d -m 755 $(SBINDIR)
--	$(INSTALL) -m 550 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl
-+	[ -d $(BINDIR) ] || $(INSTALL) -d -m 755 $(BINDIR)
-+	$(INSTALL) -m 550 $(G_USER) ejabberdctl.example $(BINDIR)/ejabberdctl
- 	# Elixir binaries
- 	[ -d $(BINDIR) ] || $(INSTALL) -d -m 755 $(BINDIR)
- 	[ -f deps/elixir/bin/iex ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/iex $(BINDIR)/iex || true
-@@ -230,13 +227,13 @@ install: all copy-files
- 	[ -f deps/elixir/bin/mix ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/mix $(BINDIR)/mix || true
- 	#
- 	# Init script
--	$(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*g" \
-+	$(SED) -e "s*@ctlscriptpath@*$(BINDIR)*g" \
- 		-e "s*@installuser@*$(INIT_USER)*g" ejabberd.init.template \
- 		> ejabberd.init
- 	chmod 755 ejabberd.init
- 	#
- 	# Service script
--	$(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*g" ejabberd.service.template \
-+	$(SED) -e "s*@ctlscriptpath@*$(BINDIR)*g" ejabberd.service.template \
- 		> ejabberd.service
- 	chmod 644 ejabberd.service
- 	#
-@@ -266,7 +263,7 @@ install: all copy-files
- uninstall: uninstall-binary
- 
- uninstall-binary:
--	rm -f  $(SBINDIR)/ejabberdctl
-+	rm -f  $(BINDIR)/ejabberdctl
- 	rm -f  $(BINDIR)/iex
- 	rm -f  $(BINDIR)/elixir
- 	rm -f  $(BINDIR)/mix
--- 
-2.20.1
-

diff --git a/ejabberd-0004-Enable-systemd-notification-if-available.patch b/ejabberd-0004-Enable-systemd-notification-if-available.patch
deleted file mode 100644
index aea6ba8..0000000
--- a/ejabberd-0004-Enable-systemd-notification-if-available.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 06b8b27aaef8229ffab5babd705c47b92b509f6c Mon Sep 17 00:00:00 2001
-From: Randy Barlow <randy@electronsweatshop.com>
-Date: Thu, 14 Nov 2019 17:00:23 -0500
-Subject: [PATCH] Enable systemd notification if available.
-
-This patch was originally written by Peter Lemenkov, and was
-adapted for ejabberd 19.09.1.
-
-Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
----
- src/ejabberd_app.erl | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/ejabberd_app.erl b/src/ejabberd_app.erl
-index f7df1dd7..f4cd1fb2 100644
---- a/src/ejabberd_app.erl
-+++ b/src/ejabberd_app.erl
-@@ -55,6 +55,7 @@ start(normal, _Args) ->
- 		    {ok, SupPid} ->
- 			ejabberd_system_monitor:start(),
- 			register_elixir_config_hooks(),
-+			{module, sd_notify} == code:load_file(sd_notify) andalso sd_notify:sd_notify(0, "READY=1\nSTATUS=Initialized\nMAINPID=" ++ os:getpid() ++ "\n"),
- 			ejabberd_cluster:wait_for_sync(infinity),
- 			ejabberd_hooks:run(ejabberd_started, []),
- 			ejabberd:check_apps(),
--- 
-2.24.0
-

diff --git a/ejabberd-18.09-fix_stun_options.patch b/ejabberd-18.09-fix_stun_options.patch
deleted file mode 100644
index 1cfe2d5..0000000
--- a/ejabberd-18.09-fix_stun_options.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 73af98a8dc091f1d8eefbcce3dfc18ce20980a38 Mon Sep 17 00:00:00 2001
-From: Evgeny Khramtsov <ekhramtsov@process-one.net>
-Date: Sat, 29 Sep 2018 23:05:41 +0300
-Subject: [PATCH] Add forgotten TURN options to validator
-
-Fixes #2621
----
- src/ejabberd_stun.erl | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/ejabberd_stun.erl b/src/ejabberd_stun.erl
-index ef1d46f40e..1e00c85f5e 100644
---- a/src/ejabberd_stun.erl
-+++ b/src/ejabberd_stun.erl
-@@ -168,6 +168,8 @@ listen_opt_type(server_name) ->
- 
- listen_options() ->
-     [{shaper, none},
-+     {use_turn, false},
-+     {turn_ip, undefined},
-      {auth_type, user},
-      {auth_realm, undefined},
-      {tls, false},

diff --git a/ejabberd.service b/ejabberd.service
index 5c39af5..41fcfe3 100644
--- a/ejabberd.service
+++ b/ejabberd.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=A distributed, fault-tolerant Jabber/XMPP server
-Requires=network-online.target
+Wants=network-online.target
 After=network-online.target
 
 [Service]
@@ -8,18 +8,18 @@ Type=notify
 NotifyAccess=all
 User=ejabberd
 Group=ejabberd
-LimitNOFILE=16000
+LimitNOFILE=65536
+Restart=on-failure
 RestartSec=5
-ExecStart=/usr/bin/ejabberdctl start \
-		--config /etc/ejabberd/ejabberd.yml \
-		--ctl-config /etc/ejabberd/ejabberdctl.cfg \
-		--logs "/var/log/ejabberd" \
-		--spool "/var/lib/ejabberd"
-ExecStop=/usr/bin/ejabberdctl stop
-RemainAfterExit=yes
+TimeoutSec=300
+ExecStart=/usr/bin/ejabberdctl foreground
+ExecStop=/bin/sh -c '/usr/bin/ejabberdctl stop && /usr/bin/ejabberdctl stopped'
+ExecReload=/usr/bin/ejabberdctl reload_config
 # The CAP_DAC_OVERRIDE capability is required for pam authentication to work
-CapabilityBoundingSet=CAP_DAC_OVERRIDE
+CapabilityBoundingSet=CAP_DAC_OVERRIDE CAP_NET_BIND_SERVICE
+AmbientCapabilities=CAP_NET_BIND_SERVICE
 PrivateTmp=true
+PrivateDevices=true
 ProtectHome=true
 ProtectSystem=full
 

diff --git a/ejabberd.spec b/ejabberd.spec
index fd3707d..be42c9c 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -3,30 +3,28 @@
 
 # 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.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.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
+%global cache_tab_ver 1.0.34
+%global eimp_ver 1.0.27
+%global epam_ver 1.0.14
+%global erlydtl_ver 0.15.0
+%global esip_ver 1.0.60
+%global ezlib_ver 1.0.16
+%global fast_tls_ver 1.1.26
+%global fast_xml_ver 1.1.60
+%global fast_yaml_ver 1.0.40
+%global idna_ver 7.1.0
+%global jose_ver 1.11.12
+%global mqtree_ver 1.0.20
+%global p1_acme_ver 1.0.31
+%global p1_mysql_ver 1.0.28
+%global p1_oauth2_ver 0.6.14
+%global p1_pgsql_ver 1.1.41
+%global p1_utils_ver 1.0.29
+%global pkix_ver 1.0.10
+%global stringprep_ver 1.0.34
+%global stun_ver 1.2.22
+%global xmpp_ver 1.13.4
+%global yconf_ver 1.0.23
 
 # Define SELinux policy variables
 %global selinuxtype targeted
@@ -36,11 +34,11 @@
 
 
 Name:           ejabberd
-Version:        20.07
-Release:        7%{?dist}
+Version:        26.07
+Release:        %autorelease
 BuildArch:      noarch
 
-License:        GPLv2+
+License:        GPL-2.0-or-later
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 URL:            https://www.ejabberd.im/
 VCS:            scm:git:https://github.com/processone/ejabberd.git
@@ -63,27 +61,19 @@ Source15:       ejabberd.fc
 Source16:       ejabberd.if
 
 
-# Fedora-specific
-Patch3: ejabberd-0003-Install-into-BINDIR-instead-of-SBINDIR.patch
-# Fedora-specific
-Patch4: ejabberd-0004-Enable-systemd-notification-if-available.patch
-
-
-BuildRequires:  elixir >= 1.4.4
-BuildRequires:  erlang-base64url >= %{base64url_ver}
 BuildRequires:  erlang-cache_tab >= %{cache_tab_ver}
 BuildRequires:  erlang-eimp >= %{eimp_ver}
 BuildRequires:  erlang-epam >= %{epam_ver}
+BuildRequires:  erlang-erlydtl >= %{erlydtl_ver}
 BuildRequires:  erlang-esip >= %{esip_ver}
 BuildRequires:  erlang-ezlib >= %{ezlib_ver}
 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 >= %{jiffy_ver}
 BuildRequires:  erlang-jose >= %{jose_ver}
-BuildRequires:  erlang-lager >= 3.6
-BuildRequires:  erlang-luerl >= %{luerl_ver}
+# For the eunit tests
+BuildRequires:  erlang-meck
 BuildRequires:  erlang-mqtree >= %{mqtree_ver}
 BuildRequires:  erlang-odbc
 BuildRequires:  erlang-p1_acme >= %{p1_acme_ver}
@@ -92,8 +82,9 @@ BuildRequires:  erlang-p1_oauth2 >= %{p1_oauth2_ver}
 BuildRequires:  erlang-p1_pgsql >= %{p1_pgsql_ver}
 BuildRequires:  erlang-p1_utils >= %{p1_utils_ver}
 BuildRequires:  erlang-pkix >= %{pkix_ver}
-BuildRequires:  erlang-rebar
-BuildRequires:  erlang-sd_notify
+BuildRequires:  erlang-provider_asn1
+BuildRequires:  erlang-rebar3
+BuildRequires:  erlang-rebar3-pc
 BuildRequires:  erlang-stringprep >= %{stringprep_ver}
 BuildRequires:  erlang-stun >= %{stun_ver}
 BuildRequires:  erlang-xmpp >= %{xmpp_ver}
@@ -104,10 +95,11 @@ BuildRequires:  libyaml-devel >= 0.1.4
 BuildRequires:  openssl-devel >= 1.0.0
 BuildRequires:  pam-devel
 BuildRequires:  selinux-policy-devel
+BuildRequires:  systemd-rpm-macros
 
 BuildRequires:  autoconf
 BuildRequires:  automake
-BuildRequires: make
+BuildRequires:  make
 
 # For creating user and group
 Requires(pre):  shadow-utils
@@ -122,21 +114,19 @@ Provides: group(%{name})
 
 Requires:  ejabberd-selinux == %{version}-%{release}
 # From rebar
-Requires:  elixir >= 1.4.4
-Requires:  erlang-base64url >= %{base64url_ver}
 Requires:  erlang-cache_tab >= %{cache_tab_ver}
 Requires:  erlang-eimp >= %{eimp_ver}
 Requires:  erlang-epam >= %{epam_ver}
+Requires:  erlang-erlydtl >= %{erlydtl_ver}
 Requires:  erlang-esip >= %{esip_ver}
 Requires:  erlang-ezlib >= %{ezlib_ver}
 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 >= %{jiffy_ver}
 Requires:  erlang-jose >= %{jose_ver}
-Requires:  erlang-luerl >= %{luerl_ver}
 Requires:  erlang-mqtree >= %{mqtree_ver}
+Requires:  erlang-odbc
 Requires:  erlang-os_mon
 Requires:  erlang-p1_acme >= %{p1_acme_ver}
 Requires:  erlang-p1_mysql >= %{p1_mysql_ver}
@@ -182,22 +172,13 @@ This is the SELinux policy for ejabberd.
 %prep
 %autosetup -p1
 
-# Upstream seems to import erlang-xmpp and erlang-fast_xml in a way that isn't compatible with them
-# being system libraries. We need to patch the include statements to fix this.
-# https://github.com/processone/ejabberd/pull/1446/
-find . -name "*.hrl" | xargs sed -i \
-    "s/include(\"fxml.hrl/include_lib(\"fast_xml\/include\/fxml.hrl/"
-find . -name "*.erl" | xargs sed -i "s/include(\"jid.hrl/include_lib(\"xmpp\/include\/jid.hrl/"
-find . -name "*.hrl" | xargs sed -i "s/include(\"ns.hrl/include_lib(\"xmpp\/include\/ns.hrl/"
-find . -name "*.erl" | xargs sed -i "s/include(\"xmpp.hrl/include_lib(\"xmpp\/include\/xmpp.hrl/"
-find . -name "*.hrl" | xargs sed -i \
-    "s/include(\"xmpp_codec.hrl/include_lib(\"xmpp\/include\/xmpp_codec.hrl/"
-
-# A few dependencies are configured to be found in the deps folder instead of in system libs
-# https://github.com/processone/ejabberd/issues/1850
-perl -p -i -e "s|deps/p1_utils/include|$(rpm -ql erlang-p1_utils | grep -E '/include$' )|g" rebar.config
-perl -p -i -e "s|deps/fast_xml/include|$(rpm -ql erlang-fast_xml | grep -E '/include$' )|g" rebar.config
-perl -p -i -e "s|deps/xmpp/include|$(rpm -ql erlang-xmpp | grep -E '/include$' )|g"   rebar.config
+# The rebar3_hex plugin is only needed for publishing to hex.pm and isn't
+# packaged in Fedora. Drop it so rebar3 doesn't try to fetch it.
+sed -i 's/{rebar3_hex, "[^"]*"},//' rebar.config
+
+# The JSON map encoding test asserts a particular key order which depends on
+# the internal map representation and doesn't hold on Erlang/OTP 27.3.
+sed -i '/^-ifndef(OTP_BELOW_27)\./,/^-endif\./d' test/json_test.erl
 
 cp %{S:14} %{S:15} %{S:16} .
 
@@ -205,9 +186,25 @@ cp %{S:14} %{S:15} %{S:16} .
 %build
 autoreconf -ivf
 
-%configure --disable-graphics --enable-odbc --enable-mysql --enable-pgsql --enable-pam --enable-zlib --enable-debug --libdir=%{_libdir}/erlang/lib/ --with-erlang=%{_libdir}/erlang/ --enable-system-deps --enable-stun
-
-%{erlang_compile}
+%configure \
+    --with-rebar=%{__rebar3} \
+    --enable-system-deps \
+    --enable-debug \
+    --enable-odbc \
+    --enable-mysql \
+    --enable-pgsql \
+    --enable-pam \
+    --enable-sip \
+    --enable-stun \
+    --enable-zlib \
+    --disable-redis \
+    --disable-sqlite \
+    --libdir=%{_erllibdir}
+
+%{rebar3_compile}
+
+# Generate the ejabberdctl script with Fedora paths baked in
+make ejabberdctl.example
 
 # Build the SELinux policy
 make NAME=ejabberd -f /usr/share/selinux/devel/Makefile DISTRO=fedora%{fedora}
@@ -215,18 +212,7 @@ bzip2 ejabberd.pp
 
 
 %install
-%{erlang_install}
-
-sed -e "s*{{rootdir}}*%{_prefix}*" \
-    -e "s*{{installuser}}*%{name}*" \
-    -e "s*{{bindir}}*%{_bindir}*" \
-    -e "s*{{libdir}}*%{_erllibdir}*" \
-    -e "s*{{sysconfdir}}*%{_sysconfdir}*" \
-    -e "s*{{localstatedir}}*/var*" \
-    -e "s*{{docdir}}*%{_datadir}/doc/%{name}*" \
-    -e "s*{{erl}}*%{_bindir}/erl*" \
-    -e "s*{{epmd}}*%{_bindir}/epmd*" ejabberdctl.template \
-> ejabberdctl.example
+%{erlang3_install}
 
 install -d -m 0750 %{buildroot}%{_sysconfdir}/%{name}
 install -D -p -m 0644 ejabberd.yml.example %{buildroot}%{_sysconfdir}/%{name}/ejabberd.yml
@@ -235,16 +221,11 @@ install -D -p -m 0644 inetrc %{buildroot}%{_sysconfdir}/%{name}/inetrc
 
 install -D -p -m 0755 ejabberdctl.example %{buildroot}%{_bindir}/ejabberdctl
 
-install -d -m 0750 %{buildroot}/var/lib/ejabberd
-install -d -m 0750 %{buildroot}/var/lock/ejabberdctl
-install -d -m 0750 %{buildroot}/var/log/ejabberd
-
-# fix example SSL certificate path to real one, which we created recently (see above)
-%{__perl} -pi -e 's!/path/to/ssl.pem!/etc/ejabberd/ejabberd.pem!g' %{buildroot}/etc/ejabberd/ejabberd.yml
+install -d -m 0750 %{buildroot}%{_sharedstatedir}/ejabberd
+install -d -m 0750 %{buildroot}%{_localstatedir}/log/ejabberd
 
-install -D -p -m 0755 tools/captcha.sh %{buildroot}%{_erllibdir}/%{name}-%{version}/priv/bin/captcha.sh
-# fix captcha path
-%{__perl} -pi -e 's!/lib/ejabberd/priv/bin/captcha.sh!%{_libdir}/%{name}/priv/bin/captcha.sh!g' %{buildroot}/etc/ejabberd/ejabberd.yml
+install -D -p -m 0755 tools/captcha.sh %{buildroot}%{erlang_appdir}/priv/bin/captcha.sh
+install -D -p -m 0755 tools/captcha-ng.sh %{buildroot}%{erlang_appdir}/priv/bin/captcha-ng.sh
 
 install -D -p -m 0644 %{S:9} %{buildroot}%{_sysconfdir}/pam.d/ejabberdctl
 install -D -p -m 0644 %{S:11} %{buildroot}%{_sysconfdir}/pam.d/ejabberd
@@ -255,28 +236,23 @@ install -D -m 0644 -p %{S:4} %{buildroot}%{_unitdir}/%{name}.service
 # install config for logrotate
 install -D -p -m 0644  %{S:2} %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd
 
-# create room for additional files (such as SQL schemas)
-install -d -m 0755 %{buildroot}%{_erllibdir}/%{name}-%{version}/priv/sql/
 # install sql-scripts for creating db schemes for various RDBMS
-install -p -m 0644 sql/lite.sql %{buildroot}%{_erllibdir}/%{name}-%{version}/priv/sql/
-install -p -m 0644 sql/mssql.sql %{buildroot}%{_erllibdir}/%{name}-%{version}/priv/sql/
-install -p -m 0644 sql/mysql.sql %{buildroot}%{_erllibdir}/%{name}-%{version}/priv/sql/
-install -p -m 0644 sql/pg.sql %{buildroot}%{_erllibdir}/%{name}-%{version}/priv/sql/
+install -d -m 0755 %{buildroot}%{erlang_appdir}/priv/sql/
+install -p -m 0644 sql/*.sql %{buildroot}%{erlang_appdir}/priv/sql/
 # Install css files
-install -d -m 0755 %{buildroot}%{_erllibdir}/%{name}-%{version}/priv/css
-install -p -m 0644 priv/css/* %{buildroot}%{_erllibdir}/%{name}-%{version}/priv/css/
+install -d -m 0755 %{buildroot}%{erlang_appdir}/priv/css
+install -p -m 0644 priv/css/* %{buildroot}%{erlang_appdir}/priv/css/
 # Install img files
-install -d -m 0755 %{buildroot}%{_erllibdir}/%{name}-%{version}/priv/img
-install -p -m 0644 priv/img/* %{buildroot}%{_erllibdir}/%{name}-%{version}/priv/img/
+install -d -m 0755 %{buildroot}%{erlang_appdir}/priv/img
+install -p -m 0644 priv/img/* %{buildroot}%{erlang_appdir}/priv/img/
 # Install js files
-install -d -m 0755 %{buildroot}%{_erllibdir}/%{name}-%{version}/priv/js
-install -p -m 0644 priv/js/* %{buildroot}%{_erllibdir}/%{name}-%{version}/priv/js/
-# Install lua files
-install -d -m 0755 %{buildroot}%{_erllibdir}/%{name}-%{version}/priv/lua
-install -p -m 0644 priv/lua/* %{buildroot}%{_erllibdir}/%{name}-%{version}/priv/lua/
-
-install -d -m 0755 %{buildroot}%{_erllibdir}/%{name}-%{version}/priv/msgs/
-install -p -m 0644 priv/msgs/*.msg %{buildroot}%{_erllibdir}/%{name}-%{version}/priv/msgs/
+install -d -m 0755 %{buildroot}%{erlang_appdir}/priv/js
+install -p -m 0644 priv/js/* %{buildroot}%{erlang_appdir}/priv/js/
+# Install mod_invites templates and static files
+cp -a priv/mod_invites %{buildroot}%{erlang_appdir}/priv/
+# Install translations
+install -d -m 0755 %{buildroot}%{erlang_appdir}/priv/msgs/
+install -p -m 0644 priv/msgs/*.msg %{buildroot}%{erlang_appdir}/priv/msgs/
 
 # Install man page
 install -d -m 0755 %{buildroot}%{_mandir}/man5/
@@ -295,13 +271,13 @@ install -p -m 0644 ejabberd.pp.bz2 %{buildroot}%{_datadir}/selinux/packages
 
 
 %check
-%{rebar_eunit}
+%{rebar3_eunit}
 
 
 %pre
 getent group %{name} >/dev/null || groupadd -r %{name}
 getent passwd %{name} >/dev/null || \
-useradd -r -g %{name} -d %{_localstatedir}/lib/%{name} -s /sbin/nologin -M \
+useradd -r -g %{name} -d %{_sharedstatedir}/%{name} -s /sbin/nologin -M \
 -c "ejabberd" %{name} 2>/dev/null || :
 
 
@@ -407,10 +383,10 @@ fi
 %{_datadir}/polkit-1/rules.d/51-ejabberdctl.rules
 %{_bindir}/ejabberdctl
 
-%{_erllibdir}/%{name}-%{version}
+%{erlang_appdir}
 
-%attr(750,ejabberd,ejabberd) %dir /var/lib/ejabberd
-%attr(750,ejabberd,ejabberd) %dir /var/log/ejabberd
+%attr(750,ejabberd,ejabberd) %dir %{_sharedstatedir}/ejabberd
+%attr(750,ejabberd,ejabberd) %dir %{_localstatedir}/log/ejabberd
 
 
 %files selinux
@@ -419,55 +395,4 @@ fi
 
 
 %changelog
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 20.07-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 20.07-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Sat Aug 07 2021 Randy Barlow <bowlofeggs@fedoraproject.org> - 20.07-5
-- Allow to bind to name_bind on udp (#1901466).
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20.07-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 20.07-3
-- Rebuilt for updated systemd-rpm-macros
-  See https://pagure.io/fesco/issue/2583.
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20.07-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* 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
-
-* Fri Feb 14 2020 Randy Barlow <bowlofeggs@fedoraproject.org> - 20.01-1
-- Update to 20.01 (#1792572).
-- https://blog.process-one.net/ejabberd-20-01/
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 19.09.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Nov 14 2019 Randy Barlow <bowlofeggs@fedoraproject.org> - 19.09.1-1
-- Update to 19.09.1 (#1742538).
-- https://blog.process-one.net/ejabberd-19-08/
-- https://blog.process-one.net/ejabberd-19-09/
-- https://blog.process-one.net/ejabberd-19-09-1/
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 19.05-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Wed Jun 05 2019 Randy Barlow <bowlofeggs@fedoraproject.org> - 19.05-1
-- Update to 19.05.
-- https://blog.process-one.net/ejabberd-19-05/
-
-* Sat Apr 13 2019 Randy Barlow <bowlofeggs@fedoraproject.org> - 19.02-1
-- Update to 19.02 (#1683310).
-- https://blog.process-one.net/ejabberd-19-02-the-mqtt-edition/
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 18.12.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+%autochangelog

diff --git a/sources b/sources
index e7d43df..c567824 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ejabberd-20.07.tar.gz) = 68a23cd0404d9f5cdf86585ec235663424c629d2145ff4e40efd35f70d934b2ec632b18797ea790791677429aa19ed3967744c2f774eb6d3d20795d84bdf0d4d
+SHA512 (ejabberd-26.07.tar.gz) = 81fb35faa9dffaf5b8d4d8cca1d8e1ae6dcae744b96194b9c83250a95dada795db6d255349f14fbe4935a831dcd5857bad448146b466131b92d1cf20ffe98031