commit cyrus-imapd for openSUSE:Factory

2019-08-05 Thread root
Hello community,

here is the log from the commit of package cyrus-imapd for openSUSE:Factory 
checked in at 2019-08-05 10:41:23

Comparing /work/SRC/openSUSE:Factory/cyrus-imapd (Old)
 and  /work/SRC/openSUSE:Factory/.cyrus-imapd.new.4126 (New)


Package is "cyrus-imapd"

Mon Aug  5 10:41:23 2019 rev:74 rq:720715 version:2.4.20

Changes:

--- /work/SRC/openSUSE:Factory/cyrus-imapd/cyrus-imapd.changes  2019-01-25 
22:45:20.619081868 +0100
+++ /work/SRC/openSUSE:Factory/.cyrus-imapd.new.4126/cyrus-imapd.changes
2019-08-05 10:41:45.779296202 +0200
@@ -1,0 +2,8 @@
+Fri Jul 19 10:18:30 UTC 2019 - matthias.gerst...@suse.com
+
+- removal of SuSEfirewall2 service, since SuSEfirewall2 has been replaced by
+  firewalld, see [1].
+
+  [1]: https://lists.opensuse.org/opensuse-factory/2019-01/msg00490.html
+
+---



Other differences:
--
++ cyrus-imapd.spec ++
--- /var/tmp/diff_new_pack.oIjF90/_old  2019-08-05 10:41:47.303296027 +0200
+++ /var/tmp/diff_new_pack.oIjF90/_new  2019-08-05 10:41:47.307296027 +0200
@@ -341,10 +341,6 @@
 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}
-
 # default config
 install -m 644 SUSE/imapd.conf %{buildroot}%{_sysconfdir}/imapd.conf
 install -m 644 SUSE/imapd.annotations.conf 
%{buildroot}%{_sysconfdir}/imapd.annotations.conf
@@ -420,7 +416,6 @@
 %config(noreplace) %{_sysconfdir}/imapd.conf
 %config(noreplace) %{_sysconfdir}/imapd.annotations.conf
 %config(noreplace) %{_sysconfdir}/cyrus.conf
-%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
 %dir %attr(0750, %{cyrus_user}, %{cyrus_group}) %{_var}/lib/imap
 %attr(0750, %{cyrus_user}, %{cyrus_group}) %{_var}/lib/imap/log
 %attr(0750, %{cyrus_user}, %{cyrus_group}) %{_var}/lib/imap/msg


++ cyrus-imapd-rc-2.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/SUSE/SuSEfirewall2.cyrus-imapd 
new/SUSE/SuSEfirewall2.cyrus-imapd
--- old/SUSE/SuSEfirewall2.cyrus-imapd  2007-03-15 11:06:19.0 +0100
+++ new/SUSE/SuSEfirewall2.cyrus-imapd  1970-01-01 01:00:00.0 +0100
@@ -1,17 +0,0 @@
-## Name: cyrus-imapd Server
-## Description: Opens ports for the cyrus-imapd Server.
-
-# space separated list of allowed TCP ports
-TCP="imap imaps pop3 pop3s sieve"
-
-# space separated list of allowed UDP ports
-UDP=""
-
-# space separated list of allowed RPC services
-RPC=""
-
-# space separated list of allowed IP protocols
-IP=""
-
-# space separated list of allowed UDP broadcast ports
-BROADCAST=""




commit cyrus-imapd for openSUSE:Factory

2019-01-25 Thread root
Hello community,

here is the log from the commit of package cyrus-imapd for openSUSE:Factory 
checked in at 2019-01-25 22:45:20

Comparing /work/SRC/openSUSE:Factory/cyrus-imapd (Old)
 and  /work/SRC/openSUSE:Factory/.cyrus-imapd.new.28833 (New)


Package is "cyrus-imapd"

Fri Jan 25 22:45:20 2019 rev:73 rq:668460 version:2.4.20

Changes:

--- /work/SRC/openSUSE:Factory/cyrus-imapd/cyrus-imapd.changes  2019-01-21 
10:57:53.663467161 +0100
+++ /work/SRC/openSUSE:Factory/.cyrus-imapd.new.28833/cyrus-imapd.changes   
2019-01-25 22:45:20.619081868 +0100
@@ -1,0 +2,9 @@
+Wed Jan 23 12:22:35 UTC 2019 - lie...@rz.uni-mannheim.de
+
+- Update to 2.4.20
+  * Fixed: lmtpd crash
+  * Fixed: auth_pts will now error if its configured socket path is
+too long for its buffer
+- Removed cyrus-imapd-2.4.19-lmtpd_crash.patch
+
+---

Old:

  cyrus-imapd-2.4.19-lmtpd_crash.patch
  cyrus-imapd-2.4.19.tar.gz
  cyrus-imapd-2.4.19.tar.gz.sig

New:

  cyrus-imapd-2.4.20.tar.gz
  cyrus-imapd-2.4.20.tar.gz.sig



Other differences:
--
++ cyrus-imapd.spec ++
--- /var/tmp/diff_new_pack.x7j8bq/_old  2019-01-25 22:45:21.563080704 +0100
+++ /var/tmp/diff_new_pack.x7j8bq/_new  2019-01-25 22:45:21.563080704 +0100
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 
@@ -39,7 +39,7 @@
 %global _servicenamecyrus
 %endif
 Name:   cyrus-imapd
-Version:2.4.19
+Version:2.4.20
 Release:0
 Summary:The Cyrus IMAP and POP Mail Server
 License:BSD-3-Clause
@@ -69,8 +69,6 @@
 Patch28:cyrus-imapd-2.4.19-implicit_definitions.patch
 # PATCH-FIX-UPSTREAM -- Outlook 2013-compatible XLIST behaviour
 Patch31:cyrus-imapd-2.4.18-D19-Outlook_2013_XLIST.patch
-# PATCH-FIX-UPSTREAM -- lmtpd: fix uninitialised variable crash
-Patch32:cyrus-imapd-2.4.19-lmtpd_crash.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  bison
@@ -221,7 +219,6 @@
 %patch27 -p1
 %patch28 -p1
 %patch31 -p1
-%patch32 -p1
 
 # remove executable bit from docs
 find doc -type f -name '*.html' -exec chmod -x {} +

++ cyrus-imapd-2.4.19.tar.gz -> cyrus-imapd-2.4.20.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/Makefile.in 
new/cyrus-imapd-2.4.20/Makefile.in
--- old/cyrus-imapd-2.4.19/Makefile.in  2017-05-15 07:43:30.0 +0200
+++ new/cyrus-imapd-2.4.20/Makefile.in  2017-08-18 02:29:14.0 +0200
@@ -64,7 +64,7 @@
 COMPILE_ET = @COMPILE_ET@
 
 PACKAGE = cyrus-imapd
-VERSION = 2.4.19
+VERSION = 2.4.20
 GIT_VERSION = $(VERSION).git$(shell date +'%Y%m%d%H%M')
 
 all:: xversion
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/autom4te.cache/requests 
new/cyrus-imapd-2.4.20/autom4te.cache/requests
--- old/cyrus-imapd-2.4.19/autom4te.cache/requests  2017-05-15 
07:53:39.0 +0200
+++ new/cyrus-imapd-2.4.20/autom4te.cache/requests  2017-08-18 
02:57:00.0 +0200
@@ -31,79 +31,79 @@
 'configure.in'
   ],
   {
-'IPv6_CHECK_FUNC' => 1,
-'CMU_TEST_LIBPATH' => 1,
-'CMU_C_FPIC' => 1,
+'CMU_KRB_INC_WHERE' => 1,
+'AC_CONFIG_MACRO_DIR_TRACE' => 1,
 'CMU_ADD_LIBPATH_TO' => 1,
-'CMU_SASL2' => 1,
-'_AM_AUTOCONF_VERSION' => 1,
-'CMU_AFS_LIB_WHERE1' => 1,
-'CMU_FIND_LIB_SUBDIR' => 1,
-'CYRUS_BERKELEY_DB_CHK' => 1,
-'CMU_SASL2_REQUIRE_VER' => 1,
 'include' => 1,
-'m4_pattern_allow' => 1,
-'CMU_KRB_LIB_WHERE1' => 1,
-'AC_DEFUN' => 1,
+'_AM_AUTOCONF_VERSION' => 1,
+'CMU_AFS_WHERE' => 1,
+'CMU_KRB_SET_KEY_PROTO' => 1,
 'CMU_SOCKETS' => 1,
-'CYRUS_BERKELEY_DB_CHK_LIB' => 1,
-'CMU_LIBSSL_LIB_WHERE' => 1,
+'CYRUS_SQLITE_CHK_LIB' => 1,
 'CMU_UCDSNMP' => 1,
-'CMU_C___ATTRIBUTE__' => 1,
-'CYRUS_SQLITE_CHK' => 1,
+

commit cyrus-imapd for openSUSE:Factory

2019-01-21 Thread root
Hello community,

here is the log from the commit of package cyrus-imapd for openSUSE:Factory 
checked in at 2019-01-21 10:57:28

Comparing /work/SRC/openSUSE:Factory/cyrus-imapd (Old)
 and  /work/SRC/openSUSE:Factory/.cyrus-imapd.new.28833 (New)


Package is "cyrus-imapd"

Mon Jan 21 10:57:28 2019 rev:72 rq:666435 version:2.4.19

Changes:

--- /work/SRC/openSUSE:Factory/cyrus-imapd/cyrus-imapd.changes  2018-12-04 
20:55:33.260771040 +0100
+++ /work/SRC/openSUSE:Factory/.cyrus-imapd.new.28833/cyrus-imapd.changes   
2019-01-21 10:57:53.663467161 +0100
@@ -1,0 +2,14 @@
+Wed Jan 16 10:09:23 UTC 2019 - Peter Varkoly 
+
+- bsc#1119629 cyrus-imapd.service contains bogus User and Groupi 
+specification
+- bsc#1115999 Please convert SysV init scripts by cyrus-imapd 
+into native systemd services
+  - Removed User and Group from the service file
+
+---
+Tue Dec  4 10:42:49 UTC 2018 - Jan Engelhardt 
+
+- Avoid repeated emission of the %service_* boilerplate.
+
+---



Other differences:
--
++ cyrus-imapd.spec ++
--- /var/tmp/diff_new_pack.XVnNug/_old  2019-01-21 10:57:54.255466388 +0100
+++ /var/tmp/diff_new_pack.XVnNug/_new  2019-01-21 10:57:54.255466388 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package cyrus-imapd
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -371,16 +371,12 @@
 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 %{with systemd}
-%service_add_pre %{_servicename}.service
-%service_add_pre backup-cyrus.service
-%service_add_pre backup-cyrus.timer
+%service_add_pre %{_servicename}.service backup-cyrus.service 
backup-cyrus.timer
 %endif
 
 %preun
 %if %{with systemd}
-%service_del_preun %{_servicename}.service
-%service_del_preun backup-cyrus.service
-%service_del_preun backup-cyrus.timer
+%service_del_preun %{_servicename}.service backup-cyrus.service 
backup-cyrus.timer
 %else
 %stop_on_removal %{_servicename}
 %endif
@@ -408,18 +404,14 @@
 }
 %if %{with systemd}
 %{fillup_only %{_servicename}}
-%service_add_post %{_servicename}.service
-%service_add_post backup-cyrus.service
-%service_add_post backup-cyrus.timer
+%service_add_post %{_servicename}.service backup-cyrus.service 
backup-cyrus.timer
 %else
 %{fillup_and_insserv %{_servicename}}
 %endif
 
 %postun
 %if %{with systemd}
-%service_del_postun %{_servicename}.service
-%service_del_postun backup-cyrus.service
-%service_del_postun backup-cyrus.timer
+%service_del_postun %{_servicename}.service backup-cyrus.service 
backup-cyrus.timer
 %else
 %restart_on_update %{_servicename}
 %insserv_cleanup


++ cyrus-imapd-rc-2.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/SUSE/cyrus-imapd.service new/SUSE/cyrus-imapd.service
--- old/SUSE/cyrus-imapd.service2018-12-03 16:27:33.438769505 +0100
+++ new/SUSE/cyrus-imapd.service2019-01-16 11:08:47.232630606 +0100
@@ -5,8 +5,6 @@
 
 [Service]
 Type=simple
-User=cyrus
-Group=mail
 EnvironmentFile=-/etc/sysconfig/cyrus-imapd
 PIDFile=/run/cyrus-imapd/master.pid
 ExecStartPre=-/bin/echo 'Starting Cyrus IMAP and POP server'




commit cyrus-imapd for openSUSE:Factory

2018-12-04 Thread root
Hello community,

here is the log from the commit of package cyrus-imapd for openSUSE:Factory 
checked in at 2018-12-04 20:55:19

Comparing /work/SRC/openSUSE:Factory/cyrus-imapd (Old)
 and  /work/SRC/openSUSE:Factory/.cyrus-imapd.new.19453 (New)


Package is "cyrus-imapd"

Tue Dec  4 20:55:19 2018 rev:71 rq:653579 version:2.4.19

Changes:

--- /work/SRC/openSUSE:Factory/cyrus-imapd/cyrus-imapd.changes  2017-11-25 
08:43:04.181359916 +0100
+++ /work/SRC/openSUSE:Factory/.cyrus-imapd.new.19453/cyrus-imapd.changes   
2018-12-04 20:55:33.260771040 +0100
@@ -1,0 +2,20 @@
+Mon Dec  3 15:29:11 UTC 2018 - Matthias Fehring 
+
+- Fixed startup of cyrus-imapd when using native systemd service
+  by setting RuntimeDirectory=cyrus-imapd in the service file
+
+---
+Wed Nov 28 14:33:41 UTC 2018 - Peter Varkoly 
+
+- cyrus-imapd: migrate from cron to systemd timers
+  (bsc#1115438)
+  Created script service and timer replacing cron daily script
+
+---
+Wed Nov 28 09:47:59 UTC 2018 - Peter Varkoly 
+
+- Please convert SysV init scripts by cyrus-imapd into native systemd services 
+  (bsc#1115999)
+  Fixed using the with_systemd macro
+
+---



Other differences:
--
++ cyrus-imapd.spec ++
--- /var/tmp/diff_new_pack.d7Pglx/_old  2018-12-04 20:55:34.236769953 +0100
+++ /var/tmp/diff_new_pack.d7Pglx/_new  2018-12-04 20:55:34.236769953 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package cyrus-imapd
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -24,12 +24,16 @@
 %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
+
+#
+# sysvinit -- build for SysVinit and not for systemd
+#
+%if %{defined systemd_requires}
+%global with_systemd 1
 %endif
-%if 0%{?with_systemd}
+%bcond_with systemd
+
+%if %{with systemd}
 %global _servicenamecyrus-imapd
 %else
 %global _servicenamecyrus
@@ -90,18 +94,18 @@
 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
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
-%if 0%{?with_systemd}
+%if %{with systemd}
 BuildRequires:  systemd
 Requires(pre):  %fillup_prereq
 %systemd_requires
 %else
+Recommends: cron
 Requires(pre):  %insserv_prereq
 %endif
 
@@ -309,7 +313,7 @@
 install -d %{buildroot}%{_fillupdir}
 install -m 644 SUSE/sysconfig.cyrus-imapd 
%{buildroot}%{_fillupdir}/sysconfig.%{_servicename}
 
-%if 0%{?with_systemd}
+%if %{with systemd}
 # systemd
 install -d %{buildroot}{%{_unitdir},%{_sbindir},%{_sysconfdir}/profile.d}
 install -m 644 SUSE/cyrus-imapd.service 
%{buildroot}%{_unitdir}/%{_servicename}.service
@@ -322,10 +326,18 @@
 ln -s %{_initddir}/%{_servicename} %{buildroot}%{_sbindir}/rc%{_servicename}
 %endif
 
+# tools
+install -d %{buildroot}%{_prefix}/lib/cyrus/tools
+install -m 755 tools/* %{buildroot}%{_prefix}/lib/cyrus/tools/
+
+%if %{with systemd}
+install -m 755 SUSE/cron.daily.cyrus 
%{buildroot}%{_prefix}/lib/cyrus/tools/daily-backup.sh
+install -m 644 SUSE/backup-cyrus.*   %{buildroot}%{_unitdir}
+%else
 # cron
 install -d %{buildroot}%{_sysconfdir}/cron.daily
 install -m 755 SUSE/cron.daily.cyrus 
%{buildroot}%{_sysconfdir}/cron.daily/suse.de-%{name}
-
+%endif
 # pam
 install -d %{buildroot}%{_sysconfdir}/pam.d
 install -m 644 SUSE/imap %{buildroot}%{_sysconfdir}/pam.d/imap
@@ -344,10 +356,6 @@
 # DB_CONFIG
 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/
-
 # snmp
 install -d %{buildroot}%{_datadir}/snmp/mibs/
 install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/snmp/mibs/CMU.mib
@@ -362,13 +370,17 @@
 getent group %{cyrus_group} >/dev/null || groupadd -r %{cyrus_group}
 getent passwd %{cyrus_user} >/dev/null || useradd 

commit cyrus-imapd for openSUSE:Factory

2017-11-24 Thread root
Hello community,

here is the log from the commit of package cyrus-imapd for openSUSE:Factory 
checked in at 2017-11-25 08:43:03

Comparing /work/SRC/openSUSE:Factory/cyrus-imapd (Old)
 and  /work/SRC/openSUSE:Factory/.cyrus-imapd.new (New)


Package is "cyrus-imapd"

Sat Nov 25 08:43:03 2017 rev:70 rq:545099 version:2.4.19

Changes:

--- /work/SRC/openSUSE:Factory/cyrus-imapd/cyrus-imapd.changes  2017-10-31 
15:43:31.102821653 +0100
+++ /work/SRC/openSUSE:Factory/.cyrus-imapd.new/cyrus-imapd.changes 
2017-11-25 08:43:04.181359916 +0100
@@ -1,0 +2,6 @@
+Thu Nov 23 13:43:01 UTC 2017 - rbr...@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
+---



Other differences:
--
++ cyrus-imapd.spec ++
--- /var/tmp/diff_new_pack.DhCPo8/_old  2017-11-25 08:43:05.305318966 +0100
+++ /var/tmp/diff_new_pack.DhCPo8/_new  2017-11-25 08:43:05.309318820 +0100
@@ -16,6 +16,11 @@
 #
 
 
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+  %define _fillupdir /var/adm/fillup-templates
+%endif
+
 %global cyrus_user  cyrus
 %global cyrus_group mail
 %global cyrus_uid   96
@@ -301,8 +306,8 @@
 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}%{_fillupdir}
+install -m 644 SUSE/sysconfig.cyrus-imapd 
%{buildroot}%{_fillupdir}/sysconfig.%{_servicename}
 
 %if 0%{?with_systemd}
 # systemd
@@ -425,7 +430,7 @@
 %attr(0750, %{cyrus_user}, %{cyrus_group}) %{_var}/lib/sieve
 %attr(0750, %{cyrus_user}, %{cyrus_group}) %{_var}/spool/imap
 %attr(0750, %{cyrus_user}, %{cyrus_group}) %{_var}/adm/backup/imap
-%config %{_var}/adm/fillup-templates/sysconfig.%{_servicename}
+%config %{_fillupdir}/sysconfig.%{_servicename}
 %if 0%{?with_systemd}
 %{_unitdir}/%{_servicename}.service
 %config %{_sysconfdir}/profile.d/%{name}.alias.sh





commit cyrus-imapd for openSUSE:Factory

2017-10-31 Thread root
Hello community,

here is the log from the commit of package cyrus-imapd for openSUSE:Factory 
checked in at 2017-10-31 15:43:30

Comparing /work/SRC/openSUSE:Factory/cyrus-imapd (Old)
 and  /work/SRC/openSUSE:Factory/.cyrus-imapd.new (New)


Package is "cyrus-imapd"

Tue Oct 31 15:43:30 2017 rev:69 rq:536505 version:2.4.19

Changes:

--- /work/SRC/openSUSE:Factory/cyrus-imapd/cyrus-imapd.changes  2017-07-11 
08:27:32.157140276 +0200
+++ /work/SRC/openSUSE:Factory/.cyrus-imapd.new/cyrus-imapd.changes 
2017-10-31 15:43:31.102821653 +0100
@@ -1,0 +2,10 @@
+Wed Oct 25 09:07:33 UTC 2017 - rha...@suse.de
+
+- Removed "cyrus-imapd-2.4.19_drac_auth.patch" and dropped drac
+  from the BuildRequires. DRAC's upstream is bascially dead nowadays,
+  and the drac patch in cyrus-imapd is also largely unmaintained.
+  Rebased cyrus-imapd-2.4.17_openslp.patch and
+  cyrus-imapd-2.4.19_autocreate-0.10-0.patch as a result of the
+  removal.
+
+---

Old:

  cyrus-imapd-2.4.19_drac_auth.patch



Other differences:
--
++ cyrus-imapd.spec ++
--- /var/tmp/diff_new_pack.PtJK0D/_old  2017-10-31 15:43:31.870793813 +0100
+++ /var/tmp/diff_new_pack.PtJK0D/_new  2017-10-31 15:43:31.874793668 +0100
@@ -42,8 +42,6 @@
 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.19_drac_auth.patch
 # PATCH-FEATURE-UPSTREAM -- Autocreate INBOX folders // included in 2.5
 Patch1: cyrus-imapd-2.4.19_autocreate-0.10-0.patch
 # PATCH-FEATURE-UPSTREAM -- Add support to define a catchall mailbox
@@ -69,7 +67,6 @@
 BuildRequires:  bison
 BuildRequires:  cyrus-sasl-devel
 BuildRequires:  db-devel
-BuildRequires:  drac
 BuildRequires:  ed
 BuildRequires:  flex
 BuildRequires:  krb5-devel
@@ -206,7 +203,6 @@
 
 %prep
 %setup -q -a 10
-%patch0 -p1
 %patch1 -p1
 %patch4 -p1
 %patch7 -p1
@@ -242,7 +238,6 @@
  --with-cyrus-user=%{cyrus_user} \
  --with-cyrus-group=%{cyrus_group} \
  --with-cyrus-prefix=%{_prefix}/lib/cyrus \
- --with-drac \
  --with-gss_impl=auto \
  --with-ldap \
  --with-libwrap \

++ cyrus-imapd-2.4.17_openslp.patch ++
--- /var/tmp/diff_new_pack.PtJK0D/_old  2017-10-31 15:43:31.922791928 +0100
+++ /var/tmp/diff_new_pack.PtJK0D/_new  2017-10-31 15:43:31.922791928 +0100
@@ -1,9 +1,10 @@
-diff -Ppru cyrus-imapd-2.4.17.orig/configure.in cyrus-imapd-2.4.17/configure.in
 cyrus-imapd-2.4.17.orig/configure.in   2012-12-01 20:57:54.0 
+0100
-+++ cyrus-imapd-2.4.17/configure.in2014-01-25 13:35:37.326786213 +0100
-@@ -1242,6 +1242,19 @@ DRACLIBS="-ldrac")
-   fi)
- AC_SUBST(DRACLIBS)
+Index: cyrus-imapd-2.4.19/configure.in
+===
+--- cyrus-imapd-2.4.19.orig/configure.in
 cyrus-imapd-2.4.19/configure.in
+@@ -1239,6 +1239,19 @@ dnl (agentx was depricated, but SNMP_SUB
+ SNMP_SUBDIRS=""
+ AC_SUBST(SNMP_SUBDIRS)
  
 +dnl
 +dnl Test for OpenSLP
@@ -21,9 +22,10 @@
  CMU_LIBWRAP
  CMU_UCDSNMP
  
-diff -Ppru cyrus-imapd-2.4.17.orig/master/Makefile.in 
cyrus-imapd-2.4.17/master/Makefile.in
 cyrus-imapd-2.4.17.orig/master/Makefile.in 2012-12-01 20:57:54.0 
+0100
-+++ cyrus-imapd-2.4.17/master/Makefile.in  2014-01-25 13:36:16.326368670 
+0100
+Index: cyrus-imapd-2.4.19/master/Makefile.in
+===
+--- cyrus-imapd-2.4.19.orig/master/Makefile.in
 cyrus-imapd-2.4.19/master/Makefile.in
 @@ -58,7 +58,7 @@ DEPLIBS = @DEPLIBS@
  
  CFLAGS = @CFLAGS@
@@ -33,9 +35,10 @@
  
  SHELL = /bin/sh
  MAKEDEPEND = @MAKEDEPEND@
-diff -Ppru cyrus-imapd-2.4.17.orig/master/master.c 
cyrus-imapd-2.4.17/master/master.c
 cyrus-imapd-2.4.17.orig/master/master.c2012-12-01 20:57:54.0 
+0100
-+++ cyrus-imapd-2.4.17/master/master.c 2014-01-25 14:35:29.896103172 +0100
+Index: cyrus-imapd-2.4.19/master/master.c
+===
+--- cyrus-imapd-2.4.19.orig/master/master.c
 cyrus-imapd-2.4.19/master/master.c
 @@ -110,6 +110,10 @@
int deny_severity = LOG_ERR;
  #endif


++ cyrus-imapd-2.4.19_autocreate-0.10-0.patch ++
--- /var/tmp/diff_new_pack.PtJK0D/_old  2017-10-31 15:43:31.954790768 +0100
+++ /var/tmp/diff_new_pack.PtJK0D/_new  2017-10-31 15:43:31.954790768 +0100
@@ -1,6 +1,7 @@
-diff -Naur cyrus-imapd-2.4.4.orig/README.autocreate 
cyrus-imapd-2.4.4/README.autocreate
 

commit cyrus-imapd for openSUSE:Factory

2017-07-11 Thread root
Hello community,

here is the log from the commit of package cyrus-imapd for openSUSE:Factory 
checked in at 2017-07-11 08:27:31

Comparing /work/SRC/openSUSE:Factory/cyrus-imapd (Old)
 and  /work/SRC/openSUSE:Factory/.cyrus-imapd.new (New)


Package is "cyrus-imapd"

Tue Jul 11 08:27:31 2017 rev:68 rq:509141 version:2.4.19

Changes:

--- /work/SRC/openSUSE:Factory/cyrus-imapd/cyrus-imapd.changes  2017-06-26 
15:56:44.661747673 +0200
+++ /work/SRC/openSUSE:Factory/.cyrus-imapd.new/cyrus-imapd.changes 
2017-07-11 08:27:32.157140276 +0200
@@ -1,0 +2,6 @@
+Mon Jul 10 10:41:23 UTC 2017 - jeng...@inai.de
+
+- Remove filler wording from description.
+- Improve find commands.
+
+---



Other differences:
--
++ cyrus-imapd.spec ++
--- /var/tmp/diff_new_pack.NP0Fia/_old  2017-07-11 08:27:32.989022936 +0200
+++ /var/tmp/diff_new_pack.NP0Fia/_new  2017-07-11 08:27:32.989022936 +0200
@@ -104,22 +104,19 @@
 %endif
 
 %description
-The %{name} package contains the core of the Cyrus IMAP server.
-It is a scaleable enterprise mail system designed for use from
-small to large enterprise environments using standards-based
-internet mail technologies.
+This package contains the core of the Cyrus IMAP server. It is a mail
+system designed for use with standards-based Internet mail
+technologies.
 
-A full Cyrus IMAP implementation allows a seamless mail and bulletin
+A full Cyrus IMAP implementation allows a mail and bulletin
 board environment to be set up across multiple servers. It differs from
 other IMAP server implementations in that it is run on "sealed"
 servers, where users are not normally permitted to log in and have no
 system account on the server. The mailbox database is stored in parts
 of the filesystem that are private to the Cyrus IMAP server. All user
 access to mail is through software using the IMAP, POP3 or KPOP
-protocols. It also includes support for virtual domains, NNTP,
-mailbox annotations, and much more. The private mailbox database design
-gives the server large advantages in efficiency, scalability and
-administratability. Multiple concurrent read/write connections to the
+protocols. It also includes support for virtual domains, NNTP, and
+mailbox annotations. Multiple concurrent read/write connections to the
 same mailbox are permitted. The server supports access control lists on
 mailboxes and storage quotas on mailbox hierarchies.
 
@@ -129,7 +126,7 @@
 library, imaps/pop3s/nntps (IMAP/POP3/NNTP encrypted using SSL and
 TLSv1) can be used for security. The server supports single instance
 store where possible when an email message is addressed to multiple
-recipients, SIEVE provides server side email filtering.
+recipients. SIEVE provides server side email filtering.
 
 %package snmp
 Summary:SNMP support for the Cyrus IMAP and POP Mail Server
@@ -139,10 +136,9 @@
 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
-small to large enterprise environments using standards-based
-internet mail technologies.
+This package contains the core of the Cyrus IMAP server. It is a mail
+system designed for use with standards-based Internet mail
+technologies.
 
 This package pulls in dependencies to enable SNMP support for %{name}.
 
@@ -223,10 +219,10 @@
 %patch32 -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' -delete
 
 %build
 rm -fr aclocal.m4 configure config.h.in autom4te.cache
@@ -261,7 +257,7 @@
 
 make depend %{?_smp_mflags}
 
-# unpredictable parallel build; fails, if sieve_err.h isn't ready in time
+# unpredictable parallel build; fails if sieve_err.h isn't ready in time
 #make %%{?_smp_mflags}
 make -j1
 
@@ -295,7 +291,7 @@
 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 -delete
 
 # create /var/* directories
 install -d -m 750 
%{buildroot}%{_var}/lib/imap/{db,log,msg,proc,quota,socket,user}





commit cyrus-imapd for openSUSE:Factory

2017-06-26 Thread root
Hello community,

here is the log from the commit of package cyrus-imapd for openSUSE:Factory 
checked in at 2017-06-26 15:56:43

Comparing /work/SRC/openSUSE:Factory/cyrus-imapd (Old)
 and  /work/SRC/openSUSE:Factory/.cyrus-imapd.new (New)


Package is "cyrus-imapd"

Mon Jun 26 15:56:43 2017 rev:67 rq:506147 version:2.4.19

Changes:

--- /work/SRC/openSUSE:Factory/cyrus-imapd/cyrus-imapd.changes  2017-06-22 
10:40:49.309995002 +0200
+++ /work/SRC/openSUSE:Factory/.cyrus-imapd.new/cyrus-imapd.changes 
2017-06-26 15:56:44.661747673 +0200
@@ -1,0 +2,6 @@
+Sun Jun 25 21:22:24 UTC 2017 - a...@ajaissle.de
+
+- Add cyrus-imapd-2.4.19-lmtpd_crash.patch:
+  * lmtpd: fix uninitialised variable crash [boo#1045899]
+
+---

New:

  cyrus-imapd-2.4.19-lmtpd_crash.patch



Other differences:
--
++ cyrus-imapd.spec ++
--- /var/tmp/diff_new_pack.0bLgLN/_old  2017-06-26 15:56:45.377646706 +0200
+++ /var/tmp/diff_new_pack.0bLgLN/_new  2017-06-26 15:56:45.381646142 +0200
@@ -62,6 +62,8 @@
 Patch28:cyrus-imapd-2.4.19-implicit_definitions.patch
 # PATCH-FIX-UPSTREAM -- Outlook 2013-compatible XLIST behaviour
 Patch31:cyrus-imapd-2.4.18-D19-Outlook_2013_XLIST.patch
+# PATCH-FIX-UPSTREAM -- lmtpd: fix uninitialised variable crash
+Patch32:cyrus-imapd-2.4.19-lmtpd_crash.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  bison
@@ -218,6 +220,7 @@
 %patch27 -p1
 %patch28 -p1
 %patch31 -p1
+%patch32 -p1
 
 # remove executable bit from docs
 find doc -type f -name '*.html' -exec chmod -x {} \;

++ cyrus-imapd-2.4.19-lmtpd_crash.patch ++
>From 129d3aedbba82d6457fc7cbd436e68f278e0628b Mon Sep 17 00:00:00 2001
From: ellie timoney 
Date: Mon, 22 May 2017 13:06:04 +1000
Subject: [PATCH] lmtpd: fix uninitialised variable crash

---
 imap/lmtpd.c | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/imap/lmtpd.c b/imap/lmtpd.c
index 5fe507a80..7428f72b5 100644
--- a/imap/lmtpd.c
+++ b/imap/lmtpd.c
@@ -712,9 +712,10 @@ int deliver(message_data_t *msgdata, char *authuser,
 
 /* loop through each recipient, attempting delivery for each */
 for (n = 0; n < nrcpts; n++) {
-   char namebuf[MAX_MAILBOX_BUFFER] = "", *server;
+   char namebuf[MAX_MAILBOX_BUFFER] = "";
char userbuf[MAX_MAILBOX_BUFFER];
const char *rcpt, *user, *domain, *mailbox;
+   char *server = NULL;
int r = 0;
 
rcpt = msg_getrcptall(msgdata, n);
@@ -954,7 +955,7 @@ static int verify_user(const char *user, const char 
*domain, char *mailbox,
 }
 
 if (!r) {
-   char *server, *acl;
+   char *server = NULL, *acl = NULL;
long aclcheck = !user ? ACL_POST : 0;
/*
 * check to see if mailbox exists and we can append to it:
@@ -1061,8 +1062,9 @@ FILE *spoolfile(message_data_t *msgdata)
(don't bother if we're only a proxy) */
 n = isproxy ? 0 : msg_getnumrcpt(msgdata);
 for (i = 0; !f && (i < n); i++) {
-   char namebuf[MAX_MAILBOX_BUFFER] = "", *server;
+   char namebuf[MAX_MAILBOX_BUFFER] = "";
const char *user, *domain, *mailbox;
+   char *server = NULL;
int r;
 
/* build the mailboxname from the recipient address */




commit cyrus-imapd for openSUSE:Factory

2017-06-22 Thread root
Hello community,

here is the log from the commit of package cyrus-imapd for openSUSE:Factory 
checked in at 2017-06-22 10:40:46

Comparing /work/SRC/openSUSE:Factory/cyrus-imapd (Old)
 and  /work/SRC/openSUSE:Factory/.cyrus-imapd.new (New)


Package is "cyrus-imapd"

Thu Jun 22 10:40:46 2017 rev:66 rq:505525 version:2.4.19

Changes:

--- /work/SRC/openSUSE:Factory/cyrus-imapd/cyrus-imapd.changes  2016-06-23 
13:35:58.0 +0200
+++ /work/SRC/openSUSE:Factory/.cyrus-imapd.new/cyrus-imapd.changes 
2017-06-22 10:40:49.309995002 +0200
@@ -1,0 +2,38 @@
+Wed Jun 21 15:38:32 UTC 2017 - a...@ajaissle.de
+
+- Rebased patch:
+  * cyrus-imapd-2.4.18-implicit_definitions.patch as 
cyrus-imapd-2.4.19-implicit_definitions.patch
+Add fix for implicit-fortify-decl in ldap.c
+
+---
+Wed Jun 14 18:20:42 UTC 2017 - a...@ajaissle.de
+
+- Update to 2.4.19
+  * Complete backport of the new (2.5 and later) IMAP IDLE implementation 
(thanks Thomas Jarosh). This fixes a bunch of bugs and race conditions that 
were inherent to the older implementation
+  * New option “imapidletimeout” overrides “timeout” specifically for 
connections in IDLE state
+  * OpenSSL 1.1.0 is now supported
+  * Fixed: imap ENABLED doesn’t print * ENABLED when nothing new enabled
+  * Fixed: mailbox lock management over rename (thanks Thomas Jarosh)
+  * Fixed: added overflow protection to urlfetch range checks
+  * Fixed: lmtpd can now deliver when mupdate server isn’t available (thanks 
Michael Menge)
+  * Fixed task 227: service processes no longer divide by zero when invoked 
with -T 0 argument (thanks Ian Batten and Jens Erat)
+  * Fixed task 229: ctl_cyrusdb now uses database paths from imapd.conf 
(thanks Simon Matter)
+  * Fixed bug #3862: mailbox database changes now rolled back on mupdate 
failure during rename (thanks Michael Menge)
+  * Fixed: XFER to 2.5 and later no longer downgrades index to oldest version
+  * Fixed: nonsensical “TEXT.MIME” section now handled as “HEADER”
+  * Fixed: added missing ‘auditlog: ‘ prefix to backend connections (thanks 
Wolfgang Breyha)
+  * Fixed: IMAP SEARCH crash on some platforms
+  * Fixed: memory leaks in IMAP SEARCH and IMAP APPEND
+  * Fixed Issue #1967: EXISTS count reported earlier if fetching past size of 
previous message set
+
+- Rebased patches:
+  * cyrus-imapd-2.4.17_drac_auth.patch as cyrus-imapd-2.4.19_drac_auth.patch
+  * cyrus-imapd-2.4.17_autocreate-0.10-0.patch as 
cyrus-imapd-2.4.19_autocreate-0.10-0.patch
+
+- Removed patches:
+  - cyrus-imapd-2.4.18-CVE-2015-8077.patch (upstream)
+  - cyrus-imapd-2.4.18-CVE-2015-8078.patch (upstream)
+
+- Added cyrus-imapd-2.4.19.tar.gz.sig
+
+---

Old:

  cyrus-imapd-2.4.17_autocreate-0.10-0.patch
  cyrus-imapd-2.4.17_drac_auth.patch
  cyrus-imapd-2.4.18-CVE-2015-8077.patch
  cyrus-imapd-2.4.18-CVE-2015-8078.patch
  cyrus-imapd-2.4.18-implicit_definitions.patch
  cyrus-imapd-2.4.18.tar.gz

New:

  cyrus-imapd-2.4.19-implicit_definitions.patch
  cyrus-imapd-2.4.19.tar.gz
  cyrus-imapd-2.4.19.tar.gz.sig
  cyrus-imapd-2.4.19_autocreate-0.10-0.patch
  cyrus-imapd-2.4.19_drac_auth.patch



Other differences:
--
++ cyrus-imapd.spec ++
--- /var/tmp/diff_new_pack.SM39kQ/_old  2017-06-22 10:40:50.153876021 +0200
+++ /var/tmp/diff_new_pack.SM39kQ/_new  2017-06-22 10:40:50.157875457 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package cyrus-imapd
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -30,7 +30,7 @@
 %global _servicename   cyrus
 %endif
 Name:   cyrus-imapd
-Version:2.4.18
+Version:2.4.19
 Release:0
 Summary:The Cyrus IMAP and POP Mail Server
 License:BSD-3-Clause
@@ -38,13 +38,14 @@
 Url:http://www.cyrusimap.org
 # Upstream sources
 Source0:http://cyrusimap.org/releases/%{name}-%{version}.tar.gz
+Source90:   http://cyrusimap.org/releases/%{name}-%{version}.tar.gz.sig
 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
+Patch0: cyrus-imapd-2.4.19_drac_auth.patch
 # PATCH-FEATURE-UPSTREAM -- Autocreate INBOX folders // included in 2.5
-Patch1: cyrus-imapd-2.4.17_autocreate-0.10-0.patch
+Patch1: 

commit cyrus-imapd for openSUSE:Factory

2016-06-23 Thread h_root
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.0 +0100
+++ /work/SRC/openSUSE:Factory/.cyrus-imapd.new/cyrus-imapd.changes 
2016-06-23 13:35:58.0 +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.0 +0200
+++ /var/tmp/diff_new_pack.Y1Bzvj/_new  2016-06-23 13:36:00.0 +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_groupmail
 %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: 

commit cyrus-imapd for openSUSE:Factory

2015-11-17 Thread h_root
Hello community,

here is the log from the commit of package cyrus-imapd for openSUSE:Factory 
checked in at 2015-11-17 14:22:52

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-09-08 
18:12:02.0 +0200
+++ /work/SRC/openSUSE:Factory/.cyrus-imapd.new/cyrus-imapd.changes 
2015-11-17 14:22:53.0 +0100
@@ -1,0 +2,9 @@
+Sun Nov 15 11:48:17 UTC 2015 - a...@ajaissle.de
+
+- Added cyrus-imapd-2.4.18-CVE-2015-8077.patch:
+  boo#954200, CVE-2015-8077: Integer overflow in range checks
+
+- Added cyrus-imapd-2.4.18-CVE-2015-8078.patch:
+  boo#954201, CVE-2015-8078: Integer overflow in index_urlfetch
+
+---
@@ -4 +13 @@
-- Update to 2.4.18
+- Update to 2.4.18 [boo#945844]

New:

  cyrus-imapd-2.4.18-CVE-2015-8077.patch
  cyrus-imapd-2.4.18-CVE-2015-8078.patch



Other differences:
--
++ cyrus-imapd.spec ++
--- /var/tmp/diff_new_pack.krq1mz/_old  2015-11-17 14:22:54.0 +0100
+++ /var/tmp/diff_new_pack.krq1mz/_new  2015-11-17 14:22:54.0 +0100
@@ -66,6 +66,10 @@
 Patch27:cyrus-imapd-2.4.17_ptloader-ldap_user_attribute.patch
 # PATCH-FIX-UPSTREAM -- Have the correct #include when using implicit 
definitions
 Patch28:cyrus-imapd-2.4.18-implicit_definitions.patch
+# PATCH-FIX-UPSTREAM -- Fix for CVE-2015-8077
+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
 
 BuildRequires:  automake
 BuildRequires:  bison
@@ -225,6 +229,8 @@
 %patch25 -p1
 %patch27 -p1
 %patch28 -p1
+%patch29 -p1
+%patch30 -p1
 
 # remove executable bit from docs
 find doc -type f -name '*.html' -exec %{__chmod} -x {} \;

++ cyrus-imapd-2.4.18-CVE-2015-8077.patch ++
>From 538359e5a7c978e2f27c80124c8bd1282c7661a9 Mon Sep 17 00:00:00 2001
From: ellie timoney 
Date: Mon, 26 Oct 2015 16:15:40 +1100
Subject: urlfetch: protect against overflow in range checks


diff --git a/imap/index.c b/imap/index.c
index 43dfe16..566a983 100644
--- a/imap/index.c
+++ b/imap/index.c
@@ -2712,7 +2712,8 @@ int index_urlfetch(struct index_state *state, uint32_t 
msgno,
 int fetchmime = 0, domain = DOMAIN_7BIT;
 unsigned size;
 int32_t skip = 0;
-int n, r = 0;
+unsigned long n;
+int r = 0;
 char *decbuf = NULL;
 struct mailbox *mailbox = state->mailbox;
 struct index_map *im = >map[msgno-1];
@@ -2849,7 +2850,7 @@ int index_urlfetch(struct index_state *state, uint32_t 
msgno,
 start_octet = size;
 n = 0;
 }
-else if (start_octet + n > size) {
+else if (start_octet + n < start_octet || start_octet + n > size) {
 n = size - start_octet;
 }
 
@@ -2861,10 +2862,10 @@ int index_urlfetch(struct index_state *state, uint32_t 
msgno,
 
if (domain == DOMAIN_BINARY) {
/* Write size of literal8 */
-   prot_printf(pout, " ~{%u}\r\n", n);
+prot_printf(pout, " ~{%lu}\r\n", n);
} else {
/* Write size of literal */
-   prot_printf(pout, " {%u}\r\n", n);
+prot_printf(pout, " {%lu}\r\n", n);
}
 }
 
-- 
cgit v0.10.2

++ cyrus-imapd-2.4.18-CVE-2015-8078.patch ++
>From 0142e98fa90f02a030f93469523ac64f91ae7a9f Mon Sep 17 00:00:00 2001
From: ellie timoney 
Date: Mon, 26 Oct 2015 16:21:01 +1100
Subject: urlfetch: and the other bit


diff --git a/imap/index.c b/imap/index.c
index 566a983..6216f02 100644
--- a/imap/index.c
+++ b/imap/index.c
@@ -2807,7 +2807,8 @@ int index_urlfetch(struct index_state *state, uint32_t 
msgno,
 size_t section_offset = CACHE_ITEM_BIT32(cacheitem);
 size_t section_size = CACHE_ITEM_BIT32(cacheitem + 
CACHE_ITEM_SIZE_SKIP);
 
-if (section_offset + section_size > size) {
+if (section_offset + section_size < section_offset
+|| section_offset + section_size > size) {
 r = IMAP_INTERNAL;
 goto done;
 }
-- 
cgit v0.10.2




commit cyrus-imapd for openSUSE:Factory

2015-09-08 Thread h_root
Hello community,

here is the log from the commit of package cyrus-imapd for openSUSE:Factory 
checked in at 2015-09-08 17:46:00

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  2014-12-16 
14:49:38.0 +0100
+++ /work/SRC/openSUSE:Factory/.cyrus-imapd.new/cyrus-imapd.changes 
2015-09-08 18:12:02.0 +0200
@@ -1,0 +2,35 @@
+Sun Aug 23 11:00:50 UTC 2015 - a...@ajaissle.de
+
+- Update to 2.4.18
+  * Security fix: handle urlfetch range starting outside message range
+  * A bunch of cleanups and fixes to compiling
+  * A bunch of sieve cleanups
+  * Enhanced SSL/TLS configuration options
+  * Disable use of SSLv2/SSLv3
+  * Allow SQL backend for mboxlist and statuscache (thanks Julien Coloos)
+  * Fixed Task #116: correct LIST response for domains starting with ‘inbox.’
+  * Fixed Task #76: fixed lmtpd userdeny db checks (thanks Leena Heino)
+  * Fixed bug #3856: lmtpd now performs userdeny checks
+  * Fixed bug #3848: support charset aliases in encoded headers
+  * Fixed bug #3853: disconnect_on_vanished_mailbox: release mailbox lock 
before exiting (thanks Wolfgang Breyha)
+  * Fixed bug #3415: fixed nntpd LIST/GROUP bug
+  * Fixed bug #3784: no longer crash in THREAD REFERENCES when messages 
reference themselves
+  * Fixed bug #3757: don’t segfault on mailbox close with no user
+  * New ssl/tls configuration options
+tls_compression: 0
+Enable TLS compression. Disabled by default.
+tls_eccurve: prime256v1
+Select the elliptic curve used for ECDHE.
+tls_prefer_server_ciphers: 0
+Prefer the cipher order configured on the server-side.
+tls_versions: tls1_0 tls1_1 tls1_2
+Disable SSL/TLS protocols not in this list.
+
+- Removed the following patches (included upstream):
+  - cyrus-imapd-2.4.17_tls-session-leak.patch
+  - cyrus-imapd.tls_options.patch
+
+- Added patch cyrus-imapd-2.4.18-implicit_definitions.patch:
+  - Have the correct #include when using implicit definitions
+
+---

Old:

  cyrus-imapd-2.4.17.tar.gz
  cyrus-imapd-2.4.17_tls-session-leak.patch
  cyrus-imapd.tls_options.patch

New:

  cyrus-imapd-2.4.18-implicit_definitions.patch
  cyrus-imapd-2.4.18.tar.gz



Other differences:
--
++ cyrus-imapd.spec ++
--- /var/tmp/diff_new_pack.To4tEs/_old  2015-09-08 18:12:08.0 +0200
+++ /var/tmp/diff_new_pack.To4tEs/_new  2015-09-08 18:12:08.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package cyrus-imapd
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -33,7 +33,7 @@
 %endif
 
 Name:   cyrus-imapd
-Version:2.4.17
+Version:2.4.18
 Release:0
 Summary:The Cyrus IMAP and POP Mail Server
 License:BSD-3-Clause
@@ -62,12 +62,10 @@
 Patch12:cyrus-imapd-2.4.17_pie.patch
 # PATCH-FIX-UPSTREAM -- Support db-6.0
 Patch25:cyrus-imapd-2.4.17_db6.patch
-# PATCH-FIX-UPSTREAM -- Fix TLS session leak // included in 2.4next
-Patch26:cyrus-imapd-2.4.17_tls-session-leak.patch
 # PATCH-FEATURE-UPSTREAM -- Allow a result attribute to be specified with 
ptclient/ldap.c // included in 2.5
 Patch27:cyrus-imapd-2.4.17_ptloader-ldap_user_attribute.patch
-# PATCH-FIX-UPSTREAM -- Allow to configure TLS more detailed (e.g. to fix 
POODLE an add PFS)
-Patch28:cyrus-imapd.tls_options.patch
+# PATCH-FIX-UPSTREAM -- Have the correct #include when using implicit 
definitions
+Patch28:cyrus-imapd-2.4.18-implicit_definitions.patch
 
 BuildRequires:  automake
 BuildRequires:  bison
@@ -225,7 +223,6 @@
 %patch10 -p1
 %patch12 -p1
 %patch25 -p1
-%patch26 -p1
 %patch27 -p1
 %patch28 -p1
 

++ cyrus-imapd-2.4.18-implicit_definitions.patch ++
diff -Ppru cyrus-imapd-2.4.18.orig/lib/strarray.c 
cyrus-imapd-2.4.18.impl/lib/strarray.c
--- cyrus-imapd-2.4.18.orig/lib/strarray.c  2015-07-06 05:38:29.0 
+0200
+++ cyrus-imapd-2.4.18.impl/lib/strarray.c  2015-08-31 17:28:35.256727763 
+0200
@@ -43,6 +43,7 @@
  * Start Date: 2011/01/11
  */
 
+#include 
 #include "strarray.h"
 #include 
 #include "util.h"   /* for strcmpsafe et al */
diff -Ppru cyrus-imapd-2.4.18.orig/sieve/flags.c 
cyrus-imapd-2.4.18.impl/sieve/flags.c
--- cyrus-imapd-2.4.18.orig/sieve/flags.c   2015-07-06 05:38:29.0 
+0200
+++ cyrus-imapd-2.4.18.impl/sieve/flags.c   

commit cyrus-imapd for openSUSE:Factory

2014-12-16 Thread h_root
Hello community,

here is the log from the commit of package cyrus-imapd for openSUSE:Factory 
checked in at 2014-12-16 14:49:14

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  2014-11-24 
11:09:20.0 +0100
+++ /work/SRC/openSUSE:Factory/.cyrus-imapd.new/cyrus-imapd.changes 
2014-12-16 14:49:38.0 +0100
@@ -1,0 +2,10 @@
+Mon Dec  8 10:19:48 UTC 2014 - a...@ajaissle.de
+
+- Changed cyrus-imapd-rc-2.tar.gz/cron.daily.cyrus to use 'su -s 
+  /bin/bash - cyrus', as the default shell is now /sbin/nologin
+  [boo#908014]
+- Changed cyrus-imapd-rc-2.tar.gz/rc.cyrus to set
+  /var/run/cyrus-master.pid as the PID file (was: /var/run/cyrus.pid)
+  [boo#908006]
+
+---



Other differences:
--
++ cyrus-imapd-rc-2.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/SUSE/cron.daily.cyrus new/SUSE/cron.daily.cyrus
--- old/SUSE/cron.daily.cyrus   2010-11-19 09:55:59.0 +0100
+++ new/SUSE/cron.daily.cyrus   2014-12-08 11:17:38.0 +0100
@@ -29,7 +29,7 @@
 dumpfile=$DBDIR/$BACKUPBASENAME
 rm -f $bakfile
 rm -f $dumpfile
-su - cyrus -c '/usr/lib/cyrus/bin/ctl_mboxlist -d'  $dumpfile
+su -s /bin/sh - cyrus -c '/usr/lib/cyrus/bin/ctl_mboxlist -d'  $dumpfile
 gzip -9 -c  $dumpfile  $bakfile
 chown cyrus.mail $dumpfile
 chmod 640 $dumpfile
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/SUSE/rc.cyrus new/SUSE/rc.cyrus
--- old/SUSE/rc.cyrus   2014-01-29 18:40:44.0 +0100
+++ new/SUSE/rc.cyrus   2014-12-08 11:18:52.0 +0100
@@ -24,7 +24,7 @@
 link=${base#*[SK][0-9][0-9]}
 
 CYRUS_BIN=/usr/lib/cyrus/bin/master
-PID_FILE=/var/run/cyrus.pid
+PID_FILE=/var/run/cyrus-master.pid
 test -f /etc/sysconfig/cyrus  . /etc/sysconfig/cyrus
 
 test -x $CYRUS_BIN || exit 5

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit cyrus-imapd for openSUSE:Factory

2014-11-24 Thread h_root
Hello community,

here is the log from the commit of package cyrus-imapd for openSUSE:Factory 
checked in at 2014-11-24 11:09:03

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  2014-03-09 
18:21:58.0 +0100
+++ /work/SRC/openSUSE:Factory/.cyrus-imapd.new/cyrus-imapd.changes 
2014-11-24 11:09:20.0 +0100
@@ -1,0 +2,25 @@
+Fri Nov 21 11:55:51 UTC 2014 - tchva...@suse.com
+
+- Drop unused patch:
+  * KOLAB_cyrus-imapd-2.3.18_cross-domain-acls.patch 
+
+---
+Fri Nov 14 10:49:38 UTC 2014 - rha...@suse.com
+
+- Replace the TLS/POODLE patch with what was merged into the upstream
+  git repo:
+  * cyrus-imapd.tls_options.patch
+  * Obsoletes patches cyrus-imapd.tls_tlsonly.patch and
+cyrus-imapd.tls_ec.patch
+- Add a default tls_versions settings to imapd.conf which disables
+  POODLE affected SSL versions.
+
+---
+Sat Oct 18 11:15:00 UTC 2014 - johan...@lst.de
+
+- Add two patches from Kristian Kraemmer Nielsen found on the info-cyrus 
mailing list 
+  (http://lists.andrew.cmu.edu/pipermail/info-cyrus/2014-October/037708.html)
+  * cyrus-imapd.tls_ec.patch   - adding tls_ec for Perfect Forward 
Secrecy
+  * cyrus-imapd.tls_tlsonly.patch  - add tlsonly config option to fix 
POODLE vulnerability
+
+---
@@ -353 +377,0 @@

@@ -354,0 +379 @@
+---
@@ -363 +387,0 @@

@@ -364,0 +389 @@
+---

Old:

  KOLAB_cyrus-imapd-2.3.18_cross-domain-acls.patch

New:

  cyrus-imapd.tls_options.patch



Other differences:
--
++ cyrus-imapd.spec ++
--- /var/tmp/diff_new_pack.uxiVmW/_old  2014-11-24 11:09:21.0 +0100
+++ /var/tmp/diff_new_pack.uxiVmW/_new  2014-11-24 11:09:21.0 +0100
@@ -66,6 +66,8 @@
 Patch26:cyrus-imapd-2.4.17_tls-session-leak.patch
 # PATCH-FEATURE-UPSTREAM -- Allow a result attribute to be specified with 
ptclient/ldap.c // included in 2.5
 Patch27:cyrus-imapd-2.4.17_ptloader-ldap_user_attribute.patch
+# PATCH-FIX-UPSTREAM -- Allow to configure TLS more detailed (e.g. to fix 
POODLE an add PFS)
+Patch28:cyrus-imapd.tls_options.patch
 
 BuildRequires:  automake
 BuildRequires:  bison
@@ -225,6 +227,7 @@
 %patch25 -p1
 %patch26 -p1
 %patch27 -p1
+%patch28 -p1
 
 # remove executable bit from docs
 find doc -type f -name '*.html' -exec %{__chmod} -x {} \;

++ cyrus-imapd-rc-2.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/SUSE/imapd.conf new/SUSE/imapd.conf
--- old/SUSE/imapd.conf 2014-01-27 17:45:45.0 +0100
+++ new/SUSE/imapd.conf 2014-11-07 12:30:00.0 +0100
@@ -25,4 +25,5 @@
 #tls_cert_file: /etc/ssl/certs/cyrus-imapd.pem
 #tls_key_file: /etc/ssl/private/cyrus-imapd.key
 #tls_ca_file: /etc/ssl/cacert.pem
-#tls_ca_path: /etc/ssl/
\ No newline at end of file
+#tls_ca_path: /etc/ssl/
+tls_versions: tls1_0 tls1_1 tls1_2

++ cyrus-imapd.tls_options.patch ++
commit 4b26d2d7244eeaa481871c337e57cd393fd76dfe
Author: Jeroen van Meeuwen (Kolab Systems) vanmeeu...@kolabsys.com
Date:   Thu Oct 16 11:12:20 2014 +0200

Enhance SSL/TLS configuration options

New settings:

tls_compression: 0

Enable TLS compression. Disabled by default.

tls_eccurve: prime256v1

Select the elliptic curve used for ECDHE.

tls_prefer_server_ciphers: 0

Prefer the cipher order configured on the server-side.

tls_versions: ssl2 ssl3 tls1_0 tls1_1 tls1_2

Disable SSL/TLS protocols not in this list.

Bugzilla #3822, #3830, #3843, #3861.

diff --git a/imap/tls.c b/imap/tls.c
index 6db4a2f..92f4c88 100644
--- a/imap/tls.c
+++ b/imap/tls.c
@@ -631,6 +631,7 @@ int tls_init_serverengine(const char *ident,
 const char   *s_cert_file;
 const char   *s_key_file;
 intrequirecert;
+intserver_cipher_order;
 inttimeout;
 
 if (tls_serverengine)
@@ -646,13 +647,6 @@ int tls_init_serverengine(const char *ident,
return -1;
 }
 
-#if 0
-if (tlsonly) {
-   s_ctx = SSL_CTX_new(TLSv1_server_method());
-} else {
-   s_ctx = 

commit cyrus-imapd for openSUSE:Factory

2014-03-09 Thread h_root
Hello community,

here is the log from the commit of package cyrus-imapd for openSUSE:Factory 
checked in at 2014-03-09 18:21:55

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  2013-06-17 
10:03:31.0 +0200
+++ /work/SRC/openSUSE:Factory/.cyrus-imapd.new/cyrus-imapd.changes 
2014-03-09 18:21:58.0 +0100
@@ -1,0 +2,104 @@
+Wed Jan 29 11:14:13 UTC 2014 - a...@ajaissle.de
+
+- Added -snmp and -snmp-mibs sub-packages
+- Added README.SNMP to cyrus-imapd-rc-2.tar.gz
+- Added sysconfig option to use SNMP
+  * TODO: convert to a yesno option
+
+---
+Fri Jan 24 13:45:42 UTC 2014 - a...@ajaissle.de
+
+- Updated to upstream release 2.4.17 (fate#311137)
+  Changes to the Cyrus IMAP Server since 2.3.x:
+* All databases are now default skiplist, and ctl_cyrusdb will 
automatically convert database type on startup.
+* make_sha1 and make_md5 are removed (replaced by GUID and reconstruct 
changes)
+* Charset subsystem rewritten - Unicode 5.2 rather than Unicode 2, and 
UTF-8 support in sieve.
+* Core mailbox handling code largely rewritten with new APIs, CRC 
checksums, new locking mechanisms, merging of cyrus.index and cyrus.expunge, 
inclusion of user \Seen flag, and much more.
+* Replication code largely rewritten to provide better performance, 
consistency checking, and recovery from split-brain scenarios.
+* Added support for LIST-EXTENDED IMAP extension. Removed support for 
deprecated (compile-time) LISTEXT IMAP extension. Based on work by Martin 
Konold martin.kon...@erfrakon.de
+* Added support for ESEARCH IMAP extension.
+* Added support for WITHIN extension to IMAP SEARCH.
+* Added support for ENABLE IMAP extension.
+* Added support for QRESYNC IMAP extension.
+* Added support for URLAUTH=BINARY IMAP extension.
+* Removed legacy IMAP[2|3|4] cruft. We now only support IMAPrev1 + 
extensions.
+* Added support for marking QoS on traffic. (courtesy of Philip 
Prindeville phil...@redfish-solutions.com)
+* Modified user_deny.db code to open database once at service startup time.
+* ... and hundreds of tiny things too numerous to mention in a short 
change log ...
+
+- Added the following patches:
+  - cyrus-imapd-2.4.17_drac_auth.patch -- this is a rebased version of 
contrib/drac_auth.patch
+  - cyrus-imapd-2.4.17_ptloader-ldap_user_attribute.patch -- Allow a result 
attribute to be specified with ptclient/ldap.c
+* Supersedes KOLAB_cyrus-imapd-2.3.18_UID.patch
+
+- Renamed the following patches:
+  - syslog-facility-doc.patch to cyrus-imapd-2.3.16_syslog-facility-doc.patch
+
+- Rebased the following patches for cyrus-imapd-2.4.17:
+  - cyrus-imapd-db6.diff as cyrus-imapd-2.4.17_db6.patch
+  - cyrus-imapd-openslp.patch as cyrus-imapd-2.4.17_openslp.patch
+  - luser_relay.patch as cyrus-imapd-2.4.17_lmtp_catchall_mailbox.patch
+* Option 'lmtp_luser_relay' was renamed to 'lmtp_catchall_mailbox'
+* https://bugzilla.cyrusimap.org/show_bug.cgi?id=2360
+  - cyrus-imapd_tls-session-leak.dif as 
cyrus-imapd-2.4.17_tls-session-leak.patch
+* https://bugzilla.cyrusimap.org/show_bug.cgi?id=3252
+  - cyrus-imapd-2.3.16-autocreate-0.10-0.drac.diff as 
cyrus-imapd-2.4.17_autocreate-0.10-0.patch
+  - pie.patch as cyrus-imapd-2.4.17_pie.patch
+
+- Removed the following patches (unknown upstream status):
+  - KOLAB_cyrus-imapd-2.3.18_Folder-names.patch
+* There is no need for us to extend the mailbox name restrictions
+* https://bugzilla.cyrusimap.org/show_bug.cgi?id=2633
+  - KOLAB_cyrus-imapd-2.3.18_Groups2.patch
+* optional/not needed
+* https://bugzilla.cyrusimap.org/show_bug.cgi?id=2632
+* https://bugzilla.cyrusimap.org/show_bug.cgi?id=3282
+  - KOLAB_cyrus-imapd-2.3.18_timsieved_starttls-sendcaps.patch
+* Workaround for an issue with kontact/kio ~ KDE 3.5.9
+  - KOLAB_cyrus-imapd-2.3.18_UID.patch
+* Superseded by cyrus-imapd-2.4.17_ptloader-ldap_user_attribute.patch
+
+- Removed the following patches (upstream inclusion):
+  - charset.patch
+  - cyrus-imapd-perl-5.14.patch
+  - cyrus-imapd-perl-path.patch
+  - cyrus-imapd_references_header-dos.dif
+  - KOLAB_cyrus-imapd-2.3.18_Cyradm_Annotations.patch
+* 
http://git.cyrusimap.org/cyrus-imapd/commit/?h=cyrus-imapd-2.4id=98dd7a9130653ac848c0782a7688d26a090b494b
+  - KOLAB_cyrus-imapd-2.3.18_Logging.patch
+* Use 'auditlog: 1' in imapd.conf
+* https://bugzilla.cyrusimap.org/show_bug.cgi?id=2964
+  - user_deny_db-once.patch
+
+- Changed cyrus-imapd-rc.tar.gz contents, now having cyrus-imapd-rc-2.tar.gz:
+  - dir name now is SUSE (was: SuSE)
+  - renamed README.SuSE - 

commit cyrus-imapd for openSUSE:Factory

2013-06-17 Thread h_root
Hello community,

here is the log from the commit of package cyrus-imapd for openSUSE:Factory 
checked in at 2013-06-17 10:03:23

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  2013-06-05 
11:45:22.0 +0200
+++ /work/SRC/openSUSE:Factory/.cyrus-imapd.new/cyrus-imapd.changes 
2013-06-17 10:03:31.0 +0200
@@ -1,0 +2,5 @@
+Fri Jun 14 01:06:46 UTC 2013 - jeng...@inai.de
+
+- Add cyrus-imapd-db6.diff to fix compile abort with db = 5
+
+---

New:

  cyrus-imapd-db6.diff



Other differences:
--
++ cyrus-imapd.spec ++
--- /var/tmp/diff_new_pack.LCVNLE/_old  2013-06-17 10:03:34.0 +0200
+++ /var/tmp/diff_new_pack.LCVNLE/_new  2013-06-17 10:03:34.0 +0200
@@ -16,7 +16,6 @@
 #
 
 
-#
 %define prjname cyrus-imapd
 
 # Define and use _name because the macro expansion is not smart enough.  
Without
@@ -24,53 +23,26 @@
 %if ! %{defined with_kolab}
 %define with_kolab 0
 %define _name cyrus-imapd
-
 %else
 %define _name cyrus-imapd-kolab
-
 %endif
 
-Name:   %_name
-
 %if %{with_kolab}
 %define pkg_perl_Cyrus_IMAP perl-Cyrus-IMAP-kolab
 %define pkg_perl_Cyrus_SIEVE_managesieve 
perl-Cyrus-SIEVE-managesieve-kolab
 %else
 %define pkg_perl_Cyrus_IMAP perl-Cyrus-IMAP
 %define pkg_perl_Cyrus_SIEVE_managesieve perl-Cyrus-SIEVE-managesieve
-
 %endif
 
-BuildRequires:  automake
-BuildRequires:  bison
-BuildRequires:  cyrus-sasl-devel
-BuildRequires:  db-devel
-BuildRequires:  drac
-BuildRequires:  ed
-BuildRequires:  flex
-BuildRequires:  krb5-devel
-BuildRequires:  openldap2-devel
-BuildRequires:  openslp-devel
-BuildRequires:  openssl-devel
-BuildRequires:  opie
-BuildRequires:  perl-Digest-SHA1
-BuildRequires:  pwdutils
-BuildRequires:  tcpd-devel
+Name:   %_name
 Url:http://cyrusimap.web.cmu.edu/
-Requires:   %pkg_perl_Cyrus_IMAP
-Requires:   %pkg_perl_Cyrus_SIEVE_managesieve
-Recommends: perl-TermReadLine-Gnu
-Conflicts:  imap courier-imap
-%if %{with_kolab}
-Conflicts:  cyrus-imapd
-%else
-Conflicts:  cyrus-imapd-kolab
-%endif
 Summary:The Cyrus IMAP and POP Mail Server
 License:BSD-3-Clause
 Group:  Productivity/Networking/Email/Servers
 Version:2.3.18
 Release:0
+
 Source: %{prjname}-%{version}.tar.gz
 Source1:cyrus-imapd-rc.tar.gz
 Source2:DB_CONFIG
@@ -87,6 +59,7 @@
 Patch22:cyrus-imapd_tls-session-leak.dif
 Patch23:cyrus-imapd_references_header-dos.dif
 Patch24:charset.patch
+Patch25:cyrus-imapd-db6.diff
 %if %{with_kolab}
 # KOLAB_cyrus-imapd patches are maintained at
 # http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/imapd/patches/
@@ -98,12 +71,36 @@
 Patch106:   KOLAB_cyrus-imapd-%{version}_UID.patch
 Patch107:   KOLAB_cyrus-imapd-%{version}_cross-domain-acls.patch
 %endif
+BuildRoot:  %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  automake
+BuildRequires:  bison
+BuildRequires:  cyrus-sasl-devel
+BuildRequires:  db-devel
+BuildRequires:  drac
+BuildRequires:  ed
+BuildRequires:  flex
+BuildRequires:  krb5-devel
+BuildRequires:  openldap2-devel
+BuildRequires:  openslp-devel
+BuildRequires:  openssl-devel
+BuildRequires:  opie
+BuildRequires:  perl-Digest-SHA1
+BuildRequires:  pwdutils
+BuildRequires:  tcpd-devel
 
 Requires(pre):  /usr/sbin/useradd /usr/sbin/usermod %insserv_prereq 
%fillup_prereq /bin/sed
 Requires(pre):  /bin/awk /bin/grep /bin/cat /usr/bin/find /usr/bin/db_verify 
sh-utils
 Requires(pre):  fileutils cyrus-sasl netcfg /usr/bin/strings
 Recommends: cron
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
+Requires:   %pkg_perl_Cyrus_IMAP
+Requires:   %pkg_perl_Cyrus_SIEVE_managesieve
+Recommends: perl-TermReadLine-Gnu
+Conflicts:  imap courier-imap
+%if %{with_kolab}
+Conflicts:  cyrus-imapd
+%else
+Conflicts:  cyrus-imapd-kolab
+%endif
 
 %package -n %pkg_perl_Cyrus_IMAP
 
@@ -170,6 +167,7 @@
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
+%patch -P 25 -p1
 
 %if %{with_kolab}
 %patch100 -p1

++ cyrus-imapd-db6.diff ++
From: Jan Engelhardt jeng...@inai.de
Date: 2013-06-14 02:52:48.129456384 +0200

src: make compilation with libdb-6.0 succeed

db-6.0 has hit the scene.

The DB_VERSION_MAJOR version number juggling has been replaced in
cyrus-imapd-2.4.7 so that they are no longer necessary.

The changes for -set_bt_compare (mbox_compar) are not yet present
in cyrus-imapd-2.4.17.

---
 lib/cyrusdb_berkeley.c |   15 ++-
 1 file changed, 10 

commit cyrus-imapd for openSUSE:Factory

2013-06-05 Thread h_root
Hello community,

here is the log from the commit of package cyrus-imapd for openSUSE:Factory 
checked in at 2013-06-05 11:45:21

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  2013-02-15 
18:41:36.0 +0100
+++ /work/SRC/openSUSE:Factory/.cyrus-imapd.new/cyrus-imapd.changes 
2013-06-05 11:45:22.0 +0200
@@ -1,0 +2,12 @@
+Mon May 27 08:29:47 UTC 2013 - wer...@suse.de
+
+- Package perl-Cyrus-SIEVE-managesieve provides the sieveshell as
+  well as the package python-managesieve, therefore make them
+  conflicting
+
+---
+Tue May 21 10:39:20 UTC 2013 - a...@ajaissle.de
+
+- Added /var/lib/imap/ptclient to %files section
+
+---



Other differences:
--
++ cyrus-imapd.spec ++
--- /var/tmp/diff_new_pack.O0Ac8m/_old  2013-06-05 11:45:23.0 +0200
+++ /var/tmp/diff_new_pack.O0Ac8m/_new  2013-06-05 11:45:23.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package cyrus-imapd
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -123,6 +123,7 @@
 %else
 Conflicts:  perl-Cyrus-SIEVE-managesieve-kolab
 %endif
+Conflicts:  python-managesieve
 Summary:A Perl Module for Cyrus SIEVE
 Group:  Development/Libraries/Perl
 Requires:   perl = %{perl_version}
@@ -271,6 +272,7 @@
 install -m 644 SuSE/cyrus.conf $RPM_BUILD_ROOT/etc/cyrus.conf
 install -d -m 750 $RPM_BUILD_ROOT/var/lib/imap/user
 install -d -m 750 $RPM_BUILD_ROOT/var/lib/imap/quota
+install -d -m 700 $RPM_BUILD_ROOT/var/lib/imap/ptclient
 install -d -m 750 $RPM_BUILD_ROOT/var/lib/imap/proc
 install -d -m 750 $RPM_BUILD_ROOT/var/lib/imap/log
 install -d -m 750 $RPM_BUILD_ROOT/var/lib/imap/msg
@@ -356,6 +358,7 @@
 %attr(0750, cyrus, mail) /var/lib/imap/msg
 %attr(0750, cyrus, mail) /var/lib/imap/proc
 %attr(0750, cyrus, mail) /var/lib/imap/quota
+%attr(0700, cyrus, mail) /var/lib/imap/ptclient
 %attr(0750, cyrus, mail) /var/lib/imap/user
 %attr(0750, cyrus, mail) /var/lib/imap/socket
 %dir %attr(0750, cyrus, mail) /var/lib/imap/db

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit cyrus-imapd for openSUSE:Factory

2013-02-15 Thread h_root
Hello community,

here is the log from the commit of package cyrus-imapd for openSUSE:Factory 
checked in at 2013-02-15 18:41:34

Comparing /work/SRC/openSUSE:Factory/cyrus-imapd (Old)
 and  /work/SRC/openSUSE:Factory/.cyrus-imapd.new (New)


Package is cyrus-imapd, Maintainer is vark...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/cyrus-imapd/cyrus-imapd.changes  2012-06-25 
11:44:56.0 +0200
+++ /work/SRC/openSUSE:Factory/.cyrus-imapd.new/cyrus-imapd.changes 
2013-02-15 18:41:36.0 +0100
@@ -1,0 +2,5 @@
+Fri Feb 15 11:26:29 UTC 2013 - a...@ajaissle.de
+
+- enable --with-ldap option
+
+---



Other differences:
--
++ cyrus-imapd.spec ++
--- /var/tmp/diff_new_pack.mhU9l7/_old  2013-02-15 18:41:38.0 +0100
+++ /var/tmp/diff_new_pack.mhU9l7/_new  2013-02-15 18:41:38.0 +0100
@@ -35,8 +35,6 @@
 %if %{with_kolab}
 %define pkg_perl_Cyrus_IMAP perl-Cyrus-IMAP-kolab
 %define pkg_perl_Cyrus_SIEVE_managesieve 
perl-Cyrus-SIEVE-managesieve-kolab
-BuildRequires:  openldap2-devel
-
 %else
 %define pkg_perl_Cyrus_IMAP perl-Cyrus-IMAP
 %define pkg_perl_Cyrus_SIEVE_managesieve perl-Cyrus-SIEVE-managesieve
@@ -51,6 +49,7 @@
 BuildRequires:  ed
 BuildRequires:  flex
 BuildRequires:  krb5-devel
+BuildRequires:  openldap2-devel
 BuildRequires:  openslp-devel
 BuildRequires:  openssl-devel
 BuildRequires:  opie
@@ -209,6 +208,7 @@
 --with-cyrus-prefix=/usr/lib/cyrus \
--with-drac=%{_libdir} \
--with-gss_impl=auto \
+--with-ldap \
--with-libwrap=/usr \
--with-lock=fcntl \
--with-openslp=%{_libdir} \

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit cyrus-imapd for openSUSE:Factory

2012-06-25 Thread h_root
Hello community,

here is the log from the commit of package cyrus-imapd for openSUSE:Factory 
checked in at 2012-06-25 11:44:54

Comparing /work/SRC/openSUSE:Factory/cyrus-imapd (Old)
 and  /work/SRC/openSUSE:Factory/.cyrus-imapd.new (New)


Package is cyrus-imapd, Maintainer is rha...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/cyrus-imapd/cyrus-imapd.changes  2012-01-04 
07:23:43.0 +0100
+++ /work/SRC/openSUSE:Factory/.cyrus-imapd.new/cyrus-imapd.changes 
2012-06-25 11:44:56.0 +0200
@@ -1,0 +2,5 @@
+Tue Jun 19 11:24:06 UTC 2012 - meiss...@suse.com
+
+- allocate the right size (reported by freri...@rz.uni-kiel.de)
+
+---

New:

  charset.patch



Other differences:
--
++ cyrus-imapd.spec ++
--- /var/tmp/diff_new_pack.rew7PE/_old  2012-06-25 11:45:00.0 +0200
+++ /var/tmp/diff_new_pack.rew7PE/_new  2012-06-25 11:45:00.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package cyrus-imapd
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -14,6 +14,9 @@
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
+
+
+#
 %define prjname cyrus-imapd
 
 # Define and use _name because the macro expansion is not smart enough.  
Without
@@ -55,9 +58,8 @@
 BuildRequires:  pwdutils
 BuildRequires:  tcpd-devel
 Url:http://cyrusimap.web.cmu.edu/
-License:BSD-3-Clause
-Group:  Productivity/Networking/Email/Servers
-Requires:   %pkg_perl_Cyrus_IMAP %pkg_perl_Cyrus_SIEVE_managesieve
+Requires:   %pkg_perl_Cyrus_IMAP
+Requires:   %pkg_perl_Cyrus_SIEVE_managesieve
 Recommends: perl-TermReadLine-Gnu
 Conflicts:  imap courier-imap
 %if %{with_kolab}
@@ -66,6 +68,8 @@
 Conflicts:  cyrus-imapd-kolab
 %endif
 Summary:The Cyrus IMAP and POP Mail Server
+License:BSD-3-Clause
+Group:  Productivity/Networking/Email/Servers
 Version:2.3.18
 Release:0
 Source: %{prjname}-%{version}.tar.gz
@@ -83,6 +87,7 @@
 Patch20:cyrus-imapd-perl-5.14.patch
 Patch22:cyrus-imapd_tls-session-leak.dif
 Patch23:cyrus-imapd_references_header-dos.dif
+Patch24:charset.patch
 %if %{with_kolab}
 # KOLAB_cyrus-imapd patches are maintained at
 # http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/imapd/patches/
@@ -109,8 +114,8 @@
 Conflicts:  perl-Cyrus-IMAP-kolab
 %endif
 Summary:Cyrus IMAP Perl Module
-Requires:   perl = %{perl_version}
 Group:  Development/Libraries/Perl
+Requires:   perl = %{perl_version}
 
 %package -n %pkg_perl_Cyrus_SIEVE_managesieve
 
@@ -120,9 +125,9 @@
 Conflicts:  perl-Cyrus-SIEVE-managesieve-kolab
 %endif
 Summary:A Perl Module for Cyrus SIEVE
+Group:  Development/Libraries/Perl
 Requires:   perl = %{perl_version}
 Recommends: perl-TermReadLine-Gnu
-Group:  Development/Libraries/Perl
 
 %package -n %{name}-devel
 
@@ -164,6 +169,7 @@
 %patch20 -p1
 %patch22 -p1
 %patch23 -p1
+%patch24 -p1
 
 %if %{with_kolab}
 %patch100 -p1

++ charset.patch ++
Index: cyrus-imapd-2.3.18/lib/charset.c
===
--- cyrus-imapd-2.3.18.orig/lib/charset.c
+++ cyrus-imapd-2.3.18/lib/charset.c
@@ -723,7 +723,7 @@ struct convert_rock *search_init(const c
 s-substr = (unsigned char *)substr;
 
 /* allocate tracking space and initialise to no match */
-s-starts = xmalloc(s-max_start * sizeof(int));
+s-starts = xmalloc(s-max_start * sizeof(size_t));
 for (i = 0; i  s-max_start; i++) {
s-starts[i] = -1;
 }
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit cyrus-imapd for openSUSE:Factory

2012-01-03 Thread h_root
Hello community,

here is the log from the commit of package cyrus-imapd for openSUSE:Factory 
checked in at 2012-01-04 07:23:40

Comparing /work/SRC/openSUSE:Factory/cyrus-imapd (Old)
 and  /work/SRC/openSUSE:Factory/.cyrus-imapd.new (New)


Package is cyrus-imapd, Maintainer is rha...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/cyrus-imapd/cyrus-imapd.changes  2011-10-05 
11:08:07.0 +0200
+++ /work/SRC/openSUSE:Factory/.cyrus-imapd.new/cyrus-imapd.changes 
2012-01-04 07:23:43.0 +0100
@@ -1,0 +2,5 @@
+Fri Dec  2 07:47:58 UTC 2011 - co...@suse.com
+
+- add automake as buildrequire to avoid implicit dependency
+
+---



Other differences:
--
++ cyrus-imapd.spec ++
--- /var/tmp/diff_new_pack.VjrEQh/_old  2012-01-04 07:23:45.0 +0100
+++ /var/tmp/diff_new_pack.VjrEQh/_new  2012-01-04 07:23:45.0 +0100
@@ -14,8 +14,6 @@
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
-
-
 %define prjname cyrus-imapd
 
 # Define and use _name because the macro expansion is not smart enough.  
Without
@@ -42,9 +40,22 @@
 
 %endif
 
-BuildRequires:  bison cyrus-sasl-devel db-devel drac ed flex krb5-devel 
openslp-devel openssl-devel opie perl-Digest-SHA1 pwdutils tcpd-devel
+BuildRequires:  automake
+BuildRequires:  bison
+BuildRequires:  cyrus-sasl-devel
+BuildRequires:  db-devel
+BuildRequires:  drac
+BuildRequires:  ed
+BuildRequires:  flex
+BuildRequires:  krb5-devel
+BuildRequires:  openslp-devel
+BuildRequires:  openssl-devel
+BuildRequires:  opie
+BuildRequires:  perl-Digest-SHA1
+BuildRequires:  pwdutils
+BuildRequires:  tcpd-devel
 Url:http://cyrusimap.web.cmu.edu/
-License:BSD3c(or similar)
+License:BSD-3-Clause
 Group:  Productivity/Networking/Email/Servers
 Requires:   %pkg_perl_Cyrus_IMAP %pkg_perl_Cyrus_SIEVE_managesieve
 Recommends: perl-TermReadLine-Gnu
@@ -56,7 +67,7 @@
 %endif
 Summary:The Cyrus IMAP and POP Mail Server
 Version:2.3.18
-Release:22
+Release:0
 Source: %{prjname}-%{version}.tar.gz
 Source1:cyrus-imapd-rc.tar.gz
 Source2:DB_CONFIG
@@ -97,7 +108,6 @@
 %else
 Conflicts:  perl-Cyrus-IMAP-kolab
 %endif
-License:BSD3c(or similar)
 Summary:Cyrus IMAP Perl Module
 Requires:   perl = %{perl_version}
 Group:  Development/Libraries/Perl
@@ -109,7 +119,6 @@
 %else
 Conflicts:  perl-Cyrus-SIEVE-managesieve-kolab
 %endif
-License:BSD3c(or similar)
 Summary:A Perl Module for Cyrus SIEVE
 Requires:   perl = %{perl_version}
 Recommends: perl-TermReadLine-Gnu
@@ -122,7 +131,6 @@
 %else
 Conflicts:  cyrus-imapd-kolab
 %endif
-License:BSD3c(or similar)
 Summary:Libraries and Includes for Cyrus IMAPd
 Group:  Development/Libraries/C and C++
 

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit cyrus-imapd for openSUSE:Factory

2011-10-05 Thread h_root

Hello community,

here is the log from the commit of package cyrus-imapd for openSUSE:Factory
checked in at Wed Oct 5 11:08:00 CEST 2011.




--- openSUSE:Factory/cyrus-imapd/cyrus-imapd.changes2011-10-02 
09:55:24.0 +0200
+++ /mounts/work_src_done/STABLE/cyrus-imapd/cyrus-imapd.changes
2011-10-05 09:15:00.0 +0200
@@ -1,0 +2,8 @@
+Wed Oct  5 07:10:08 UTC 2011 - rha...@suse.de
+
+- Update to 2.3.18:
+  Malicious NNTP clients could bypass the authentication and
+  execute commands that normally require authentication.
+  (bnc#719998, CVE-2011-3372)
+
+---

calling whatdependson for head-i586


Old:

  KOLAB_cyrus-imapd-2.3.17_Cyradm_Annotations.patch
  KOLAB_cyrus-imapd-2.3.17_Folder-names.patch
  KOLAB_cyrus-imapd-2.3.17_Groups2.patch
  KOLAB_cyrus-imapd-2.3.17_Logging.patch
  KOLAB_cyrus-imapd-2.3.17_UID.patch
  KOLAB_cyrus-imapd-2.3.17_cross-domain-acls.patch
  KOLAB_cyrus-imapd-2.3.17_timsieved_starttls-sendcaps.patch
  cyrus-imapd-2.3.17.tar.gz

New:

  KOLAB_cyrus-imapd-2.3.18_Cyradm_Annotations.patch
  KOLAB_cyrus-imapd-2.3.18_Folder-names.patch
  KOLAB_cyrus-imapd-2.3.18_Groups2.patch
  KOLAB_cyrus-imapd-2.3.18_Logging.patch
  KOLAB_cyrus-imapd-2.3.18_UID.patch
  KOLAB_cyrus-imapd-2.3.18_cross-domain-acls.patch
  KOLAB_cyrus-imapd-2.3.18_timsieved_starttls-sendcaps.patch
  cyrus-imapd-2.3.18.tar.gz



Other differences:
--
++ cyrus-imapd.spec ++
--- /var/tmp/diff_new_pack.PwToTd/_old  2011-10-05 11:07:56.0 +0200
+++ /var/tmp/diff_new_pack.PwToTd/_new  2011-10-05 11:07:56.0 +0200
@@ -55,7 +55,7 @@
 Conflicts:  cyrus-imapd-kolab
 %endif
 Summary:The Cyrus IMAP and POP Mail Server
-Version:2.3.17
+Version:2.3.18
 Release:22
 Source: %{prjname}-%{version}.tar.gz
 Source1:cyrus-imapd-rc.tar.gz
@@ -72,7 +72,6 @@
 Patch20:cyrus-imapd-perl-5.14.patch
 Patch22:cyrus-imapd_tls-session-leak.dif
 Patch23:cyrus-imapd_references_header-dos.dif
-
 %if %{with_kolab}
 # KOLAB_cyrus-imapd patches are maintained at
 # http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/imapd/patches/

++ KOLAB_cyrus-imapd-2.3.17_Cyradm_Annotations.patch - 
KOLAB_cyrus-imapd-2.3.18_Cyradm_Annotations.patch ++

++ KOLAB_cyrus-imapd-2.3.17_Folder-names.patch - 
KOLAB_cyrus-imapd-2.3.18_Folder-names.patch ++

++ KOLAB_cyrus-imapd-2.3.17_Groups2.patch - 
KOLAB_cyrus-imapd-2.3.18_Groups2.patch ++

++ KOLAB_cyrus-imapd-2.3.17_Logging.patch - 
KOLAB_cyrus-imapd-2.3.18_Logging.patch ++

++ KOLAB_cyrus-imapd-2.3.17_UID.patch - KOLAB_cyrus-imapd-2.3.18_UID.patch 
++

++ KOLAB_cyrus-imapd-2.3.17_cross-domain-acls.patch - 
KOLAB_cyrus-imapd-2.3.18_cross-domain-acls.patch ++

++ KOLAB_cyrus-imapd-2.3.17_timsieved_starttls-sendcaps.patch - 
KOLAB_cyrus-imapd-2.3.18_timsieved_starttls-sendcaps.patch ++

++ cyrus-imapd-2.3.17.tar.gz - cyrus-imapd-2.3.18.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.3.17/Makefile.in 
new/cyrus-imapd-2.3.18/Makefile.in
--- old/cyrus-imapd-2.3.17/Makefile.in  2011-09-08 20:02:23.0 +0200
+++ new/cyrus-imapd-2.3.18/Makefile.in  2011-10-04 21:59:14.0 +0200
@@ -65,7 +65,7 @@
 COMPILE_ET = @COMPILE_ET@
 
 PACKAGE = cyrus-imapd
-VERSION = 2.3.17
+VERSION = 2.3.18
 
 all:: 
@for d in  $(SUBDIRS); \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.3.17/doc/changes.html 
new/cyrus-imapd-2.3.18/doc/changes.html
--- old/cyrus-imapd-2.3.17/doc/changes.html 2011-09-08 20:02:23.0 
+0200
+++ new/cyrus-imapd-2.3.18/doc/changes.html 2011-10-04 21:59:14.0 
+0200
@@ -8,6 +8,13 @@
 /head
 body
 
+h1Changes to the Cyrus IMAP Server since 2.3.17/h1
+ul
+liFix for incomplete authentication checks in nntpd,
+reported by Secunia as SA46093 - thanks Stefan Cornelius,
+Secunia Research/li
+/ul
+
 h1Changes to the Cyrus IMAP Server since 2.3.16/h1
 ul
 liFix for CVE-2011-3208, a remotely exploitable buffer
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.3.17/doc/man/arbitron.8.html 
new/cyrus-imapd-2.3.18/doc/man/arbitron.8.html
--- old/cyrus-imapd-2.3.17/doc/man/arbitron.8.html  2011-09-08 
20:03:46.0 +0200
+++ new/cyrus-imapd-2.3.18/doc/man/arbitron.8.html  2011-10-04 
21:59:24.0 +0200
@@ -1,5 +1,5 @@
 !-- Creator : groff version 1.21 --
-!-- CreationDate: Thu Sep  8 20:03:46 2011 --
+!-- CreationDate: Tue Oct  4 21:59:24 2011 --
 !DOCTYPE html PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN
 http://www.w3.org/TR/html4/loose.dtd;
 html
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 

commit cyrus-imapd for openSUSE:Factory

2011-09-21 Thread h_root

Hello community,

here is the log from the commit of package cyrus-imapd for openSUSE:Factory
checked in at Wed Sep 21 16:59:50 CEST 2011.




--- cyrus-imapd/cyrus-imapd.changes 2011-09-18 02:14:32.0 +0200
+++ /mounts/work_src_done/STABLE/cyrus-imapd/cyrus-imapd.changes
2011-09-21 11:35:51.0 +0200
@@ -1,0 +2,9 @@
+Wed Sep 21 09:34:04 UTC 2011 - rha...@suse.de
+
+- Update to 2.3.17. Only change:
+  * includes the nntpd bufferoverflow patch
+- Refreshed KOLAB patches
+- Fixed a potential DoS bug, when server-side threading is used
+  (bnc#718428)
+
+---

calling whatdependson for head-i586


Old:

  KOLAB_cyrus-imapd-2.3.16_Cyradm_Annotations.patch
  KOLAB_cyrus-imapd-2.3.16_Folder-names.patch
  KOLAB_cyrus-imapd-2.3.16_Groups2.patch
  KOLAB_cyrus-imapd-2.3.16_Logging.patch
  KOLAB_cyrus-imapd-2.3.16_UID.patch
  KOLAB_cyrus-imapd-2.3.16_cross-domain-acls.patch
  KOLAB_cyrus-imapd-2.3.16_timsieved_starttls-sendcaps.patch
  auth_krb5-sentinel.patch
  cyrus-imapd-2.3.16.tar.bz2
  cyrus-imapd-STARTTLS-plaintext-command-injection.patch
  cyrus-imapd-libdb-4_8.patch
  cyrus-imapd_nntp-overflow.dif
  murder-backend-empty-mechlist.patch

New:

  KOLAB_cyrus-imapd-2.3.17_Cyradm_Annotations.patch
  KOLAB_cyrus-imapd-2.3.17_Folder-names.patch
  KOLAB_cyrus-imapd-2.3.17_Groups2.patch
  KOLAB_cyrus-imapd-2.3.17_Logging.patch
  KOLAB_cyrus-imapd-2.3.17_UID.patch
  KOLAB_cyrus-imapd-2.3.17_cross-domain-acls.patch
  KOLAB_cyrus-imapd-2.3.17_timsieved_starttls-sendcaps.patch
  cyrus-imapd-2.3.17.tar.gz
  cyrus-imapd_references_header-dos.dif



Other differences:
--
++ cyrus-imapd.spec ++
--- /var/tmp/diff_new_pack.h9noIn/_old  2011-09-21 16:59:44.0 +0200
+++ /var/tmp/diff_new_pack.h9noIn/_new  2011-09-21 16:59:44.0 +0200
@@ -42,7 +42,7 @@
 
 %endif
 
-BuildRequires:  bison cyrus-sasl-devel db-devel drac ed flex krb5-devel 
openslp-devel openssl-devel opie pwdutils tcpd-devel
+BuildRequires:  bison cyrus-sasl-devel db-devel drac ed flex krb5-devel 
openslp-devel openssl-devel opie perl-Digest-SHA1 pwdutils tcpd-devel
 Url:http://cyrusimap.web.cmu.edu/
 License:BSD3c(or similar)
 Group:  Productivity/Networking/Email/Servers
@@ -55,27 +55,23 @@
 Conflicts:  cyrus-imapd-kolab
 %endif
 Summary:The Cyrus IMAP and POP Mail Server
-Version:2.3.16
+Version:2.3.17
 Release:22
-Source: %{prjname}-%{version}.tar.bz2
+Source: %{prjname}-%{version}.tar.gz
 Source1:cyrus-imapd-rc.tar.gz
 Source2:DB_CONFIG
 # The autocreate Patchset is maintained at:
 # http://email.uoa.gr/projects/cyrus/autocreate/
 Patch1: cyrus-imapd-2.3.16-autocreate-0.10-0.drac.diff
-Patch3: auth_krb5-sentinel.patch
 Patch4: luser_relay.patch
 Patch5: user_deny_db-once.patch
-Patch6: murder-backend-empty-mechlist.patch
 Patch7: syslog-facility-doc.patch
 Patch10:cyrus-imapd-openslp.patch
 Patch12:pie.patch
 Patch18:cyrus-imapd-perl-path.patch
-Patch19:cyrus-imapd-libdb-4_8.patch
 Patch20:cyrus-imapd-perl-5.14.patch
-Patch21:cyrus-imapd-STARTTLS-plaintext-command-injection.patch
 Patch22:cyrus-imapd_tls-session-leak.dif
-Patch23:cyrus-imapd_nntp-overflow.dif
+Patch23:cyrus-imapd_references_header-dos.dif
 
 %if %{with_kolab}
 # KOLAB_cyrus-imapd patches are maintained at
@@ -152,17 +148,13 @@
 %setup -q -a 1 -n %{prjname}-%{version}
 patch -s -p0  contrib/drac_auth.patch
 %patch1 -p1
-%patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 %patch7 -p1
 %patch10
 %patch12 -p1
 %patch18
-%patch19 -p1
 %patch20 -p1
-%patch21 -p1
 %patch22 -p1
 %patch23 -p1
 

++ KOLAB_cyrus-imapd-2.3.16_Cyradm_Annotations.patch - 
KOLAB_cyrus-imapd-2.3.17_Cyradm_Annotations.patch ++

++ KOLAB_cyrus-imapd-2.3.16_Folder-names.patch - 
KOLAB_cyrus-imapd-2.3.17_Folder-names.patch ++
--- cyrus-imapd/KOLAB_cyrus-imapd-2.3.16_Folder-names.patch 2010-02-24 
22:11:06.0 +0100
+++ 
/mounts/work_src_done/STABLE/cyrus-imapd/KOLAB_cyrus-imapd-2.3.17_Folder-names.patch
2011-09-21 11:35:45.0 +0200
@@ -1,16 +1,17 @@
 Modifies the set of accepted characters in folder names for the cyrus imapd 
server [Version: 2.3.9]
 
-diff -r 17e54b46d7b6 imap/mboxname.c
 a/imap/mboxname.c  Mon Oct 27 18:44:56 2008 +0100
-+++ b/imap/mboxname.c  Mon Oct 27 18:47:11 2008 +0100
-@@ -713,8 +713,10 @@
+Index: cyrus-imapd-2.3.17/imap/mboxname.c
+===
+--- cyrus-imapd-2.3.17.orig/imap/mboxname.c
 cyrus-imapd-2.3.17/imap/mboxname.c
+@@ -720,8 +720,10 @@ int mboxname_netnewscheck(char *name)
  /*
   * Apply site policy restrictions on mailbox names.
   * Restrictions are hardwired for now.

commit cyrus-imapd for openSUSE:Factory

2011-09-20 Thread h_root

Hello community,

here is the log from the commit of package cyrus-imapd for openSUSE:Factory
checked in at Tue Sep 20 12:50:49 CEST 2011.




--- cyrus-imapd/cyrus-imapd.changes 2011-09-09 09:42:59.0 +0200
+++ /mounts/work_src_done/STABLE/cyrus-imapd/cyrus-imapd.changes
2011-09-18 02:14:32.0 +0200
@@ -1,0 +2,6 @@
+Sun Sep 18 00:14:26 UTC 2011 - jeng...@medozas.de
+
+- Remove redundant tags/sections from specfile
+- Use %_smp_mflags for parallel build
+
+---

calling whatdependson for head-i586




Other differences:
--
++ cyrus-imapd.spec ++
--- /var/tmp/diff_new_pack.diMAwG/_old  2011-09-20 12:50:42.0 +0200
+++ /var/tmp/diff_new_pack.diMAwG/_new  2011-09-20 12:50:42.0 +0200
@@ -15,7 +15,6 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 %define prjname cyrus-imapd
 
@@ -98,7 +97,6 @@
 
 %package -n %pkg_perl_Cyrus_IMAP
 
-
 %if %{with_kolab}
 Conflicts:  perl-Cyrus-IMAP
 %else
@@ -111,7 +109,6 @@
 
 %package -n %pkg_perl_Cyrus_SIEVE_managesieve
 
-
 %if %{with_kolab}
 Conflicts:  perl-Cyrus-SIEVE-managesieve
 %else
@@ -125,7 +122,6 @@
 
 %package -n %{name}-devel
 
-
 %if %{with_kolab}
 Conflicts:  cyrus-imapd
 %else
@@ -141,39 +137,15 @@
 technologies. Cyrus technologies scale from independent use in email
 departments to a system centrally managed in a large enterprise.
 
-
-
-Authors:
-
-Office of Technology Transfer Carnegie Mellon University 
tech-trans...@andrew.cmu.edu
-
 %description -n %pkg_perl_Cyrus_IMAP
 A Cyrus IMAP Perl module for the Cyrus IMAPD.
 
-
-
-Authors:
-
-Office of Technology Transfer Carnegie Mellon University 
tech-trans...@andrew.cmu.edu
-
 %description -n %pkg_perl_Cyrus_SIEVE_managesieve
 A Perl module for Cyrus SIEVE.
 
-
-
-Authors:
-
-Office of Technology Transfer Carnegie Mellon University 
tech-trans...@andrew.cmu.edu
-
 %description -n %{name}-devel
 This package provides the libraries and include files for Cyrus IMAPd.
 
-
-
-Authors:
-
-Office of Technology Transfer Carnegie Mellon University 
tech-trans...@andrew.cmu.edu
-
 %define cyrus_uid 96
 
 %prep
@@ -239,8 +211,8 @@
--with-perl=/usr/bin/perl \
--with-syslogfacility=DAEMON \
--without-ucdsnmp $CONFIGURE_ARGS
-make depend
-make
+make depend %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
 mkdir -p $RPM_BUILD_ROOT/etc/init.d






Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit cyrus-imapd for openSUSE:Factory

2011-09-09 Thread h_root

Hello community,

here is the log from the commit of package cyrus-imapd for openSUSE:Factory
checked in at Fri Sep 9 13:34:33 CEST 2011.




--- cyrus-imapd/cyrus-imapd.changes 2011-06-20 11:52:20.0 +0200
+++ /mounts/work_src_done/STABLE/cyrus-imapd/cyrus-imapd.changes
2011-09-09 09:42:59.0 +0200
@@ -1,0 +2,5 @@
+Thu Sep  1 09:08:52 UTC 2011 - rha...@suse.de
+
+- Fixed a buffer overflow in nntpd (bnc#715251) 
+
+---

calling whatdependson for head-i586


New:

  cyrus-imapd_nntp-overflow.dif



Other differences:
--
++ cyrus-imapd.spec ++
--- /var/tmp/diff_new_pack.STdO9J/_old  2011-09-09 13:34:29.0 +0200
+++ /var/tmp/diff_new_pack.STdO9J/_new  2011-09-09 13:34:29.0 +0200
@@ -57,7 +57,7 @@
 %endif
 Summary:The Cyrus IMAP and POP Mail Server
 Version:2.3.16
-Release:20
+Release:22
 Source: %{prjname}-%{version}.tar.bz2
 Source1:cyrus-imapd-rc.tar.gz
 Source2:DB_CONFIG
@@ -76,6 +76,7 @@
 Patch20:cyrus-imapd-perl-5.14.patch
 Patch21:cyrus-imapd-STARTTLS-plaintext-command-injection.patch
 Patch22:cyrus-imapd_tls-session-leak.dif
+Patch23:cyrus-imapd_nntp-overflow.dif
 
 %if %{with_kolab}
 # KOLAB_cyrus-imapd patches are maintained at
@@ -191,6 +192,7 @@
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
+%patch23 -p1
 
 %if %{with_kolab}
 %patch100 -p1

++ cyrus-imapd_nntp-overflow.dif ++
Index: cyrus-imapd-2.3.11/imap/nntpd.c
===
--- cyrus-imapd-2.3.11.orig/imap/nntpd.c
+++ cyrus-imapd-2.3.11/imap/nntpd.c
@@ -4107,7 +4107,8 @@ static struct wildmat *split_wildmats(ch
else if (*c == '@') wild[n].not = -1;   /* absolute not (feeding) */
else wild[n].not = 0;
 
-   strcpy(p, wild[n].not ? c + 1 : c);
+   strncpy(p, wild[n].not ? c + 1 : c, pattern+sizeof(pattern) - p);
+   pattern[sizeof(pattern)-1] = '\0';
wild[n++].pat = xstrdup(pattern);
 } while (c != str);
 wild[n].pat = NULL;





Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit cyrus-imapd for openSUSE:Factory

2011-06-20 Thread h_root

Hello community,

here is the log from the commit of package cyrus-imapd for openSUSE:Factory
checked in at Mon Jun 20 14:02:16 CEST 2011.




--- cyrus-imapd/cyrus-imapd.changes 2011-05-23 16:18:17.0 +0200
+++ /mounts/work_src_done/STABLE/cyrus-imapd/cyrus-imapd.changes
2011-06-20 11:52:20.0 +0200
@@ -1,0 +2,7 @@
+Mon Jun 20 09:50:50 UTC 2011 - rha...@suse.de
+
+- TLS initialization failures could lead to a bdb resource leak
+  resulting lmtpd to stop delivering mails. (bnc#606710,
+  cyrus-bug#3252)
+
+---

calling whatdependson for head-i586


New:

  cyrus-imapd_tls-session-leak.dif



Other differences:
--
++ cyrus-imapd.spec ++
--- /var/tmp/diff_new_pack.DRQ2SB/_old  2011-06-20 14:01:12.0 +0200
+++ /var/tmp/diff_new_pack.DRQ2SB/_new  2011-06-20 14:01:12.0 +0200
@@ -57,7 +57,7 @@
 %endif
 Summary:The Cyrus IMAP and POP Mail Server
 Version:2.3.16
-Release:18
+Release:20
 Source: %{prjname}-%{version}.tar.bz2
 Source1:cyrus-imapd-rc.tar.gz
 Source2:DB_CONFIG
@@ -75,6 +75,7 @@
 Patch19:cyrus-imapd-libdb-4_8.patch
 Patch20:cyrus-imapd-perl-5.14.patch
 Patch21:cyrus-imapd-STARTTLS-plaintext-command-injection.patch
+Patch22:cyrus-imapd_tls-session-leak.dif
 
 %if %{with_kolab}
 # KOLAB_cyrus-imapd patches are maintained at
@@ -189,6 +190,7 @@
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
 
 %if %{with_kolab}
 %patch100 -p1

++ cyrus-imapd_tls-session-leak.dif ++
Index: cyrus-imapd-2.3.16/imap/tls.c
===
--- cyrus-imapd-2.3.16.orig/imap/tls.c
+++ cyrus-imapd-2.3.16/imap/tls.c
@@ -714,6 +714,10 @@ int tls_init_serverengine(const char
 if (!SSL_CTX_set_cipher_list(s_ctx, cipher_list)) {
syslog(LOG_ERR,TLS server engine: cannot load cipher list '%s',
   cipher_list);
+   if ( sess_dbopen  (DB-close)(sessdb) ) {
+   syslog(LOG_ERR, DBERROR: error closing tlsdb: %s,
+  cyrusdb_strerror(r));
+   }
return (-1);
 }
 
@@ -731,6 +735,10 @@ int tls_init_serverengine(const char
 
 if (!set_cert_stuff(s_ctx, s_cert_file, s_key_file)) {
syslog(LOG_ERR,TLS server engine: cannot load cert/key data);
+   if ( sess_dbopen  (DB-close)(sessdb) ) {
+   syslog(LOG_ERR, DBERROR: error closing tlsdb: %s,
+  cyrusdb_strerror(r));
+   }
return (-1);
 }
 SSL_CTX_set_tmp_rsa_callback(s_ctx, tmp_rsa_cb);





Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit cyrus-imapd for openSUSE:Factory

2011-05-24 Thread h_root

Hello community,

here is the log from the commit of package cyrus-imapd for openSUSE:Factory
checked in at Tue May 24 14:19:10 CEST 2011.




--- cyrus-imapd/cyrus-imapd.changes 2010-12-07 23:02:10.0 +0100
+++ /mounts/work_src_done/STABLE/cyrus-imapd/cyrus-imapd.changes
2011-05-23 16:18:17.0 +0200
@@ -1,0 +2,7 @@
+Mon May 23 14:17:33 UTC 2011 - rha...@suse.de
+
+- Fixed STARTTLS plaintext command injection vulnerability
+  (bnc#694247, cyrus-bug#3425)
+- Fixed building against newer perl release (5.14)
+
+---

calling whatdependson for head-i586


New:

  cyrus-imapd-STARTTLS-plaintext-command-injection.patch
  cyrus-imapd-perl-5.14.patch



Other differences:
--
++ cyrus-imapd.spec ++
--- /var/tmp/diff_new_pack.hzPwS1/_old  2011-05-24 14:16:56.0 +0200
+++ /var/tmp/diff_new_pack.hzPwS1/_new  2011-05-24 14:16:56.0 +0200
@@ -1,7 +1,7 @@
 #
-# spec file for package cyrus-imapd (Version 2.3.16)
+# spec file for package cyrus-imapd
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -57,7 +57,7 @@
 %endif
 Summary:The Cyrus IMAP and POP Mail Server
 Version:2.3.16
-Release:12
+Release:18
 Source: %{prjname}-%{version}.tar.bz2
 Source1:cyrus-imapd-rc.tar.gz
 Source2:DB_CONFIG
@@ -73,6 +73,8 @@
 Patch12:pie.patch
 Patch18:cyrus-imapd-perl-path.patch
 Patch19:cyrus-imapd-libdb-4_8.patch
+Patch20:cyrus-imapd-perl-5.14.patch
+Patch21:cyrus-imapd-STARTTLS-plaintext-command-injection.patch
 
 %if %{with_kolab}
 # KOLAB_cyrus-imapd patches are maintained at
@@ -185,6 +187,8 @@
 %patch12 -p1
 %patch18
 %patch19 -p1
+%patch20 -p1
+%patch21 -p1
 
 %if %{with_kolab}
 %patch100 -p1

++ cyrus-imapd-STARTTLS-plaintext-command-injection.patch ++
From febfa4a5e2b20521e6176c787b0f05acc05d93e6 Mon Sep 17 00:00:00 2001
From: Ken Murchison mu...@andrew.cmu.edu
Date: Fri, 25 Mar 2011 11:50:18 -0400
Subject: Fixed bug #3423 - STARTTLS plaintext command injection vulnerability


Index: cyrus-imapd-2.3.16/imap/imapd.c
===
--- cyrus-imapd-2.3.16.orig/imap/imapd.c
+++ cyrus-imapd-2.3.16/imap/imapd.c
@@ -1774,6 +1774,9 @@ void cmdloop()
if (c == '\r') c = prot_getc(imapd_in);
if (c != '\n') goto extraargs;
 
+   /* XXX  discard any input pipelined after STARTTLS */
+   prot_flush(imapd_in);
+
/* if we've already done SASL fail */
if (imapd_userid != NULL) {
prot_printf(imapd_out, 
Index: cyrus-imapd-2.3.16/imap/lmtpengine.c
===
--- cyrus-imapd-2.3.16.orig/imap/lmtpengine.c
+++ cyrus-imapd-2.3.16/imap/lmtpengine.c
@@ -1576,6 +1576,9 @@ void lmtpmode(struct lmtp_func *func,
sasl_ssf_t ssf;
char *auth_id;
 
+   /* XXX  discard any input pipelined after STARTTLS */
+   prot_flush(pin);
+
/* SASL and openssl have different ideas
   about whether ssf is signed */
layerp = (int *) ssf;
Index: cyrus-imapd-2.3.16/imap/mupdate.c
===
--- cyrus-imapd-2.3.16.orig/imap/mupdate.c
+++ cyrus-imapd-2.3.16/imap/mupdate.c
@@ -927,6 +927,9 @@ mupdate_docmd_result_t docmd(struct conn
if (!strcmp(c-cmd.s, Starttls)) {
CHECKNEWLINE(c, ch);

+   /* XXX  discard any input pipelined after STARTTLS */
+   prot_flush(c-pin);
+
if (!tls_enabled()) {
/* we don't support starttls */
goto badcmd;
Index: cyrus-imapd-2.3.16/imap/nntpd.c
===
--- cyrus-imapd-2.3.16.orig/imap/nntpd.c
+++ cyrus-imapd-2.3.16/imap/nntpd.c
@@ -1436,6 +1436,9 @@ static void cmdloop(void)
if (c == '\r') c = prot_getc(nntp_in);
if (c != '\n') goto extraargs;
 
+   /* XXX  discard any input pipelined after STARTTLS */
+   prot_flush(nntp_in);
+
cmd_starttls(0);
}
else if (!strcmp(cmd.s, Stat)) {
Index: cyrus-imapd-2.3.16/imap/pop3d.c
===
--- cyrus-imapd-2.3.16.orig/imap/pop3d.c
+++ cyrus-imapd-2.3.16/imap/pop3d.c
@@ -950,6 +950,9 @@ static void cmdloop(void)
if (arg) {
prot_printf(popd_out, -ERR