This patch updates dovecot to 2.2.2.
Signed-off-by: Peter Wagner tripo...@gmx.atdiff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index e13fd1a..5c70b34 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=dovecot
-PKG_VERSION:=1.2.13
-PKG_RELEASE:=2
+PKG_VERSION:=2.2.2
+PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.dovecot.org/releases/1.2
-PKG_MD5SUM:=aaee3b5fd59e01780305553248f686bc
+PKG_SOURCE_URL:=http://www.dovecot.org/releases/2.2
+PKG_MD5SUM:=e6c011b4bbddf19e79205d012723449a
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
@@ -51,13 +51,16 @@ CONFIGURE_VARS += \
lib_cv_va_copy=yes \
lib_cv___va_copy=yes \
lib_cv_va_val_copy=yes \
+ LD=$(TARGET_CC)
define Package/dovecot/install
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/dovecot.init $(1)/etc/init.d/dovecot
- $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/dovecot-example.conf $(1)/etc/dovecot.conf
+ $(INSTALL_CONF) $(PKG_INSTALL_DIR)/usr/share/doc/dovecot/example-config/dovecot.conf $(1)/etc/dovecot.conf
$(INSTALL_DIR) $(1)/usr/lib/dovecot
$(CP) $(PKG_INSTALL_DIR)/usr/lib/dovecot/* $(1)/usr/lib/dovecot/
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(CP) $(PKG_INSTALL_DIR)/usr/bin/doveconf $(1)/usr/bin/
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/
find $(1)/usr/lib/dovecot/modules/ \
diff --git a/mail/dovecot/patches/001-configure_in.patch b/mail/dovecot/patches/001-configure_in.patch
index 2192605..e6f3806 100644
--- a/mail/dovecot/patches/001-configure_in.patch
+++ b/mail/dovecot/patches/001-configure_in.patch
@@ -1,5 +1,5 @@
a/configure.in
-+++ b/configure.in
+--- a/configure.ac
b/configure.ac
@@ -398,9 +398,9 @@ have_ioloop=no
if test $ioloop = best || test $ioloop = epoll; then
diff --git a/mail/dovecot/patches/002-example_conf.patch b/mail/dovecot/patches/002-example_conf.patch
deleted file mode 100644
index c2e98b4..000
--- a/mail/dovecot/patches/002-example_conf.patch
+++ /dev/null
@@ -1,87 +0,0 @@
a/dovecot-example.conf
-+++ b/dovecot-example.conf
-@@ -537,20 +537,20 @@
-
- protocol imap {
- # Login executable location.
-- #login_executable = /usr/libexec/dovecot/imap-login
-+ #login_executable = /usr/lib/dovecot/imap-login
-
- # IMAP executable location. Changing this allows you to execute other
- # binaries before the imap process is executed.
- #
- # This would write rawlogs into user's ~/dovecot.rawlog/, if it exists:
-- # mail_executable = /usr/libexec/dovecot/rawlog /usr/libexec/dovecot/imap
-+ # mail_executable = /usr/lib/dovecot/rawlog /usr/lib/dovecot/imap
- # doc/wiki/Debugging/Rawlog.txt
- #
- # This would attach gdb into the imap process and write backtraces into
- # /tmp/gdbhelper.* files:
-- # mail_executable = /usr/libexec/dovecot/gdbhelper /usr/libexec/dovecot/imap
-+ # mail_executable = /usr/lib/dovecot/gdbhelper /usr/lib/dovecot/imap
- #
-- #mail_executable = /usr/libexec/dovecot/imap
-+ #mail_executable = /usr/lib/dovecot/imap
-
- # Maximum IMAP command line length in bytes. Some clients generate very long
- # command lines with huge mailboxes, so you may need to raise this if you get
-@@ -614,11 +614,11 @@ protocol imap {
-
- protocol pop3 {
- # Login executable location.
-- #login_executable = /usr/libexec/dovecot/pop3-login
-+ #login_executable = /usr/lib/dovecot/pop3-login
-
- # POP3 executable location. See IMAP's mail_executable above for examples
- # how this could be changed.
-- #mail_executable = /usr/libexec/dovecot/pop3
-+ #mail_executable = /usr/lib/dovecot/pop3
-
- # Don't try to set mails non-recent or seen with POP3 sessions. This is
- # mostly intended to reduce disk I/O. With maildir it doesn't move files
-@@ -743,7 +743,7 @@ protocol lda {
- ##
-
- # Executable location
--#auth_executable = /usr/libexec/dovecot/dovecot-auth
-+#auth_executable = /usr/lib/dovecot/dovecot-auth
-
- # Set max. process size in megabytes.
- #auth_process_size = 256
-@@ -872,7 +872,7 @@ auth default {
- # database (passwd usually), you can use static userdb.
- # REMEMBER: You'll need /etc/pam.d/dovecot file created for PAM
- # authentication to actually work. doc/wiki/PasswordDatabase.PAM.txt
-- passdb pam {
-+ #passdb pam {
- # [session=yes] [setcred=yes] [failure_show_msg=yes] [max_requests=n]
- # [cache_key=key] [service name]
- #
-@@ -905,15 +905,15 @@ auth default {
- # args = session=yes %Ls
- # args = cache_key=%u dovecot
- #args = dovecot
-- }
-+ #}
-
- # System users (NSS, /etc/passwd, or similiar)
- # In many systems nowadays this uses Name Service Switch, which is
- # configured in /etc/nsswitch.conf. doc/wiki/AuthDatabase.Passwd.txt
-- #passdb passwd {
-+ passdb passwd {
- # [blocking=yes] - See userdb passwd for explanation
- #args =
-- #}
-+ }
-
- # Shadow passwords for system users (NSS,
