[packages/cyrus-imapd] - up to 3.8.1
baggins
baggins at pld-linux.org
Sun Nov 26 23:29:06 CET 2023
commit 854c4e138cb0b5d17bf15792798ba89eb35e4e5e
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Nov 26 23:28:00 2023 +0100
- up to 3.8.1
assert.patch | 131 ----------------------------------------------
cyrus-imapd-sphinx3.patch | 37 -------------
cyrus-imapd.spec | 22 ++++----
libxml2.patch | 41 +++++++++++++++
link.patch | 11 ----
openssl3.patch | 11 ----
sphinx.patch | 22 --------
7 files changed, 50 insertions(+), 225 deletions(-)
---
diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index ef98075..09816f5 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -17,12 +17,12 @@ Summary: High-performance mail store with IMAP and POP3
Summary(pl.UTF-8): Wysoko wydajny serwer IMAP i POP3
Summary(pt_BR.UTF-8): Um servidor de mail de alto desempenho que suporta IMAP e POP3
Name: cyrus-imapd
-Version: 3.0.16
-Release: 9
+Version: 3.8.1
+Release: 0.1
License: BSD-like
Group: Networking/Daemons/POP3
Source0: https://github.com/cyrusimap/cyrus-imapd/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: f93394d3bf981d558a8d7e2cb989b568
+# Source0-md5: 87d9092f94b88289f8a4949b3f2afa82
Source1: cyrus-README
Source2: cyrus-procmailrc
Source3: cyrus-deliver-wrapper.c
@@ -36,12 +36,8 @@ Source11: %{name}.init
Source12: cyrus.conf
Source13: cyrus-sync.init
Patch0: %{name}-et.patch
-Patch1: link.patch
+Patch1: libxml2.patch
Patch2: %{name}-clamav-0.101.patch
-Patch3: %{name}-sphinx3.patch
-Patch4: openssl3.patch
-Patch5: sphinx.patch
-Patch6: assert.patch
URL: http://www.cyrusimap.org/
BuildRequires: autoconf >= 2.63
BuildRequires: automake
@@ -207,10 +203,6 @@ Perlowy interfejs do biblioteki cyrus-imapd.
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
cp -p %{SOURCE1} %{SOURCE2} %{SOURCE4} %{SOURCE5} .
@@ -382,6 +374,7 @@ fi
%attr(755,root,root) %{pkglibexecdir}/ptloader
%attr(755,root,root) %{pkglibexecdir}/pop3d
%attr(755,root,root) %{pkglibexecdir}/pop3proxyd
+%attr(755,root,root) %{pkglibexecdir}/promstatsd
%attr(755,root,root) %{pkglibexecdir}/proxyd
%attr(755,root,root) %{pkglibexecdir}/smmapd
%attr(755,root,root) %{pkglibexecdir}/sync_server
@@ -397,6 +390,7 @@ fi
%attr(755,root,root) %{_sbindir}/cvt_cyrusdb
%attr(755,root,root) %{_sbindir}/cvt_xlist_specialuse
%attr(755,root,root) %{_sbindir}/cyr_buildinfo
+%attr(755,root,root) %{_sbindir}/cyr_cd.sh
%attr(755,root,root) %{_sbindir}/cyr_dbtool
%attr(755,root,root) %{_sbindir}/cyr_deny
%attr(755,root,root) %{_sbindir}/cyr_df
@@ -404,7 +398,8 @@ fi
%attr(755,root,root) %{_sbindir}/cyr_backup
%attr(755,root,root) %{_sbindir}/cyr_expire
%attr(755,root,root) %{_sbindir}/cyr_info
-%attr(755,root,root) %{_sbindir}/cyr_sequence
+%attr(755,root,root) %{_sbindir}/cyr_ls
+%attr(755,root,root) %{_sbindir}/cyr_pwd
%attr(755,root,root) %{_sbindir}/cyr_synclog
%attr(755,root,root) %{_sbindir}/cyr_userseen
%attr(755,root,root) %{_sbindir}/cyr_virusscan
@@ -419,6 +414,7 @@ fi
%attr(755,root,root) %{_sbindir}/ptdump
%attr(755,root,root) %{_sbindir}/ptexpire
%attr(755,root,root) %{_sbindir}/reconstruct
+%attr(755,root,root) %{_sbindir}/relocate_by_id
%attr(755,root,root) %{_sbindir}/restore
%attr(755,root,root) %{_sbindir}/sievec
%attr(755,root,root) %{_sbindir}/sieved
diff --git a/assert.patch b/assert.patch
deleted file mode 100644
index 0094e51..0000000
--- a/assert.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From e6c8208a38cfcbe21209965f9793e8d0558a7294 Mon Sep 17 00:00:00 2001
-From: ellie timoney <ellie at fastmail.com>
-Date: Fri, 17 Jun 2022 14:12:09 +1000
-Subject: [PATCH 1/2] assert: assert() must be an expression, not a statement
-
-Note that while this is now syntactically compatible with the
-C standard assert macro(), it is still not semantically compatible.
-
-Specifically, the C standard assert() macro can be compiled out
-entirely by defining NDEBUG during compilation, and thus is a
-debugging aid only.
-
-Ours cannot be compiled out, and therefore can be relied upon as
-a run-time safety -- which we do, extensively!
----
- lib/assert.h | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/lib/assert.h b/lib/assert.h
-index d7e251245b..1be6c51479 100644
---- a/lib/assert.h
-+++ b/lib/assert.h
-@@ -43,11 +43,11 @@
- #ifndef INCLUDED_ASSERT_H
- #define INCLUDED_ASSERT_H
-
--#ifdef __STDC__
--#define assert(ex) {if (!(ex))assertionfailed(__FILE__, __LINE__, #ex);}
- void assertionfailed(const char *file, int line, const char *expr);
--#else
--#define assert(ex) {if (!(ex))assertionfailed(__FILE__, __LINE__, (char*)0);}
--#endif
-+
-+#define assert(expr) \
-+ ((expr) \
-+ ? (void)(0) \
-+ : assertionfailed(__FILE__, __LINE__, #expr))
-
- #endif /* INCLUDED_ASSERT_H */
-
-From 30472acc9f6a899a143590d01989f6cbde434ff5 Mon Sep 17 00:00:00 2001
-From: ellie timoney <ellie at fastmail.com>
-Date: Fri, 17 Jun 2022 14:18:33 +1000
-Subject: [PATCH 2/2] misc: fix missing semicolons
-
-bad behaviour that was enabled by the bad assert() definition... /sigh
----
- imap/mailbox.c | 2 +-
- imap/message.c | 16 ++++++++--------
- 2 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/imap/mailbox.c b/imap/mailbox.c
-index 37014400e2..c427a9280f 100644
---- a/imap/mailbox.c
-+++ b/imap/mailbox.c
-@@ -4492,7 +4492,7 @@ EXPORTED int mailbox_append_index_record(struct mailbox *mailbox,
- assert(mailbox_index_islocked(mailbox, 1));
-
- /* Append MUST be a higher UID than any we've yet seen */
-- assert(record->uid > mailbox->i.last_uid)
-+ assert(record->uid > mailbox->i.last_uid);
-
- /* Append MUST have a message with data */
- assert(record->size);
-diff --git a/imap/message.c b/imap/message.c
-index 37146c2beb..0db52a6cf0 100644
---- a/imap/message.c
-+++ b/imap/message.c
-@@ -5070,7 +5070,7 @@ EXPORTED int message_get_priority(message_t *m, struct buf *buf)
-
- EXPORTED const struct index_record *msg_record(const message_t *m)
- {
-- assert(!message_need(m, M_RECORD))
-+ assert(!message_need(m, M_RECORD));
- return &m->record;
- }
-
-@@ -5096,7 +5096,7 @@ EXPORTED int message_get_size(message_t *m, uint32_t *sizep)
-
- EXPORTED uint32_t msg_size(const message_t *m)
- {
-- assert(!message_need(m, M_RECORD))
-+ assert(!message_need(m, M_RECORD));
- return m->record.size;
- }
-
-@@ -5110,7 +5110,7 @@ EXPORTED int message_get_uid(message_t *m, uint32_t *uidp)
-
- EXPORTED uint32_t msg_uid(const message_t *m)
- {
-- assert(!message_need(m, M_RECORD))
-+ assert(!message_need(m, M_RECORD));
- return m->record.uid;
- }
-
-@@ -5124,7 +5124,7 @@ EXPORTED int message_get_cid(message_t *m, conversation_id_t *cidp)
-
- EXPORTED conversation_id_t msg_cid(const message_t *m)
- {
-- assert(!message_need(m, M_RECORD))
-+ assert(!message_need(m, M_RECORD));
- return m->record.cid;
- }
-
-@@ -5138,7 +5138,7 @@ EXPORTED int message_get_modseq(message_t *m, modseq_t *modseqp)
-
- EXPORTED modseq_t msg_modseq(const message_t *m)
- {
-- assert(!message_need(m, M_RECORD))
-+ assert(!message_need(m, M_RECORD));
- return m->record.modseq;
- }
-
-@@ -5152,7 +5152,7 @@ EXPORTED int message_get_msgno(message_t *m, uint32_t *msgnop)
-
- EXPORTED int msg_msgno(const message_t *m)
- {
-- assert(!message_need(m, M_INDEX))
-+ assert(!message_need(m, M_INDEX));
- return m->msgno;
- }
-
-@@ -5174,7 +5174,7 @@ EXPORTED int message_get_guid(message_t *m, const struct message_guid **guidp)
-
- EXPORTED const struct message_guid *msg_guid(const message_t *m)
- {
-- assert(!message_need(m, M_RECORD))
-+ assert(!message_need(m, M_RECORD));
- return &m->record.guid;
- }
-
diff --git a/cyrus-imapd-sphinx3.patch b/cyrus-imapd-sphinx3.patch
deleted file mode 100644
index 7d6b454..0000000
--- a/cyrus-imapd-sphinx3.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- cyrus-imapd-3.0.9/docsrc/exts/sphinxlocal/builders/manpage.py~ 2021-05-09 11:36:01.000000000 +0200
-+++ cyrus-imapd-3.0.9/docsrc/exts/sphinxlocal/builders/manpage.py 2021-05-09 11:41:39.266179918 +0200
-@@ -21,7 +21,6 @@
- from sphinx import addnodes
- from sphinx.errors import SphinxError
- from sphinx.builders import Builder
--from sphinx.environment import NoUri
- from sphinx.util.nodes import inline_all_toctrees
- from sphinx.util.console import bold, darkgreen
- from sphinx.writers.manpage import ManualPageWriter
---- cyrus-imapd-3.0.9/docsrc/exts/sphinxlocal/writers/manpage.py~ 2021-05-09 11:36:01.000000000 +0200
-+++ cyrus-imapd-3.0.9/docsrc/exts/sphinxlocal/writers/manpage.py 2021-05-09 11:48:57.416148611 +0200
-@@ -14,6 +14,7 @@
-
- import docutils
- from docutils import nodes
-+from time import strftime
- from sphinx.writers.manpage import (
- ManualPageWriter,
- ManualPageTranslator as BaseTranslator
-@@ -26,7 +27,6 @@
-
- from sphinx import addnodes
- from sphinx.locale import admonitionlabels, _
--from sphinx.util.osutil import ustrftime
-
- class CyrusManualPageWriter(ManualPageWriter):
-
-@@ -71,7 +71,7 @@
- if builder.config.today:
- self._docinfo['date'] = builder.config.today
- else:
-- self._docinfo['date'] = ustrftime(builder.config.today_fmt
-+ self._docinfo['date'] = strftime(builder.config.today_fmt
- or _('%B %d, %Y'))
- self._docinfo['copyright'] = builder.config.copyright
- self._docinfo['version'] = builder.config.version
diff --git a/libxml2.patch b/libxml2.patch
new file mode 100644
index 0000000..75b5608
--- /dev/null
+++ b/libxml2.patch
@@ -0,0 +1,41 @@
+--- cyrus-imapd-3.8.1/imap/vcard_support.c~ 2023-09-11 03:23:52.000000000 +0200
++++ cyrus-imapd-3.8.1/imap/vcard_support.c 2023-11-26 23:16:21.657955478 +0100
+@@ -42,6 +42,7 @@
+ */
+
+ #include <config.h>
++#include <libxml/parser.h>
+ #include <libxml/tree.h>
+
+ #include "vcard_support.h"
+--- cyrus-imapd-3.8.1/imap/http_dav.c~ 2023-09-11 03:23:52.000000000 +0200
++++ cyrus-imapd-3.8.1/imap/http_dav.c 2023-11-26 23:18:32.021051917 +0100
+@@ -93,6 +93,7 @@
+ #include "imap/imap_err.h"
+
+ #include <errno.h>
++#include <libxml/parser.h>
+ #include <libxml/uri.h>
+
+ static const struct dav_namespace_t {
+--- cyrus-imapd-3.8.1/imap/http_dav_sharing.c~ 2023-09-11 03:23:52.000000000 +0200
++++ cyrus-imapd-3.8.1/imap/http_dav_sharing.c 2023-11-26 23:19:26.519004807 +0100
+@@ -59,6 +59,8 @@
+ #include "imap/http_err.h"
+ #include "imap/imap_err.h"
+
++#include <libxml/parser.h>
++
+ #define DAVNOTIFICATION_CONTENT_TYPE \
+ "application/davnotification+xml; charset=utf-8"
+
+--- cyrus-imapd-3.8.1/imap/xcal.c~ 2023-09-11 02:04:18.000000000 +0200
++++ cyrus-imapd-3.8.1/imap/xcal.c 2023-11-26 23:19:52.066272967 +0100
+@@ -47,6 +47,7 @@
+ #include <stddef.h> /* for offsetof() macro */
+ #include <syslog.h>
+
++#include <libxml/parser.h>
+ #include <libxml/tree.h>
+
+ #include "httpd.h"
diff --git a/link.patch b/link.patch
deleted file mode 100644
index 245d2e6..0000000
--- a/link.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cyrus-imapd-3.0.8/Makefile.am~ 2018-09-16 15:38:42.000000000 +0200
-+++ cyrus-imapd-3.0.8/Makefile.am 2018-09-16 20:20:45.578966842 +0200
-@@ -1379,7 +1379,7 @@ lib_libcyrus_la_SOURCES += lib/nonblock_
- else
- lib_libcyrus_la_SOURCES += lib/nonblock_ioctl.c
- endif
--lib_libcyrus_la_LIBADD = libcrc32.la ${LIB_SASL} $(SSL_LIBS) $(GCOV_LIBS)
-+lib_libcyrus_la_LIBADD = lib/libcyrus_min.la libcrc32.la ${LIB_SASL} $(SSL_LIBS) $(GCOV_LIBS)
- if USE_CYRUSDB_LMDB
- lib_libcyrus_la_LIBADD += -llmdb
- endif
diff --git a/openssl3.patch b/openssl3.patch
deleted file mode 100644
index 2af3906..0000000
--- a/openssl3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cyrus-imapd-3.0.9/imap/httpd.c~ 2019-03-15 01:31:20.000000000 +0100
-+++ cyrus-imapd-3.0.9/imap/httpd.c 2021-10-02 21:53:14.171936180 +0200
-@@ -914,7 +914,7 @@
- cyrus_version(),
- SASL_VERSION_MAJOR, SASL_VERSION_MINOR, SASL_VERSION_STEP);
- #ifdef HAVE_SSL
-- buf_printf(&serverinfo, " OpenSSL/%s", SHLIB_VERSION_NUMBER);
-+ buf_printf(&serverinfo, " OpenSSL/%s", OPENSSL_SHLIB_VERSION);
- #endif
-
- #ifdef HAVE_NGHTTP2
diff --git a/sphinx.patch b/sphinx.patch
deleted file mode 100644
index e8310cc..0000000
--- a/sphinx.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- cyrus-imapd-3.0.16/docsrc/exts/sphinxlocal/writers/manpage.py.orig 2022-06-07 10:16:14.013713399 +0200
-+++ cyrus-imapd-3.0.16/docsrc/exts/sphinxlocal/writers/manpage.py 2022-06-07 10:23:44.408058016 +0200
-@@ -38,7 +38,7 @@
- self.builder = builder
-
- def translate(self):
-- visitor = CyrusManualPageTranslator(self.builder, self.document)
-+ visitor = CyrusManualPageTranslator(self.document, self.builder)
- self.visitor = visitor
- self.document.walkabout(visitor)
- self.output = visitor.astext()
-@@ -49,8 +49,8 @@
- Custom translator.
- """
-
-- def __init__(self, builder, *args, **kwds):
-- BaseTranslator.__init__(self, builder, *args, **kwds)
-+ def __init__(self, document, builder, *args, **kwds):
-+ BaseTranslator.__init__(self, document, builder, *args, **kwds)
- self.builder = builder
-
- self.in_productionlist = 0
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/cyrus-imapd.git/commitdiff/854c4e138cb0b5d17bf15792798ba89eb35e4e5e
More information about the pld-cvs-commit
mailing list