The package rpms/cyrus-imapd.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/cyrus-imapd.git/commit/?id=77e8c6....
Change:
+%ifarch ppc64
Thanks.
Full change:
============
commit a84e4931935f086e20b89bec838882189433d5cd
Author: Jason Tibbitts <tibbs(a)math.uh.edu>
Date: Thu Mar 1 16:22:53 2018 -0600
Bump release.
diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index 7f4a244..028a750 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -9,7 +9,7 @@
Name: cyrus-imapd
Version: 3.0.5
-Release: 7%{?dist}
+Release: 8%{?dist}
%define ssl_pem_file /etc/pki/%name/%name.pem
@@ -638,6 +638,9 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus
IMAP Server" -d /v
%changelog
+* Thu Mar 01 2018 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 3.0.5-8
+- Bump client_timeout value in test suite.
+
* Thu Mar 01 2018 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 3.0.5-7
- Add patch to fix imtest (rhbz#1543481).
- Fix vzic makefile to use proper cflags (rhbz#1550543).
commit 6009bd90d36003371eff7df5cbcdc6cdff58f17f
Author: Jason Tibbitts <tibbs(a)math.uh.edu>
Date: Thu Mar 1 16:21:30 2018 -0600
Bump client_timeout in cassandane.ini
Slower builders are still having trouble running cassandane. Upstream
suggested that configuring the spawned daemons with a higher
client_timeout value might help.
diff --git a/cassandane.ini b/cassandane.ini
index cdab066..60e6112 100644
--- a/cassandane.ini
+++ b/cassandane.ini
@@ -36,6 +36,7 @@ quota = cyr_quota
[config]
altnamespace = no
unixhierarchysep = no
+client_timeout = 60
#[caldavtalk]
#basedir = CASSDIR/cassandane/testdata
commit 0387a932714d834ae35b14b9e5f7067ca2269fdf
Author: Jason Tibbitts <tibbs(a)math.uh.edu>
Date: Thu Mar 1 12:55:25 2018 -0600
Fix a couple of open tickets.
Add patch to fix imtest (rhbz#1543481).
Fix vzic makefile to use proper cflags (rhbz#1550543).
diff --git a/7214a7e3a60c628575a73dab0437e065b9e9a32a.patch
b/7214a7e3a60c628575a73dab0437e065b9e9a32a.patch
new file mode 100644
index 0000000..0ac2548
--- /dev/null
+++ b/7214a7e3a60c628575a73dab0437e065b9e9a32a.patch
@@ -0,0 +1,29 @@
+From 7214a7e3a60c628575a73dab0437e065b9e9a32a Mon Sep 17 00:00:00 2001
+From: Pavel Zhukov <pzhukov(a)redhat.com>
+Date: Tue, 27 Feb 2018 09:48:13 +0100
+Subject: [PATCH] Check if mechlist buffer is not empty
+
+Check if mechlist is null is redundant because it's initialized in
+ask_capabilities flow. As the result some capabilities may be lost and
+reported as not advertised
+Keeping (now reduntant) null check to avoid regressions in the future
+This is regression in 9fd201ba2b4ab58eda3372fb6765e1d5d8f027b4
+
+Bug-Url:
https://bugzilla.redhat.com/1543481
+---
+ imtest/imtest.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/imtest/imtest.c b/imtest/imtest.c
+index 716e2b252..85f4cc5ce 100644
+--- a/imtest/imtest.c
++++ b/imtest/imtest.c
+@@ -3084,7 +3084,7 @@ int main(int argc, char **argv)
+ /* try to get the capabilities from the banner */
+ mechlist = ask_capability(protocol, servername,
+ &capabilities, AUTO_BANNER);
+- if (!mechlist && !(capabilities & CAPA_STARTTLS)) {
++ if ((!mechlist || !buf_len(mechlist)) && !(capabilities &
CAPA_STARTTLS)) {
+ /* found no capabilities in banner -> get them explicitly */
+ protocol->banner.is_capa = 0;
+ }
diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index 016474e..7f4a244 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -9,7 +9,7 @@
Name: cyrus-imapd
Version: 3.0.5
-Release: 6%{?dist}
+Release: 7%{?dist}
%define ssl_pem_file /etc/pki/%name/%name.pem
@@ -45,6 +45,14 @@ Patch5:
https://github.com/elliefm/cyrus-imapd/commit/79244173353d95149ad1944f61
# Fix squatter segfaults seen on rawhide.
Patch6:
https://github.com/cyrusimap/cyrus-imapd/commit/24af24aa77144e0c1ab976657...
+# Fix imtest -m gssapi on some servers.
+#
https://bugzilla.redhat.com/show_bug.cgi?id=1543481
+#
https://github.com/cyrusimap/cyrus-imapd/pull/2268
+Patch7:
https://github.com/cyrusimap/cyrus-imapd/commit/7214a7e3a60c628575a73dab0...
+
+# vzic uses an old makefile that needs hacks to use the proper flags
+Patch8: patch-vzic-proper-cflags
+
Source10: cyrus-imapd.logrotate
Source11: cyrus-imapd.pam-config
Source12: cyrus-imapd.sysconfig
@@ -630,6 +638,10 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus
IMAP Server" -d /v
%changelog
+* Thu Mar 01 2018 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 3.0.5-7
+- Add patch to fix imtest (rhbz#1543481).
+- Fix vzic makefile to use proper cflags (rhbz#1550543).
+
* Mon Feb 26 2018 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 3.0.5-6
- Update cassandane checkout.
- Add two new build dependencies.
diff --git a/patch-vzic-proper-cflags b/patch-vzic-proper-cflags
new file mode 100644
index 0000000..0e299b3
--- /dev/null
+++ b/patch-vzic-proper-cflags
@@ -0,0 +1,25 @@
+diff --git a/tools/vzic/Makefile b/tools/vzic/Makefile
+index 8ae6afa..3882998 100644
+--- a/tools/vzic/Makefile
++++ b/tools/vzic/Makefile
+@@ -45,17 +45,17 @@ LIBICAL_LDADD = -lical
+ GLIB_CFLAGS = `pkg-config --cflags glib-2.0`
+ GLIB_LDADD = `pkg-config --libs glib-2.0`
+
+-CFLAGS = -g -I../.. -DOLSON_DIR=\"$(OLSON_DIR)\"
-DPRODUCT_ID='"$(PRODUCT_ID)"'
-DTZID_PREFIX='"$(TZID_PREFIX)"' $(GLIB_CFLAGS) $(LIBICAL_CFLAGS)
++CFLAGS += -I../.. -DOLSON_DIR=\"$(OLSON_DIR)\"
-DPRODUCT_ID='"$(PRODUCT_ID)"'
-DTZID_PREFIX='"$(TZID_PREFIX)"' $(GLIB_CFLAGS) $(LIBICAL_CFLAGS)
+
+ OBJECTS = vzic.o vzic-parse.o vzic-dump.o vzic-output.o
+
+ all: vzic
+
+ vzic: $(OBJECTS)
+- $(CC) $(OBJECTS) $(GLIB_LDADD) -o vzic
++ $(CC) $(LDFLAGS) $(OBJECTS) $(GLIB_LDADD) -o vzic
+
+ test-vzic: test-vzic.o
+- $(CC) test-vzic.o $(LIBICAL_LDADD) -o test-vzic
++ $(CC) $(LDFLAGS) test-vzic.o $(LIBICAL_LDADD) -o test-vzic
+
+ # Dependencies.
+ $(OBJECTS): vzic.h
commit e58c32913ffd917e9413e46136ed3954c2f4d023
Author: Jason Tibbitts <tibbs(a)math.uh.edu>
Date: Mon Feb 26 21:38:51 2018 -0600
Commit the sources file.
diff --git a/.gitignore b/.gitignore
index 56fc631..28417b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
/cassandane-0a6c13e.tar.gz
/cassandane-2f8f3f4.tar.gz
/cassandane-6d33978.tar.gz
+/cassandane-6bd697c.tar.gz
diff --git a/sources b/sources
index c1911fb..0631d0d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
SHA512 (cassandane-6d33978.tar.gz) =
aafc2a98d49f86b00f5b1af649ce63157c8d0652502248271ca14e6f000aebf6eca8931a6e33cc068e37fdd086e9dc4cdc90cf7eccfdda63dfd73c733d75fc40
SHA512 (cassandane-testdata-20170523.tar.gz) =
705f5af6a31fe3b8d6e8027bbddbedb2f64d65997f8a06620ec07fcd30a95d98ac3f3fbef7af5080684ee21be1c5b8bcad2374b2749f0571099e780355a04420
SHA512 (cyrus-imapd-3.0.5.tar.gz) =
262806729d5ee5d753732603aa7af33c6f96bc5145b7a951b8668ffdee0dcd4a90bd287da0949e85c4596cccb471a688f7f8b6f3e39194e1cff311950d4d4410
+SHA512 (cassandane-6bd697c.tar.gz) =
aadeb8c1899db17d482ffa0571bb6d308fc35beccb04e093ad1c9c6a6aa542fa8a9004c9f1772eb9f2f066c1ab1a562512f1f8d328342dd2e90e4b014aac0850
commit 7a0b31dd49f35f5e455f12dbcf4436be8056a1cb
Author: Jason Tibbitts <tibbs(a)math.uh.edu>
Date: Mon Feb 26 21:36:59 2018 -0600
Update cassandane.
Use current git head.
Add a couple of new build deps.
Remove all JMAP test exclusions, since cassandane no longer runs JMAP
tests on the 3.0 branch.
Clean up exclusion lists.
Add ten additional skipped tests, after consultation with upstream.
diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index 7446826..016474e 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -2,14 +2,14 @@
# Cassandane commit hash. Cassandane doesn't have releases often, but it
# receives constant development. This was fetched on 20170622.
-%global cocas 6d33978ebb0055be41a5cb8e52958e100401bf26
+%global cocas 6bd697c4799cf3f5eed0d89fcc7a365a9ff93680
# Cassandane run by default. '--without cassandane' disables.
%bcond_without cassandane
Name: cyrus-imapd
Version: 3.0.5
-Release: 5%{?dist}
+Release: 6%{?dist}
%define ssl_pem_file /etc/pki/%name/%name.pem
@@ -66,6 +66,8 @@ Source80:
https://github.com/cyrusimap/cassandane/archive/%cocas.tar.gz#/cassand
# This archive was generated by running:
# svn export
https://github.com/brong/Net-CalDAVTalk/trunk/testdata
# tar cfz cassandane-testdata-20170523.tar.gz testdata
+# Note that this changes very rarely. See
+#
https://github.com/brong/Net-CalDAVTalk/tree/master/testdata
Source81: cassandane-testdata-20170523.tar.gz
# A template config file for cassandane; we will substitute in varions values.
@@ -80,9 +82,6 @@ Source91: patch-cassandane-no-syslog
# Tell the annotator script to run as the current user/group
# Upstream ticket
https://github.com/cyrusimap/cyrus-imapd/issues/1995
Source92: patch-cassandane-fix-annotator
-## Upstream commit:
-##
https://github.com/cyrusimap/cassandane/commit/2221787bf86cb886b878eb844e...
-Source93: patch-cassandane-unknown_calendars
BuildRequires: autoconf automake bison flex gcc gcc-c++ git groff libtool
BuildRequires: pkgconfig systemd transfig
@@ -103,7 +102,8 @@ BuildRequires: cyrus-sasl-plain cyrus-sasl-md5
# Additional packages required for cassandane to function
BuildRequires: imaptest net-tools words
BuildRequires: perl(AnyEvent) perl(BSD::Resource) perl(Clone)
-BuildRequires: perl(File::chdir) perl(IO::Socket::INET6) perl(Mail::IMAPTalk)
+BuildRequires: perl(experimental) perl(File::chdir) perl(File::Slurp)
+BuildRequires: perl(IO::Socket::INET6) perl(Mail::IMAPTalk)
BuildRequires: perl(Config::IniFiles) perl(Mail::JMAPTalk) perl(Math::Int64)
BuildRequires: perl(Net::CalDAVTalk) perl(Net::CardDAVTalk)
BuildRequires: perl(Net::Server) perl(News::NNTPClient) perl(Path::Tiny)
@@ -217,7 +217,6 @@ tar xf %SOURCE81
patch -p1 < %SOURCE91
patch -p1 < %SOURCE92
-patch -p1 < %SOURCE93
cp %SOURCE82 cassandane.ini
# RF rpm-buildroot-usage
@@ -461,6 +460,10 @@ tests=(
# intercepts coredumps.
Cassandane::Test::Core
+ # Upstream recommends disabling this because it has an internal race and
+ # will fail randomly.
+ Master.sighup_recycling
+
# Fails because our Xapian is too old for proper CJK support. 1.5 will be
# OK, but it is not yet released. The alternative is to bundle.
SearchFuzzy.cjk_words
@@ -482,40 +485,23 @@ tests=(
# Not sure why this one is failing.
Caldav.changes_remove
- # This fails because of some libical issues
- JMAPCalendars.getcalendareventlist_datetime
-)
-for i in ${tests[@]}; do exclude+=("!$i"); done
-
-%if 0%{?fedora} >= 28
-# The update to libical3 caused an additional failure, reported upstream as
-#
https://github.com/cyrusimap/cyrus-imapd/issues/2200
-tests=(
- JMAPCalendars.setcalendarevents_recurrenceoverrides
-)
-for i in ${tests[@]}; do exclude+=("!$i"); done
-%endif
-
-%if 0%{?fedora} <= 27
-tests=(
- # Without libical3 or a patch to libical2, the following test will fail
- #
https://github.com/cyrusimap/cyrus-imapd/issues/2048
- JMAPCalendars.setcalendarevents_alerts
- JMAPCalendars.setcalendarevents_endtimezone_recurrence
+ # Upstream on IRC indicates that all of these are expected to fail on 3.0.
+ CaldavAlarm.override_multiuser
+ Annotator.annotator_callout_disabled
+ CaldavAlarm.simple_multiuser_sametime
+ CaldavAlarm.simple_multiuser
+ Carddav.sharing_contactpaths
+ Info.info_lint_junk
+ Info.info_lint
+ Metadata.set_specialuse_twice
+ SearchFuzzy.search_subjectsnippet
)
for i in ${tests[@]}; do exclude+=("!$i"); done
-%endif
%if 0%{?fedora} <= 26
# Some F26-specific test exclusions
tests=(
- # These fail because F26 libical has not been compiled with
- # ICAL_ALLOW_EMPTY_PROPERTIES.
- JMAPCalendars.setcalendarevents_locations
- JMAPCalendars.setcalendarevents_recurrenceoverrides
-
# These all fail because F26 perl doesn't support quad types in unpack.
- JMAPContacts.setcontacts_importance_later
Metadata.expunge_messages
Metadata.msg_replication_new_mas_partial_wwd
Metadata.msg_replication_new_rep
@@ -644,6 +630,15 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus
IMAP Server" -d /v
%changelog
+* Mon Feb 26 2018 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 3.0.5-6
+- Update cassandane checkout.
+- Add two new build dependencies.
+- Remove all JMAP-related tests from the exclusion lists, since cassandane no
+ longer runs any JMAP tests on cyrus 3.0.
+- Collapse unused test skip lists.
+- Add ten additional skipped tests, after consultation with upstream.
+
+
* Mon Feb 26 2018 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 3.0.5-5
- Add patch to fix segfaults in squatter.
- Exclude one test on all releases instead of just F28+.
commit 7d83ccdff41c7de4ad350f388cc29d37bf8c5b05
Author: Jason Tibbitts <tibbs(a)math.uh.edu>
Date: Mon Feb 26 16:17:33 2018 -0600
Actually commit the patch.
diff --git a/24af24aa77144e0c1ab976657833b470502be7a8.patch
b/24af24aa77144e0c1ab976657833b470502be7a8.patch
new file mode 100644
index 0000000..99d70f8
--- /dev/null
+++ b/24af24aa77144e0c1ab976657833b470502be7a8.patch
@@ -0,0 +1,23 @@
+From 24af24aa77144e0c1ab976657833b470502be7a8 Mon Sep 17 00:00:00 2001
+From: Robert Stepanek <rsto(a)fastmail.com>
+Date: Mon, 26 Feb 2018 22:00:34 +0100
+Subject: [PATCH] xapian_wrap.cpp: change set_stem_version signature to return
+ void
+
+---
+ imap/xapian_wrap.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/imap/xapian_wrap.cpp b/imap/xapian_wrap.cpp
+index 0afb73674..ce07cdcf6 100644
+--- a/imap/xapian_wrap.cpp
++++ b/imap/xapian_wrap.cpp
+@@ -259,7 +259,7 @@ static int stem_version_get(Xapian::Database *database)
+ return version;
+ }
+
+-static int stem_version_set(Xapian::WritableDatabase *database, int version)
++static void stem_version_set(Xapian::WritableDatabase *database, int version)
+ {
+ std::ostringstream convert;
+ convert << version;
commit 86f7adef689375e00f140460343db222c26d6950
Author: Jason Tibbitts <tibbs(a)math.uh.edu>
Date: Mon Feb 26 16:14:52 2018 -0600
Fix squatter segfaults seen in rawhide.
Add patch to fix segfaults in squatter.
Exclude one test on all releases instead of just F28+.
Remove --cleanup from cassandane invocation.
diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index 73d5e10..7446826 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -9,7 +9,7 @@
Name: cyrus-imapd
Version: 3.0.5
-Release: 4%{?dist}
+Release: 5%{?dist}
%define ssl_pem_file /etc/pki/%name/%name.pem
@@ -42,6 +42,9 @@ Patch4:
https://github.com/cyrusimap/cyrus-imapd/commit/1966c22fc4249a1157a4d4c1
# gcc8 detects a strcpy overflow in master.
Patch5:
https://github.com/elliefm/cyrus-imapd/commit/79244173353d95149ad1944f61c...
+# Fix squatter segfaults seen on rawhide.
+Patch6:
https://github.com/cyrusimap/cyrus-imapd/commit/24af24aa77144e0c1ab976657...
+
Source10: cyrus-imapd.logrotate
Source11: cyrus-imapd.pam-config
Source12: cyrus-imapd.sysconfig
@@ -478,14 +481,16 @@ tests=(
# Not sure why this one is failing.
Caldav.changes_remove
+
+ # This fails because of some libical issues
+ JMAPCalendars.getcalendareventlist_datetime
)
for i in ${tests[@]}; do exclude+=("!$i"); done
%if 0%{?fedora} >= 28
-# The update to libical3 caused two additional failures, reported upstream as
+# The update to libical3 caused an additional failure, reported upstream as
#
https://github.com/cyrusimap/cyrus-imapd/issues/2200
tests=(
- JMAPCalendars.getcalendareventlist_datetime
JMAPCalendars.setcalendarevents_recurrenceoverrides
)
for i in ${tests[@]}; do exclude+=("!$i"); done
@@ -493,7 +498,7 @@ for i in ${tests[@]}; do exclude+=("!$i"); done
%if 0%{?fedora} <= 27
tests=(
- # Without libcal3 or a patch to libical2, the following test will fail
+ # Without libical3 or a patch to libical2, the following test will fail
#
https://github.com/cyrusimap/cyrus-imapd/issues/2048
JMAPCalendars.setcalendarevents_alerts
JMAPCalendars.setcalendarevents_endtimezone_recurrence
@@ -530,7 +535,7 @@ for i in ${tests[@]}; do exclude+=("!$i"); done
%endif
# Add -vvv for too much output
-./testrunner.pl %{?_smp_mflags} --cleanup -v -f pretty ${exclude[@]} 2>&1
+./testrunner.pl %{?_smp_mflags} -v -f pretty ${exclude[@]} 2>&1
%pre
@@ -639,6 +644,11 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus
IMAP Server" -d /v
%changelog
+* Mon Feb 26 2018 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 3.0.5-5
+- Add patch to fix segfaults in squatter.
+- Exclude one test on all releases instead of just F28+.
+- Remove --cleanup from cassandane invocation.
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.0.5-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
commit 03a9f45cb416393dce6175cfc4710df2d97ca757
Author: Jason Tibbitts <tibbs(a)math.uh.edu>
Date: Mon Feb 19 22:52:47 2018 -0600
Start working on patches to some new failures.
diff --git a/79244173353d95149ad1944f61cc6bd2e43bd7d4.patch
b/79244173353d95149ad1944f61cc6bd2e43bd7d4.patch
new file mode 100644
index 0000000..835922b
--- /dev/null
+++ b/79244173353d95149ad1944f61cc6bd2e43bd7d4.patch
@@ -0,0 +1,43 @@
+From 79244173353d95149ad1944f61cc6bd2e43bd7d4 Mon Sep 17 00:00:00 2001
+From: ellie timoney <ellie(a)fastmail.com>
+Date: Tue, 20 Feb 2018 13:17:39 +1100
+Subject: [PATCH] master: reject unix domain listen paths that are too long
+
+Fixes #2253
+---
+ master/master.c | 15 ++++++++++++++-
+ 1 file changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/master/master.c b/master/master.c
+index 325afd42f..a28731fd0 100644
+--- a/master/master.c
++++ b/master/master.c
+@@ -496,6 +496,12 @@ static void service_create(struct service *s)
+ EX_SOFTWARE);
+
+ if (s->listen[0] == '/') { /* unix socket */
++ if (strlen(s->listen) >= sizeof(sunsock.sun_path)) {
++ syslog(LOG_ERR, "invalid listen '%s' (too long), disabling
%s",
++ s->listen, s->name);
++ service_forget_exec(s);
++ return;
++ }
+ res0_is_local = 1;
+ res0 = (struct addrinfo *)xzmalloc(sizeof(struct addrinfo));
+ res0->ai_flags = AI_PASSIVE;
+@@ -513,7 +519,14 @@ static void service_create(struct service *s)
+ sunsock.sun_len = res0->ai_addrlen;
+ #endif
+ sunsock.sun_family = AF_UNIX;
+- strcpy(sunsock.sun_path, s->listen);
++
++ int r = snprintf(sunsock.sun_path, sizeof(sunsock.sun_path), "%s",
s->listen);
++ if (r < 0 || (size_t) r >= sizeof(sunsock.sun_path)) {
++ /* belt and suspenders */
++ fatal("Serious software bug found: "
++ "over-long listen path not detected earlier!",
++ EX_SOFTWARE);
++ }
+ unlink(s->listen);
+ } else { /* inet socket */
+ char *port;
diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index f296078..73d5e10 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -39,6 +39,9 @@ Patch3: patch-cyrus-default-configs
# branch
Patch4:
https://github.com/cyrusimap/cyrus-imapd/commit/1966c22fc4249a1157a4d4c12...
+# gcc8 detects a strcpy overflow in master.
+Patch5:
https://github.com/elliefm/cyrus-imapd/commit/79244173353d95149ad1944f61c...
+
Source10: cyrus-imapd.logrotate
Source11: cyrus-imapd.pam-config
Source12: cyrus-imapd.sysconfig
@@ -527,7 +530,7 @@ for i in ${tests[@]}; do exclude+=("!$i"); done
%endif
# Add -vvv for too much output
-./testrunner.pl %{?_smp_mflags} --cleanup -f pretty ${exclude[@]} 2>&1
+./testrunner.pl %{?_smp_mflags} --cleanup -v -f pretty ${exclude[@]} 2>&1
%pre
commit e94c31c552d8cefe6094b994cfbe7f1e431ffbaa
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Feb 7 06:15:04 2018 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index ddef15f..f296078 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -9,7 +9,7 @@
Name: cyrus-imapd
Version: 3.0.5
-Release: 3%{?dist}
+Release: 4%{?dist}
%define ssl_pem_file /etc/pki/%name/%name.pem
@@ -636,6 +636,9 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus
IMAP Server" -d /v
%changelog
+* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.0.5-4
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
* Tue Jan 09 2018 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 3.0.5-3
- Re-enable clamav and mariadb support as those are now built with openssl 1.1.
- But no clamav on ppc64 because of
commit 77e8c64a80a39bc121e8ec3971f9c0e29ff8b11f
Author: Jason Tibbitts <tibbs(a)math.uh.edu>
Date: Fri Jan 12 19:22:35 2018 -0600
Disable clamav on ppc64.
Clamav support doesn't work on ppc64 due to
https://bugzilla.redhat.com/show_bug.cgi?id=1534071 so disable it there.
diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index c006c3e..ddef15f 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -232,13 +232,14 @@ make
popd
%endif
-# Options not enabled:
+# Notes about configure options:
# --enable-objectstore
# It's experimental, and it doesn't appear that either openio or caringo are
# in Fedora.
-# --with-mysql
-# libmysqlclient doesn't support openssl 1.1 and you can't two versions of
-# openssl linked into the same program.
+
+# --without-clamav (on ppc64 only)
+# cyr_virusscan fails with internal llvm errors on ppc64 _only_. See
+#
https://bugzilla.redhat.com/show_bug.cgi?id=1534071
# --with-cyrus-prefix and --with-service-path went away; use --with-libexecdir=
# instead.
@@ -270,6 +271,9 @@ autoreconf -vi
--enable-replication \
--enable-unit-tests \
--enable-xapian \
+%ifarch ppc64
+ --without-clamav \
+%endif
#
# The configure script will set up the Perl makefiles, but not in the way
@@ -634,6 +638,8 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus
IMAP Server" -d /v
%changelog
* Tue Jan 09 2018 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 3.0.5-3
- Re-enable clamav and mariadb support as those are now built with openssl 1.1.
+- But no clamav on ppc64 because of
+
https://bugzilla.redhat.com/show_bug.cgi?id=1534071
* Thu Jan 04 2018 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 3.0.5-2
- Reorganize some test exclusions so things build on all releases.
commit 34e1a93ccbe2f553f9c3bfd15711d3742419dcdd
Author: Jason Tibbitts <tibbs(a)math.uh.edu>
Date: Tue Jan 9 20:46:26 2018 -0600
Re-enable clamav and mysql support.
Since both clamav and mysql are built with openssl 1.1 now, they can be
re-enabled here.
diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index 0e007ba..c006c3e 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -9,7 +9,7 @@
Name: cyrus-imapd
Version: 3.0.5
-Release: 2%{?dist}
+Release: 3%{?dist}
%define ssl_pem_file /etc/pki/%name/%name.pem
@@ -78,24 +78,17 @@ Source92: patch-cassandane-fix-annotator
##
https://github.com/cyrusimap/cassandane/commit/2221787bf86cb886b878eb844e...
Source93: patch-cassandane-unknown_calendars
-# Dependency notes:
-# * clamav-devel and mariadb-devel removed because they both depend on
-# compat-openssl.
-# * As of 2017-05-22, libical 2.1 has not actually been released. The
-# configure script will always produce the following message:
-# configure: Your version of libical can not support patching iCalendar
-# objects. Consider upgrading to libical >= 2.1
-
BuildRequires: autoconf automake bison flex gcc gcc-c++ git groff libtool
BuildRequires: pkgconfig systemd transfig
BuildRequires: perl-devel perl-generators perl(ExtUtils::MakeMaker)
BuildRequires: perl(Pod::Html)
-BuildRequires: CUnit-devel cyrus-sasl-devel glib2-devel jansson-devel
-BuildRequires: krb5-devel libical-devel libnghttp2-devel libxml2-devel
-BuildRequires: net-snmp-devel openldap-devel openssl-devel postgresql-devel
-BuildRequires: shapelib-devel sqlite-devel xapian-core-devel
+BuildRequires: CUnit-devel clamav-devel cyrus-sasl-devel glib2-devel
+BuildRequires: jansson-devel krb5-devel libical-devel libnghttp2-devel
+BuildRequires: libxml2-devel mariadb-devel net-snmp-devel openldap-devel
+BuildRequires: openssl-devel postgresql-devel shapelib-devel sqlite-devel
+BuildRequires: xapian-core-devel
# Miscellaneous modules needed for 'make check' to function:
BuildRequires: cyrus-sasl-plain cyrus-sasl-md5
@@ -639,6 +632,9 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus
IMAP Server" -d /v
%changelog
+* Tue Jan 09 2018 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 3.0.5-3
+- Re-enable clamav and mariadb support as those are now built with openssl 1.1.
+
* Thu Jan 04 2018 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 3.0.5-2
- Reorganize some test exclusions so things build on all releases.