OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 04-Jul-2008 09:41:02
Branch: HEAD Handle: 2008070408410200
Modified files:
openpkg-src/dovecot dovecot.patch dovecot.spec
Log:
upgrading package: dovecot 1.0.15 -> 1.1.1
Summary:
Revision Changes Path
1.4 +128 -97 openpkg-src/dovecot/dovecot.patch
1.13 +15 -8 openpkg-src/dovecot/dovecot.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/dovecot/dovecot.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 dovecot.patch
--- openpkg-src/dovecot/dovecot.patch 3 Jun 2008 09:19:58 -0000 1.3
+++ openpkg-src/dovecot/dovecot.patch 4 Jul 2008 07:41:02 -0000 1.4
@@ -1,13 +1,13 @@
-Index: configure.in
---- configure.in.orig 2008-03-09 11:45:25.000000000 +0100
-+++ configure.in 2008-03-11 12:46:18.000000000 +0100
-@@ -1529,14 +1529,14 @@
+Index: configure
+--- configure.orig 2008-05-05 00:02:24.000000000 +0200
++++ configure 2008-05-16 12:09:26.000000000 +0200
+@@ -31919,14 +31919,14 @@
- if test $want_pgsql = yes; then
+ if test $want_pgsql != no; then
# based on code from PHP
- for i in /usr /usr/local /usr/local/pgsql; do
- for j in include include/pgsql include/postgres
include/postgresql ""; do
-+ for i in @l_prefix@; do
++ for i in @l_prefix@; do
+ for j in include/postgresql; do
if test -r "$i/$j/libpq-fe.h"; then
PGSQL_INCLUDE=$i/$j
@@ -20,12 +20,12 @@
if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a";
then
PGSQL_LIBDIR=$i/$j
fi
-Index: configure
---- configure.orig 2008-03-09 11:45:36.000000000 +0100
-+++ configure 2008-03-11 11:35:24.000000000 +0100
-@@ -30183,14 +30183,14 @@
+Index: configure.in
+--- configure.in.orig 2008-05-05 00:01:52.000000000 +0200
++++ configure.in 2008-05-16 12:09:26.000000000 +0200
+@@ -1753,14 +1753,14 @@
- if test $want_pgsql = yes; then
+ if test $want_pgsql != no; then
# based on code from PHP
- for i in /usr /usr/local /usr/local/pgsql; do
- for j in include include/pgsql include/postgres
include/postgresql ""; do
@@ -42,66 +42,32 @@
if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a";
then
PGSQL_LIBDIR=$i/$j
fi
-Index: doc/Makefile.am
---- doc/Makefile.am.orig 2007-12-11 19:52:08.000000000 +0100
-+++ doc/Makefile.am 2008-03-11 12:47:20.000000000 +0100
-@@ -1,6 +1,6 @@
- SUBDIRS = wiki
-
--docdir = $(datadir)/doc/dovecot
-+docdir = $(datadir)/doc
-
- confdir = $(sysconfdir)
- conf_DATA = \
-Index: doc/Makefile.in
---- doc/Makefile.in.orig 2008-03-09 11:45:36.000000000 +0100
-+++ doc/Makefile.in 2008-03-11 11:35:24.000000000 +0100
-@@ -168,7 +168,7 @@
- build_vendor = @build_vendor@
- datadir = @datadir@
- datarootdir = @datarootdir@
--docdir = $(datadir)/doc/dovecot
-+docdir = $(datadir)/doc
- dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
Index: doc/dovecot-sql-example.conf
---- doc/dovecot-sql-example.conf.orig 2007-12-11 19:52:08.000000000
+0100
-+++ doc/dovecot-sql-example.conf 2008-03-11 11:35:24.000000000 +0100
-@@ -52,7 +52,7 @@
+--- doc/dovecot-sql-example.conf.orig 2008-05-05 00:01:52.000000000
+0200
++++ doc/dovecot-sql-example.conf 2008-05-16 12:09:26.000000000 +0200
+@@ -47,7 +47,8 @@
+ # the default my.cnf location
+ # option_group - Read options from the given group (default:
client)
+ #
+-# You can connect to UNIX sockets by using host: host=/var/run/mysql.sock
++# You can connect to UNIX sockets by using host:
++# [EMAIL PROTECTED]@/var/mysql/mysql.sock
+ # Note that currently you can't use spaces in parameters.
+ #
+ # sqlite:
+@@ -56,7 +57,7 @@
# Examples:
# connect = host=192.168.1.1 dbname=users
# connect = host=sql.example.com dbname=virtual user=virtual
password=blarg
-# connect = /etc/dovecot/authdb.sqlite
+# connect = @l_prefix@/etc/dovecot/authdb.sqlite
#
- #connect = dbname=virtual user=virtual
+ #connect =
-Index: doc/wiki/Makefile.am
---- doc/wiki/Makefile.am.orig 2007-12-29 07:06:37.000000000 +0100
-+++ doc/wiki/Makefile.am 2008-03-11 12:48:40.000000000 +0100
-@@ -1,4 +1,4 @@
--docdir = $(datadir)/doc/dovecot
-+docdir = $(datadir)
- wikidir = $(docdir)/wiki
-
- EXTRA_DIST = \
-Index: doc/wiki/Makefile.in
---- doc/wiki/Makefile.in.orig 2008-03-09 11:45:36.000000000 +0100
-+++ doc/wiki/Makefile.in 2008-03-11 11:35:24.000000000 +0100
-@@ -158,7 +158,7 @@
- build_vendor = @build_vendor@
- datadir = @datadir@
- datarootdir = @datarootdir@
--docdir = $(datadir)/doc/dovecot
-+docdir = $(datadir)
- dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
Index: dovecot-example.conf
---- dovecot-example.conf.orig 2008-03-04 06:48:12.000000000 +0100
-+++ dovecot-example.conf 2008-03-11 11:35:24.000000000 +0100
-@@ -11,12 +11,10 @@
+--- dovecot-example.conf.orig 2008-05-05 00:01:52.000000000 +0200
++++ dovecot-example.conf 2008-05-16 12:11:39.000000000 +0200
+@@ -11,16 +11,14 @@
# Default values are shown for each setting, it's not required to uncomment
# any of the lines. Exception to this are paths, they're just examples with
@@ -116,6 +82,11 @@
# Protocols we want to be serving: imap imaps pop3 pop3s
# If you only want to use dovecot-auth, you can set this to "none".
+-#protocols = imap imaps
++#protocols = imap
+
+ # A space separated list of IP or host addresses where to listen in for
+ # connections. "*" listens in all IPv4 interfaces. "[::]" listens in all
IPv6
@@ -39,7 +37,7 @@
# listen = *:10100
# ..
@@ -125,8 +96,12 @@
# Disable LOGIN command and all other plaintext authentications unless
# SSL/TLS is used (LOGINDISABLED capability). Note that if the remote IP
-@@ -85,14 +83,14 @@
- #ssl_listen =
+@@ -82,17 +80,17 @@
+
+ # IP or host address where to listen in for SSL connections. Defaults
+ # to above if not specified.
+-#ssl_listen =
++#ssl_listen = 127.0.0.1
# Disable SSL/TLS support.
-#ssl_disable = no
@@ -143,7 +118,7 @@
# If key file is password protected, give the password here. Alternatively
# give it when starting dovecot with -p parameter.
-@@ -128,7 +126,7 @@
+@@ -133,7 +131,7 @@
# which login needs to be able to connect to. The sockets are created when
# running as root, so you don't have to worry about permissions. Note that
# everything in this directory is deleted when Dovecot is started.
@@ -152,7 +127,7 @@
# chroot login process to the login_dir. Only reason not to do this is if
you
# wish to run the whole Dovecot without roots. <doc/wiki/Rootless.txt>
-@@ -138,7 +136,7 @@
+@@ -143,7 +141,7 @@
# and don't use it anywhere else. The user must also belong to a group where
# only it has access, it's used to control access for authentication
process.
# Note that this user is NOT used to access mails. <doc/wiki/UserIds.txt>
@@ -161,7 +136,7 @@
# Set max. process size in megabytes. If you don't use
# login_process_per_connection you might need to grow this.
-@@ -506,7 +504,7 @@
+@@ -503,7 +501,7 @@
protocol imap {
# Login executable location.
@@ -170,7 +145,7 @@
# IMAP executable location. Changing this allows you to execute other
# binaries before the imap process is executed.
-@@ -518,7 +516,7 @@
+@@ -515,7 +513,7 @@
# /tmp/gdbhelper.* files:
# mail_executable = /usr/libexec/dovecot/gdbhelper
/usr/libexec/dovecot/imap
#
@@ -179,7 +154,7 @@
# 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
-@@ -528,7 +526,7 @@
+@@ -529,7 +527,7 @@
# Support for dynamically loadable plugins. mail_plugins is a space
separated
# list of plugins to load.
#mail_plugins =
@@ -188,7 +163,7 @@
# Send IMAP capabilities in greeting message. This makes it unnecessary
for
# clients to request it with CAPABILITY command, so it saves one
round-trip.
-@@ -571,11 +569,11 @@
+@@ -572,11 +570,11 @@
protocol pop3 {
# Login executable location.
@@ -202,7 +177,7 @@
# 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
-@@ -635,7 +633,7 @@
+@@ -636,7 +634,7 @@
# Support for dynamically loadable plugins. mail_plugins is a space
separated
# list of plugins to load.
#mail_plugins =
@@ -211,24 +186,33 @@
# Workarounds for various client bugs:
# outlook-no-nuls:
-@@ -663,13 +661,13 @@
+@@ -664,7 +662,7 @@
# Support for dynamically loadable plugins. mail_plugins is a space
separated
# list of plugins to load.
#mail_plugins =
- #mail_plugin_dir = /usr/lib/dovecot/lda
+ #mail_plugin_dir = @l_prefix@/lib/dovecot/lda
+ # If user is over quota, return with temporary failure instead of
+ # bouncing the mail.
+@@ -678,14 +676,14 @@
+ #deliver_log_format = msgid=%m: %$
+
# Binary to use for sending mails.
- #sendmail_path = /usr/lib/sendmail
+ #sendmail_path = @l_prefix@/sbin/sendmail
+ # Human readable error message for rejection mails. Use can use variables:
+ # %n = CRLF, %r = reason, %s = subject, %t = recipient
+ #rejection_reason = Your message to <%t> was automatically rejected:%n%r
+
# UNIX socket path to master authentication server to find users.
- #auth_socket_path = /var/run/dovecot/auth-master
+ #auth_socket_path = @l_prefix@/var/dovecot/run/auth-master
}
##
-@@ -677,7 +675,7 @@
+@@ -693,7 +691,7 @@
##
# Executable location
@@ -238,6 +222,15 @@
# Set max. process size in megabytes.
#auth_process_size = 256
@@ -783,7 +781,7 @@
+ #auth_ntlm_use_winbind = no
+
+ # Path for Samba's ntlm_auth helper binary.
+-#auth_winbind_helper_path = /usr/bin/ntlm_auth
++#auth_winbind_helper_path = @l_prefix@/bin/ntlm_auth
+
+ # Number of seconds to delay before replying to failed authentications.
+ #auth_failure_delay = 2
+@@ -816,7 +814,7 @@
#passdb passwd-file {
# File contains a list of usernames, one per line
@@ -246,7 +239,7 @@
#deny = yes
#}
-@@ -869,13 +867,13 @@
+@@ -899,13 +897,13 @@
# SQL database <doc/wiki/AuthDatabase.SQL.txt>
#passdb sql {
# Path for SQL configuration file, see doc/dovecot-sql-example.conf
@@ -262,7 +255,23 @@
#}
# vpopmail authentication <doc/wiki/AuthDatabase.VPopMail.txt>
-@@ -981,7 +979,7 @@
+@@ -962,13 +960,13 @@
+ # SQL database <doc/wiki/AuthDatabase.SQL.txt>
+ #userdb sql {
+ # Path for SQL configuration file, see doc/dovecot-sql-example.conf
+- #args =
++ #args = @l_prefix@/etc/dovecot/dovecot-sql.conf
+ #}
+
+ # LDAP database <doc/wiki/AuthDatabase.LDAP.txt>
+ #userdb ldap {
+ # Path for LDAP configuration file, see doc/dovecot-ldap-example.conf
+- #args =
++ #args = @l_prefix@/etc/dovecot/dovecot-ldap.conf
+ #}
+
+ # vpopmail <doc/wiki/AuthDatabase.VPopMail.txt>
+@@ -1013,7 +1011,7 @@
# Master socket provides access to userdb information. It's typically
# used to give Dovecot's local delivery agent access to userdb so it
# can find mailbox locations.
@@ -271,16 +280,16 @@
#mode = 0600
# Default user/group is the one who started dovecot-auth (root)
#user =
-@@ -991,7 +989,7 @@
+@@ -1023,7 +1021,7 @@
# The client socket is generally safe to export to everyone. Typical
use
# is to export it to your SMTP server so it can do SMTP AUTH lookups
# using it.
- #path = /var/run/dovecot/auth-client
-+ #path = @l_prefix@/var/dovecot/run/auth-client
++ #path = @l_prefix@/dovecot/run/auth-client
#mode = 0660
#}
#}
-@@ -1005,7 +1003,7 @@
+@@ -1037,7 +1035,7 @@
#auth external {
# socket connect {
# master {
@@ -289,54 +298,67 @@
# }
# }
#}
-@@ -1021,7 +1019,7 @@
+@@ -1053,7 +1051,7 @@
# referenced using URIs in format "proxy:<name>".
dict {
- #quota = mysql:/etc/dovecot-dict-quota.conf
-+ #quota = mysql:@l_prefix@/etc/dovecot/dovecot-dict-quota.conf
++ #quota = mysql:@l_prefix@/etc/dovecot/dovecot-dict-quota.conf
}
- ##
-@@ -1045,7 +1043,7 @@
- # directory. You can also optionally give a global ACL directory path
where
- # ACLs are applied to all users' mailboxes. The global ACL directory
contains
- # one file for each mailbox, eg. INBOX or sub.mailbox.
-- #acl = vfile:/etc/dovecot-acls
-+ #acl = vfile:@l_prefix@/etc/dovecot/dovecot-acls
+ # Path to Berkeley DB's configuration file. See doc/dovecot-db.conf for an
+@@ -1105,7 +1103,7 @@
+ # one file for each mailbox, eg. INBOX or sub.mailbox. cache_secs
parameter
+ # specifies how many seconds to wait between stat()ing dovecot-acl file
+ # to see if it changed.
+- #acl = vfile:/etc/dovecot-acls:cache_secs=300
++ #acl = vfile:@l_prefix@/etc/dovecot/dovecot-acls:cache_secs=300
# Convert plugin. If set, specifies the source storage path which is
# converted to destination storage (mail_location) when the user logs in.
-@@ -1059,7 +1057,7 @@
+@@ -1124,16 +1122,16 @@
# until the message can be saved within quota limits. The configuration
file
# is a text file where each line is in format: <priority> <mailbox name>
# Mails are first deleted in lowest -> highest priority number order
- #trash = /etc/dovecot-trash.conf
+ #trash = @l_prefix@/etc/dovecot/dovecot-trash.conf
+ # Expire plugin. Mails are expunged from mailboxes after being there the
+ # configurable time. The first expiration date for each mailbox is stored
in
+ # a dictionary so it can be quickly determined which mailboxes contain
+ # expired mails. The actual expunging is done in a nightly cronjob, which
+ # you must set up:
+- # dovecot --exec-mail ext /usr/libexec/dovecot/expire-tool
++ # dovecot --exec-mail ext @l_prefix@/libexec/dovecot/expire-tool
+ #expire = Trash 7 Spam 30
+- #expire_dict = db:/var/lib/dovecot/expire.db
++ #expire_dict = db:@l_prefix@/var/dovecot/lib/expire.db
+
# Lazy expunge plugin. Currently works only with maildirs. When a user
# expunges mails, the mails are moved to a mailbox in another namespace
Index: src/deliver/deliver.c
---- src/deliver/deliver.c.orig 2008-02-29 10:17:05.000000000 +0100
-+++ src/deliver/deliver.c 2008-03-11 11:35:24.000000000 +0100
-@@ -38,7 +38,7 @@
+--- src/deliver/deliver.c.orig 2008-05-05 00:01:52.000000000 +0200
++++ src/deliver/deliver.c 2008-05-16 12:09:26.000000000 +0200
+@@ -41,7 +41,7 @@
+ #include <syslog.h>
#define DEFAULT_CONFIG_FILE SYSCONFDIR"/dovecot.conf"
- #define DEFAULT_AUTH_SOCKET_PATH PKG_RUNDIR"/auth-master"
-#define DEFAULT_SENDMAIL_PATH "/usr/lib/sendmail"
+#define DEFAULT_SENDMAIL_PATH "@l_prefix@/sbin/sendmail"
#define DEFAULT_ENVELOPE_SENDER "MAILER-DAEMON"
/* After buffer grows larger than this, create a temporary file to /tmp
Index: src/master/master-settings.c
---- src/master/master-settings.c.orig 2008-03-04 06:50:37.000000000
+0100
-+++ src/master/master-settings.c 2008-03-11 11:35:24.000000000 +0100
-@@ -163,13 +163,13 @@
+--- src/master/master-settings.c.orig 2008-05-05 00:01:54.000000000
+0200
++++ src/master/master-settings.c 2008-05-16 12:09:26.000000000 +0200
+@@ -178,14 +178,14 @@
+ MEMBER(syslog_facility) "mail",
/* general */
- MEMBER(protocols) "imap imaps",
+- MEMBER(protocols) "imap imaps",
- MEMBER(listen) "*",
- MEMBER(ssl_listen) "",
++ MEMBER(protocols) "imap",
+ MEMBER(listen) "127.0.0.1",
+ MEMBER(ssl_listen) "127.0.0.1",
@@ -350,7 +372,7 @@
MEMBER(ssl_key_password) "",
MEMBER(ssl_parameters_regenerate) 168,
MEMBER(ssl_cipher_list) "",
-@@ -183,7 +183,7 @@
+@@ -200,7 +200,7 @@
/* login */
MEMBER(login_dir) "login",
MEMBER(login_executable) NULL,
@@ -359,3 +381,12 @@
MEMBER(login_greeting) "Dovecot ready.",
MEMBER(login_log_format_elements) "user=<%u> method=%m rip=%r lip=%l
%c",
MEMBER(login_log_format) "%$: %s",
+@@ -317,7 +317,7 @@
+ MEMBER(anonymous_username) "anonymous",
+ MEMBER(krb5_keytab) "",
+ MEMBER(gssapi_hostname) "",
+- MEMBER(winbind_helper_path) "/usr/bin/ntlm_auth",
++ MEMBER(winbind_helper_path) "@l_prefix@/bin/ntlm_auth",
+ MEMBER(failure_delay) 2,
+
+ MEMBER(verbose) FALSE,
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dovecot/dovecot.spec
============================================================================
$ cvs diff -u -r1.12 -r1.13 dovecot.spec
--- openpkg-src/dovecot/dovecot.spec 4 Jul 2008 07:22:40 -0000 1.12
+++ openpkg-src/dovecot/dovecot.spec 4 Jul 2008 07:41:02 -0000 1.13
@@ -22,10 +22,11 @@
##
# package version
-%define V_major 1.0
-%define V_minor 15
-%define V_minor_sieve 3
-%define V_managesieve 9.3
+%define V_major 1.1
+%define V_minor 1
+%define V_minor_sieve 5
+%define V_minor_managesieve 1
+%define V_managesieve 0.10.3
# package information
Name: dovecot
@@ -57,7 +58,7 @@
Source2: fsl.dovecot
Source3: rc.dovecot
Patch0: dovecot.patch
-Patch1:
http://www.rename-it.nl/dovecot/%{V_major}/dovecot-%{V_major}.%{V_minor}-MANAGESIEVE-v%{V_managesieve}.diff.gz
+Patch1:
http://www.rename-it.nl/dovecot/%{V_major}/dovecot-%{V_major}.%{V_minor_managesieve}-managesieve-%{V_managesieve}.diff.gz
# build information
Prefix: %{l_prefix}
@@ -108,7 +109,7 @@
prog dovecot = {
version = %{V_major}.%{V_minor}
url = http://www.dovecot.org/download.html
- regex = dovecot-(1\.0(\.\d+)+)\.tar\.gz
+ regex = dovecot-(1\.1(\.\d+)+)\.tar\.gz
}
prog dovecot:sieve = {
version = %{V_major}.%{V_minor_sieve}
@@ -118,7 +119,7 @@
prog dovecot:managesieve = {
version = %{V_managesieve}
url = http://www.rename-it.nl/dovecot/%{V_major}/
- regex =
dovecot-%{V_major}\.%{V_minor}-MANAGESIEVE-v(__VER__)\.diff\.gz
+ regex =
dovecot-%{V_major}\.%{V_minor_managesieve}-managesieve-(__VER__)\.diff\.gz
}
%prep
@@ -166,10 +167,12 @@
--sysconfdir=%{l_prefix}/etc/dovecot \
--with-ssldir=%{l_prefix}/etc/dovecot/ssl \
--datadir=%{l_prefix}/share/dovecot \
+ --docdir=%{l_prefix}/share/dovecot/doc \
--with-rundir=%{l_prefix}/var/dovecot/run \
--with-libiconv-prefix=%{l_prefix} \
--with-ssl=openssl \
--with-deliver \
+ --with-docs \
%if "%{with_ldap}" == "yes"
--with-ldap \
%else
@@ -210,6 +213,10 @@
%else
--without-pop3d \
%endif
+ --without-gc \
+ --without-gssapi \
+ --without-lucene \
+ --without-vpopmail \
--enable-shared \
--disable-static
%{l_make} %{l_mflags -O}
@@ -291,7 +298,7 @@
'%dir %attr(0755,%{l_susr},%{l_mgrp}) %{l_prefix}/var/dovecot/run' \
'%dir %attr(0750,%{l_susr},%{l_mgrp})
%{l_prefix}/var/dovecot/run/login' \
'%doc %{l_prefix}/share/dovecot/doc' \
- '%doc %{l_prefix}/share/dovecot/wiki'
+ '%doc %{l_prefix}/share/dovecot/doc/wiki'
%files -f files
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
