- new, 2.1.16

diff --git a/dovecot-am.patch b/dovecot-am.patch
new file mode 100644 (file)
index 0000000..f420ae4
--- /dev/null
+++ b/dovecot-am.patch
@@ -0,0 +1,21 @@
+--- dovecot-2.0.16/Makefile.am~        2012-01-31 14:21:23.717655182 +0100
++++ dovecot-2.0.16/Makefile.am 2012-01-31 14:24:01.384328961 +0100
+@@ -21,7 +21,8 @@
+       dovecot-config
+ 
+ nodist_pkginclude_HEADERS = config.h
+-pkglib_DATA = $(datafiles)
++pkgdatadir = $(pkglibdir)
++pkgdata_DATA = $(datafiles)
+ 
+ if MAINTAINER_MODE
+ ChangeLog: .hg/dirstate
+@@ -61,7 +61,7 @@
+ EXTRA_DIST += dovecot.socket dovecot.service.in
+ endif
+ 
+-install-exec-hook:
++install-data-hook:
+       rm $(DESTDIR)$(pkglibdir)/dovecot-config && \
+       grep -v '^LIBDOVECOT_.*_INCLUDE' dovecot-config | \
+       grep -v '^LIBDOVECOT.*_DEPS' | sed \

diff --git a/dovecot-config.patch b/dovecot-config.patch
new file mode 100644 (file)
index 0000000..c5c40a3
--- /dev/null
+++ b/dovecot-config.patch
@@ -0,0 +1,21 @@
+diff -urN dovecot-2.0.3.org/doc/example-config/conf.d/10-ssl.conf dovecot-2.0.3/doc/example-config/conf.d/10-ssl.conf
+--- dovecot-2.0.3.org/doc/example-config/conf.d/10-ssl.conf    2010-05-24 16:35:40.000000000 +0200
++++ dovecot-2.0.3/doc/example-config/conf.d/10-ssl.conf        2010-09-18 22:05:37.079775811 +0200
+@@ -3,14 +3,14 @@
+ ##
+ 
+ # SSL/TLS support: yes, no, required. <doc/wiki/SSL.txt>
+-#ssl = yes
++ssl = no
+ 
+ # PEM encoded X.509 SSL/TLS certificate and private key. They're opened before
+ # dropping root privileges, so keep the key file unreadable by anyone but
+ # root. Included doc/mkcert.sh can be used to easily generate self-signed
+ # certificate, just make sure to update the domains in dovecot-openssl.cnf
+-ssl_cert = </etc/ssl/certs/dovecot.pem
+-ssl_key = </etc/ssl/private/dovecot.pem
++#ssl_cert = </var/lib/openssl/certs/imap.pem
++#ssl_key = </var/lib/openssl/private/imap.pem
+ 
+ # If key file is password protected, give the password here. Alternatively
+ # give it when starting dovecot with -p parameter. Since this file is often

diff --git a/dovecot.init b/dovecot.init
new file mode 100644 (file)
index 0000000..6a76990
--- /dev/null
+++ b/dovecot.init
@@ -0,0 +1,97 @@
+#!/bin/sh
+# IMAP Daemon
+#
+# chkconfig:   345 80 20
+# description: IMAP Daemon
+
+# Source function library
+. /etc/rc.d/init.d/functions
+
+# Get network config
+. /etc/sysconfig/network
+
+# Get service config
+[ -f /etc/sysconfig/dovecot ] && . /etc/sysconfig/dovecot
+
+# Check that networking is up.
+if is_yes "${NETWORKING}"; then
+       if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
+               msg_network_down "Dovecot"
+               exit 1
+       fi
+else
+       exit 0
+fi
+
+start() {
+       # Check if the service is already running?
+       if [ ! -f /var/lock/subsys/dovecot ]; then
+               msg_starting "Dovecot"
+               daemon /usr/sbin/dovecot
+               RETVAL=$?
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/dovecot
+       else
+               msg_already_running "Dovecot"
+       fi
+}
+
+stop() {
+       if [ -f /var/lock/subsys/dovecot ]; then
+               msg_stopping "Dovecot"
+               killproc --pidfile dovecot/master.pid dovecot
+               rm -f /var/lock/subsys/dovecot
+       else
+               msg_not_running "Dovecot"
+       fi
+}
+
+reload() {
+       if [ -f /var/lock/subsys/dovecot ]; then
+               msg_reloading dovecot
+               killproc --pidfile dovecot/master.pid docevot -HUP
+               RETVAL=$?
+       else
+               msg_not_running "Dovecot"
+               RETVAL=7
+       fi
+}
+
+condrestart() {
+       if [ -f /var/lock/subsys/dovecot ]; then
+               stop
+               start
+       else
+               msg_not_running "Dovecot"
+               RETVAL=$1
+       fi
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+       start
+       ;;
+  stop)
+       stop
+       ;;
+  restart)
+       stop
+       start
+       ;;
+  try-restart)
+       condrestart 0
+       ;;
+  reload|force-reload)
+       reload
+       ;;
+  status)
+       status dovecot
+       exit $?
+       ;;
+  *)
+       msg_usage "$0 {start|stop|restart|try-restart|reload|force-reload|status}"
+       exit 3
+esac
+
+exit $RETVAL

diff --git a/dovecot.pamd b/dovecot.pamd
new file mode 100644 (file)
index 0000000..5b48c52
--- /dev/null
+++ b/dovecot.pamd
@@ -0,0 +1,6 @@
+#%PAM-1.0
+auth           required        pam_listfile.so item=user sense=deny file=/etc/security/blacklist.imap onerr=succeed
+auth           include         system-auth
+account                required        pam_nologin.so
+account                include         system-auth
+session                include         system-auth

diff --git a/dovecot.spec b/dovecot.spec
new file mode 100644 (file)
index 0000000..8a81ea2
--- /dev/null
+++ b/dovecot.spec
@@ -0,0 +1,360 @@
+#
+# Conditional build:
+%bcond_without gssapi  # without GSSAPI support
+%bcond_without ldap    # without LDAP auth
+%bcond_without mysql   # without MySQL auth
+%bcond_without pgsql   # without PostgreSQL auth
+%bcond_without sqlite  # without SQLite3 auth
+%bcond_without sasl    # without SASL auth
+
+Summary:       IMAP and POP3 server written with security primarily in mind
+Summary(pl.UTF-8):     Serwer IMAP i POP3 pisany głównie z myślą o bezpieczeństwie
+Name:          dovecot
+Version:       2.1.16
+Release:       1
+Epoch:         1
+License:       MIT (libraries), LGPL v2.1 (the rest)
+Group:         Networking/Daemons
+Source0:       http://dovecot.org/releases/2.1/%{name}-%{version}.tar.gz
+# Source0-md5: 72abf618cfa678194f9338f6c0aeb47d
+Source1:       %{name}.pamd
+Source2:       %{name}.init
+Source3:       %{name}.sysconfig
+Source4:       %{name}.tmpfiles
+Patch0:                %{name}-config.patch
+URL:           http://dovecot.org/
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: bzip2-devel
+%{?with_sasl:BuildRequires:    cyrus-sasl-devel >= 2.0}
+BuildRequires: gettext-devel
+%{?with_gssapi:BuildRequires:  heimdal-devel}
+BuildRequires: libcap-devel
+BuildRequires: libtool
+%{?with_mysql:BuildRequires:   mysql-devel}
+%{?with_ldap:BuildRequires:    openldap-devel >= 2.3.3}
+BuildRequires: openssl-devel >= 0.9.7d
+BuildRequires: pam-devel
+BuildRequires: pkgconfig
+%{?with_pgsql:BuildRequires:   postgresql-devel}
+BuildRequires: sed >= 4.0
+%{?with_sqlite:BuildRequires:  sqlite3-devel}
+BuildRequires: zlib-devel
+Requires(post,preun):  /sbin/chkconfig
+Requires(postun):      /usr/sbin/groupdel
+Requires(postun):      /usr/sbin/userdel
+Requires(pre): /bin/id
+Requires(pre): /usr/bin/getgid
+Requires(pre): /usr/sbin/groupadd
+Requires(pre): /usr/sbin/useradd
+Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
+Requires:      pam >= 0.79.0
+Provides:      group(dovecot)
+Provides:      imapdaemon
+Provides:      user(dovecot)
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%define                no_install_post_check_so        1
+
+%description
+Dovecot is an IMAP and POP3 server for Linux/UNIX-like systems,
+written with security primarily in mind. Although it's written with C,
+it uses several coding techniques to avoid most of the common
+pitfalls.
+
+Dovecot can work with standard mbox and maildir formats and it's fully
+compatible with UW-IMAP and Courier IMAP servers as well as mail
+clients accessing the mailboxes directly. It's also planned to support
+storing mails in SQL databases.
+
+Dovecot is easy to set up and doesn't require special maintenance.
+Only thing you need is to get the authentication working properly - if
+your users are in /etc/passwd there's hardly anything you have to do.
+
+Dovecot should be pretty fast, mostly because of index files that
+Dovecot maintains; instead of having to scan through all the data in
+mailbox, Dovecot can get most of the wanted information from index
+with little effort.
+
+Status:
+- should be quite ready for use with normal IMAP clients
+- complete IMAP4rev1 and POP3 support
+- supports THREAD, SORT and IDLE extensions, required by many IMAP
+  webmails
+- complete TLS/SSL support
+- IPv6 ready
+- shared mailboxes aren't yet supported
+- Maildir++ quota is supported, bad hard filesystem quota can be
+  problematic
+
+%description -l pl.UTF-8
+Dovecot to serwer IMAP i POP3 dla systemów linuksowych/uniksowych,
+pisany głównie z myślą o bezpieczeństwie. Chociaż jest pisany w C,
+używa kilku technik kodowania zapobiegających większości popularnych
+pułapek.
+
+Dovecot może działać ze standardowymi formatami mbox i maildir, jest
+całkowicie kompatybilny z serwerami UW-IMAP i Courier IMAP, a także z
+klientami pocztowymi bezpośrednio dostającymi się do skrzynek.
+Planowana jest także obsługa przechowywania listów w bazach SQL.
+
+Dovecot jest łatwy do skonfigurowania i nie wymaga specjalnego
+nadzoru. Wystarczy tylko doprowadzić do działania uwierzytelnianie -
+jeśli użytkownicy są w /etc/passwd, to właściwie nie trzeba nic
+zmieniać.
+
+Dovecot powinien być w miarę szybki, głównie z powodu plików
+indeksowych utrzymywanych przez serwer; zamiast potrzeby skanowania
+wszystkich danych w skrzynce, Dovecot może małym kosztem uzyskać
+większość potrzebnych informacji z indeksu.
+
+Stan:
+- powinien być gotowy do użycia ze zwykłymi klientami IMAP
+- pełna obsługa IMAP4rev1 i POP3
+- obsługa rozszerzeń THREAD, SORT i IDLE, wymaganych przez wiele
+  webmaili IMAP
+- obsługa IPv6
+- pełna obsługa TLS/SSL
+- quota Maildir++ jest obsługiwana, ale twarda quota na systemach
+  plików może być problematyczna
+
+%package devel
+Summary:       Development package for Dovecot plugins
+Summary(pl.UTF-8):     Pakiet programistyczny do tworzenia wtyczek dla Dovecota
+Group:         Development/Libraries
+Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
+
+%description devel
+Development package for Dovecot plugins.
+
+%description devel -l pl.UTF-8
+Pakiet programistyczny do tworzenia wtyczek dla Dovecota.
+
+%package libs
+Summary:       Dovecot shared libraries
+Summary(pl.UTF-8):     Współdzielone biblioteki Dovecota
+Group:         Development/Libraries
+
+%description libs
+Dovecot shared libraries.
+
+%description libs -l pl.UTF-8
+Współdzielone biblioteki Dovecota.
+
+%prep
+%setup -q
+%patch0 -p1
+
+%{__sed} -i 's,/usr/lib/dovecot,%{_libdir}/dovecot,g' doc/example-config/*.conf doc/example-config/conf.d/*.conf
+
+%build
+touch config.rpath
+%{__libtoolize}
+%{__aclocal} -I .
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure \
+       --disable-static \
+       %{?debug:--enable-debug} \
+       %{?with_ldap:--with-ldap=yes} \
+       %{?with_mysql:--with-mysql} \
+       %{?with_pgsql:--with-pgsql} \
+       %{?with_sqlite:--with-sqlite} \
+       %{?with_gssapi:--with-gssapi=plugin} \
+       --with-sql=plugin \
+       --with-pam \
+       --with-zlib \
+       --with-bzlib \
+       --with-libcap \
+       --with-ssl=openssl \
+       --with-moduledir=%{_libdir}/%{name}/plugins \
+       --with-ssldir=/var/lib/openssl \
+       --sysconfdir=%{_sysconfdir} \
+       --with-systemdsystemunitdir=/lib/systemd/system
+
+%{__make}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,sysconfig,security} \
+       $RPM_BUILD_ROOT{/var/lib/dovecot,/var/run/dovecot/login} \
+       $RPM_BUILD_ROOT/usr/lib/tmpfiles.d
+
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT
+
+mv -f $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/example-config/* $RPM_BUILD_ROOT%{_sysconfdir}/dovecot
+
+cp -a %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/%{name}
+install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+cp -a %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
+install %{SOURCE4} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
+
+touch $RPM_BUILD_ROOT/etc/security/blacklist.imap
+
+find $RPM_BUILD_ROOT%{_libdir}/%{name} -name '*.la' | xargs rm
+
+mv $RPM_BUILD_ROOT%{_libdir}/%{name}/dovecot-config $RPM_BUILD_ROOT%{_libdir}/%{name}-devel
+
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
+%{__rm} -r $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/README
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%pre
+%groupadd -g 172 dovecot
+%useradd -u 172 -d /usr/share/empty -s /bin/false -c "Dovecot server" -g dovecot dovecot
+%groupadd -g 254 dovenull
+%useradd -u 254 -d /usr/share/empty -s /bin/false -c "Dovecot server" -g dovenull dovenull
+
+%post
+/sbin/chkconfig --add dovecot
+%service dovecot restart
+
+%preun
+if [ "$1" = "0" ]; then
+       %service dovecot stop
+       /sbin/chkconfig --del dovecot
+fi
+
+%postun
+if [ "$1" = "0" ]; then
+       %userremove dovecot
+       %groupremove dovecot
+       %userremove dovenull
+       %groupremove dovenull
+fi
+
+%post  libs -p /sbin/ldconfig
+%postun        libs -p /sbin/ldconfig
+
+%triggerin -- pam
+# restart devocot if pam is upgraded
+# (dovecot is linked with old libpam but tries to open modules linked with new libpam)
+if [ "$2" != 1 ]; then
+       %service -q dovecot restart
+fi
+
+%triggerpostun -- dovecot < 1:2.0.0
+# upgrading dovecot < 1.1
+echo "Configuration change default_mail_env -> mail_location"
+%{__sed} -i -e "s/^default_mail_env/mail_location/" /etc/dovecot/dovecot.conf
+# upgrading dovecot < 2.0
+i=0
+for a in /etc/dovecot/dovecot-db-example.conf \
+       /etc/dovecot/dovecot-dict-sql-example.conf \
+       /etc/dovecot/dovecot-ldap-example.conf \
+       /etc/dovecot/dovecot-sql-example.conf \
+       /etc/dovecot/dovecot.conf; do
+       if [ -f "$a" ]; then
+               [ "$i" -eq 0 ] && echo "Read http://wiki2.dovecot.org/Upgrading/2.0"
+               i=1
+               echo "Trying to migrate $a config file to dovecot 2."
+               cp -a "$a" "$a-1.2.org"
+               :> "$a.log"
+               chmod 600 "$a.log"
+               # convert config and prefix stderr lines with #
+               %{_bindir}/doveconf -n -c "$a-1.2.org" > "$a" 2> "$a.log" || :
+       fi
+done
+if [ "$i" -eq 1 ]; then
+       echo "Please verify contents of %{_sysconfdir}/%{name}/* files."
+fi
+
+%files
+%defattr(644,root,root,755)
+# COPYING contains some notes, not actual LGPL text
+%doc AUTHORS COPYING ChangeLog NEWS README TODO doc/*.txt doc/*.c*f doc/wiki/*.txt
+%attr(755,root,root) %{_bindir}/doveadm
+%attr(755,root,root) %{_bindir}/doveconf
+%attr(755,root,root) %{_bindir}/dsync
+%attr(755,root,root) %{_sbindir}/%{name}
+%attr(751,root,root) %dir %{_sysconfdir}/%{name}
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/%{name}.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*.ext
+%attr(751,root,root) %dir %{_sysconfdir}/%{name}/conf.d
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/conf.d/*.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/conf.d/*.ext
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/%{name}
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.imap
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
+%attr(754,root,root) /etc/rc.d/init.d/%{name}
+%attr(755,root,root) %{_libdir}/%{name}/aggregator
+%attr(755,root,root) %{_libdir}/%{name}/anvil
+%attr(755,root,root) %{_libdir}/%{name}/auth
+%attr(755,root,root) %{_libdir}/%{name}/checkpassword-reply
+%attr(755,root,root) %{_libdir}/%{name}/config
+%attr(755,root,root) %{_libdir}/%{name}/decode2text.sh
+%attr(755,root,root) %{_libdir}/%{name}/deliver
+%attr(755,root,root) %{_libdir}/%{name}/dict
+%attr(755,root,root) %{_libdir}/%{name}/director
+%attr(755,root,root) %{_libdir}/%{name}/dns-client
+%attr(755,root,root) %{_libdir}/%{name}/doveadm-server
+%attr(755,root,root) %{_libdir}/%{name}/dovecot-lda
+%attr(755,root,root) %{_libdir}/%{name}/gdbhelper
+%attr(755,root,root) %{_libdir}/%{name}/imap
+%attr(755,root,root) %{_libdir}/%{name}/imap-login
+%attr(755,root,root) %{_libdir}/%{name}/indexer
+%attr(755,root,root) %{_libdir}/%{name}/indexer-worker
+%attr(755,root,root) %{_libdir}/%{name}/ipc
+%attr(755,root,root) %{_libdir}/%{name}/lmtp
+%attr(755,root,root) %{_libdir}/%{name}/log
+%attr(755,root,root) %{_libdir}/%{name}/maildirlock
+%attr(755,root,root) %{_libdir}/%{name}/pop3
+%attr(755,root,root) %{_libdir}/%{name}/pop3-login
+%attr(755,root,root) %{_libdir}/%{name}/rawlog
+%attr(755,root,root) %{_libdir}/%{name}/replicator
+%attr(755,root,root) %{_libdir}/%{name}/script
+%attr(755,root,root) %{_libdir}/%{name}/script-login
+%attr(755,root,root) %{_libdir}/%{name}/ssl-params
+%attr(755,root,root) %{_libdir}/%{name}/stats
+%attr(755,root,root) %{_libdir}/%{name}/xml2text
+%dir %{_libdir}/%{name}/plugins
+%attr(755,root,root) %{_libdir}/%{name}/plugins/*.so
+%dir %{_libdir}/%{name}/plugins/auth
+%attr(755,root,root) %{_libdir}/%{name}/plugins/auth/*.so
+%dir %{_libdir}/%{name}/plugins/dict
+%attr(755,root,root) %{_libdir}/%{name}/plugins/dict/*.so
+%dir %{_libdir}/%{name}/plugins/doveadm
+%attr(755,root,root) %{_libdir}/%{name}/plugins/doveadm/*.so
+/usr/lib/tmpfiles.d/%{name}.conf
+%dir /var/lib/dovecot
+%dir /var/run/dovecot
+%attr(750,root,dovenull) %dir /var/run/dovecot/login
+
+%{_mandir}/man1/deliver.1*
+%{_mandir}/man1/dove*.1*
+%{_mandir}/man1/dsync.1*
+%{_mandir}/man7/doveadm-search-query.7*
+
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/libdovecot.so
+%attr(755,root,root) %{_libdir}/%{name}/libdovecot-lda.so
+%attr(755,root,root) %{_libdir}/%{name}/libdovecot-login.so
+%attr(755,root,root) %{_libdir}/%{name}/libdovecot-sql.so
+%attr(755,root,root) %{_libdir}/%{name}/libdovecot-ssl.so
+%attr(755,root,root) %{_libdir}/%{name}/libdovecot-storage.so
+%{_libdir}/%{name}-devel
+%{_includedir}/%{name}
+%{_aclocaldir}/dovecot.m4
+
+%files libs
+%defattr(644,root,root,755)
+%dir %{_libdir}/%{name}
+%attr(755,root,root) %{_libdir}/%{name}/libdovecot.so.0.0.0
+%attr(755,root,root) %{_libdir}/%{name}/libdovecot-lda.so.0.0.0
+%attr(755,root,root) %{_libdir}/%{name}/libdovecot-login.so.0.0.0
+%attr(755,root,root) %{_libdir}/%{name}/libdovecot-sql.so.0.0.0
+%attr(755,root,root) %{_libdir}/%{name}/libdovecot-ssl.so.0.0.0
+%attr(755,root,root) %{_libdir}/%{name}/libdovecot-storage.so.0.0.0
+# Note: we are in %{_libdir}/dovecot, ldconfig does not look into this
+# directory. This is why the following files are not %ghost
+%attr(755,root,root) %{_libdir}/%{name}/libdovecot.so.0
+%attr(755,root,root) %{_libdir}/%{name}/libdovecot-lda.so.0
+%attr(755,root,root) %{_libdir}/%{name}/libdovecot-login.so.0
+%attr(755,root,root) %{_libdir}/%{name}/libdovecot-sql.so.0
+%attr(755,root,root) %{_libdir}/%{name}/libdovecot-ssl.so.0
+%attr(755,root,root) %{_libdir}/%{name}/libdovecot-storage.so.0

diff --git a/dovecot.sysconfig b/dovecot.sysconfig
new file mode 100644 (file)
index 0000000..3449370
--- /dev/null
+++ b/dovecot.sysconfig
@@ -0,0 +1,5 @@
+# Customized setings for dovecot
+
+# Define nice level for dovecot
+SERVICE_RUN_NICE_LEVEL="+0"
+

diff --git a/dovecot.tmpfiles b/dovecot.tmpfiles
new file mode 100644 (file)
index 0000000..61d4bdf
--- /dev/null
+++ b/dovecot.tmpfiles
@@ -0,0 +1,2 @@
+d /var/run/dovecot 0755 root root -
+d /var/run/dovecot/login 0750 root dovenull -