rpms/cyrus-imapd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Add upstream patch for reconstruct bug.

Browse Source 
Add a patch from https://github.com/cyrusimap/cassandane/issues/21 which
fixes a bug in reconstruct that appears on 32-bit architectures.  This
lets us re-enable five Cassandane tests on 32-bit.
This commit is contained in:
Jason Tibbitts 2017-06-20 19:48:35 -05:00
parent 373f513e1d
commit 9937287217
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cyrus-imapd.spec
View File

@ -43,6 +43,9 @@ Patch6: patch-cyrus-autoreconf-keep-version
# Upstream https://github.com/cyrusimap/cyrus-imapd/issues/2026 # Upstream https://github.com/cyrusimap/cyrus-imapd/issues/2026
Patch7: patch-cyrus-managesieve-linking Patch7: patch-cyrus-managesieve-linking
# Upstream https://github.com/cyrusimap/cassandane/issues/21
Patch8: patch-cyrus-32bit-reconstruct
Source10: cyrus-imapd.logrotate Source10: cyrus-imapd.logrotate
Source11: cyrus-imapd.pam-config Source11: cyrus-imapd.pam-config
Source12: cyrus-imapd.sysconfig Source12: cyrus-imapd.sysconfig
@ -547,18 +550,6 @@ for i in ${tests[@]}; do exclude+=("!$i"); done
exclude+=("!Master.maxforkrate") exclude+=("!Master.maxforkrate")
%endif %endif
%ifarch i686 armv7hl
# Some additional failures only on 32-bit machines.
# Reported upstream as https://github.com/cyrusimap/cassandane/issues/21
tests=(
Reconstruct.reconstruct_removedfile
Reconstruct.reconstruct_truncated
Reconstruct.reconstruct_zerouid
Quota.reconstruct
Quota.reconstruct_orphans
)
for i in ${tests[@]}; do exclude+=("!$i"); done
%if 0%{?fedora} <= 26 %if 0%{?fedora} <= 26
# For F26 and older, 32-bit Perl doesn't support the quad types in unpack. The # For F26 and older, 32-bit Perl doesn't support the quad types in unpack. The
# following tests use those, and so they fail on those releases. # following tests use those, and so they fail on those releases.
@ -581,7 +572,6 @@ tests=(
) )
for i in ${tests[@]}; do exclude+=("!$i"); done for i in ${tests[@]}; do exclude+=("!$i"); done
%endif %endif
%endif
# Add -vvv for too much output # Add -vvv for too much output
./testrunner.pl %{?_smp_mflags} --cleanup -f pretty ${exclude[@]} 2>&1 ./testrunner.pl %{?_smp_mflags} --cleanup -f pretty ${exclude[@]} 2>&1
@ -683,6 +673,8 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v
* Tue Jun 20 2017 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.1-7 * Tue Jun 20 2017 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.1-7
- Add old /usr/lib/cyrus-imapd directory to the utils package and add a symlink - Add old /usr/lib/cyrus-imapd directory to the utils package and add a symlink
there to the deliver binary. This should help a bit with migrations. there to the deliver binary. This should help a bit with migrations.
- Add upstream patch to fix reconstruct failures on 32-bit architectures.
Re-enable those five Cassandane tests.
* Thu Jun 15 2017 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.1-6 * Thu Jun 15 2017 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.1-6
- Rename two commands: quota -> cyr_quota, restore -> cyr_restore. - Rename two commands: quota -> cyr_quota, restore -> cyr_restore.