Hello community,
here is the log from the commit of package cyrus-imapd for openSUSE:Factory
checked in at 2016-06-23 13:35:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cyrus-imapd (Old)
and /work/SRC/openSUSE:Factory/.cyrus-imapd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cyrus-imapd"
Changes:
--------
--- /work/SRC/openSUSE:Factory/cyrus-imapd/cyrus-imapd.changes 2015-11-17
14:22:53.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.cyrus-imapd.new/cyrus-imapd.changes
2016-06-23 13:35:58.000000000 +0200
@@ -1,0 +2,14 @@
+Fri May 27 12:28:46 UTC 2016 - tchva...@suse.com
+
+- Try to cleanup with spec-cleaner
+- Remove exit 0 in pre that stopped execution of the rest of the code
+- Update pre/post requires to be acutally correct
+- Disable stict-aliasing to avoid some problems
+
+-------------------------------------------------------------------
+Mon Dec 21 18:01:23 UTC 2015 - a...@ajaissle.de
+
+- Add cyrus-imapd-2.4.18-D19-Outlook_2013_XLIST.patch to add
+ Outlook 2013-compatible XLIST behaviour.
+
+-------------------------------------------------------------------
New:
----
cyrus-imapd-2.4.18-D19-Outlook_2013_XLIST.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cyrus-imapd.spec ++++++
--- /var/tmp/diff_new_pack.Y1Bzvj/_old 2016-06-23 13:36:00.000000000 +0200
+++ /var/tmp/diff_new_pack.Y1Bzvj/_new 2016-06-23 13:36:00.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package cyrus-imapd
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,35 +19,28 @@
%global cyrus_user cyrus
%global cyrus_group mail
%global cyrus_uid 96
-
%if 0%{?suse_version} >= 1220
# Systemd support not fully integrated, yet
#%%global with_systemd 1
%global with_systemd 0
%endif
-
%if 0%{?with_systemd}
%global _servicename cyrus-imapd
%else
%global _servicename cyrus
%endif
-
Name: cyrus-imapd
Version: 2.4.18
Release: 0
Summary: The Cyrus IMAP and POP Mail Server
License: BSD-3-Clause
Group: Productivity/Networking/Email/Servers
-
Url: http://www.cyrusimap.org
-
# Upstream sources
Source0: http://cyrusimap.org/releases/%{name}-%{version}.tar.gz
Source1: http://ftp.andrew.cmu.edu/pub/mibs/cmu/cmu.mib
-
# Distribution specific sources
Source10: cyrus-imapd-rc-2.tar.gz
-
# PATCH-FEATURE-UPSTREAM -- Add support for Dynamic Relay Authorization Control
Patch0: cyrus-imapd-2.4.17_drac_auth.patch
# PATCH-FEATURE-UPSTREAM -- Autocreate INBOX folders // included in 2.5
@@ -70,7 +63,9 @@
Patch29: cyrus-imapd-2.4.18-CVE-2015-8077.patch
# PATCH-FIX-UPSTREAM -- Fix for CVE-2015-8078
Patch30: cyrus-imapd-2.4.18-CVE-2015-8078.patch
-
+# PATCH-FIX-UPSTREAM -- Outlook 2013-compatible XLIST behaviour
+Patch31: cyrus-imapd-2.4.18-D19-Outlook_2013_XLIST.patch
+BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bison
BuildRequires: cyrus-sasl-devel
@@ -79,6 +74,7 @@
BuildRequires: ed
BuildRequires: flex
BuildRequires: krb5-devel
+BuildRequires: libtool
BuildRequires: net-snmp-devel
BuildRequires: openldap2-devel
BuildRequires: openslp-devel
@@ -86,81 +82,27 @@
BuildRequires: opie
BuildRequires: perl-Digest-SHA1
BuildRequires: pwdutils
-%if 0%{?with_systemd}
-BuildRequires: systemd
-%endif
BuildRequires: tcpd-devel
BuildRequires: zlib
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-
-%if 0%{?with_systemd}
-%{systemd_requires}
-%else
-Requires(pre): %{insserv_prereq}
-%endif
-Requires(pre): /usr/sbin/useradd /usr/sbin/usermod %{fillup_prereq} /bin/sed
-Requires(pre): /bin/awk /bin/grep /bin/cat /usr/bin/find /usr/bin/db_verify
sh-utils
-Requires(pre): aaa_base fileutils cyrus-sasl netcfg /usr/bin/strings pwdutils
-
Requires: perl-Cyrus-IMAP = %{version}
Requires: perl-Cyrus-SIEVE-managesieve = %{version}
-
+Requires(post): cyrus-sasl
+Requires(post): fileutils
+Requires(pre): pwdutils
Recommends: cron
Recommends: cyradm
Recommends: perl-TermReadLine-Gnu
-
+Conflicts: courier-imap
Conflicts: cyrus-imapd-kolab
-Conflicts: imap courier-imap
-
-%package snmp
-Summary: SNMP support for the Cyrus IMAP and POP Mail Server
-Group: Productivity/Networking/Email/Utilities
-Requires: %{name} = %{version}
-Requires: %{name}-snmp-mibs = %{version}
-Requires: net-snmp >= 5.0
-
-%package snmp-mibs
-Summary: MIBs for the Cyrus IMAP and POP Mail Server
-Group: Productivity/Networking/Email/Utilities
-
-%package utils
-Summary: Test tools for mail servers
-Group: Productivity/Networking/Email/Utilities
-Requires: cyrus-sasl-plain
-Conflicts: cyrus-imapd <= 2.3.18
-
-%package -n perl-Cyrus-IMAP
-Summary: Cyrus IMAP Perl Module
-Group: Development/Libraries/Perl
-%if 0%{?suse_version} < 1140
-Requires: perl = %{perl_version}
-%else
-%{perl_requires}
-%endif
-Conflicts: perl-Cyrus-IMAP-kolab
-
-%package -n cyradm
-Summary: Administration tool for the Cyrus IMAP server
-Group: Productivity/Networking/Email/Utilities
-Requires: perl(Cyrus::IMAP::Shell)
-Conflicts: cyrus-imapd <= 2.3.18
-
-%package -n perl-Cyrus-SIEVE-managesieve
-Summary: Cyrus SIEVE Perl Module
-Group: Development/Libraries/Perl
-%if 0%{?suse_version} < 1140
-Requires: perl = %{perl_version}
+Conflicts: imap
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%if 0%{?with_systemd}
+BuildRequires: systemd
+Requires(pre): %fillup_prereq
+%systemd_requires
%else
-%{perl_requires}
+Requires(pre): %insserv_prereq
%endif
-Recommends: perl-TermReadLine-Gnu
-Conflicts: perl-Cyrus-SIEVE-managesieve-kolab
-Conflicts: python-managesieve
-
-%package devel
-Summary: Libraries and Includes for %{name}
-Group: Development/Libraries/C and C++
-Conflicts: cyrus-imapd-kolab-devel
%description
The %{name} package contains the core of the Cyrus IMAP server.
@@ -190,6 +132,13 @@
store where possible when an email message is addressed to multiple
recipients, SIEVE provides server side email filtering.
+%package snmp
+Summary: SNMP support for the Cyrus IMAP and POP Mail Server
+Group: Productivity/Networking/Email/Utilities
+Requires: %{name} = %{version}
+Requires: %{name}-snmp-mibs = %{version}
+Requires: net-snmp >= 5.0
+
%description snmp
The %{name} package contains the core of the Cyrus IMAP server.
It is a scaleable enterprise mail system designed for use from
@@ -198,26 +147,68 @@
This package pulls in dependencies to enable SNMP support for %{name}.
+%package snmp-mibs
+Summary: MIBs for the Cyrus IMAP and POP Mail Server
+Group: Productivity/Networking/Email/Utilities
+
%description snmp-mibs
This package contains MIBs for the Cyrus IMAP server. They are required to use
%{name} with SNMP.
+%package utils
+Summary: Test tools for mail servers
+Group: Productivity/Networking/Email/Utilities
+Requires: cyrus-sasl-plain
+Conflicts: cyrus-imapd <= 2.3.18
+
%description utils
This package contains test tools for mail protocols (not only %{name}
specific).
-%description -n cyradm
-This package contains an administration tool for the Cyrus IMAP server.
+%package -n perl-Cyrus-IMAP
+Summary: Cyrus IMAP Perl Module
+Group: Development/Libraries/Perl
+Conflicts: perl-Cyrus-IMAP-kolab
+%if 0%{?suse_version} < 1140
+Requires: perl = %{perl_version}
+%else
+%{perl_requires}
+%endif
%description -n perl-Cyrus-IMAP
This package contains a Perl module for the Cyrus IMAP server.
+%package -n cyradm
+Summary: Administration tool for the Cyrus IMAP server
+Group: Productivity/Networking/Email/Utilities
+Requires: perl(Cyrus::IMAP::Shell)
+Conflicts: cyrus-imapd <= 2.3.18
+
+%description -n cyradm
+This package contains an administration tool for the Cyrus IMAP server.
+
+%package -n perl-Cyrus-SIEVE-managesieve
+Summary: Cyrus SIEVE Perl Module
+Group: Development/Libraries/Perl
+Recommends: perl-TermReadLine-Gnu
+Conflicts: perl-Cyrus-SIEVE-managesieve-kolab
+Conflicts: python-managesieve
+%if 0%{?suse_version} < 1140
+Requires: perl = %{perl_version}
+%else
+%{perl_requires}
+%endif
+
%description -n perl-Cyrus-SIEVE-managesieve
This package contains a Perl module for Cyrus SIEVE.
+%package devel
+Summary: Libraries and Includes for %{name}
+Group: Development/Libraries/C and C++
+Conflicts: cyrus-imapd-kolab-devel
+
%description devel
The %{name}-devel package contains header files and libraries
necessary for developing applications which use the imclient library.
-
%prep
%setup -q -a 10
%patch0 -p1
@@ -231,20 +222,21 @@
%patch28 -p1
%patch29 -p1
%patch30 -p1
+%patch31 -p1
# remove executable bit from docs
-find doc -type f -name '*.html' -exec %{__chmod} -x {} \;
+find doc -type f -name '*.html' -exec chmod -x {} \;
# remove cruft
-find doc -type f -a -name '.cvsignore' -exec %{__rm} -f {} \;
+find doc -type f -a -name '.cvsignore' -exec rm -f {} \;
%build
-%{__rm} -fr aclocal.m4 configure config.h.in autom4te.cache
+rm -fr aclocal.m4 configure config.h.in autom4te.cache
+# this is basically autoreconf
sh SMakefile
-export CFLAGS="%{?optflags}"
-
-%{configure} --localstatedir=%{_var}/lib \
+export CFLAGS="%{?optflags} -fno-strict-aliasing"
+%configure --localstatedir=%{_var}/lib \
--enable-idled \
--enable-murder \
--enable-netscapehack \
@@ -263,24 +255,24 @@
--with-lock=fcntl \
--with-openslp \
--with-openssl \
- --with-perl=%{__perl} \
+ --with-perl=perl \
--with-sasl \
--with-snmp \
--with-syslogfacility=DAEMON \
--with-zlib
-%{__make} depend %{?_smp_mflags}
-%{__make} %{?_smp_mflags}
+make depend %{?_smp_mflags}
+make %{?_smp_mflags}
%install
# Cyrus IMAP
-%{__make} install DESTDIR=%{buildroot}
+make %{?_smp_mflags} DESTDIR=%{buildroot} install
# make install results in make install within the perl modules subdir, so
# remove the stuff from buildroot to satisfy the picky rpm4, as we don't need
# it and use install_vendor for perl modules below
-%{__rm} -rf %{buildroot}%{perl_sitelib}
-%{__rm} -rf %{buildroot}%{perl_sitearch}
+rm -rf %{buildroot}%{perl_sitelib}
+rm -rf %{buildroot}%{perl_sitearch}
# Cyrus IMAP Perl modules
cd perl/imap
@@ -295,98 +287,93 @@
cd -
# after make install we can remove stuff we don't want in our packages
-%{__rm} -f doc/Makefile.dist*
-%{__rm} -rf doc/man
-%{__rm} -f doc/text/htmlstrip.c
-%{__rm} -f doc/text/Makefile
-%{__rm} -f tools/config2*
+rm -f doc/Makefile.dist*
+rm -rf doc/man
+rm -f doc/text/htmlstrip.c
+rm -f doc/text/Makefile
+rm -f tools/config2*
# remove Perl bootstrap files
-find %{buildroot}%{perl_vendorarch}/ -name '*.bs' -type f -exec %{__rm} {} \;
+find %{buildroot}%{perl_vendorarch}/ -name '*.bs' -type f -exec rm {} \;
# create /var/* directories
-%{__install} -d -m 750
%{buildroot}%{_var}/lib/imap/{db,log,msg,proc,quota,socket,user}
-%{__install} -d -m 700 %{buildroot}%{_var}/lib/imap/ptclient
-%{__install} -d -m 750 %{buildroot}%{_var}/lib/sieve
-%{__install} -d -m 750 %{buildroot}%{_var}/spool/imap
-%{__install} -d -m 750 %{buildroot}%{_var}/adm/backup/imap
+install -d -m 750
%{buildroot}%{_var}/lib/imap/{db,log,msg,proc,quota,socket,user}
+install -d -m 700 %{buildroot}%{_var}/lib/imap/ptclient
+install -d -m 750 %{buildroot}%{_var}/lib/sieve
+install -d -m 750 %{buildroot}%{_var}/spool/imap
+install -d -m 750 %{buildroot}%{_var}/adm/backup/imap
for i in a b c d e f g h i j k l m n o p q r s t u v w x y z; do
- %{__install} -d -m 755 %{buildroot}%{_var}/lib/imap/user/$i
- %{__install} -d -m 755 %{buildroot}%{_var}/lib/imap/quota/$i
- %{__install} -d -m 750 %{buildroot}%{_var}/lib/sieve/$i
+ install -d -m 755 %{buildroot}%{_var}/lib/imap/user/$i
+ install -d -m 755 %{buildroot}%{_var}/lib/imap/quota/$i
+ install -d -m 750 %{buildroot}%{_var}/lib/sieve/$i
done
# sysconfig
-%{__install} -d %{buildroot}%{_var}/adm/fillup-templates
-%{__install} -m 644 SUSE/sysconfig.cyrus-imapd
%{buildroot}%{_var}/adm/fillup-templates/sysconfig.%{_servicename}
+install -d %{buildroot}%{_var}/adm/fillup-templates
+install -m 644 SUSE/sysconfig.cyrus-imapd
%{buildroot}%{_var}/adm/fillup-templates/sysconfig.%{_servicename}
%if 0%{?with_systemd}
# systemd
-%{__install} -d %{buildroot}{%{_unitdir},%{_sbindir},%{_sysconfdir}/profile.d}
-%{__install} -m 644 SUSE/cyrus-imapd.service
%{buildroot}%{_unitdir}/%{_servicename}.service
-%if 0%{?suse_version} >= 1310
-%{__ln_s} %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{_servicename}
-%else
-%{__ln_s} /sbin/service %{buildroot}%{_sbindir}/rc%{_servicename}
-%endif
+install -d %{buildroot}{%{_unitdir},%{_sbindir},%{_sysconfdir}/profile.d}
+install -m 644 SUSE/cyrus-imapd.service
%{buildroot}%{_unitdir}/%{_servicename}.service
+ln -s service %{buildroot}%{_sbindir}/rc%{_servicename}
echo 'alias rccyrus >/dev/null 2>&1 || alias
rccyrus=%{_sbindir}/rc%{_servicename}' >
%{buildroot}%{_sysconfdir}/profile.d/%{name}.alias.sh
%else
# sysvinit
-%{__install} -d %{buildroot}{%{_sysconfdir}/init.d,%{_sbindir}}
-%{__install} -m 755 SUSE/rc.cyrus %{buildroot}%{_initrddir}/%{_servicename}
-%{__ln_s} %{_initrddir}/%{_servicename}
%{buildroot}%{_sbindir}/rc%{_servicename}
+install -d %{buildroot}{%{_sysconfdir}/init.d,%{_sbindir}}
+install -m 755 SUSE/rc.cyrus %{buildroot}%{_initddir}/%{_servicename}
+ln -s %{_initddir}/%{_servicename} %{buildroot}%{_sbindir}/rc%{_servicename}
%endif
# cron
-%{__install} -d %{buildroot}%{_sysconfdir}/cron.daily
-%{__install} -m 755 SUSE/cron.daily.cyrus
%{buildroot}%{_sysconfdir}/cron.daily/suse.de-%{name}
+install -d %{buildroot}%{_sysconfdir}/cron.daily
+install -m 755 SUSE/cron.daily.cyrus
%{buildroot}%{_sysconfdir}/cron.daily/suse.de-%{name}
# pam
-%{__install} -d %{buildroot}%{_sysconfdir}/pam.d
-%{__install} -m 644 SUSE/imap %{buildroot}%{_sysconfdir}/pam.d/imap
-%{__install} -m 644 SUSE/pop %{buildroot}%{_sysconfdir}/pam.d/pop
-%{__install} -m 644 SUSE/sieve %{buildroot}%{_sysconfdir}/pam.d/sieve
+install -d %{buildroot}%{_sysconfdir}/pam.d
+install -m 644 SUSE/imap %{buildroot}%{_sysconfdir}/pam.d/imap
+install -m 644 SUSE/pop %{buildroot}%{_sysconfdir}/pam.d/pop
+install -m 644 SUSE/sieve %{buildroot}%{_sysconfdir}/pam.d/sieve
# SuSEfirewall2
-%{__install} -d %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/
-%{__install} -m 644 SUSE/SuSEfirewall2.%{name}
%{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
+install -d %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/
+install -m 644 SUSE/SuSEfirewall2.%{name}
%{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
# default config
-%{__install} -m 644 SUSE/imapd.conf %{buildroot}%{_sysconfdir}/imapd.conf
-%{__install} -m 644 SUSE/imapd.annotations.conf
%{buildroot}%{_sysconfdir}/imapd.annotations.conf
-%{__install} -m 644 SUSE/cyrus.conf %{buildroot}%{_sysconfdir}/cyrus.conf
+install -m 644 SUSE/imapd.conf %{buildroot}%{_sysconfdir}/imapd.conf
+install -m 644 SUSE/imapd.annotations.conf
%{buildroot}%{_sysconfdir}/imapd.annotations.conf
+install -m 644 SUSE/cyrus.conf %{buildroot}%{_sysconfdir}/cyrus.conf
# DB_CONFIG
-%{__install} -m 644 SUSE/DB_CONFIG %{buildroot}%{_var}/lib/imap/db
+install -m 644 SUSE/DB_CONFIG %{buildroot}%{_var}/lib/imap/db
# tools
-%{__install} -d %{buildroot}%{_prefix}/lib/cyrus/tools
-%{__install} -m 755 tools/* %{buildroot}%{_prefix}/lib/cyrus/tools/
+install -d %{buildroot}%{_prefix}/lib/cyrus/tools
+install -m 755 tools/* %{buildroot}%{_prefix}/lib/cyrus/tools/
# snmp
-%{__install} -d %{buildroot}%{_datadir}/snmp/mibs/
-%{__install} -m 644 %{SOURCE1} %{buildroot}%{_datadir}/snmp/mibs/CMU.mib
-%{__install} -m 644 master/CYRUS-MASTER.mib
%{buildroot}%{_datadir}/snmp/mibs/CYRUS-MASTER.mib
+install -d %{buildroot}%{_datadir}/snmp/mibs/
+install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/snmp/mibs/CMU.mib
+install -m 644 master/CYRUS-MASTER.mib
%{buildroot}%{_datadir}/snmp/mibs/CYRUS-MASTER.mib
# rename manual to avoid conflicts
-%{__mv} %{buildroot}%{_mandir}/man8/master.8
%{buildroot}%{_mandir}/man8/cyrus_master.8
-%{__mv} %{buildroot}%{_mandir}/man8/idled.8
%{buildroot}%{_mandir}/man8/cyrus_idled.8
-%{__mv} %{buildroot}%{_mandir}/man8/fetchnews.8
%{buildroot}%{_mandir}/man8/cyrus_fetchnews.8
+mv %{buildroot}%{_mandir}/man8/master.8
%{buildroot}%{_mandir}/man8/cyrus_master.8
+mv %{buildroot}%{_mandir}/man8/idled.8
%{buildroot}%{_mandir}/man8/cyrus_idled.8
+mv %{buildroot}%{_mandir}/man8/fetchnews.8
%{buildroot}%{_mandir}/man8/cyrus_fetchnews.8
%pre
getent group %{cyrus_group} >/dev/null || groupadd -r %{cyrus_group}
-getent passwd %{cyrus_user} >/dev/null || useradd -r -o -g %{cyrus_group} -u
%{cyrus_uid} -d /var/lib/imap -s /sbin/nologin -c "user for %{name}"
%{cyrus_user}
-usermod -d /var/lib/imap %{cyrus_user} || :
-exit 0
+getent passwd %{cyrus_user} >/dev/null || useradd -r -o -g %{cyrus_group} -u
%{cyrus_uid} -d %{_localstatedir}/lib/imap -s /sbin/nologin -c "user for
%{name}" %{cyrus_user}
+usermod -d %{_localstatedir}/lib/imap %{cyrus_user} || :
%if 0%{?with_systemd}
-%{service_add_pre %{_servicename}.service}
+%service_add_pre %{_servicename}.service
%endif
%preun
%if 0%{?with_systemd}
-%{service_del_preun %{_servicename}.service}
+%service_del_preun %{_servicename}.service
%else
-%{stop_on_removal %{_servicename}}
+%stop_on_removal %{_servicename}
%endif
%post
@@ -401,28 +388,28 @@
IMAPUP=
}
test -n "$SIEVEUP" && {
- echo "Creating compatibility symlink /var/lib/sieve -> /usr/sieve"
+ echo "Creating compatibility symlink %{_localstatedir}/lib/sieve ->
%{_prefix}/sieve"
rm -rf var/lib/sieve
- ln -sf ../../usr/sieve var/lib/sieve
+ ln -sf ../..%{_prefix}/sieve var/lib/sieve
}
test -n "$IMAPUP" && {
- echo "Creating compatibility symlink /var/lib/imap -> /var/imap"
+ echo "Creating compatibility symlink %{_localstatedir}/lib/imap ->
%{_localstatedir}/imap"
rm -rf var/lib/imap
- ln -sf ../imap /var/lib/imap
+ ln -sf ../imap %{_localstatedir}/lib/imap
}
%if 0%{?with_systemd}
%{fillup_only %{_servicename}}
-%{service_add_post %{_servicename}.service}
+%service_add_post %{_servicename}.service
%else
%{fillup_and_insserv %{_servicename}}
%endif
%postun
%if 0%{?with_systemd}
-%{service_del_postun %{_servicename}.service}
+%service_del_postun %{_servicename}.service
%else
-%{restart_on_update %{_servicename}}
-%{insserv_cleanup}
+%restart_on_update %{_servicename}
+%insserv_cleanup
%endif
%files
@@ -451,13 +438,13 @@
%{_unitdir}/%{_servicename}.service
%config %{_sysconfdir}/profile.d/%{name}.alias.sh
%else
-%{_initrddir}/%{_servicename}
+%{_initddir}/%{_servicename}
%endif
%{_sbindir}/rc%{_servicename}
%{_prefix}/lib/cyrus
-%doc %{_mandir}/man3/imclient.3.gz
-%doc %{_mandir}/man5/*.gz
-%doc %{_mandir}/man8/*.gz
+%{_mandir}/man3/imclient.3%{ext_man}
+%{_mandir}/man5/*%{ext_man}
+%{_mandir}/man8/*%{ext_man}
%doc COPYRIGHT README README.andrew doc master/conf
%doc SUSE/README.SUSE
@@ -482,18 +469,18 @@
%{_bindir}/sivtest
%{_bindir}/smtptest
%{_bindir}/synctest
-%doc %{_mandir}/man1/imtest.1.gz
-%doc %{_mandir}/man1/lmtptest.1.gz
-%doc %{_mandir}/man1/mupdatetest.1.gz
-%doc %{_mandir}/man1/nntptest.1.gz
-%doc %{_mandir}/man1/pop3test.1.gz
-%doc %{_mandir}/man1/sivtest.1.gz
-%doc %{_mandir}/man1/smtptest.1.gz
+%{_mandir}/man1/imtest.1%{ext_man}
+%{_mandir}/man1/lmtptest.1%{ext_man}
+%{_mandir}/man1/mupdatetest.1%{ext_man}
+%{_mandir}/man1/nntptest.1%{ext_man}
+%{_mandir}/man1/pop3test.1%{ext_man}
+%{_mandir}/man1/sivtest.1%{ext_man}
+%{_mandir}/man1/smtptest.1%{ext_man}
%files -n cyradm
%defattr(-, root, root)
%{_bindir}/cyradm
-%doc %{_mandir}/man1/cyradm.1.gz
+%{_mandir}/man1/cyradm.1%{ext_man}
%files -n perl-Cyrus-IMAP
%defattr(-, root, root)
@@ -502,25 +489,25 @@
%{perl_vendorarch}/Cyrus/IMAP.pm
%dir %{perl_vendorarch}/auto/Cyrus
%{perl_vendorarch}/auto/Cyrus/IMAP
-%if %{suse_version} < 1140
+%if 0%{?suse_version} < 1140
%{_var}/adm/perl-modules/perl-Cyrus-IMAP
%endif
-%doc %{_mandir}/man3/Cyrus::IMAP*
+%{_mandir}/man3/Cyrus::IMAP*
%files -n perl-Cyrus-SIEVE-managesieve
%defattr(-, root, root)
%{_bindir}/installsieve
%{_bindir}/sieveshell
-%doc %{_mandir}/man1/installsieve.1.gz
-%doc %{_mandir}/man1/sieveshell.1.gz
+%{_mandir}/man1/installsieve.1%{ext_man}
+%{_mandir}/man1/sieveshell.1%{ext_man}
%dir %{perl_vendorarch}/Cyrus
%{perl_vendorarch}/Cyrus/SIEVE
%dir %{perl_vendorarch}/auto/Cyrus
%{perl_vendorarch}/auto/Cyrus/SIEVE
-%if %{suse_version} < 1140
+%if 0%{?suse_version} < 1140
%{_var}/adm/perl-modules/perl-Cyrus-SIEVE-managesieve
%endif
-%doc %{_mandir}/man3/Cyrus::SIEVE::managesieve.3pm.gz
+%{_mandir}/man3/Cyrus::SIEVE::managesieve.3pm%{ext_man}
%files devel
%defattr(-, root, root)
++++++ cyrus-imapd-2.4.18-D19-Outlook_2013_XLIST.patch ++++++
diff -Ppru cyrus-imapd-2.4.18.orig/imap/imapd.c cyrus-imapd-2.4.18/imap/imapd.c
--- cyrus-imapd-2.4.18.orig/imap/imapd.c 2015-07-06 05:38:29.000000000
+0200
+++ cyrus-imapd-2.4.18/imap/imapd.c 2015-12-21 18:00:27.551941924 +0100
@@ -6002,7 +6002,11 @@ void cmd_list(char *tag, struct listargs
list_callback_calls = 0;
- if (!listargs->pat->s[0] && !(listargs->cmd & LIST_CMD_LSUB)) {
+ if (!listargs->pat->s[0] && (listargs->cmd == LIST_CMD_LIST)) {
+ /* special case: query top-level hierarchy separator */
+ prot_printf(imapd_out, "* LIST (\\Noselect) \"%c\" \"\"\r\n",
+ imapd_namespace.hier_sep);
+ } else if (!listargs->pat->s[0] && (listargs->cmd == LIST_CMD_XLIST)) {
/* special case: query top-level hierarchy separator */
prot_printf(imapd_out, "* LIST (\\Noselect) \"%c\" \"\"\r\n",
imapd_namespace.hier_sep);
