Request 2169 (superseded)

This request is superseded by request 2171 (Show diff)

Overview

Request 2169 (superseded)

Move checking /dev/null up a bit

Created by vanmeeuwen almost 7 years ago
In state superseded
Superseded by 2171
Open review for Admin
Open review for vanmeeuwen

Submit cyrus-imapd

Submit package Kolab:Winterfell / cyrus-imapd to package Kolab:16 / cyrus-imapd

cyrus-imapd.spec Changed

@@ -18,9 +18,9 @@
 %global _cyrusgroup mail
 %global _cyrexecdir %{_exec_prefix}/lib/%{name}
 
-%global tag_version 2.5.17
-%global revision    34
-%global git_hash    3e2a85d6e
+%global tag_version 2.5.11
+%global revision    41
+%global git_hash    gd53406f3f
 
 ##
 ## Options
@@ -36,8 +36,8 @@
 
 Name:               cyrus-imapd
 Summary:            A high-performance mail server with IMAP, POP3, NNTP and SIEVE support
-Version:            %{tag_version}.%{revision}
-Release:            1%{?dist}
+Version:            %{tag_version}
+Release:            0.%{revision}.%{git_hash}%{?dist}
 License:            BSD
 Group:              System Environment/Daemons
 URL:                http://www.cyrusimap.org
@@ -63,6 +63,8 @@
 ##
 ## Patches
 ##
+Patch0001:          0001-dlist-Use-int8_t-in-dlist_parsemap.patch
+Patch0002:          0002-Avoid-returning-1-as-255.patch
 
 BuildRoot:          %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -263,6 +265,11 @@
 sed -r -i -e 's/"berkeley(|-[a-z-]+)", //g' lib/imapoptions
 %endif
 
+%if %{_arch} == "ppc64le"
+%patch0001 -p1
+%patch0002 -p1
+%endif
+
 # only to update config.* files
 autoreconf -vi || (libtoolize --force && autoreconf -vi)
 
@@ -628,12 +635,11 @@
 %{_cyrexecdir}/cyr_deny
 %{_cyrexecdir}/cyr_df
 %{_cyrexecdir}/cyr_info
-#%%{_cyrexecdir}/ctl_conversationsdb
+#%{_cyrexecdir}/ctl_conversationsdb
 %{_cyrexecdir}/ctl_cyrusdb
 %{_cyrexecdir}/ctl_deliver
 %{_cyrexecdir}/ctl_mboxlist
 %{_cyrexecdir}/cvt_cyrusdb
-%{_cyrexecdir}/cyr_buildinfo
 %{_cyrexecdir}/cyr_dbtool
 %{_cyrexecdir}/cyr_expire
 %{_cyrexecdir}/cyr_sequence
@@ -649,7 +655,7 @@
 %{_cyrexecdir}/fixsearchpath.pl
 %{_cyrexecdir}/fud
 %exclude %{_cyrexecdir}/git-version.sh
-#%%{_cyrexecdir}/hammer_cyrusdb
+#%{_cyrexecdir}/hammer_cyrusdb
 %{_cyrexecdir}/imapd
 %{_cyrexecdir}/ipurge
 %exclude %{_cyrexecdir}/jenkins-build.sh
@@ -659,7 +665,7 @@
 %{_cyrexecdir}/mbexamine
 %{_cyrexecdir}/mbpath
 %{_cyrexecdir}/mbtool
-#%%{_cyrexecdir}/message_test
+#%{_cyrexecdir}/message_test
 %{_cyrexecdir}/migrate-metadata
 %{_cyrexecdir}/mkimap
 %{_cyrexecdir}/mknewsgroups
@@ -668,11 +674,11 @@
 %{_cyrexecdir}/quota
 %{_cyrexecdir}/reconstruct
 %{_cyrexecdir}/rehash
-#%%{_cyrexecdir}/search_test
+#%{_cyrexecdir}/search_test
 %{_cyrexecdir}/sievec
 %{_cyrexecdir}/sieved
 %{_cyrexecdir}/smmapd
-#%%{_cyrexecdir}/squat_dump
+#%{_cyrexecdir}/squat_dump
 %{_cyrexecdir}/squatter
 %{_cyrexecdir}/timsieved
 %{_cyrexecdir}/tls_prune
@@ -742,34 +748,14 @@
 
 %files devel
 %defattr(0644,root,root,0755)
+%files devel
+%defattr(0644,root,root,0755)
 %{_includedir}/cyrus
 %{_libdir}/pkgconfig/*cyrus*.pc
 %{_libdir}/*.so
 %{_libdir}/*.la
 
 %changelog
-* Wed Jul 28 2021 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.5.17.34-1
-- Check in 34 revisions ahead of upstream 2.5.17 release
-
-* Wed Jan 29 2020 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.5.15.28-1
-- Fix MessageExpunge event notification when executed from system
-
-* Tue Oct 29 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 2.5.13.40-1
-- Include the user or group ID in failed login attempts
-
-* Wed Oct 23 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 2.5.13.36-1
-- Rebase on to upstream -2.5 series
-- Fix ptloader group membership (Bifrost T250286)
-
-* Mon Aug 19 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 2.5.12.30-1
-- Rebase on to upstream 2.5.13
-
-* Tue Mar 12 2019 Timotheus Pokorra <tp@tbits.net> - 2.5.12.25-2
-- Backport patch from upstream for canonification for multiple domains
-
-* Wed Jan  2 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 2.5.12.25-1
-- Rebase on to upstream 2.5.12
-
 * Tue Oct 17 2017 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.5.11-4
 - Fix potentially non-readable, non-writeable /dev/null

0001-dlist-Use-int8_t-in-dlist_parsemap.patch Added

@@ -0,0 +1,35 @@
+From 18077fc3c77ab9d62e8691d853e5516a7a765281 Mon Sep 17 00:00:00 2001
+From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
+Date: Fri, 25 Aug 2017 15:17:27 +0200
+Subject: [PATCH 1/2] [dlist]: Use int8_t in dlist_parsemap()
+
+Resolves #2119
+---
+ imap/dlist.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/imap/dlist.c b/imap/dlist.c
+index c93b85c..83ae73d 100644
+--- a/imap/dlist.c
++++ b/imap/dlist.c
+@@ -843,7 +843,7 @@ EXPORTED char dlist_parse(struct dlist **dlp, int parsekey, struct protstream *i
+     struct dlist *dl = NULL;
+     static struct buf kbuf;
+     static struct buf vbuf;
+-    int c;
++    int8_t c;
+ 
+     /* handle the key if wanted */
+     if (parsekey) {
+@@ -957,7 +957,7 @@ EXPORTED int dlist_parsemap(struct dlist **dlp, int parsekey,
+ 		   const char *base, unsigned len)
+ {
+     struct protstream *stream;
+-    char c;
++    int8_t c;
+     struct dlist *dl = NULL;
+ 
+     stream = prot_readmap(base, len);
+-- 
+1.8.3.1
+

0002-Avoid-returning-1-as-255.patch Added

cyr_systemd_helper Changed

cyrus-imapd-2.5.11-41-gd53406f3f.tar.gz Added

cyrus-imapd-2.5.17-34-3e2a85d6e.tar.gz Deleted

cyrus-imapd.cvt_cyrusdb_all Changed

cyrus-imapd.dsc Changed

debian.changelog Changed

@@ -1,48 +1,3 @@
-cyrus-imapd (2.5.17.34-0~kolab1) unstable; urgency=low
-
-  * Check in 34 revisions ahead of the upsteam 2.5.17 release
-
- -- Jeroen van Meeuwen <vanmeeuwen@apheleia-it.ch>  Wed, 28 Jul 2021 11:30:13 +0100
-
-cyrus-imapd (2.5.15.28-0~kolab1) unstable; urgency=low
-
-  * Ensure MessageExpunge notifications include a user parameter even if it is (none)
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu, 30 Jan 2020 11:30:13 +0100
-
-cyrus-imapd (2.5.13.36-0~kolab4) unstable; urgency=low
-
-  * added patch: 0003-Canonification-for-multiple-domains.patch
-  * added cyrus-(admin,clients,murder,nntpd,pop3d,replication) to Provides
-    Control field to match vanilla cyrus-imapd packages
-
- -- Daniel Hoffend <dh@dotlan.net>  Sun, 24 Nov 2019 01:44:00 +0100
-
-cyrus-imapd (2.5.13.36-0~kolab3) unstable; urgency=low
-
-  * Include the user or group ID in failed authentication attempts
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue, 29 Oct 2019 11:30:13 +0100
-
-cyrus-imapd (2.5.13.36-0~kolab2) unstable; urgency=low
-
-  * Rebase on to upstream 2.5.13
-  * Fix ptloader group membership (Bifrost T250286)
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed, 23 Oct 2019 11:30:13 +0100
-
-cyrus-imapd (2.5.13.30-0~kolab2) unstable; urgency=low
-
-  * Rebase on to upstream 2.5.13
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Mon, 19 Aug 2019 11:30:13 +0100
-
-cyrus-imapd (2.5.12.25-0~kolab1) unstable; urgency=low
-
-  * Rebase on to upstream 2.5.12
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed,  2 Jan 2019 11:30:13 +0100
-
 cyrus-imapd (2.5.11.41-0~kolab2) unstable; urgency=low
 
   * Fix potential non-writeable /dev/null and consequences

debian.control Changed

Build Results
RPM Lint

Refresh

Comments for request 2169 0

Request History

vanmeeuwen created request almost 7 years ago

Move checking /dev/null up a bit

vanmeeuwen superseded request almost 7 years ago

superseded by 2171