Request 388 (accepted)

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Overview

Request 388 (accepted)

No description set

Created by vanmeeuwen almost 11 years ago
In state accepted
Open review for Admin
Open review for kolab-developers

Submit cyrus-imapd

Submit package home:vanmeeuw...b:Development / cyrus-imapd to package Kolab:Development / cyrus-imapd

cyrus-imapd.spec Changed

@@ -1,4 +1,8 @@
-#TODO: merge all sub-packages (except -devel) into cyrus-imapd, they are all required
+%if 0%{?suse_version} < 1 && 0%{?fedora} < 1 && 0%{?rhel} < 7
+%global with_systemd 0
+%else
+%global with_systemd 1
+%endif
 
 %global _name cyrus-imapd
 
@@ -11,22 +15,22 @@
 %global _cyrusgroup mail
 %global _cyrexecdir %{_exec_prefix}/lib/%{_name}
 
-%global real_version 2.4.17
+%global real_version 2.5
 #%%global snapshot_version git201204161439
 #%%global dot_snapshot_version .%{snapshot_version}
 
-%if 0%{?suse_version}
-%define with_systemd 1
-%endif
+##
+## Options
+##
 
-%if 0%{?rhel} > 6 || 0%{?fedora} > 16
-%define with_systemd 1
-%endif
+%global with_mysql 0
+%global with_pgsql 0
+%global with_dav 0
 
 Name:               cyrus-imapd
 Summary:            A high-performance mail server with IMAP, POP3, NNTP and SIEVE support
-Version:            2.4.17
-Release:            2%{?dist}
+Version:            2.5
+Release:            1%{?dist}
 License:            BSD
 Group:              System Environment/Daemons
 URL:                http://www.cyrusimap.org
@@ -53,78 +57,105 @@
 ##
 ## Patches
 ##
-Patch1:             http://www.oakton.edu/~jwade/cyrus/cyrus-imapd-2.1.3/cyrus-imapd-2.1.3-flock.patch
-# fedora/rhel specific, find current db lib, rhbz#461875
-Patch11:            cyrus-imapd-2.3.12p2-current-db.patch
-# for c-i <= 2.4.12
-Patch12:            cyrus-imapd-2.4.12-debugopt.patch
-Patch13:            %{name}-2.3.16-002-strip-out-krb4.patch
-# PATCH-FIX-UPSTREAM cyrus-imapd-2.4.17_htmlstrip_no_return.patch
-Patch20:            %{name}-2.4.17_htmlstrip_no_return.patch
-# Patches of which the status or upstream is unknown
-Patch903:           %{name}-2.4.15-903-normalize-authorization-id.patch
-Patch905:           cyrus-imapd-2.4.10-ptloader-ldap_user_attribute.patch
+Patch0001:          cyrus-imapd-2.5-autoconf-2.63.patch
+Patch0002:          cyrus-imapd-2.5-lt-prereq.patch
+Patch0003:          cyrus-imapd-2.5-with-dav-ifdefs.patch
 
 BuildRoot:          %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
+##
+## Build Requirements
+##
 BuildRequires:      autoconf
 BuildRequires:      automake
 BuildRequires:      bison
 BuildRequires:      cyrus-sasl-devel
+
+%if 0%{?suse_version}
+BuildRequires:      db-devel
+%else
+BuildRequires:      db4-devel
+%endif
+
 BuildRequires:      flex
+BuildRequires:      gcc-c++
+
 %if 0%{?suse_version} >= 1310
 BuildRequires:      groff-full
 %else
 BuildRequires:      groff
 %endif
+
+%if 0%{?suse_version}
+BuildRequires:      libjansson4-devel
+%else
+BuildRequires:      jansson-devel
+%endif
 BuildRequires:      krb5-devel
-%if 0%{?with_mysql} > 0
+
+%if 0%{?with_dav}
+BuildRequires:      libical-devel
+%endif
+
+%if 0%{?suse_version}
+BuildRequires:      libtool
+%endif
+
+BuildRequires:      libuuid-devel
+
+%if 0%{?with_mysql}
 BuildRequires:      mysql-devel
 %endif
+
+BuildRequires:      net-snmp-devel
+%if 0%{?suse_version}
+BuildRequires:      openldap2-devel
+%else
+BuildRequires:      openldap-devel
+%endif
+
 BuildRequires:      openssl-devel
 BuildRequires:      perl(ExtUtils::MakeMaker)
-BuildRequires:      pkgconfig
-%if 0%{?with_pgsql} > 0
-BuildRequires:      postgresql-devel
-%endif
-BuildRequires:      net-snmp-devel
-BuildRequires:      transfig
 
-%if 0%{?fedora} > 8
-BuildRequires:      perl-devel
+%if 0%{?suse_version}
+BuildRequires:      perl
 %else
-%if 0%{?rhel} >= 6
 BuildRequires:      perl-devel
 %endif
+
+BuildRequires:      pkgconfig
+
+%if 0%{?with_pgsql}
+BuildRequires:      postgresql-devel
+%endif
+
+%if 0%{?with_dav}
+BuildRequires:      sqlite-devel
 %endif
 
 %if 0%{?suse_version}
-BuildRequires:      db-devel
-BuildRequires:      openldap2-devel
 BuildRequires:      tcpd-devel
-Requires:           db-utils
-PreReq:             /usr/sbin/groupadd
-PreReq:             /usr/sbin/useradd
 %else
-BuildRequires:      db4-devel
-BuildRequires:      openldap-devel
-Requires:           db4-utils
 BuildRequires:      tcp_wrappers
 %endif
 
-Requires:           %{name}-utils = %{version}-%{release}
-Requires:           file
-Requires:           perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires:      transfig
+BuildRequires:      xapian-core-devel
 
 %if 0%{?suse_version}
-%if 0%{?with_systemd}
-PreReq: %fillup_prereq
-%else
-PreReq: %fillup_prereq
-PreReq: %insserv_prereq
+PreReq:             /usr/sbin/groupadd
+PreReq:             /usr/sbin/useradd
 %endif
+
+%if 0%{?suse_version}
+Requires:           db-utils
+%else
+Requires:           db4-utils
 %endif
 
+Requires:           file
+Requires:           perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+
 Requires(post):     coreutils
 Requires(post):     e2fsprogs
 Requires(post):     findutils
@@ -135,6 +166,7 @@
 
 %if 0%{?with_systemd}
 %if 0%{?suse_version}
+PreReq:             %fillup_prereq
 Requires(post):     systemd
 Requires(preun):    systemd
 Requires(postun):   systemd
@@ -144,12 +176,17 @@
 Requires(postun):   systemd-units
 %endif
 %else
+%if 0%{?suse_version}
+PreReq:             %fillup_prereq
+PreReq:             %insserv_prereq
+%else
 Requires(preun):    chkconfig
 Requires(preun):    initscripts
 Requires(post):     chkconfig
 Requires(post):     initscripts
 Requires(postun):   initscripts
 %endif
+%endif
 
 Obsoletes:          %{name}-perl < %{version}-%{release}
 Provides:           %{name}-perl = %{version}-%{release}
@@ -194,27 +231,28 @@
 
 %prep
 %setup -q -n %{_name}-%{real_version}%{?dot_snapshot_version}
-%patch1 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-
-%patch20 -p1
-
-%patch903 -p1
-%patch905 -p1
+#%patch0001 -p1
+%patch0002 -p1
+%patch0003 -p1
 
 # only to update config.* files
-automake -a -f -c || :
 aclocal -I cmulocal
-autoheader
-autoconf -f
+libtoolize --install
+automake --add-missing || autoreconf -v && automake --add-missing
+autoreconf -v
 
 # Modify docs master --> cyrus-master
 %{__perl} -pi -e "s@master$8$@cyrus-master(8)@" man/*5 man/*8 lib/imapoptions
 %{__sed} -i -e 's|$[^-]$master|\1cyrus-master|g;s|^master|cyrus-master|g;s|Master|Cyrus-master|g;s|MASTER|CYRUS-MASTER|g' \
         man/master.8 doc/man.html
 
+%if 0%{?with_dav}
+# Modify docs httpd --> cyrus-httpd
+%{__perl} -pi -e "s@httpd$8$@cyrus-httpd(8)@" man/*5 man/*8 lib/imapoptions
+%{__sed} -i -e 's|$[^-]$httpd|\1cyrus-httpd|g;s|^httpd|cyrus-httpd|g;s|Httpd|Cyrus-httpd|g;s|HTTPD|CYRUS-HTTPD|g' \
+        man/httpd.8 doc/man.html
+%endif
+
 # Modify path in perl scripts
 find . -type f -name "*.pl" | xargs %{__perl} -pi -e "s@/usr/local/bin/perl@%{__perl}@"
 
@@ -235,35 +273,40 @@
 %endif
 
 %{configure} \
-    --enable-netscapehack \
+    --enable-event-notification \
+    --enable-gssapi \
     --enable-idled \
-    --with-ldap=/usr \
-    --with-snmp \
-    --without-snmp \
     --enable-murder \
-    --enable-replication \
+    --enable-netscapehack \
     --enable-nntp \
-    --enable-gssapi \
+    --enable-replication \
+    --enable-xapian \
+%if 0%{?fedora} >= 20 || 0%{?rhel} || 0%{?suse_version}
     --with-bdb-incdir=%{_includedir}/db4 \
+%else
+    --with-bdb-incdir=%{_includedir}/libdb4 \
+%endif
     --with-cyrus-prefix=%{_cyrexecdir} \
     --with-extraident="Kolab-%{version}-%{release}" \
-%if 0%{?with_mysql} > 0
+%if 0%{?with_dav}
+    --with-http \
+%endif
+    --with-krbimpl=mit \
+    --with-ldap=/usr \
+%if 0%{?with_mysql}
     --with-mysql=%{_prefix} \
     --with-mysql-incdir=%{_includedir}/mysql/ \
     --with-mysql-libdir=%{_libdir}/mysql/ \
 %endif
     --with-perl=%{__perl} \
-%if 0%{?with_pgsql} > 0
+%if 0%{?with_pgsql}
     --with-pgsql=%{_includedir} \
 %endif
     --with-service-path=%{_cyrexecdir} \
-    --with-syslogfacility=MAIL \
-    --with-krbimpl=mit
+    --with-snmp \
+    --with-syslogfacility=MAIL
 
-%{__make} -C man -f Makefile.dist
-%{__make} -C doc -f Makefile.dist
 %{__make}
-%{__make} -C notifyd notifytest
 
 %install
 %{__rm} -rf %{buildroot}
@@ -271,21 +314,8 @@
 # Fix permissions on perl programs
 find . -type f -name "*.pl" -exec %{__chmod} 755 {} \;
 
-# This is needed to install the perl files correctly
-pushd perl/imap
-  %{__perl} Makefile.PL PREFIX=%{buildroot}%{_prefix} INSTALLDIRS=vendor
-popd
-pushd perl/sieve/managesieve
-  %{__perl} Makefile.PL PREFIX=%{buildroot}%{_prefix} INSTALLDIRS=vendor
-popd
-
 # Do what the regular make install does
-%{__make} install DESTDIR=%{buildroot} PREFIX=%{_prefix} mandir=%{_mandir}
-%{__make} -C man install DESTDIR=%{buildroot} PREFIX=%{_prefix} mandir=%{_mandir}
-
-%{__install} -m 755 imtest/imtest       %{buildroot}%{_bindir}/
-%{__install} -m 755 notifyd/notifytest  %{buildroot}%{_bindir}/
-%{__install} -m 755 perl/imap/cyradm    %{buildroot}%{_bindir}/
+%{__make} install DESTDIR=%{buildroot} PREFIX=%{_prefix} mandir=%{_mandir} INSTALLDIRS=vendor
 
 # Install tools
 for tool in tools/* ; do
@@ -294,7 +324,7 @@
 
 # Create directories
 %{__install} -d \
-  %{buildroot}%{_sysconfdir}/{rc.d/init.d,logrotate.d,pam.d,sysconfig,cron.daily} \
+  %{buildroot}%{_sysconfdir}/{logrotate.d,pam.d,cron.daily} \
   %{buildroot}%{_libdir}/sasl \
   %{buildroot}%{_var}/spool/imap \
   %{buildroot}%{_var}/lib/imap/{user,quota,proc,log,msg,socket,db,sieve,sync,md5,rpm,backup,meta} \
@@ -303,11 +333,6 @@
   %{buildroot}%{_sysconfdir}/pki/%{_name} \
   doc/contrib
 
-%if 0%{?suse_version}
-%{__install} -d \
-  %{buildroot}%{_localstatedir}/adm/fillup-templates/
-%endif
-
 # Install additional files
 %{__install} -p -m 644 master/conf/prefork.conf %{buildroot}%{_sysconfdir}/cyrus.conf
 %{__install} -p -m 644 %{SOURCE1}    %{buildroot}%{_sysconfdir}/imapd.conf
@@ -323,8 +348,10 @@
 %{__install} -p -m 644 %{SOURCE12}    %{buildroot}%{_sysconfdir}/pam.d/csync
 %{__install} -p -m 755 %{SOURCE13}   %{buildroot}%{_sysconfdir}/cron.daily/%{_name}
 %if 0%{?suse_version}
+%{__install} -d %{buildroot}%{_localstatedir}/adm/fillup-templates/
 %{__install} -p -m 644 %{SOURCE22}   %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{_name}
 %else
+%{__install} -d %{buildroot}%{_sysconfdir}/sysconfig/
 %{__install} -p -m 644 %{SOURCE22}   %{buildroot}%{_sysconfdir}/sysconfig/%{_name}
 %endif
 
@@ -332,6 +359,7 @@
 %{__install} -p -D -m 644 %{SOURCE31}   %{buildroot}%{_unitdir}/cyrus-imapd.service
 %{__install} -p -D -m 755 %{SOURCE32}   %{buildroot}%{_cyrexecdir}/cyr_systemd_helper
 %else
+%{__install} -d %{buildroot}%{_sysconfdir}/rc.d/init.d
 %{__install} -p -m 755 %{SOURCE21}   %{buildroot}%{_sysconfdir}/rc.d/init.d/%{_name}
 %endif
 
@@ -363,12 +391,18 @@
 touch %{buildroot}%{ssl_pem_file}
 
 # Rename 'master' binary and manpage to avoid clash with postfix
-%{__mv} -f %{buildroot}%{_cyrexecdir}/master         %{buildroot}%{_cyrexecdir}/cyrus-master
-%{__mv} -f %{buildroot}%{_mandir}/man8/master.8      %{buildroot}%{_mandir}/man8/cyrus-master.8
+%{__mv} -f %{buildroot}%{_cyrexecdir}/master        %{buildroot}%{_cyrexecdir}/cyrus-master
+%{__mv} -f %{buildroot}%{_mandir}/man8/master.8     %{buildroot}%{_mandir}/man8/cyrus-master.8
+
+# Rename 'httpd' binary and manpage to avoid clash with apache httpd
+%if 0%{?with_dav}
+%{__mv} -f %{buildroot}%{_cyrexecdir}/httpd         %{buildroot}%{_cyrexecdir}/cyrus-httpd
+%{__mv} -f %{buildroot}%{_mandir}/man8/httpd.8      %{buildroot}%{_mandir}/man8/cyrus-httpd.8
+%endif
 
 # Rename 'fetchnews' binary and manpage to avoid clash with leafnode
-%{__mv} -f %{buildroot}%{_cyrexecdir}/fetchnews      %{buildroot}%{_cyrexecdir}/cyrfetchnews
-%{__mv} -f %{buildroot}%{_mandir}/man8/fetchnews.8   %{buildroot}%{_mandir}/man8/cyrfetchnews.8
+%{__mv} -f %{buildroot}%{_cyrexecdir}/fetchnews     %{buildroot}%{_cyrexecdir}/cyrfetchnews
+%{__mv} -f %{buildroot}%{_mandir}/man8/fetchnews.8  %{buildroot}%{_mandir}/man8/cyrfetchnews.8
 %{__perl} -pi -e 's|fetchnews|cyrfetchnews|g;s|Fetchnews|Cyrfetchnews|g;s/FETCHNEWS/CYRFETCHNEWS/g' \
         %{buildroot}%{_mandir}/man8/cyrfetchnews.8
 
@@ -386,10 +420,11 @@
 %{__rm} -f %{buildroot}%{_cyrexecdir}/config2header*
 %{__rm} -f %{buildroot}%{_cyrexecdir}/config2man
 %{__rm} -f %{buildroot}%{_cyrexecdir}/pop3proxyd
-find %{buildroot} -name "perllocal.pod" -exec %{__rm} -f {} \;
-find %{buildroot} -name ".packlist" -exec %{__rm} -f {} \;
+find %{buildroot} -type f -name "perllocal.pod" -exec %{__rm} -vf {} \;
+find %{buildroot} -type f -name ".packlist" -exec %{__rm} -vf {} \;
+find %{buildroot} -type f -name ".gitignore" -exec %{__rm} -vf {} \;
 %{__rm} -f %{buildroot}%{_mandir}/man8/syncnews.8*
-find %{buildroot}%{perl_vendorarch} -name "*.bs" -exec %{__rm} -f {} \;
+find %{buildroot}%{perl_vendorarch} -type f -name "*.bs" -exec %{__rm} -vf {} \;
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -400,7 +435,7 @@
 /usr/sbin/useradd -c "Cyrus IMAP Server" -d %{_var}/lib/imap -g %{_cyrusgroup} \
   -G saslauth -s /sbin/nologin -u %{uid} -r %{_cyrususer} 2> /dev/null || :
 
-%post
+%post  -p /sbin/ldconfig
 CHATTRSYNC=0
 
 %if 0%{?suse_version}
@@ -426,6 +461,10 @@
 # Create SSL certificates
 exec > /dev/null 2> /dev/null
 
+if [ ! -z "%{ssl_pem_file}" -a -z "$(cat %{ssl_pem_file})" ]; then
+    %{__rm} -f "%{ssl_pem_file}" || :
+fi
+
 if [ ! -f %{ssl_pem_file} -a -d "%{_sysconfdir}/pki/tls/certs" ]; then
     pushd %{_sysconfdir}/pki/tls/certs
     umask 077
@@ -469,7 +508,7 @@
     fi
 %endif
 
-%postun
+%postun -p /sbin/ldconfig
 %if 0%{?with_systemd}
 %if 0%{?suse_version}
     %service_del_postun cyrus-imapd.service
@@ -508,13 +547,28 @@
 %config(noreplace) %{_sysconfdir}/pam.d/mupdate
 %config(noreplace) %{_sysconfdir}/pam.d/csync
 %config(noreplace) %{_sysconfdir}/pam.d/nntp
+%attr(0755,root,root) %{_bindir}/cyradm
+%{_bindir}/imtest
+%{_bindir}/installsieve
+%{_bindir}/lmtptest
+%{_bindir}/mupatetest
+%{_bindir}/nntptest
+%{_bindir}/pop3test
+%{_bindir}/sieveshell
+%{_bindir}/sivtest
+%{_bindir}/smpttest
+%{_bindir}/synctest
 %{_sysconfdir}/cron.daily/%{_name}
 %dir %{_cyrexecdir}
 %{_cyrexecdir}/arbitron
 %{_cyrexecdir}/arbitronsort.pl
 %{_cyrexecdir}/chk_cyrus
+%{_cyrexecdir}/compile_st.pl
 %{_cyrexecdir}/convert-sieve.pl
+%{_cyrexecdir}/cyr_deny
 %{_cyrexecdir}/cyr_df
+%{_cyrexecdir}/cyr_info
+%{_cyrexecdir}/ctl_conversationsdb
 %{_cyrexecdir}/ctl_cyrusdb
 %{_cyrexecdir}/ctl_deliver
 %{_cyrexecdir}/ctl_mboxlist
@@ -525,17 +579,25 @@
 %{_cyrexecdir}/cyr_synclog
 %{_cyrexecdir}/cyr_userseen
 %{_cyrexecdir}/cyrdump
+%if 0%{?with_dav}
+%{_cyrexecdir}/cyrus-httpd
+%endif
 %{_cyrexecdir}/cyrus-master
 %{_cyrexecdir}/deliver
 %{_cyrexecdir}/dohash
+%{_cyrexecdir}/fixsearchpath.pl
 %{_cyrexecdir}/fud
+%{_cyrexecdir}/hammer_cyrusdb
 %{_cyrexecdir}/imapd
 %{_cyrexecdir}/ipurge
+%exclude %{_cyrexecdir}/jenkins-build.sh
 %{_cyrexecdir}/lmtpd
 %{_cyrexecdir}/lmtpproxyd
 %{_cyrexecdir}/masssievec
 %{_cyrexecdir}/mbexamine
 %{_cyrexecdir}/mbpath
+%{_cyrexecdir}/mbtool
+%{_cyrexecdir}/message_test
 %{_cyrexecdir}/migrate-metadata
 %{_cyrexecdir}/mkimap
 %{_cyrexecdir}/mknewsgroups
@@ -544,9 +606,11 @@
 %{_cyrexecdir}/quota
 %{_cyrexecdir}/reconstruct
 %{_cyrexecdir}/rehash
+%{_cyrexecdir}/search_test
 %{_cyrexecdir}/sievec
 %{_cyrexecdir}/sieved
 %{_cyrexecdir}/smmapd
+%{_cyrexecdir}/squat_dump
 %{_cyrexecdir}/squatter
 %{_cyrexecdir}/timsieved
 %{_cyrexecdir}/tls_prune
@@ -568,28 +632,23 @@
 %{_cyrexecdir}/ptexpire
 %{_cyrexecdir}/ptloader
 %attr(0750,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap
-%attr(0700,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/backup
-%attr(0700,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/db
-%attr(0700,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/log
-%attr(0700,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/meta
-%attr(0700,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/md5
-%attr(0700,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/msg
-%attr(0700,%{_cyrususer},%{_cyrusgroup}) %{_var}/lib/imap/proc
-%attr(0700,%{_cyrususer},%{_cyrusgroup}) %{_var}/lib/imap/ptclient
-%attr(0700,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/quota
-%attr(0700,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/rpm
-%attr(0700,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/sieve
+%attr(0750,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/backup
+%attr(0750,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/db
+%attr(0750,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/log
+%attr(0750,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/meta
+%attr(0750,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/md5
+%attr(0750,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/msg
+%attr(0750,%{_cyrususer},%{_cyrusgroup}) %{_var}/lib/imap/proc
+%attr(0750,%{_cyrususer},%{_cyrusgroup}) %{_var}/lib/imap/ptclient
+%attr(0750,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/quota
+%attr(0750,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/rpm
+%attr(0750,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/sieve
 %attr(0750,%{_cyrususer},%{_cyrusgroup}) %{_var}/lib/imap/socket
-%attr(0700,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/sync
-%attr(0700,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/user
-%attr(0700,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/spool/imap
-%dir %{_datadir}/%{_name}
-%dir %{_datadir}/%{_name}/rpm
+%attr(0750,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/sync
+%attr(0750,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/user
+%attr(0750,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/spool/imap
+%{_libdir}/*.so.*
 %{_datadir}/%{_name}/rpm/*
-%{_mandir}/man5/*
-%{_mandir}/man8/*
-%dir %{_sysconfdir}/pki/%{_name}
-%attr(0640,root,%{_cyrusgroup}) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{ssl_pem_file}
 %doc perl/imap/README
 %doc perl/imap/Changes
 %doc perl/imap/examples
@@ -601,6 +660,9 @@
 %{perl_vendorarch}/Cyrus/IMAP.pm
 %dir %{perl_vendorarch}/Cyrus/SIEVE
 %{perl_vendorarch}/Cyrus/SIEVE/managesieve.pm
+%dir %{perl_vendorlib}/Cyrus/Annotator
+%{perl_vendorlib}/Cyrus/Annotator/Daemon.pm
+%{perl_vendorlib}/Cyrus/Annotator/Message.pm
 %dir %{perl_vendorarch}/auto
 %dir %{perl_vendorarch}/auto/Cyrus
 %dir %{perl_vendorarch}/auto/Cyrus/IMAP
@@ -608,20 +670,21 @@
 %dir %{perl_vendorarch}/auto/Cyrus/SIEVE
 %dir %{perl_vendorarch}/auto/Cyrus/SIEVE/managesieve
 %{perl_vendorarch}/auto/Cyrus/SIEVE/managesieve/managesieve.so
-%{_mandir}/man3/Cyrus::IMAP::Admin.3pm.gz
-%{_mandir}/man3/Cyrus::IMAP::Shell.3pm.gz
-%{_mandir}/man3/Cyrus::IMAP.3pm.gz
-%{_mandir}/man3/Cyrus::IMAP::IMSP.3pm.gz
-%{_mandir}/man3/Cyrus::SIEVE::managesieve.3pm.gz
-%attr(0755,root,root) %{_bindir}/*
 %{_mandir}/man1/*
+%{_mandir}/man3/*
+%{_mandir}/man5/*
+%{_mandir}/man8/*
+%dir %{_sysconfdir}/pki/%{_name}
+%attr(0640,root,%{_cyrusgroup}) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{ssl_pem_file}
 
 %files devel
 %defattr(0644,root,root,0755)
-%dir %{_includedir}/cyrus
-%{_includedir}/cyrus/*.h
-%{_libdir}/lib*.a
-%{_mandir}/man3/imclient.3*
+%files devel
+%defattr(0644,root,root,0755)
+%{_includedir}/cyrus
+%{_libdir}/pkgconfig/*cyrus*.pc
+%{_libdir}/*.so
+%{_libdir}/*.la
 
 %changelog
 * Tue Mar 12 2013 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.4.17-2

cyrus-imapd-2.1.3-flock.patch Deleted

@@ -1,78 +0,0 @@
-diff -up cyrus-imapd-2.4.6/lib/lock_flock.c.flock cyrus-imapd-2.4.6/lib/lock_flock.c
---- cyrus-imapd-2.4.6/lib/lock_flock.c.flock	2010-12-20 14:15:49.000000000 +0100
-+++ cyrus-imapd-2.4.6/lib/lock_flock.c	2011-02-10 12:56:45.262786102 +0100
-@@ -52,6 +52,10 @@
- #endif
- 
- #include "cyr_lock.h"
-+#include <syslog.h>
-+
-+/* Locking timeout parameter */
-+#define MAXTIME 99
- 
- const char *lock_method_desc = "flock";
- 
-@@ -68,6 +72,18 @@ const char *lock_method_desc = "flock";
-  * 'failaction' is provided, it is filled in with a pointer to a fixed
-  * string naming the action that failed.
-  *
-+ *  Modified by jwade 4/16/2002 to work around seen file locking problem
-+ *  Added locking timeout parameter to allow processes that are  
-+ *  waiting for a lock to eventually time out
-+ *
-+ *  Calls flock() in non-blocking fashion and then retries until a 
-+ *  maximum delay is reached or the lock succeeds.
-+ *  
-+ *  As written, uses a quadratic backoff on retries with MAXTIME being
-+ *  the longest interval delay.   Total delay time is the sum of the squares
-+ *  of all integers whose square is less than MAXTIME.  In the case of 
-+ *  MAXTIME = 99 this is 0+1+4+9+16+25+36+49+64+81= 285 Seconds   
-+ *  This time is arbitrary and can be adjusted
-  */
- int lock_reopen(fd, filename, sbuf, failaction)
- int fd;
-@@ -78,17 +94,29 @@ const char **failaction;
-     int r;
-     struct stat sbuffile, sbufspare;
-     int newfd;
-+    int delay=0, i=0;
- 
-     if (!sbuf) sbuf = &sbufspare;
- 
--    for (;;) {
--	r = flock(fd, LOCK_EX);
-+    for(i=0,delay=0;;) {
-+	r = flock(fd, LOCK_EX|LOCK_NB);
- 	if (r == -1) {
--	    if (errno == EINTR) continue;
--	    if (failaction) *failaction = "locking";
-+	    if (errno == EINTR) {
-+                 continue;
-+            }
-+            else if ((errno == EWOULDBLOCK) && (delay < MAXTIME)) {
-+                syslog(LOG_DEBUG, "lock: reopen-blocked sleeping for %d on interval %d (%d, %s)" , delay, i, fd, filename);
-+                sleep(delay);
-+                i++;
-+                delay = i*i;
-+                continue;
-+            }
-+	    if (failaction) {
-+                if (delay >= MAXTIME) *failaction = "locking_timeout";
-+                else *failaction = "locking";
-+            }
- 	    return -1;
- 	}
--
- 	fstat(fd, sbuf);
- 	r = stat(filename, &sbuffile);
- 	if (r == -1) {
-@@ -96,9 +124,7 @@ const char **failaction;
- 	    flock(fd, LOCK_UN);
- 	    return -1;
- 	}
--
- 	if (sbuf->st_ino == sbuffile.st_ino) return 0;
--
- 	newfd = open(filename, O_RDWR);
- 	if (newfd == -1) {
- 	    if (failaction) *failaction = "opening";

cyrus-imapd-2.3.12p2-current-db.patch Deleted

cyrus-imapd-2.3.16-002-strip-out-krb4.patch Deleted

@@ -1,39 +0,0 @@
-From 8e4a444ddf93984aa25ec4a1d860213af2a284ae Mon Sep 17 00:00:00 2001
-From: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
-Date: Tue, 3 Aug 2010 10:25:42 +0200
-Subject: [PATCH 11/13] Strip out krb4
-
----
- imap/pop3d.c   |    2 --
- imap/version.c |    2 +-
- 2 files changed, 1 insertions(+), 3 deletions(-)
-
-diff --git a/imap/pop3d.c b/imap/pop3d.c
-index ad3fdd5..3a2cb8b 100644
---- a/imap/pop3d.c
-+++ b/imap/pop3d.c
-@@ -93,8 +93,6 @@
- #include "statuscache.h"
- 
- #ifdef HAVE_KRB
--/* kerberos des is purported to conflict with OpenSSL DES */
--#define DES_DEFS
- #include <krb.h>
- 
- /* MIT's kpop authentication kludge */
-diff --git a/imap/version.c b/imap/version.c
-index 85223c2..d78a696 100644
---- a/imap/version.c
-+++ b/imap/version.c
-@@ -177,7 +177,7 @@ void id_response(struct protstream *pout)
- 	     "; lock = %s", lock_method_desc);
-     snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
- 	     "; nonblock = %s", nonblock_method_desc);
--#ifdef HAVE_KRB
-+#if 0
-     snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
- 	     " (%s)", krb4_version);
- #endif
--- 
-1.7.2
-

cyrus-imapd-2.4.10-ptloader-ldap_user_attribute.patch Deleted

@@ -1,1230 +0,0 @@
-diff --git a/lib/imapoptions b/lib/imapoptions
-index 464de37..98e0341 100644
---- a/lib/imapoptions
-+++ b/lib/imapoptions
-@@ -483,6 +483,9 @@ Blank lines and lines beginning with ``#'' are ignored.
- { "ldap_mech", NULL, STRING }
- /* SASL mechanism for LDAP authentication */
- 
-+{ "ldap_user_attribute", NULL, STRING }
-+/* Specify LDAP attribute to use as canonical user id */
-+
- { "ldap_member_attribute", NULL, STRING }
- /* See ldap_member_method. */
- 
-diff --git a/ptclient/ldap.c b/ptclient/ldap.c
-index 7bd8664..b3507d1 100644
---- a/ptclient/ldap.c
-+++ b/ptclient/ldap.c
-@@ -91,7 +91,7 @@
-  * This may not be restrictive enough.
-  * Here are the reasons for the restrictions:
-  *
-- * &	forbidden because of MUTF-7.  (This could be fixed.)
-+ * &    forbidden because of MUTF-7.  (This could be fixed.)
-  * :    forbidden because it's special in /etc/passwd
-  * /    forbidden because it can't be used in a mailbox name
-  * * %  forbidden because they're IMAP magic in the LIST/LSUB commands
-@@ -158,6 +158,7 @@ typedef struct _ptsm {
-     const char   *tls_cert;
-     const char   *tls_key;
-     int    member_method;
-+    const char   *user_attribute;
-     const char   *member_attribute;
-     const char   *member_filter;
-     const char   *member_base;
-@@ -182,41 +183,41 @@ typedef struct _ptsm {
- static t_ptsm *ptsm = NULL;
- 
- static int ptsmodule_interact(
--	LDAP *ld, 
--	unsigned flags __attribute__((unused)), 
--	void *def, 
--	void *inter)
-+    LDAP *ld,
-+    unsigned flags __attribute__((unused)),
-+    void *def,
-+    void *inter)
- {
--	sasl_interact_t *in = inter;
--	const char *p;
--	t_ptsm *ptsmdef = def;
--
--	for (;in->id != SASL_CB_LIST_END;in++) {
--		p = NULL;
--		switch(in->id) {
--			case SASL_CB_AUTHNAME:
--				if (ISSET(ptsmdef->id))
--					p = ptsmdef->id;
--				break;
--			case SASL_CB_USER:
--				if (ISSET(ptsmdef->authz))
--					p = ptsmdef->authz;
--				break;
--			case SASL_CB_GETREALM:
--				if (ISSET(ptsmdef->realm))
--					p = ptsmdef->realm;
--				break;          
--			case SASL_CB_PASS:
--				if (ISSET(ptsmdef->password))
--					p = ptsmdef->password;
--				break;
--		}
--
--		in->result = p ? p : "";
--		in->len = strlen(in->result);
--	}
--
--	return LDAP_SUCCESS;
-+    sasl_interact_t *in = inter;
-+    const char *p;
-+    t_ptsm *ptsmdef = def;
-+
-+    for (;in->id != SASL_CB_LIST_END;in++) {
-+        p = NULL;
-+        switch(in->id) {
-+            case SASL_CB_AUTHNAME:
-+                if (ISSET(ptsmdef->id))
-+                    p = ptsmdef->id;
-+                break;
-+            case SASL_CB_USER:
-+                if (ISSET(ptsmdef->authz))
-+                    p = ptsmdef->authz;
-+                break;
-+            case SASL_CB_GETREALM:
-+                if (ISSET(ptsmdef->realm))
-+                    p = ptsmdef->realm;
-+                break;
-+            case SASL_CB_PASS:
-+                if (ISSET(ptsmdef->password))
-+                    p = ptsmdef->password;
-+                break;
-+        }
-+
-+        in->result = p ? p : "";
-+        in->len = strlen(in->result);
-+    }
-+
-+    return LDAP_SUCCESS;
- }
- 
- /*
-@@ -259,11 +260,11 @@ static char *ptsmodule_canonifyid(const char *identifier, size_t len)
-         switch (allowedchars[*(unsigned char*) p]) {
-         case 0:
-             return NULL;
--            
-+
-         case 2:
-             sawalpha = 1;
-             /* FALL THROUGH */
--            
-+
-         default:
-             ;
-         }
-@@ -275,149 +276,149 @@ static char *ptsmodule_canonifyid(const char *identifier, size_t len)
- }
- 
- 
--static int ptsmodule_connect(void) 
-+static int ptsmodule_connect(void)
- {
--	int rc = 0;
--
--	if (ptsm == NULL)  // Sanity Check
--		return PTSM_FAIL;
--
--	if (ptsm->ld != NULL)
--		return PTSM_OK;
--
--	if (ISSET(ptsm->tls_cacert_file)) {
--		rc = ldap_set_option (NULL, LDAP_OPT_X_TLS_CACERTFILE, ptsm->tls_cacert_file);
--		if (rc != LDAP_SUCCESS) {
--			syslog (LOG_WARNING, "Unable to set LDAP_OPT_X_TLS_CACERTFILE (%s).", ldap_err2string (rc));
--		}
--	}
--
--	if (ISSET(ptsm->tls_cacert_dir)) {
--		rc = ldap_set_option (NULL, LDAP_OPT_X_TLS_CACERTDIR, ptsm->tls_cacert_dir);
--		if (rc != LDAP_SUCCESS) {
--			syslog (LOG_WARNING, "Unable to set LDAP_OPT_X_TLS_CACERTDIR (%s).", ldap_err2string (rc));
--		}
--	}
--
--	if (ptsm->tls_check_peer != 0) {
--		rc = ldap_set_option(NULL, LDAP_OPT_X_TLS_REQUIRE_CERT, &ptsm->tls_check_peer);
--		if (rc != LDAP_SUCCESS) {
--			syslog (LOG_WARNING, "Unable to set LDAP_OPT_X_TLS_REQUIRE_CERT (%s).", ldap_err2string (rc));
--		}
--	}
--
--	if (ISSET(ptsm->tls_ciphers)) {
--		/* set cipher suite, certificate and private key: */
--		rc = ldap_set_option(NULL, LDAP_OPT_X_TLS_CIPHER_SUITE, ptsm->tls_ciphers);
--		if (rc != LDAP_SUCCESS) {
--			syslog (LOG_WARNING, "Unable to set LDAP_OPT_X_TLS_CIPHER_SUITE (%s).", ldap_err2string (rc));
--		}
--	}
--
--	if (ISSET(ptsm->tls_cert)) {
--		rc = ldap_set_option(NULL, LDAP_OPT_X_TLS_CERTFILE, ptsm->tls_cert);
--		if (rc != LDAP_SUCCESS) {
--			syslog (LOG_WARNING, "Unable to set LDAP_OPT_X_TLS_CERTFILE (%s).", ldap_err2string (rc));
--		}
--	}
--
--	if (ISSET(ptsm->tls_key)) {
--		rc = ldap_set_option(NULL, LDAP_OPT_X_TLS_KEYFILE, ptsm->tls_key);
--		if (rc != LDAP_SUCCESS) {
--			syslog (LOG_WARNING, "Unable to set LDAP_OPT_X_TLS_KEYFILE (%s).", ldap_err2string (rc));
--		}
--	}
--
--	rc = ldap_initialize(&ptsm->ld, ptsm->uri);
--	if (rc != LDAP_SUCCESS) {
--		syslog(LOG_ERR, "ldap_initialize failed (%s)", ptsm->uri);
--		return PTSM_FAIL;
--	}
--
--	rc = ldap_set_option(ptsm->ld, LDAP_OPT_PROTOCOL_VERSION, &(ptsm->version));
--	if (rc != LDAP_OPT_SUCCESS) {
--
--		if (ptsm->sasl ||
--		    ptsm->start_tls) {
--			syslog(LOG_ERR, "Failed to set LDAP_OPT_PROTOCOL_VERSION %d, required for ldap_start_tls and ldap_sasl.", ptsm->version);
--			ldap_unbind(ptsm->ld);
-+    int rc = 0;
-+
-+    if (ptsm == NULL)  // Sanity Check
-+        return PTSM_FAIL;
-+
-+    if (ptsm->ld != NULL)
-+        return PTSM_OK;
-+
-+    if (ISSET(ptsm->tls_cacert_file)) {
-+        rc = ldap_set_option (NULL, LDAP_OPT_X_TLS_CACERTFILE, ptsm->tls_cacert_file);
-+        if (rc != LDAP_SUCCESS) {
-+            syslog (LOG_WARNING, "Unable to set LDAP_OPT_X_TLS_CACERTFILE (%s).", ldap_err2string (rc));
-+        }
-+    }
-+
-+    if (ISSET(ptsm->tls_cacert_dir)) {
-+        rc = ldap_set_option (NULL, LDAP_OPT_X_TLS_CACERTDIR, ptsm->tls_cacert_dir);
-+        if (rc != LDAP_SUCCESS) {
-+            syslog (LOG_WARNING, "Unable to set LDAP_OPT_X_TLS_CACERTDIR (%s).", ldap_err2string (rc));
-+        }
-+    }
-+
-+    if (ptsm->tls_check_peer != 0) {
-+        rc = ldap_set_option(NULL, LDAP_OPT_X_TLS_REQUIRE_CERT, &ptsm->tls_check_peer);
-+        if (rc != LDAP_SUCCESS) {
-+            syslog (LOG_WARNING, "Unable to set LDAP_OPT_X_TLS_REQUIRE_CERT (%s).", ldap_err2string (rc));
-+        }
-+    }
-+
-+    if (ISSET(ptsm->tls_ciphers)) {
-+        /* set cipher suite, certificate and private key: */
-+        rc = ldap_set_option(NULL, LDAP_OPT_X_TLS_CIPHER_SUITE, ptsm->tls_ciphers);
-+        if (rc != LDAP_SUCCESS) {
-+            syslog (LOG_WARNING, "Unable to set LDAP_OPT_X_TLS_CIPHER_SUITE (%s).", ldap_err2string (rc));
-+        }
-+    }
-+
-+    if (ISSET(ptsm->tls_cert)) {
-+        rc = ldap_set_option(NULL, LDAP_OPT_X_TLS_CERTFILE, ptsm->tls_cert);
-+        if (rc != LDAP_SUCCESS) {
-+            syslog (LOG_WARNING, "Unable to set LDAP_OPT_X_TLS_CERTFILE (%s).", ldap_err2string (rc));
-+        }
-+    }
-+
-+    if (ISSET(ptsm->tls_key)) {
-+        rc = ldap_set_option(NULL, LDAP_OPT_X_TLS_KEYFILE, ptsm->tls_key);
-+        if (rc != LDAP_SUCCESS) {
-+            syslog (LOG_WARNING, "Unable to set LDAP_OPT_X_TLS_KEYFILE (%s).", ldap_err2string (rc));
-+        }
-+    }
-+
-+    rc = ldap_initialize(&ptsm->ld, ptsm->uri);
-+    if (rc != LDAP_SUCCESS) {
-+        syslog(LOG_ERR, "ldap_initialize failed (%s)", ptsm->uri);
-+        return PTSM_FAIL;
-+    }
-+
-+    rc = ldap_set_option(ptsm->ld, LDAP_OPT_PROTOCOL_VERSION, &(ptsm->version));
-+    if (rc != LDAP_OPT_SUCCESS) {
-+
-+        if (ptsm->sasl ||
-+            ptsm->start_tls) {
-+            syslog(LOG_ERR, "Failed to set LDAP_OPT_PROTOCOL_VERSION %d, required for ldap_start_tls and ldap_sasl.", ptsm->version);
-+            ldap_unbind(ptsm->ld);
-             ptsm->ld = NULL;
--			return PTSM_FAIL;
--		} else
--			syslog(LOG_WARNING, "Unable to set LDAP_OPT_PROTOCOL_VERSION %d.", ptsm->version);
--
--		ptsm->version = LDAP_VERSION2;
--	}
--
--	rc = ldap_set_option(ptsm->ld, LDAP_OPT_NETWORK_TIMEOUT, &(ptsm->timeout));
--	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %d.%d.", ptsm->timeout.tv_sec, ptsm->timeout.tv_usec);
--	}
--
--	rc = ldap_set_option(ptsm->ld, LDAP_OPT_TIMELIMIT, &(ptsm->time_limit));
--	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING, "Unable to set LDAP_OPT_TIMELIMIT %d.", ptsm->time_limit);
--	}
--
--	rc = ldap_set_option(ptsm->ld, LDAP_OPT_DEREF, &(ptsm->deref));
--	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING, "Unable to set LDAP_OPT_DEREF %d.", ptsm->deref);
--	}
--
--	rc = ldap_set_option(ptsm->ld, LDAP_OPT_REFERRALS, ptsm->referrals ? LDAP_OPT_ON : LDAP_OPT_OFF);
--	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING, "Unable to set LDAP_OPT_REFERRALS.");
--	}
--
--	rc = ldap_set_option(ptsm->ld, LDAP_OPT_SIZELIMIT, &(ptsm->size_limit));
--	if (rc != LDAP_OPT_SUCCESS)
--		syslog(LOG_WARNING, "Unable to set LDAP_OPT_SIZELIMIT %d.", ptsm->size_limit);
--
--	rc = ldap_set_option(ptsm->ld, LDAP_OPT_RESTART, ptsm->restart ? LDAP_OPT_ON : LDAP_OPT_OFF);
--	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING, "Unable to set LDAP_OPT_RESTART.");
--	}
--
--	if (ptsm->start_tls) {
--
--		rc = ldap_start_tls_s(ptsm->ld, NULL, NULL);
--		if (rc != LDAP_SUCCESS) {
--			syslog(LOG_ERR, "start tls failed (%s).", ldap_err2string(rc));
--			ldap_unbind(ptsm->ld);
-+            return PTSM_FAIL;
-+        } else
-+            syslog(LOG_WARNING, "Unable to set LDAP_OPT_PROTOCOL_VERSION %d.", ptsm->version);
-+
-+        ptsm->version = LDAP_VERSION2;
-+    }
-+
-+    rc = ldap_set_option(ptsm->ld, LDAP_OPT_NETWORK_TIMEOUT, &(ptsm->timeout));
-+    if (rc != LDAP_OPT_SUCCESS) {
-+        syslog(LOG_WARNING, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %d.%d.", ptsm->timeout.tv_sec, ptsm->timeout.tv_usec);
-+    }
-+
-+    rc = ldap_set_option(ptsm->ld, LDAP_OPT_TIMELIMIT, &(ptsm->time_limit));
-+    if (rc != LDAP_OPT_SUCCESS) {
-+        syslog(LOG_WARNING, "Unable to set LDAP_OPT_TIMELIMIT %d.", ptsm->time_limit);
-+    }
-+
-+    rc = ldap_set_option(ptsm->ld, LDAP_OPT_DEREF, &(ptsm->deref));
-+    if (rc != LDAP_OPT_SUCCESS) {
-+        syslog(LOG_WARNING, "Unable to set LDAP_OPT_DEREF %d.", ptsm->deref);
-+    }
-+
-+    rc = ldap_set_option(ptsm->ld, LDAP_OPT_REFERRALS, ptsm->referrals ? LDAP_OPT_ON : LDAP_OPT_OFF);
-+    if (rc != LDAP_OPT_SUCCESS) {
-+        syslog(LOG_WARNING, "Unable to set LDAP_OPT_REFERRALS.");
-+    }
-+
-+    rc = ldap_set_option(ptsm->ld, LDAP_OPT_SIZELIMIT, &(ptsm->size_limit));
-+    if (rc != LDAP_OPT_SUCCESS)
-+        syslog(LOG_WARNING, "Unable to set LDAP_OPT_SIZELIMIT %d.", ptsm->size_limit);
-+
-+    rc = ldap_set_option(ptsm->ld, LDAP_OPT_RESTART, ptsm->restart ? LDAP_OPT_ON : LDAP_OPT_OFF);
-+    if (rc != LDAP_OPT_SUCCESS) {
-+        syslog(LOG_WARNING, "Unable to set LDAP_OPT_RESTART.");
-+    }
-+
-+    if (ptsm->start_tls) {
-+
-+        rc = ldap_start_tls_s(ptsm->ld, NULL, NULL);
-+        if (rc != LDAP_SUCCESS) {
-+            syslog(LOG_ERR, "start tls failed (%s).", ldap_err2string(rc));
-+            ldap_unbind(ptsm->ld);
-             ptsm->ld = NULL;
--			return PTSM_FAIL;
--		}
--	}
--	
--	if (ptsm->sasl) {
--
--		if (EMPTY(ptsm->mech))
--			ldap_get_option(ptsm->ld, LDAP_OPT_X_SASL_MECH, &(ptsm->mech));
--
--		if (EMPTY(ptsm->realm))
--			ldap_get_option(ptsm->ld, LDAP_OPT_X_SASL_REALM, &(ptsm->realm));
--
--		if (ISSET(ptsm->sasl_secprops)) {
--			rc = ldap_set_option(ptsm->ld, LDAP_OPT_X_SASL_SECPROPS, (void *) ptsm->sasl_secprops);
--			if( rc != LDAP_OPT_SUCCESS ) {
--				syslog(LOG_ERR, "Unable to set LDAP_OPT_X_SASL_SECPROPS.");
--				ldap_unbind(ptsm->ld);
-+            return PTSM_FAIL;
-+        }
-+    }
-+
-+    if (ptsm->sasl) {
-+
-+        if (EMPTY(ptsm->mech))
-+            ldap_get_option(ptsm->ld, LDAP_OPT_X_SASL_MECH, &(ptsm->mech));
-+
-+        if (EMPTY(ptsm->realm))
-+            ldap_get_option(ptsm->ld, LDAP_OPT_X_SASL_REALM, &(ptsm->realm));
-+
-+        if (ISSET(ptsm->sasl_secprops)) {
-+            rc = ldap_set_option(ptsm->ld, LDAP_OPT_X_SASL_SECPROPS, (void *) ptsm->sasl_secprops);
-+            if( rc != LDAP_OPT_SUCCESS ) {
-+                syslog(LOG_ERR, "Unable to set LDAP_OPT_X_SASL_SECPROPS.");
-+                ldap_unbind(ptsm->ld);
-                 ptsm->ld = NULL;
--				return PTSM_FAIL;
--			}
--		}
--
--		rc = ldap_sasl_interactive_bind_s(
--			ptsm->ld, 
--			ptsm->bind_dn,
--			ptsm->mech, 
--			NULL, 
--			NULL, 
--			LDAP_SASL_QUIET, 
--			ptsmodule_interact, 
--			ptsm);
--	} else
--		rc = ldap_simple_bind_s(ptsm->ld, ptsm->bind_dn, ptsm->password);
-+                return PTSM_FAIL;
-+            }
-+        }
-+
-+        rc = ldap_sasl_interactive_bind_s(
-+            ptsm->ld,
-+            ptsm->bind_dn,
-+            ptsm->mech,
-+            NULL,
-+            NULL,
-+            LDAP_SASL_QUIET,
-+            ptsmodule_interact,
-+            ptsm);
-+    } else
-+        rc = ldap_simple_bind_s(ptsm->ld, ptsm->bind_dn, ptsm->password);
- 
-     if (rc != LDAP_SUCCESS) {
-         syslog(LOG_ERR,
-@@ -425,14 +426,14 @@ static int ptsmodule_connect(void)
-         ldap_unbind(ptsm->ld);
-         ptsm->ld = NULL;
-         return (rc == LDAP_SERVER_DOWN ? PTSM_RETRY : PTSM_FAIL);
--	}
-+    }
- 
--	return PTSM_OK;
-+    return PTSM_OK;
- }
- 
- /* API */
- 
--static void myinit(void) 
-+static void myinit(void)
- {
-     const char *p = NULL;
- 
-@@ -444,7 +445,7 @@ static void myinit(void)
-         fatal("xmalloc() failed", EC_CONFIG);
-     }
- 
--    ptsm->uri = (config_getstring(IMAPOPT_LDAP_URI) ? 
-+    ptsm->uri = (config_getstring(IMAPOPT_LDAP_URI) ?
-         config_getstring(IMAPOPT_LDAP_URI) : config_getstring(IMAPOPT_LDAP_SERVERS));
-     ptsm->version = (config_getint(IMAPOPT_LDAP_VERSION) == 2 ? LDAP_VERSION2 : LDAP_VERSION3);
-     ptsm->timeout.tv_sec = config_getint(IMAPOPT_LDAP_TIME_LIMIT);
-@@ -473,15 +474,15 @@ static void myinit(void)
-     }
-     ptsm->bind_dn = config_getstring(IMAPOPT_LDAP_BIND_DN);
-     ptsm->sasl = config_getswitch(IMAPOPT_LDAP_SASL);
--    ptsm->id = (config_getstring(IMAPOPT_LDAP_ID) ? 
-+    ptsm->id = (config_getstring(IMAPOPT_LDAP_ID) ?
-         config_getstring(IMAPOPT_LDAP_ID) : config_getstring(IMAPOPT_LDAP_SASL_AUTHC));
--    ptsm->authz = (config_getstring(IMAPOPT_LDAP_AUTHZ) ? 
-+    ptsm->authz = (config_getstring(IMAPOPT_LDAP_AUTHZ) ?
-         config_getstring(IMAPOPT_LDAP_AUTHZ) : config_getstring(IMAPOPT_LDAP_SASL_AUTHZ));
--    ptsm->mech = (config_getstring(IMAPOPT_LDAP_MECH) ? 
-+    ptsm->mech = (config_getstring(IMAPOPT_LDAP_MECH) ?
-         config_getstring(IMAPOPT_LDAP_MECH) : config_getstring(IMAPOPT_LDAP_SASL_MECH));
--    ptsm->realm = (config_getstring(IMAPOPT_LDAP_REALM) ? 
-+    ptsm->realm = (config_getstring(IMAPOPT_LDAP_REALM) ?
-         config_getstring(IMAPOPT_LDAP_REALM) : config_getstring(IMAPOPT_LDAP_SASL_REALM));
--    ptsm->password = (config_getstring(IMAPOPT_LDAP_PASSWORD) ? 
-+    ptsm->password = (config_getstring(IMAPOPT_LDAP_PASSWORD) ?
-         config_getstring(IMAPOPT_LDAP_PASSWORD) : config_getstring(IMAPOPT_LDAP_SASL_PASSWORD));
-     ptsm->start_tls = config_getswitch(IMAPOPT_LDAP_START_TLS);
-     ptsm->tls_check_peer = config_getswitch(IMAPOPT_LDAP_TLS_CHECK_PEER);
-@@ -508,6 +509,8 @@ static void myinit(void)
-     ptsm->member_base = config_getstring(IMAPOPT_LDAP_MEMBER_BASE);
-     ptsm->member_attribute = (config_getstring(IMAPOPT_LDAP_MEMBER_ATTRIBUTE) ?
-         config_getstring(IMAPOPT_LDAP_MEMBER_ATTRIBUTE) : config_getstring(IMAPOPT_LDAP_MEMBER_ATTRIBUTE));
-+    ptsm->user_attribute = (config_getstring(IMAPOPT_LDAP_USER_ATTRIBUTE) ?
-+        config_getstring(IMAPOPT_LDAP_USER_ATTRIBUTE) : config_getstring(IMAPOPT_LDAP_USER_ATTRIBUTE));
-     p = config_getstring(IMAPOPT_LDAP_GROUP_SCOPE);
-     if (!strcasecmp(p, "one")) {
-         ptsm->group_scope = LDAP_SCOPE_ONELEVEL;
-@@ -521,10 +524,10 @@ static void myinit(void)
-     ptsm->filter = config_getstring(IMAPOPT_LDAP_FILTER);
-     ptsm->base = config_getstring(IMAPOPT_LDAP_BASE);
- 
--	if (ptsm->version != LDAP_VERSION3 && 
--	    (ptsm->sasl ||
--	     ptsm->start_tls))
--	    ptsm->version = LDAP_VERSION3;
-+    if (ptsm->version != LDAP_VERSION3 &&
-+        (ptsm->sasl ||
-+         ptsm->start_tls))
-+        ptsm->version = LDAP_VERSION3;
- 
-     ptsm->ld = NULL;
- }
-@@ -533,98 +536,98 @@ static void myinit(void)
-  * Note: calling function must free memory.
-  */
- static int ptsmodule_escape(
--	const char *s, 
--	const unsigned int n, 
--	char **result) 
-+    const char *s,
-+    const unsigned int n,
-+    char **result)
- {
--	char *buf;
--	char *end, *ptr, *temp;
--
--	if (n > strlen(s))  // Sanity check, just in case
--		return PTSM_FAIL;
--
--	buf = xmalloc(n * 5 + 1);
--	if (buf == NULL) {
--		return PTSM_NOMEM;
--	}
--
--	buf[0] = '\0';
--	ptr = (char *)s;
--	end = ptr + n;
--
--	while (((temp = strpbrk(ptr, "*()\\\0"))!=NULL) && (temp<end)) {
--
--		if (temp>ptr)
--			strncat(buf, ptr, temp-ptr);
--
--		switch (*temp) {
--			case '*':
--				strcat(buf, "\\2a");
--				break;
--			case '(':
--				strcat(buf, "\\28");
--				break;
--			case ')':
--				strcat(buf, "\\29");
--				break;
--			case '\\':
--				strcat(buf, "\\5c");
--				break;
--			case '\0':
--				strcat(buf, "\\00");
--				break;
--		}
--		ptr=temp+1;
--	}
--	if (ptr<end)
--		strncat(buf, ptr, end-ptr);
--
--	*result = buf;
--
--	return PTSM_OK;
-+    char *buf;
-+    char *end, *ptr, *temp;
-+
-+    if (n > strlen(s))  // Sanity check, just in case
-+        return PTSM_FAIL;
-+
-+    buf = xmalloc(n * 5 + 1);
-+    if (buf == NULL) {
-+        return PTSM_NOMEM;
-+    }
-+
-+    buf[0] = '\0';
-+    ptr = (char *)s;
-+    end = ptr + n;
-+
-+    while (((temp = strpbrk(ptr, "*()\\\0"))!=NULL) && (temp<end)) {
-+
-+        if (temp>ptr)
-+            strncat(buf, ptr, temp-ptr);
-+
-+        switch (*temp) {
-+            case '*':
-+                strcat(buf, "\\2a");
-+                break;
-+            case '(':
-+                strcat(buf, "\\28");
-+                break;
-+            case ')':
-+                strcat(buf, "\\29");
-+                break;
-+            case '\\':
-+                strcat(buf, "\\5c");
-+                break;
-+            case '\0':
-+                strcat(buf, "\\00");
-+                break;
-+        }
-+        ptr=temp+1;
-+    }
-+    if (ptr<end)
-+        strncat(buf, ptr, end-ptr);
-+
-+    *result = buf;
-+
-+    return PTSM_OK;
- }
- 
- static int ptsmodule_tokenize_domains(
--	const char *d, 
--	int n, 
--	char **result)
-+    const char *d,
-+    int n,
-+    char **result)
- {
--	char *s, *s1;
--	char *lasts;
--	int nt, i, rc;
--
--	*result = NULL;
--
--	if (d == NULL || n < 1 || n > 9)
--		return PTSM_FAIL;
--
--	s = strdup(d);
--	if (s == NULL)
--		return PTSM_NOMEM;
--
--	for( nt=0, s1=s; *s1; s1++ )
--		if( *s1 == '.' ) nt++;
--	nt++;
--
--	if (n > nt) {
--		free(s);
--		return PTSM_FAIL;
--	}
--
--	i = nt - n;
--	s1 = (char *)strtok_r(s, ".", &lasts);
--	while(s1) {
--		if (i == 0) {
--			rc = ptsmodule_escape(s1, strlen(s1), result);
--			free(s);
--			return rc;
--		}
--		s1 = (char *)strtok_r(NULL, ".", &lasts);
--		i--;
--	}
--
--	free(s);
--	return PTSM_FAIL;
-+    char *s, *s1;
-+    char *lasts;
-+    int nt, i, rc;
-+
-+    *result = NULL;
-+
-+    if (d == NULL || n < 1 || n > 9)
-+        return PTSM_FAIL;
-+
-+    s = strdup(d);
-+    if (s == NULL)
-+        return PTSM_NOMEM;
-+
-+    for( nt=0, s1=s; *s1; s1++ )
-+        if( *s1 == '.' ) nt++;
-+    nt++;
-+
-+    if (n > nt) {
-+        free(s);
-+        return PTSM_FAIL;
-+    }
-+
-+    i = nt - n;
-+    s1 = (char *)strtok_r(s, ".", &lasts);
-+    while(s1) {
-+        if (i == 0) {
-+            rc = ptsmodule_escape(s1, strlen(s1), result);
-+            free(s);
-+            return rc;
-+        }
-+        s1 = (char *)strtok_r(NULL, ".", &lasts);
-+        i--;
-+    }
-+
-+    free(s);
-+    return PTSM_FAIL;
- }
- 
- #define PTSM_MAX(a,b) (a>b?a:b)
-@@ -642,137 +645,137 @@ static int ptsmodule_tokenize_domains(
-  * Note: calling function must free memory.
-  */
- static int ptsmodule_expand_tokens(
--	const char *pattern,
--	const char *username, 
--	const char *dn,
--	char **result) 
-+    const char *pattern,
-+    const char *username,
-+    const char *dn,
-+    char **result)
- {
--	char *buf; 
--	char *end, *ptr, *temp;
--	char *ebuf, *user;
--	char *domain;
--	int rc;
--
--	/* to permit multiple occurences of username and/or realm in filter */
--	/* and avoid memory overflow in filter build [eg: (|(uid=%u)(userid=%u)) ] */
--	int percents, user_len, dn_len, maxparamlength;
--	
--	if (pattern == NULL) {
--		syslog(LOG_ERR, "filter pattern not setup");
--		return PTSM_FAIL;
--	}
--
--	/* find the longest param of username and realm, 
--	   do not worry about domain because it is always shorter 
--	   then username                                           */
--	user_len=username ? strlen(username) : 0;
--	dn_len=dn ? strlen(dn) : 0;
--
--	maxparamlength = PTSM_MAX(user_len+1, dn_len); /* +1 for %R when '@' is prepended */
--
--	/* find the number of occurences of percent sign in filter */
--	for( percents=0, buf=(char *)pattern; *buf; buf++ ) {
--		if( *buf == '%' ) percents++;
--	}
--
--	/* percents * 3 * maxparamlength because we need to account for
-+    char *buf;
-+    char *end, *ptr, *temp;
-+    char *ebuf, *user;
-+    char *domain;
-+    int rc;
-+
-+    /* to permit multiple occurences of username and/or realm in filter */
-+    /* and avoid memory overflow in filter build [eg: (|(uid=%u)(userid=%u)) ] */
-+    int percents, user_len, dn_len, maxparamlength;
-+
-+    if (pattern == NULL) {
-+        syslog(LOG_ERR, "filter pattern not setup");
-+        return PTSM_FAIL;
-+    }
-+
-+    /* find the longest param of username and realm,
-+       do not worry about domain because it is always shorter
-+       then username                                           */
-+    user_len=username ? strlen(username) : 0;
-+    dn_len=dn ? strlen(dn) : 0;
-+
-+    maxparamlength = PTSM_MAX(user_len+1, dn_len); /* +1 for %R when '@' is prepended */
-+
-+    /* find the number of occurences of percent sign in filter */
-+    for( percents=0, buf=(char *)pattern; *buf; buf++ ) {
-+        if( *buf == '%' ) percents++;
-+    }
-+
-+    /* percents * 3 * maxparamlength because we need to account for
-          * an entirely-escaped worst-case-length parameter */
--	buf=xmalloc(strlen(pattern) + (percents * 3 * maxparamlength) +1);
--	if(buf == NULL)
--		return PTSM_NOMEM;
--	buf[0] = '\0';
--	
--	ptr = (char *)pattern;
--	end = ptr + strlen(ptr);
--
--	while ((temp=strchr(ptr,'%'))!=NULL ) {
--
--		if ((temp-ptr) > 0)
--			strncat(buf, ptr, temp-ptr);
--
--		if ((temp+1) >= end) {
--			syslog(LOG_DEBUG, "Incomplete lookup substitution format");
--			break;
--		}
--
--		switch (*(temp+1)) {
--			case '%':
--				strncat(buf,temp+1,1);
--				break;
--			case 'u':
--				if (ISSET(username)) {
--					rc=ptsmodule_escape(username, strlen(username), &ebuf);
--					if (rc == PTSM_OK) {
--						strcat(buf,ebuf);
--						free(ebuf);
--					}
--				} else
--					syslog(LOG_DEBUG, "Username not available.");
--				break;
--			case 'U':
--				if (ISSET(username)) {
--					
--					user = strchr(username, '@');
--					rc=ptsmodule_escape(username, (user ? user - username : strlen(username)), &ebuf);
--					if (rc == PTSM_OK) {
--						strcat(buf,ebuf);
--						free(ebuf);
--					}
--				} else
--					syslog(LOG_DEBUG, "Username not available.");
--				break;
--			case '1':
--			case '2':
--			case '3':
--			case '4':
--			case '5':
--			case '6':
--			case '7':
--			case '8':
--			case '9':
--				if (ISSET(username) && (domain = strchr(username, '@')) && domain[1]!='\0') {
--					rc=ptsmodule_tokenize_domains(domain+1, (int) *(temp+1)-48, &ebuf);
--					if (rc == PTSM_OK) {
--						strcat(buf,ebuf);
--						free(ebuf);
--					}
--				} else
--					syslog(LOG_DEBUG, "Domain tokens not available.");
--				break;
--			case 'R':
--			case 'd':
--				if (ISSET(username) && (domain = strchr(username, '@')) && domain[1]!='\0') {
--					rc=ptsmodule_escape(domain+1, strlen(domain+1), &ebuf);
--					if (rc == PTSM_OK) {
--						if (*(temp+1) == 'R')
--							strcat(buf,"@");
--						strcat(buf,ebuf);
--						free(ebuf);
--					}
--					break;
--				} 
--				break;
--			case 'D':
--				if (ISSET(dn)) {
--					rc = ptsmodule_escape(dn, strlen(dn), &ebuf);
--					if (rc == PTSM_OK) {
--						strcat(buf,ebuf);
--						free(ebuf);
--					}
--				} else
--					syslog(LOG_DEBUG, "dn not available.");
--				break;
--			default:
--				break;
--		}
--		ptr=temp+2;
--	}
--	if (temp<end)
--		strcat(buf, ptr);
--
--	*result = buf;
--
--	return PTSM_OK;
-+    buf=xmalloc(strlen(pattern) + (percents * 3 * maxparamlength) +1);
-+    if(buf == NULL)
-+        return PTSM_NOMEM;
-+    buf[0] = '\0';
-+
-+    ptr = (char *)pattern;
-+    end = ptr + strlen(ptr);
-+
-+    while ((temp=strchr(ptr,'%'))!=NULL ) {
-+
-+        if ((temp-ptr) > 0)
-+            strncat(buf, ptr, temp-ptr);
-+
-+        if ((temp+1) >= end) {
-+            syslog(LOG_DEBUG, "Incomplete lookup substitution format");
-+            break;
-+        }
-+
-+        switch (*(temp+1)) {
-+            case '%':
-+                strncat(buf,temp+1,1);
-+                break;
-+            case 'u':
-+                if (ISSET(username)) {
-+                    rc=ptsmodule_escape(username, strlen(username), &ebuf);
-+                    if (rc == PTSM_OK) {
-+                        strcat(buf,ebuf);
-+                        free(ebuf);
-+                    }
-+                } else
-+                    syslog(LOG_DEBUG, "Username not available.");
-+                break;
-+            case 'U':
-+                if (ISSET(username)) {
-+
-+                    user = strchr(username, '@');
-+                    rc=ptsmodule_escape(username, (user ? user - username : strlen(username)), &ebuf);
-+                    if (rc == PTSM_OK) {
-+                        strcat(buf,ebuf);
-+                        free(ebuf);
-+                    }
-+                } else
-+                    syslog(LOG_DEBUG, "Username not available.");
-+                break;
-+            case '1':
-+            case '2':
-+            case '3':
-+            case '4':
-+            case '5':
-+            case '6':
-+            case '7':
-+            case '8':
-+            case '9':
-+                if (ISSET(username) && (domain = strchr(username, '@')) && domain[1]!='\0') {
-+                    rc=ptsmodule_tokenize_domains(domain+1, (int) *(temp+1)-48, &ebuf);
-+                    if (rc == PTSM_OK) {
-+                        strcat(buf,ebuf);
-+                        free(ebuf);
-+                    }
-+                } else
-+                    syslog(LOG_DEBUG, "Domain tokens not available.");
-+                break;
-+            case 'R':
-+            case 'd':
-+                if (ISSET(username) && (domain = strchr(username, '@')) && domain[1]!='\0') {
-+                    rc=ptsmodule_escape(domain+1, strlen(domain+1), &ebuf);
-+                    if (rc == PTSM_OK) {
-+                        if (*(temp+1) == 'R')
-+                            strcat(buf,"@");
-+                        strcat(buf,ebuf);
-+                        free(ebuf);
-+                    }
-+                    break;
-+                }
-+                break;
-+            case 'D':
-+                if (ISSET(dn)) {
-+                    rc = ptsmodule_escape(dn, strlen(dn), &ebuf);
-+                    if (rc == PTSM_OK) {
-+                        strcat(buf,ebuf);
-+                        free(ebuf);
-+                    }
-+                } else
-+                    syslog(LOG_DEBUG, "dn not available.");
-+                break;
-+            default:
-+                break;
-+        }
-+        ptr=temp+2;
-+    }
-+    if (temp<end)
-+        strcat(buf, ptr);
-+
-+    *result = buf;
-+
-+    return PTSM_OK;
- }
- 
- 
-@@ -790,7 +793,7 @@ static int ptsmodule_get_dn(
-     char *authzid;
- #endif
-     char *base = NULL, *filter = NULL;
--    char *attrs[] = {NULL};
-+    char *attrs[] = {LDAP_NO_ATTRS,NULL}; //do not return all attrs!
-     LDAPMessage *res;
-     LDAPMessage *entry;
-     char *attr, **vals;
-@@ -859,14 +862,14 @@ static int ptsmodule_get_dn(
-             return PTSM_FAIL;
-         }
- 
--	/*
--	 * We don't want to return the *first* entry found, we want to return
--	 * the *only* entry found.
--	 */
--	if ( ldap_count_entries(ptsm->ld, res) == 1 ) {
--	    if ( (entry = ldap_first_entry(ptsm->ld, res)) != NULL )
--		*ret = ldap_get_dn(ptsm->ld, entry);
--	}
-+    /*
-+     * We don't want to return the *first* entry found, we want to return
-+     * the *only* entry found.
-+     */
-+    if ( ldap_count_entries(ptsm->ld, res) == 1 ) {
-+        if ( (entry = ldap_first_entry(ptsm->ld, res)) != NULL )
-+        *ret = ldap_get_dn(ptsm->ld, entry);
-+    }
- 
-         ldap_msgfree(res);
-         res = NULL;
-@@ -879,16 +882,17 @@ static int ptsmodule_get_dn(
- static int ptsmodule_make_authstate_attribute(
-     const char *canon_id,
-     size_t size,
--    const char **reply, 
-+    const char **reply,
-     int *dsize,
--    struct auth_state **newstate) 
-+    struct auth_state **newstate)
- {
-     char *dn = NULL;
-     LDAPMessage *res = NULL;
-     LDAPMessage *entry = NULL;
-     char **vals = NULL;
-+    char **rdn = NULL;
-     int rc;
--    char *attrs[] = {(char *)ptsm->member_attribute,NULL};
-+    char *attrs[] = {(char *)ptsm->member_attribute,(char *)ptsm->user_attribute,NULL};
- 
-     rc = ptsmodule_connect();
-     if (rc != PTSM_OK) {
-@@ -915,37 +919,69 @@ static int ptsmodule_make_authstate_attribute(
-     }
- 
-     if ((entry = ldap_first_entry(ptsm->ld, res)) != NULL) {
--	int i, numvals;
--
--	vals = ldap_get_values(ptsm->ld, entry, (char *)ptsm->member_attribute);
--	if (vals != NULL) {
--	    numvals = ldap_count_values( vals );
--
--	    *dsize = sizeof(struct auth_state) +
--		     (numvals * sizeof(struct auth_ident));
--	    *newstate = xmalloc(*dsize);
--	    if (*newstate == NULL) {
--		*reply = "no memory";
--		rc = PTSM_FAIL;
--		goto done;
--	    }
--	    (*newstate)->ngroups = numvals;
--
--	    for (i = 0; i < numvals; i++) {
--		int j;
--		strcpy((*newstate)->groups[i].id, "group:");
--		for(j =0; j < strlen(vals[i]); j++) {
--		  if(Uisupper(vals[i][j]))
--		    vals[i][j]=tolower(vals[i][j]);
--		}
--		strlcat((*newstate)->groups[i].id, vals[i], 
--		    sizeof((*newstate)->groups[i].id));
--		(*newstate)->groups[i].hash = strhash((*newstate)->groups[i].id);
--	    }
--
--	    ldap_value_free(vals);
--	    vals = NULL;
--	}
-+    int i, numvals;
-+
-+    vals = ldap_get_values(ptsm->ld, entry, (char *)ptsm->member_attribute);
-+    if (vals != NULL) {
-+        numvals = ldap_count_values( vals );
-+
-+        *dsize = sizeof(struct auth_state) +
-+             (numvals * sizeof(struct auth_ident));
-+        *newstate = xmalloc(*dsize);
-+        if (*newstate == NULL) {
-+            *reply = "no memory";
-+            rc = PTSM_FAIL;
-+            goto done;
-+        }
-+
-+        (*newstate)->ngroups = numvals;
-+        (*newstate)->userid.id[0] = '\0';
-+        for (i = 0; i < numvals; i++) {
-+            int j;
-+            strcpy((*newstate)->groups[i].id, "group:");
-+            rdn = ldap_explode_rdn(vals[i],1);
-+            for (j = 0; j < strlen(rdn[0]); j++) {
-+              if (Uisupper(rdn[0][j]))
-+                  rdn[0][j]=tolower(rdn[0][j]);
-+            }
-+            strlcat((*newstate)->groups[i].id, rdn[0],
-+                sizeof((*newstate)->groups[i].id));
-+            (*newstate)->groups[i].hash = strhash((*newstate)->groups[i].id);
-+        }
-+
-+        ldap_value_free(rdn);
-+        ldap_value_free(vals);
-+        vals = NULL;
-+    }
-+
-+    if ((char *)ptsm->user_attribute) {
-+        vals = ldap_get_values(ptsm->ld, entry, (char *)ptsm->user_attribute);
-+        if (vals != NULL) {
-+            numvals = ldap_count_values( vals );
-+
-+                if (numvals==1) {
-+                    if(!*newstate) {
-+                        *dsize = sizeof(struct auth_state);
-+                        *newstate = xmalloc(*dsize);
-+
-+                        if (*newstate == NULL) {
-+                            *reply = "no memory";
-+                            rc = PTSM_FAIL;
-+                            goto done;
-+                        }
-+
-+                        (*newstate)->ngroups = 0;
-+                    }
-+
-+                    size=strlen(vals[0]);
-+                    strcpy((*newstate)->userid.id, ptsmodule_canonifyid(vals[0],size));
-+                    (*newstate)->userid.hash = strhash((*newstate)->userid.id);
-+                }
-+
-+                ldap_value_free(vals);
-+                vals = NULL;
-+            }
-+        }
-     }
- 
-     if(!*newstate) {
-@@ -957,11 +993,14 @@ static int ptsmodule_make_authstate_attribute(
-             goto done;
-         }
-         (*newstate)->ngroups = 0;
-+        (*newstate)->userid.id[0] = '\0';
-     }
--    
-+
-     /* fill in the rest of our new state structure */
--    strcpy((*newstate)->userid.id, canon_id);
--    (*newstate)->userid.hash = strhash(canon_id);
-+    if ((*newstate)->userid.id[0]=='\0') {
-+        strcpy((*newstate)->userid.id, canon_id);
-+        (*newstate)->userid.hash = strhash(canon_id);
-+    }
-     (*newstate)->mark = time(0);
- 
-     rc = PTSM_OK;
-@@ -981,9 +1020,9 @@ done:;
- static int ptsmodule_make_authstate_filter(
-     const char *canon_id,
-     size_t size,
--    const char **reply, 
-+    const char **reply,
-     int *dsize,
--    struct auth_state **newstate) 
-+    struct auth_state **newstate)
- {
-     char *base = NULL, *filter = NULL;
-     int rc;
-@@ -1053,32 +1092,32 @@ static int ptsmodule_make_authstate_filter(
-     for (i = 0, entry = ldap_first_entry(ptsm->ld, res); entry != NULL;
-          i++, entry = ldap_next_entry(ptsm->ld, entry)) {
- 
--	vals = ldap_get_values(ptsm->ld, entry, (char *)ptsm->member_attribute);
--	if (vals == NULL)
--	    continue;
-+    vals = ldap_get_values(ptsm->ld, entry, (char *)ptsm->member_attribute);
-+    if (vals == NULL)
-+        continue;
- 
--	if ( ldap_count_values( vals ) != 1 ) {
--	    *reply = "too many values";
--	    rc = PTSM_FAIL;
--	    ldap_value_free(vals);
--	    vals = NULL;
--	    goto done;
--	}
-+    if ( ldap_count_values( vals ) != 1 ) {
-+        *reply = "too many values";
-+        rc = PTSM_FAIL;
-+        ldap_value_free(vals);
-+        vals = NULL;
-+        goto done;
-+    }
- 
--	strcpy((*newstate)->groups[i].id, "group:");
-+    strcpy((*newstate)->groups[i].id, "group:");
- 
--	int j;
--	for(j =0; j < strlen(vals[0]); j++) {
--	  if(Uisupper(vals[0][j]))
--	    vals[0][j]=tolower(vals[0][j]);
--	}
-+    int j;
-+    for(j =0; j < strlen(vals[0]); j++) {
-+      if(Uisupper(vals[0][j]))
-+        vals[0][j]=tolower(vals[0][j]);
-+    }
- 
--	strlcat((*newstate)->groups[i].id, vals[0], 
--	    sizeof((*newstate)->groups[i].id));
--	(*newstate)->groups[i].hash = strhash((*newstate)->groups[i].id);
-+    strlcat((*newstate)->groups[i].id, vals[0],
-+        sizeof((*newstate)->groups[i].id));
-+    (*newstate)->groups[i].hash = strhash((*newstate)->groups[i].id);
- 
--	ldap_value_free(vals);
--	vals = NULL;
-+    ldap_value_free(vals);
-+    vals = NULL;
-     }
- 
-     rc = PTSM_OK;
-@@ -1100,9 +1139,9 @@ done:;
- static int ptsmodule_make_authstate_group(
-     const char *canon_id,
-     size_t size,
--    const char **reply, 
-+    const char **reply,
-     int *dsize,
--    struct auth_state **newstate) 
-+    struct auth_state **newstate)
- {
-     char *base = NULL, *filter = NULL;
-     int rc;
-@@ -1184,8 +1223,8 @@ done:;
- static struct auth_state *myauthstate(
-     const char *identifier,
-     size_t size,
--    const char **reply, 
--    int *dsize) 
-+    const char **reply,
-+    int *dsize)
- {
-     const char *canon_id;
-     struct auth_state *newstate = NULL;
-@@ -1224,23 +1263,23 @@ retry:;
- 
- static void myinit(void)
- {
--	fatal("PTS module (ldap) not compiled in", EC_CONFIG);
-+    fatal("PTS module (ldap) not compiled in", EC_CONFIG);
- }
- 
- static struct auth_state *myauthstate(
-     const char *identifier __attribute__((unused)),
-     size_t size __attribute__((unused)),
--    const char **reply __attribute__((unused)), 
--    int *dsize __attribute__((unused))) 
-+    const char **reply __attribute__((unused)),
-+    int *dsize __attribute__((unused)))
- {
--	fatal("PTS module (ldap) not compiled in", EC_CONFIG);
-+    fatal("PTS module (ldap) not compiled in", EC_CONFIG);
- }
- 
- #endif /* HAVE_LDAP */
- 
--struct pts_module pts_ldap = 
-+struct pts_module pts_ldap =
- {
--    "ldap",		/* name */
-+    "ldap",        /* name */
- 
-     &myinit,
-     &myauthstate,

cyrus-imapd-2.4.12-debugopt.patch Deleted

@@ -1,109 +0,0 @@
-diff -up cyrus-imapd-2.4.12/imap/global.c.debugopt cyrus-imapd-2.4.12/imap/global.c
---- cyrus-imapd-2.4.12/imap/global.c.debugopt	2011-10-04 21:53:03.000000000 +0200
-+++ cyrus-imapd-2.4.12/imap/global.c	2011-11-22 14:24:28.272416643 +0100
-@@ -157,6 +157,10 @@ int cyrus_init(const char *alt_config, c
- 	/* don't free the openlog() string! */
-     }
- 
-+    /* allow debug logging */
-+    if (!config_debug)
-+	setlogmask(~LOG_MASK(LOG_DEBUG));
-+
-     /* Look up default partition */
-     config_defpartition = config_getstring(IMAPOPT_DEFAULTPARTITION);
-     for (p = (char *)config_defpartition; p && *p; p++) {
-diff -up cyrus-imapd-2.4.12/imap/tls.c.debugopt cyrus-imapd-2.4.12/imap/tls.c
---- cyrus-imapd-2.4.12/imap/tls.c.debugopt	2011-10-04 21:53:03.000000000 +0200
-+++ cyrus-imapd-2.4.12/imap/tls.c	2011-11-22 14:24:28.272416643 +0100
-@@ -255,9 +255,9 @@ static DH *load_dh_param(const char *key
- 
-     if (ret == NULL) {
- 	ret = get_dh1024();
--	syslog(LOG_NOTICE, "imapd:Loading hard-coded DH parameters");
-+	syslog(LOG_DEBUG, "imapd:Loading hard-coded DH parameters");
-     } else {
--	syslog(LOG_NOTICE, "imapd:Loading DH parameters from file");
-+	syslog(LOG_DEBUG, "imapd:Loading DH parameters from file");
-     }
- 
-     if (bio != NULL) BIO_free(bio);
-diff -up cyrus-imapd-2.4.12/lib/imapoptions.debugopt cyrus-imapd-2.4.12/lib/imapoptions
---- cyrus-imapd-2.4.12/lib/imapoptions.debugopt	2011-11-22 14:24:28.265416615 +0100
-+++ cyrus-imapd-2.4.12/lib/imapoptions	2011-11-22 14:24:28.273416647 +0100
-@@ -388,6 +388,9 @@ Blank lines and lines beginning with ``#
-    hashing done on configuration directories.  This is recommended if
-    one partition has a very bushy mailbox tree. */
- 
-+{ "debug", 0, SWITCH }
-+/* If enabled, allow syslog() to pass LOG_DEBUG messages. */
-+
- # Commented out - there's no such thing as "hostname_mechs", but we need
- # this for the man page
- # { "hostname_mechs", NULL, STRING }
-diff -up cyrus-imapd-2.4.12/lib/libconfig.c.debugopt cyrus-imapd-2.4.12/lib/libconfig.c
---- cyrus-imapd-2.4.12/lib/libconfig.c.debugopt	2011-10-04 21:53:03.000000000 +0200
-+++ cyrus-imapd-2.4.12/lib/libconfig.c	2011-11-22 14:24:28.274416650 +0100
-@@ -84,6 +84,7 @@ int config_auditlog;
- unsigned config_maxword;
- unsigned config_maxquoted;
- int config_qosmarking;
-+int config_debug;
- 
- /* declared in each binary that uses libconfig */
- extern const int config_need_data;
-@@ -350,6 +351,9 @@ void config_read(const char *alt_config)
- 
-     ival = config_getenum(IMAPOPT_QOSMARKING);
-     config_qosmarking = qos[ival];
-+
-+    /* allow debug logging */
-+    config_debug = config_getswitch(IMAPOPT_DEBUG);
- }
- 
- #define GROWSIZE 4096
-diff -up cyrus-imapd-2.4.12/lib/libconfig.h.debugopt cyrus-imapd-2.4.12/lib/libconfig.h
---- cyrus-imapd-2.4.12/lib/libconfig.h.debugopt	2011-10-04 21:53:03.000000000 +0200
-+++ cyrus-imapd-2.4.12/lib/libconfig.h	2011-11-22 14:24:28.274416650 +0100
-@@ -82,6 +82,7 @@ extern int config_auditlog;
- extern unsigned config_maxquoted;
- extern unsigned config_maxword;
- extern int config_qosmarking;
-+extern int config_debug;
- 
- /* config requirement flags */
- #define CONFIG_NEED_PARTITION_DATA (1<<0)
-diff -up cyrus-imapd-2.4.12/master/master.c.debugopt cyrus-imapd-2.4.12/master/master.c
---- cyrus-imapd-2.4.12/master/master.c.debugopt	2011-10-04 21:53:03.000000000 +0200
-+++ cyrus-imapd-2.4.12/master/master.c	2011-11-22 14:30:47.243975974 +0100
-@@ -1984,7 +1984,7 @@ int main(int argc, char **argv)
- 	if(pidlock_fd != -1) close(pidlock_fd);
-     }
- 
--    syslog(LOG_NOTICE, "process started");
-+    syslog(LOG_DEBUG, "process started");
- 
- #if defined(HAVE_UCDSNMP) || defined(HAVE_NETSNMP)
-     /* initialize SNMP agent */
-@@ -2041,7 +2041,7 @@ int main(int argc, char **argv)
-     init_janitor();
-     
-     /* ok, we're going to start spawning like mad now */
--    syslog(LOG_NOTICE, "ready for work");
-+    syslog(LOG_DEBUG, "ready for work");
- 
-     now = time(NULL);
-     for (;;) {
-diff -up cyrus-imapd-2.4.12/master/masterconf.c.debugopt cyrus-imapd-2.4.12/master/masterconf.c
---- cyrus-imapd-2.4.12/master/masterconf.c.debugopt	2011-10-04 21:53:03.000000000 +0200
-+++ cyrus-imapd-2.4.12/master/masterconf.c	2011-11-22 14:24:28.276416658 +0100
-@@ -99,6 +99,10 @@ int masterconf_init(const char *ident, c
-         /* don't free the openlog() string! */
-     }
- 
-+    /* drop debug messages locally */
-+    if (!config_debug)
-+	setlogmask(~LOG_MASK(LOG_DEBUG));
-+
-     return 0;
- }
-

cyrus-imapd-2.4.15-903-normalize-authorization-id.patch Deleted

@@ -1,97 +0,0 @@
-diff --git a/imap/global.c b/imap/global.c
-index d2e5ba7..930d539 100644
---- a/imap/global.c
-+++ b/imap/global.c
-@@ -219,6 +219,8 @@ int cyrus_init(const char *alt_config, const char *ident, unsigned flags)
- 				  config_getswitch(IMAPOPT_UNIX_GROUP_ENABLE));
- 	libcyrus_config_setswitch(CYRUSOPT_USERNAME_TOLOWER,
- 				  config_getswitch(IMAPOPT_USERNAME_TOLOWER));
-+	libcyrus_config_setswitch(CYRUSOPT_NORMALIZEUID,
-+				  config_getswitch(IMAPOPT_NORMALIZEUID));
- 	libcyrus_config_setswitch(CYRUSOPT_SKIPLIST_UNSAFE,
- 				  config_getswitch(IMAPOPT_SKIPLIST_UNSAFE));
- 	libcyrus_config_setstring(CYRUSOPT_TEMP_PATH,
-diff --git a/lib/auth_unix.c b/lib/auth_unix.c
-index c1f0329..d7abf79 100644
---- a/lib/auth_unix.c
-+++ b/lib/auth_unix.c
-@@ -156,10 +156,12 @@ const char *identifier;
- size_t len;
- {
-     static char retbuf[81];
-+    char backup[81];
-     struct group *grp;
-     char sawalpha;
-     char *p;
-     int username_tolower = 0;
-+    int ic,rbc;
- 
-     if(!len) len = strlen(identifier);
-     if(len >= sizeof(retbuf)) return NULL;
-@@ -211,6 +213,22 @@ size_t len;
-     /* now we don't */
-     /* if (!sawalpha) return NULL;  */
- 
-+    if( (libcyrus_config_getswitch(CYRUSOPT_NORMALIZEUID) == 1) ) {
-+        strcpy(backup,retbuf);
-+       /* remove leading blanks */
-+       for(ic=0; isblank(backup[ic]); ic++);
-+       for(rbc=0; backup[ic]; ic++) {
-+            retbuf[rbc] = ( isalpha(backup[ic]) ?
-+                 tolower(backup[ic]) : backup[ic] );
-+            rbc++;
-+       }
-+       retbuf[rbc] = '\0';
-+       /* remove trailing blanks */
-+       for(--rbc; isblank(retbuf[rbc]); rbc--) {
-+            retbuf[rbc] = '\0';
-+       }
-+    }
-+
-     return retbuf;
- }
- 
-diff --git a/lib/imapoptions b/lib/imapoptions
-index c049501..4d16fb5 100644
---- a/lib/imapoptions
-+++ b/lib/imapoptions
-@@ -1416,6 +1416,11 @@ product version in the capabilities */
-    the special use flag "\Drafts" added.  Later versions of Cyrus
-    have a much more flexible RFC 6154 compatible system.  */
- 
-+{ "normalizeuid", 0, SWITCH }
-+/* Lowercase uid and strip leading and trailing blanks. It is recommended
-+   to set this to yes, especially if OpenLDAP is used as authentication
-+   source. */
-+
- /*
- .SH SEE ALSO
- .PP
-diff --git a/lib/libcyr_cfg.c b/lib/libcyr_cfg.c
-index 688523c..b5c6008 100644
---- a/lib/libcyr_cfg.c
-+++ b/lib/libcyr_cfg.c
-@@ -158,6 +158,10 @@ struct cyrusopt_s cyrus_options[] = {
-       CFGVAL(long, 1),
-       CYRUS_OPT_SWITCH },
- 
-+    { CYRUSOPT_NORMALIZEUID,
-+      CFGVAL(long, 1),
-+      CYRUS_OPT_SWITCH },
-+
-     { CYRUSOPT_LAST, { NULL }, CYRUS_OPT_NOTOPT }
- };
- 
-diff --git a/lib/libcyr_cfg.h b/lib/libcyr_cfg.h
-index 7bdca06..1afe95a 100644
---- a/lib/libcyr_cfg.h
-+++ b/lib/libcyr_cfg.h
-@@ -116,6 +116,8 @@ enum cyrus_opt {
-     CYRUSOPT_SQL_USESSL,
-     /* Checkpoint after every recovery (OFF) */
-     CYRUSOPT_SKIPLIST_ALWAYS_CHECKPOINT,
-+    /* Lowercase uid and strip leading and trailing blanks (OFF) */
-+    CYRUSOPT_NORMALIZEUID,
- 
-     CYRUSOPT_LAST
-

cyrus-imapd-2.4.17_htmlstrip_no_return.patch Deleted

cyrus-imapd-2.5-autoconf-2.63.patch Added

cyrus-imapd-2.5-lt-prereq.patch Added

cyrus-imapd-2.5-with-dav-ifdefs.patch Added

@@ -0,0 +1,262 @@
+diff --git a/Makefile.am b/Makefile.am
+index 8b227ea..204dfab 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1184,7 +1184,6 @@ dist_man_MANS = \
+ 	man/deliver.8 \
+ 	man/fetchnews.8 \
+ 	man/fud.8 \
+-	man/httpd.8 \
+ 	man/idled.8 \
+ 	man/imapd.8 \
+ 	man/ipurge.8 \
+@@ -1200,17 +1199,27 @@ dist_man_MANS = \
+ 	man/rmnews.8 \
+ 	man/smmapd.8 \
+ 	man/syncnews.8 \
+-	man/sync_client.8 \
+-	man/sync_reset.8 \
+-	man/sync_server.8 \
+ 	man/timsieved.8 \
+ 	man/tls_prune.8 \
+ 	man/unexpunge.8
+-if USE_SQUAT
++
++if SQUATTER
+ dist_man_MANS += \
+ 	man/squatter.8
+ endif
+ 
++if HTTPD
++dist_man_MANS += \
++	man/httpd.8
++endif
++
++if REPLICATION
++dist_man_MANS += \
++	man/sync_client.8 \
++	man/sync_reset.8 \
++	man/sync_server.8
++endif
++
+ master_master_SOURCES = \
+ 	master/cyrusMasterMIB.c \
+ 	master/cyrusMasterMIB.h \
+diff --git a/imap/mailbox.c b/imap/mailbox.c
+index f9ae70a..3baf44e 100644
+--- a/imap/mailbox.c
++++ b/imap/mailbox.c
+@@ -51,7 +51,9 @@
+ #elif defined(HAVE_STDINT_H)
+ # include <stdint.h>
+ #endif
++#ifdef WITH_DAV
+ #include <libical/vcc.h>
++#endif
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -81,8 +83,10 @@
+ 
+ #include "annotate.h"
+ #include "assert.h"
++#ifdef WITH_DAV
+ #include "caldav_db.h"
+ #include "carddav_db.h"
++#endif
+ #include "crc32.h"
+ #include "md5.h"
+ #include "exitcodes.h"
+@@ -2666,6 +2670,7 @@ out:
+     return r;
+ }
+ 
++#ifdef WITH_DAV
+ static int mailbox_update_carddav(struct mailbox *mailbox,
+ 				 struct index_record *old,
+ 				 struct index_record *new)
+@@ -2886,6 +2891,7 @@ static int mailbox_update_dav(struct mailbox *mailbox,
+ 	return mailbox_update_caldav(mailbox, old, new);
+     return 0;
+ }
++#endif //WITH_DAV
+ 
+ EXPORTED int mailbox_update_conversations(struct mailbox *mailbox,
+ 				 struct index_record *old,
+@@ -3112,8 +3118,10 @@ static int mailbox_update_indexes(struct mailbox *mailbox,
+ {
+     int r = 0;
+ 
++#ifdef WITH_DAV
+     r = mailbox_update_dav(mailbox, old, new);
+     if (r) return r;
++#endif
+ 
+     r = mailbox_update_conversations(mailbox, old, new);
+ 
+@@ -4238,6 +4246,7 @@ static int chkchildren(char *name,
+     return r;
+ }
+ 
++#ifdef WITH_DAV
+ EXPORTED int mailbox_add_dav(struct mailbox *mailbox)
+ {
+     struct index_record record;
+@@ -4257,6 +4266,7 @@ EXPORTED int mailbox_add_dav(struct mailbox *mailbox)
+ 
+     return 0;
+ }
++#endif
+ 
+ EXPORTED int mailbox_add_conversations(struct mailbox *mailbox)
+ {
+diff --git a/imap/mailbox.h b/imap/mailbox.h
+index 5d3ed01..fe0bf91 100644
+--- a/imap/mailbox.h
++++ b/imap/mailbox.h
+@@ -587,6 +587,8 @@ extern int mailbox_get_xconvmodseq(struct mailbox *mailbox, modseq_t *);
+ extern int mailbox_update_xconvmodseq(struct mailbox *mailbox, modseq_t, int force);
+ extern int mailbox_has_conversations(struct mailbox *mailbox);
+ 
++#ifdef WITH_DAV
+ extern int mailbox_add_dav(struct mailbox *mailbox);
++#endif
+ 
+ #endif /* INCLUDED_MAILBOX_H */
+diff --git a/imap/mboxevent.c b/imap/mboxevent.c
+index eabc462..13f0945 100644
+--- a/imap/mboxevent.c
++++ b/imap/mboxevent.c
+@@ -53,8 +53,10 @@
+ 
+ #include "annotate.h"
+ #include "assert.h"
++#ifdef WITH_DAV
+ #include "caldav_db.h"
+ #include "carddav_db.h"
++#endif
+ #include "exitcodes.h"
+ #include "imapurl.h"
+ #include "libconfig.h"
+@@ -131,9 +133,11 @@ static struct mboxevent event_template =
+     { EVENT_USER, "user", EVENT_PARAM_STRING, 0, 0 },
+     { EVENT_MESSAGE_SIZE, "messageSize", EVENT_PARAM_INT, 0, 0 },
+     { EVENT_MESSAGE_CID, "vnd.fastmail.cid", EVENT_PARAM_STRING, 0, 0 },
++#ifdef WITH_DAV
+     { EVENT_MBTYPE, "vnd.cmu.mbtype", EVENT_PARAM_STRING, 0, 0 },
+     { EVENT_DAV_FILENAME, "vnd.cmu.davFilename", EVENT_PARAM_STRING, 0, 0 },
+     { EVENT_DAV_UID, "vnd.cmu.davUid", EVENT_PARAM_STRING, 0, 0 },
++#endif
+     /* always at end to let the parser to easily truncate this part */
+     { EVENT_ENVELOPE, "vnd.cmu.envelope", EVENT_PARAM_STRING, 0, 0 },
+     { EVENT_BODYSTRUCTURE, "bodyStructure", EVENT_PARAM_STRING, 0, 0 },
+@@ -374,8 +378,10 @@ static int mboxevent_expected_param(enum event_type type, enum event_param param
+ 	return extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_VND_FASTMAIL_SESSIONID;
+     case EVENT_MAILBOX_ID:
+ 	return (type & MAILBOX_EVENTS);
++#ifdef WITH_DAV
+     case EVENT_MBTYPE:
+ 	return (type & MAILBOX_EVENTS);
++#endif
+     case EVENT_MAX_MESSAGES:
+ 	return type & QUOTA_EVENTS;
+     case EVENT_MESSAGE_CONTENT:
+@@ -387,12 +393,14 @@ static int mboxevent_expected_param(enum event_type type, enum event_param param
+     case EVENT_MESSAGE_CID:
+ 	return (extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_VND_FASTMAIL_CID) &&
+ 	       (type & (EVENT_MESSAGE_APPEND|EVENT_MESSAGE_NEW));
++#ifdef WITH_DAV
+     case EVENT_DAV_FILENAME:
+ 	return (extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_VND_CMU_DAVFILENAME) &&
+ 	       (type & EVENT_CALENDAR);
+     case EVENT_DAV_UID:
+ 	return (extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_VND_CMU_DAVUID) &&
+ 	       (type & EVENT_CALENDAR);
++#endif
+     case EVENT_MESSAGES:
+ 	if (type & (EVENT_QUOTA_EXCEED|EVENT_QUOTA_WITHIN))
+ 	    return 1;
+@@ -738,6 +746,7 @@ EXPORTED void mboxevent_extract_record(struct mboxevent *event, struct mailbox *
+ 				   cacheitem_size(record, CACHE_BODYSTRUCTURE)));
+     }
+ 
++#ifdef WITH_DAV
+     /* add caldav items */
+     if ((mailbox->mbtype & (MBTYPES_DAV)) &&
+ 	(mboxevent_expected_param(event->type, EVENT_DAV_FILENAME) ||
+@@ -779,7 +788,7 @@ EXPORTED void mboxevent_extract_record(struct mboxevent *event, struct mailbox *
+ 	    }
+ 	}
+     }
+-
++#endif //WITH_DAV
+ }
+ 
+ void mboxevent_extract_copied_record(struct mboxevent *event,
+@@ -991,8 +1000,10 @@ EXPORTED void mboxevent_extract_mailbox(struct mboxevent *event,
+     imapurl_toURL(url, &imapurl);
+     FILL_STRING_PARAM(event, EVENT_URI, xstrdup(url));
+ 
++#ifdef WITH_DAV
+     FILL_STRING_PARAM(event, EVENT_MBTYPE,
+ 	xstrdup(mboxlist_mbtype_to_string(mailbox->mbtype)));
++#endif
+ 
+     /* mailbox related events also require mailboxID */
+     if (event->type & MAILBOX_EVENTS) {
+diff --git a/imap/mboxevent.h b/imap/mboxevent.h
+index f56ad9e..2f1e022 100644
+--- a/imap/mboxevent.h
++++ b/imap/mboxevent.h
+@@ -113,9 +113,11 @@ enum event_param {
+     EVENT_USER,
+     EVENT_MESSAGE_SIZE,
+     EVENT_MESSAGE_CID,
++#ifdef WITH_DAV
+     EVENT_MBTYPE,
+     EVENT_DAV_FILENAME,
+     EVENT_DAV_UID,
++#endif
+     EVENT_ENVELOPE,
+     EVENT_BODYSTRUCTURE,
+     EVENT_CLIENT_ID,
+diff --git a/imap/sync_server.c b/imap/sync_server.c
+index 745b3cf..e51983d 100644
+--- a/imap/sync_server.c
++++ b/imap/sync_server.c
+@@ -74,9 +74,11 @@
+ #include "annotate.h"
+ #include "append.h"
+ #include "auth.h"
++#ifdef WITH_DAV
+ #include "caldav_db.h"
+ #include "carddav_db.h"
+ #include "dav_db.h"
++#endif
+ #include "dlist.h"
+ #include "exitcodes.h"
+ #include "global.h"
+@@ -291,9 +293,11 @@ int service_init(int argc __attribute__((unused)),
+ 	statuscache_open();
+     }
+ 
++#ifdef WITH_DAV
+     dav_init();
+     caldav_init();
+     carddav_init();
++#endif
+ 
+     return 0;
+ }
+@@ -455,9 +459,11 @@ void shut_down(int code)
+ 
+     proc_cleanup();
+ 
++#ifdef WITH_DAV
+     carddav_done();
+     caldav_done();
+     dav_done();
++#endif
+ 
+     if (config_getswitch(IMAPOPT_STATUSCACHE)) {
+ 	statuscache_close();

cyrus-imapd-2.4.17.tar.gz -> cyrus-imapd-2.5.tar.gz Changed

cyrus-imapd.dsc Changed

@@ -2,9 +2,9 @@
 Source: cyrus-imapd
 Binary: cyrus-imapd
 Architecture: any
-Version: 2.4.17-8
-Maintainer: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>
-Uploaders: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>, Paul Klos <kolab@klos2day.nl>
+Version: 2.5~dev2014011701-0~kolab1
+Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
+Uploaders: Paul Klos <kolab@klos2day.nl>
 Homepage: http://www.cyrusimap.org/
 Standards-Version: 3.9.1
 Vcs-Browser: http://git.kolabsys.com/apt/cyrus-imapd/
@@ -21,19 +21,23 @@
     groff,
     heimdal-dev,
     libdb5.1-dev | libdb-dev,
+    libjansson-dev,
     libkvm-dev [kfreebsd-amd64],
     libkvm-dev [kfreebsd-i386],
     libldap2-dev,
     libpam0g-dev,
+    libpcre3-dev,
     libsasl2-dev (>= 2.1.9),
     libsnmp-dev | libsnmp9-dev,
     libssl-dev,
+    libtool,
     libwrap0-dev,
+    libxapian-dev,
     libzephyr-dev,
     lsb-base,
     perl,
+    pkg-config,
     po-debconf,
-    quilt,
     tcl-dev | tcl8.3-dev,
     transfig,
     xutils-dev | xutils,
@@ -41,5 +45,5 @@
 Package-List: 
  cyrus-imapd deb mail extra
 Files: 
- 00000000000000000000000000000000 0 cyrus-imapd-2.4.17.tar.gz
+ 00000000000000000000000000000000 0 cyrus-imapd-2.5.tar.gz
  00000000000000000000000000000000 0 debian.tar.gz

debian.changelog Changed

debian.control Changed

debian.rules Changed

@@ -17,8 +17,6 @@
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-include /usr/share/quilt/quilt.make
-
 # Extra version information to add to Cyrus IMAPd ID
 DEBVERSION:=$(shell LCALL=C dpkg-parsechangelog | sed -ne 's/^Version: $.*-$/\1/p')
 EXTRA_IDENT:="Debian-$(DEBVERSION)"
@@ -48,7 +46,7 @@
 	CONFFLAGS += --enable-warnings-are-errors
 endif
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	dh_clean
@@ -57,23 +55,24 @@
 
 configure-stamp: $(QUILT_STAMPFN)
 	dh_testdir
-	cp /usr/share/misc/config.sub config.sub
-	cp /usr/share/misc/config.guess config.guess
-	touch configure.in && touch aclocal.m4 && touch configure
-	autoheader || :
 	aclocal -I cmulocal
-	autoreconf -v -f
+	libtoolize --install
+	autoheader
+	automake --add-missing || autoreconf -v && automake --add-missing
+	autoreconf -v
+
 	#
 	# IF YOU CHANGE BERKELEY DB VERSION, MAKE SURE TO UPDATE
 	# DBENGINE AT THE TOP OF THIS MAKEFILE!
 	./configure CFLAGS="-fno-strict-aliasing -fPIC -Wall -pipe $(DEBUGFLAGS)" $(CONFFLAGS) \
+		--enable-event-notification \
 		--enable-idled \
 		--enable-gssapi --with-gss_impl=heimdal \
 		--enable-listext \
 		--enable-murder \
 		--enable-nntp \
 		--enable-replication \
-		--with-extraident=$(EXTRA_IDENT) \
+		--enable-xapian \
 		--prefix=/usr \
 		--exec-prefix=/usr \
 		--libexecdir=/usr/sbin \
@@ -86,15 +85,16 @@
 		--localstatedir=/var/lib/imap \
 		--mandir=/usr/share/man \
 		--with-auth=pts \
+		--with-com_err="" \
 		--with-cyrus-prefix=/usr/lib/cyrus-imapd \
+		--with-cyrus-group=mail \
+		--with-cyrus-user=cyrus \
+		--with-extraident=$(EXTRA_IDENT) \
 		--with-ldap=/usr \
 		--with-lock=fcntl \
 		--with-perl=/usr/bin/perl \
 		--with-openssl=/usr \
 		--with-sasl=/usr \
-		--with-cyrus-user=cyrus \
-		--with-cyrus-group=mail \
-		--with-com_err="" \
 		--with-pidfile=/var/run/cyrus-master.pid \
 		--with-service-path=/usr/lib/cyrus-imapd \
 		--with-syslogfacility=MAIL \
@@ -108,7 +108,6 @@
 	grep with\ options config.status \
 	| sed -e 's/^.*options \\"/configure /;s/\\"$///' \
 		>> debian/README.configure-options
-	sed -i 's/ -lsensors//' master/Makefile
 	touch configure-stamp
 
 build-arch: build-arch-stamp

debian.series Changed

debian.tar.gz/cyrus-imapd.install Changed

@@ -2,54 +2,56 @@
 etc/imapd.annotations.conf
 etc/imapd.conf
 usr/bin/*
-usr/sbin/cyrus-makedirs
-/usr/lib/cyrus-imapd/arbitron
-/usr/lib/cyrus-imapd/chk_cyrus
-/usr/lib/cyrus-imapd/ctl_cyrusdb
-/usr/lib/cyrus-imapd/ctl_deliver
-/usr/lib/cyrus-imapd/ctl_mboxlist
-/usr/lib/cyrus-imapd/cvt_cyrusdb
-/usr/lib/cyrus-imapd/cyr_dbtool
-/usr/lib/cyrus-imapd/cyr_df
-/usr/lib/cyrus-imapd/cyrdump
-/usr/lib/cyrus-imapd/cyr_expire
-/usr/lib/cyrus-imapd/cyr_sequence
-/usr/lib/cyrus-imapd/cyr_synclog
-/usr/lib/cyrus-imapd/cyr_userseen
-/usr/lib/cyrus-imapd/cyrus-master
-/usr/lib/cyrus-imapd/deliver
-/usr/lib/cyrus-imapd/fud
-/usr/lib/cyrus-imapd/idled
-/usr/lib/cyrus-imapd/imapd
-/usr/lib/cyrus-imapd/ipurge
-/usr/lib/cyrus-imapd/lmtpd
-/usr/lib/cyrus-imapd/lmtpproxyd
-/usr/lib/cyrus-imapd/mbexamine
-/usr/lib/cyrus-imapd/mbpath
-/usr/lib/cyrus-imapd/mupdate
-/usr/lib/cyrus-imapd/nntpd
-/usr/lib/cyrus-imapd/notifyd
-/usr/lib/cyrus-imapd/pop3d
-/usr/lib/cyrus-imapd/proxyd
-/usr/lib/cyrus-imapd/ptdump
-/usr/lib/cyrus-imapd/ptexpire
-/usr/lib/cyrus-imapd/ptloader
-/usr/lib/cyrus-imapd/quota
-/usr/lib/cyrus-imapd/reconstruct
-/usr/lib/cyrus-imapd/sievec
-/usr/lib/cyrus-imapd/sieved
-/usr/lib/cyrus-imapd/smmapd
-/usr/lib/cyrus-imapd/squatter
-/usr/lib/cyrus-imapd/sync_client
-/usr/lib/cyrus-imapd/sync_reset
-/usr/lib/cyrus-imapd/sync_server
-/usr/lib/cyrus-imapd/timsieved
-/usr/lib/cyrus-imapd/tls_prune
-/usr/lib/cyrus-imapd/unexpunge
+usr/lib*/*.so
+usr/lib*/*.so.*
+usr/lib/cyrus-imapd/arbitron
+usr/lib/cyrus-imapd/chk_cyrus
+usr/lib/cyrus-imapd/ctl_cyrusdb
+usr/lib/cyrus-imapd/ctl_deliver
+usr/lib/cyrus-imapd/ctl_mboxlist
+usr/lib/cyrus-imapd/cvt_cyrusdb
+usr/lib/cyrus-imapd/cyr_dbtool
+usr/lib/cyrus-imapd/cyr_df
+usr/lib/cyrus-imapd/cyrdump
+usr/lib/cyrus-imapd/cyr_expire
+usr/lib/cyrus-imapd/cyr_sequence
+usr/lib/cyrus-imapd/cyr_synclog
+usr/lib/cyrus-imapd/cyr_userseen
+usr/lib/cyrus-imapd/cyrus-master
+usr/lib/cyrus-imapd/deliver
+usr/lib/cyrus-imapd/fud
+usr/lib/cyrus-imapd/idled
+usr/lib/cyrus-imapd/imapd
+usr/lib/cyrus-imapd/ipurge
+usr/lib/cyrus-imapd/lmtpd
+usr/lib/cyrus-imapd/lmtpproxyd
+usr/lib/cyrus-imapd/mbexamine
+usr/lib/cyrus-imapd/mbpath
+usr/lib/cyrus-imapd/mupdate
+usr/lib/cyrus-imapd/nntpd
+usr/lib/cyrus-imapd/notifyd
+usr/lib/cyrus-imapd/pop3d
+usr/lib/cyrus-imapd/proxyd
+usr/lib/cyrus-imapd/ptdump
+usr/lib/cyrus-imapd/ptexpire
+usr/lib/cyrus-imapd/ptloader
+usr/lib/cyrus-imapd/quota
+usr/lib/cyrus-imapd/reconstruct
+usr/lib/cyrus-imapd/sievec
+usr/lib/cyrus-imapd/sieved
+usr/lib/cyrus-imapd/smmapd
+usr/lib/cyrus-imapd/squatter
+usr/lib/cyrus-imapd/sync_client
+usr/lib/cyrus-imapd/sync_reset
+usr/lib/cyrus-imapd/sync_server
+usr/lib/cyrus-imapd/timsieved
+usr/lib/cyrus-imapd/tls_prune
+usr/lib/cyrus-imapd/unexpunge
 usr/lib/perl*
 usr/sbin/*
 usr/share/icons/*
 usr/share/man/man1/*
+usr/share/man/man3/*
 usr/share/man/man8/*
 usr/share/perl*
 usr/share/snmp

Build Results
RPM Lint

Refresh

Comments for request 388 0

Request History

vanmeeuwen created request almost 11 years ago

vanmeeuwen accepted request almost 11 years ago

Please add a comment

vanmeeuwen accepted request almost 11 years ago

Please add a comment