openpkg
/
openpkg-packages
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

modifying package: dovecot-1.1.7 20081125 -> 20081222

master
Dr. Ralf S. Engelschall 17 years ago
parent
ad3759f6ae
commit
786eb63c04
2 changed files with 45 additions and 45 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 86
      dovecot/dovecot.patch
  2. 4
      dovecot/dovecot.spec

86
dovecot/dovecot.patch
Unescape View File

@ -1,13 +1,13 @@
Index: configure Index: configure.in
--- configure.orig 2008-05-05 00:02:24.000000000 +0200 --- configure.in.orig 2008-11-23 23:16:26 +0100
+++ configure 2008-05-16 12:09:26.000000000 +0200 +++ configure.in 2008-12-22 19:24:15 +0100
@@ -31919,14 +31919,14 @@ @@ -1917,14 +1917,14 @@
if test $want_pgsql != no; then if test $want_pgsql != no; then
# based on code from PHP # based on code from PHP
- for i in /usr /usr/local /usr/local/pgsql; do - for i in /usr /usr/local /usr/local/pgsql; do
- for j in include include/pgsql include/postgres include/postgresql ""; 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 + for j in include/postgresql; do
if test -r "$i/$j/libpq-fe.h"; then if test -r "$i/$j/libpq-fe.h"; then
PGSQL_INCLUDE=$i/$j PGSQL_INCLUDE=$i/$j
@ -20,16 +20,16 @@ Index: configure
if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then
PGSQL_LIBDIR=$i/$j PGSQL_LIBDIR=$i/$j
fi fi
Index: configure.in Index: configure
--- configure.in.orig 2008-05-05 00:01:52.000000000 +0200 --- configure.orig 2008-11-23 23:16:38 +0100
+++ configure.in 2008-05-16 12:09:26.000000000 +0200 +++ configure 2008-12-22 19:24:15 +0100
@@ -1753,14 +1753,14 @@ @@ -32681,14 +32681,14 @@
if test $want_pgsql != no; then if test $want_pgsql != no; then
# based on code from PHP # based on code from PHP
- for i in /usr /usr/local /usr/local/pgsql; do - for i in /usr /usr/local /usr/local/pgsql; do
- for j in include include/pgsql include/postgres include/postgresql ""; 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 + for j in include/postgresql; do
if test -r "$i/$j/libpq-fe.h"; then if test -r "$i/$j/libpq-fe.h"; then
PGSQL_INCLUDE=$i/$j PGSQL_INCLUDE=$i/$j
@ -43,8 +43,8 @@ Index: configure.in
PGSQL_LIBDIR=$i/$j PGSQL_LIBDIR=$i/$j
fi fi
Index: doc/dovecot-sql-example.conf Index: doc/dovecot-sql-example.conf
--- doc/dovecot-sql-example.conf.orig 2008-05-05 00:01:52.000000000 +0200 --- doc/dovecot-sql-example.conf.orig 2008-10-26 16:00:45 +0100
+++ doc/dovecot-sql-example.conf 2008-05-16 12:09:26.000000000 +0200 +++ doc/dovecot-sql-example.conf 2008-12-22 19:24:15 +0100
@@ -47,7 +47,8 @@ @@ -47,7 +47,8 @@
# the default my.cnf location # the default my.cnf location
# option_group - Read options from the given group (default: client) # option_group - Read options from the given group (default: client)
@ -54,8 +54,8 @@ Index: doc/dovecot-sql-example.conf
+# host=@l_prefix@/var/mysql/mysql.sock +# host=@l_prefix@/var/mysql/mysql.sock
# Note that currently you can't use spaces in parameters. # Note that currently you can't use spaces in parameters.
# #
# sqlite: # MySQL supports multiple host parameters for load balancing / HA.
@@ -56,7 +57,7 @@ @@ -58,7 +59,7 @@
# Examples: # Examples:
# connect = host=192.168.1.1 dbname=users # connect = host=192.168.1.1 dbname=users
# connect = host=sql.example.com dbname=virtual user=virtual password=blarg # connect = host=sql.example.com dbname=virtual user=virtual password=blarg
@ -65,8 +65,8 @@ Index: doc/dovecot-sql-example.conf
#connect = #connect =
Index: dovecot-example.conf Index: dovecot-example.conf
--- dovecot-example.conf.orig 2008-05-05 00:01:52.000000000 +0200 --- dovecot-example.conf.orig 2008-11-23 22:53:53 +0100
+++ dovecot-example.conf 2008-05-16 12:11:39.000000000 +0200 +++ dovecot-example.conf 2008-12-22 19:24:15 +0100
@@ -11,16 +11,14 @@ @@ -11,16 +11,14 @@
# Default values are shown for each setting, it's not required to uncomment # Default values are shown for each setting, it's not required to uncomment
@ -87,7 +87,7 @@ Index: dovecot-example.conf
# A space separated list of IP or host addresses where to listen in for # A space separated list of IP or host addresses where to listen in for
# connections. "*" listens in all IPv4 interfaces. "[::]" listens in all IPv6 # connections. "*" listens in all IPv4 interfaces. "[::]" listens in all IPv6
@@ -39,7 +37,7 @@ @@ -38,7 +36,7 @@
# listen = *:10100 # listen = *:10100
# .. # ..
# } # }
@ -96,7 +96,7 @@ Index: dovecot-example.conf
# Disable LOGIN command and all other plaintext authentications unless # Disable LOGIN command and all other plaintext authentications unless
# SSL/TLS is used (LOGINDISABLED capability). Note that if the remote IP # SSL/TLS is used (LOGINDISABLED capability). Note that if the remote IP
@@ -82,17 +80,17 @@ @@ -81,17 +79,17 @@
# IP or host address where to listen in for SSL connections. Defaults # IP or host address where to listen in for SSL connections. Defaults
# to above if not specified. # to above if not specified.
@ -117,8 +117,8 @@ Index: dovecot-example.conf
+#ssl_key_file = @l_prefix@/etc/dovecot/ssl/dovecot.key +#ssl_key_file = @l_prefix@/etc/dovecot/ssl/dovecot.key
# If key file is password protected, give the password here. Alternatively # If key file is password protected, give the password here. Alternatively
# give it when starting dovecot with -p parameter. # give it when starting dovecot with -p parameter. Since this file is often
@@ -133,7 +131,7 @@ @@ -134,7 +132,7 @@
# which login needs to be able to connect to. The sockets are created when # 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 # running as root, so you don't have to worry about permissions. Note that
# everything in this directory is deleted when Dovecot is started. # everything in this directory is deleted when Dovecot is started.
@ -127,7 +127,7 @@ Index: dovecot-example.conf
# chroot login process to the login_dir. Only reason not to do this is if you # 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> # wish to run the whole Dovecot without roots. <doc/wiki/Rootless.txt>
@@ -143,7 +141,7 @@ @@ -144,7 +142,7 @@
# and don't use it anywhere else. The user must also belong to a group where # 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. # 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> # Note that this user is NOT used to access mails. <doc/wiki/UserIds.txt>
@ -136,7 +136,7 @@ Index: dovecot-example.conf
# Set max. process size in megabytes. If you don't use # Set max. process size in megabytes. If you don't use
# login_process_per_connection you might need to grow this. # login_process_per_connection you might need to grow this.
@@ -503,7 +501,7 @@ @@ -504,7 +502,7 @@
protocol imap { protocol imap {
# Login executable location. # Login executable location.
@ -145,7 +145,7 @@ Index: dovecot-example.conf
# IMAP executable location. Changing this allows you to execute other # IMAP executable location. Changing this allows you to execute other
# binaries before the imap process is executed. # binaries before the imap process is executed.
@@ -515,7 +513,7 @@ @@ -516,7 +514,7 @@
# /tmp/gdbhelper.* files: # /tmp/gdbhelper.* files:
# mail_executable = /usr/libexec/dovecot/gdbhelper /usr/libexec/dovecot/imap # mail_executable = /usr/libexec/dovecot/gdbhelper /usr/libexec/dovecot/imap
# #
@ -154,7 +154,7 @@ Index: dovecot-example.conf
# Maximum IMAP command line length in bytes. Some clients generate very long # 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 # command lines with huge mailboxes, so you may need to raise this if you get
@@ -529,7 +527,7 @@ @@ -530,7 +528,7 @@
# Support for dynamically loadable plugins. mail_plugins is a space separated # Support for dynamically loadable plugins. mail_plugins is a space separated
# list of plugins to load. # list of plugins to load.
#mail_plugins = #mail_plugins =
@ -163,7 +163,7 @@ Index: dovecot-example.conf
# Send IMAP capabilities in greeting message. This makes it unnecessary for # Send IMAP capabilities in greeting message. This makes it unnecessary for
# clients to request it with CAPABILITY command, so it saves one round-trip. # clients to request it with CAPABILITY command, so it saves one round-trip.
@@ -572,11 +570,11 @@ @@ -573,11 +571,11 @@
protocol pop3 { protocol pop3 {
# Login executable location. # Login executable location.
@ -177,7 +177,7 @@ Index: dovecot-example.conf
# Don't try to set mails non-recent or seen with POP3 sessions. This is # 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 # mostly intended to reduce disk I/O. With maildir it doesn't move files
@@ -636,7 +634,7 @@ @@ -637,7 +635,7 @@
# Support for dynamically loadable plugins. mail_plugins is a space separated # Support for dynamically loadable plugins. mail_plugins is a space separated
# list of plugins to load. # list of plugins to load.
#mail_plugins = #mail_plugins =
@ -186,7 +186,7 @@ Index: dovecot-example.conf
# Workarounds for various client bugs: # Workarounds for various client bugs:
# outlook-no-nuls: # outlook-no-nuls:
@@ -664,7 +662,7 @@ @@ -665,7 +663,7 @@
# Support for dynamically loadable plugins. mail_plugins is a space separated # Support for dynamically loadable plugins. mail_plugins is a space separated
# list of plugins to load. # list of plugins to load.
#mail_plugins = #mail_plugins =
@ -195,7 +195,7 @@ Index: dovecot-example.conf
# If user is over quota, return with temporary failure instead of # If user is over quota, return with temporary failure instead of
# bouncing the mail. # bouncing the mail.
@@ -678,14 +676,14 @@ @@ -679,14 +677,14 @@
#deliver_log_format = msgid=%m: %$ #deliver_log_format = msgid=%m: %$
# Binary to use for sending mails. # Binary to use for sending mails.
@ -212,7 +212,7 @@ Index: dovecot-example.conf
} }
## ##
@@ -693,7 +691,7 @@ @@ -694,7 +692,7 @@
## ##
# Executable location # Executable location
@ -221,7 +221,7 @@ Index: dovecot-example.conf
# Set max. process size in megabytes. # Set max. process size in megabytes.
#auth_process_size = 256 #auth_process_size = 256
@@ -783,7 +781,7 @@ @@ -784,7 +782,7 @@
#auth_ntlm_use_winbind = no #auth_ntlm_use_winbind = no
# Path for Samba's ntlm_auth helper binary. # Path for Samba's ntlm_auth helper binary.
@ -230,7 +230,7 @@ Index: dovecot-example.conf
# Number of seconds to delay before replying to failed authentications. # Number of seconds to delay before replying to failed authentications.
#auth_failure_delay = 2 #auth_failure_delay = 2
@@ -816,7 +814,7 @@ @@ -817,7 +815,7 @@
#passdb passwd-file { #passdb passwd-file {
# File contains a list of usernames, one per line # File contains a list of usernames, one per line
@ -239,7 +239,7 @@ Index: dovecot-example.conf
#deny = yes #deny = yes
#} #}
@@ -899,13 +897,13 @@ @@ -900,13 +898,13 @@
# SQL database <doc/wiki/AuthDatabase.SQL.txt> # SQL database <doc/wiki/AuthDatabase.SQL.txt>
#passdb sql { #passdb sql {
# Path for SQL configuration file, see doc/dovecot-sql-example.conf # Path for SQL configuration file, see doc/dovecot-sql-example.conf
@ -255,7 +255,7 @@ Index: dovecot-example.conf
#} #}
# vpopmail authentication <doc/wiki/AuthDatabase.VPopMail.txt> # vpopmail authentication <doc/wiki/AuthDatabase.VPopMail.txt>
@@ -962,13 +960,13 @@ @@ -963,13 +961,13 @@
# SQL database <doc/wiki/AuthDatabase.SQL.txt> # SQL database <doc/wiki/AuthDatabase.SQL.txt>
#userdb sql { #userdb sql {
# Path for SQL configuration file, see doc/dovecot-sql-example.conf # Path for SQL configuration file, see doc/dovecot-sql-example.conf
@ -271,7 +271,7 @@ Index: dovecot-example.conf
#} #}
# vpopmail <doc/wiki/AuthDatabase.VPopMail.txt> # vpopmail <doc/wiki/AuthDatabase.VPopMail.txt>
@@ -1013,7 +1011,7 @@ @@ -1014,7 +1012,7 @@
# Master socket provides access to userdb information. It's typically # Master socket provides access to userdb information. It's typically
# used to give Dovecot's local delivery agent access to userdb so it # used to give Dovecot's local delivery agent access to userdb so it
# can find mailbox locations. # can find mailbox locations.
@ -280,7 +280,7 @@ Index: dovecot-example.conf
#mode = 0600 #mode = 0600
# Default user/group is the one who started dovecot-auth (root) # Default user/group is the one who started dovecot-auth (root)
#user = #user =
@@ -1023,7 +1021,7 @@ @@ -1024,7 +1022,7 @@
# The client socket is generally safe to export to everyone. Typical use # 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 # is to export it to your SMTP server so it can do SMTP AUTH lookups
# using it. # using it.
@ -289,7 +289,7 @@ Index: dovecot-example.conf
#mode = 0660 #mode = 0660
#} #}
#} #}
@@ -1037,7 +1035,7 @@ @@ -1038,7 +1036,7 @@
#auth external { #auth external {
# socket connect { # socket connect {
# master { # master {
@ -298,15 +298,15 @@ Index: dovecot-example.conf
# } # }
# } # }
#} #}
@@ -1053,7 +1051,7 @@ @@ -1054,7 +1052,7 @@
# referenced using URIs in format "proxy:<name>". # referenced using URIs in format "proxy::<name>".
dict { dict {
- #quota = mysql:/etc/dovecot-dict-quota.conf - #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
} }
# Path to Berkeley DB's configuration file. See doc/dovecot-db.conf for an # Path to Berkeley DB's configuration file. See doc/dovecot-db-example.conf
@@ -1105,7 +1103,7 @@ @@ -1105,7 +1103,7 @@
# one file for each mailbox, eg. INBOX or sub.mailbox. cache_secs parameter # 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 # specifies how many seconds to wait between stat()ing dovecot-acl file
@ -337,8 +337,8 @@ Index: dovecot-example.conf
# Lazy expunge plugin. Currently works only with maildirs. When a user # Lazy expunge plugin. Currently works only with maildirs. When a user
# expunges mails, the mails are moved to a mailbox in another namespace # expunges mails, the mails are moved to a mailbox in another namespace
Index: src/deliver/deliver.c Index: src/deliver/deliver.c
--- src/deliver/deliver.c.orig 2008-05-05 00:01:52.000000000 +0200 --- src/deliver/deliver.c.orig 2008-11-19 18:43:13 +0100
+++ src/deliver/deliver.c 2008-05-16 12:09:26.000000000 +0200 +++ src/deliver/deliver.c 2008-12-22 19:24:15 +0100
@@ -41,7 +41,7 @@ @@ -41,7 +41,7 @@
#include <syslog.h> #include <syslog.h>
@ -349,8 +349,8 @@ Index: src/deliver/deliver.c
/* After buffer grows larger than this, create a temporary file to /tmp /* After buffer grows larger than this, create a temporary file to /tmp
Index: src/master/master-settings.c Index: src/master/master-settings.c
--- src/master/master-settings.c.orig 2008-05-05 00:01:54.000000000 +0200 --- src/master/master-settings.c.orig 2008-11-15 18:13:18 +0100
+++ src/master/master-settings.c 2008-05-16 12:09:26.000000000 +0200 +++ src/master/master-settings.c 2008-12-22 19:24:15 +0100
@@ -178,14 +178,14 @@ @@ -178,14 +178,14 @@
MEMBER(syslog_facility) "mail", MEMBER(syslog_facility) "mail",

4
dovecot/dovecot.spec
Unescape View File

@ -24,7 +24,7 @@
# package version # package version
%define V_major 1.1 %define V_major 1.1
%define V_minor 7 %define V_minor 7
%define V_minor_sieve 5 %define V_minor_sieve 6
%define V_minor_managesieve 1 %define V_minor_managesieve 1
%define V_managesieve 0.10.3 %define V_managesieve 0.10.3
@ -39,7 +39,7 @@ Class: EVAL
Group: Mail Group: Mail
License: MIT+LGPL License: MIT+LGPL
Version: %{V_major}.%{V_minor} Version: %{V_major}.%{V_minor}
Release: 20081125 Release: 20081222
# package options # package options
%option with_fsl yes %option with_fsl yes

Write Preview
Loading…
Cancel
Save