Attachment 96268 Details for Bug 134852 – file.diff

[patch] file.diff

file.diff (text/plain), 8.90 KB, created by Yarema on 2009-05-22 11:50:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yarema

Created: 2009-05-22 11:50:03 UTC

Size: 8.90 KB

patch

obsolete

>diff -u -r -N dovecot-1.1.14/Makefile dovecot/Makefile
>--- dovecot-1.1.14/Makefile	2009-05-14 13:17:41.000000000 -0400
>+++ dovecot/Makefile	2009-05-19 17:46:07.859372203 -0400
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	dovecot
>-PORTVERSION=	1.1.14
>+PORTVERSION=	1.1.15
> CATEGORIES=	mail ipv6
> MASTER_SITES=	http://www.dovecot.org/releases/1.1/
> 
>@@ -142,7 +142,7 @@
> ## BDB Support
> #
> .if defined(WITH_BDB) && !defined(WITHOUT_BDB)
>-USE_BDB=		yes
>+USE_BDB=		42+
> CONFIGURE_ARGS+=	--with-db
> CFLAGS+=		-I${BDB_INCLUDE_DIR} -L${BDB_LIB_DIR}
> PLIST_SUB+=		BDB=""
>diff -u -r -N dovecot-1.1.14/distinfo dovecot/distinfo
>--- dovecot-1.1.14/distinfo	2009-05-14 13:17:41.000000000 -0400
>+++ dovecot/distinfo	2009-05-22 05:36:24.277420677 -0400
>@@ -1,6 +1,6 @@
>-MD5 (dovecot-1.1.14.tar.gz) = 60b1deccc0ae77e5669060d2b1894e5e
>-SHA256 (dovecot-1.1.14.tar.gz) = 95aa89b65fd89a42484850bbd33d463601039eea21107febc15175d4f3652c4c
>-SIZE (dovecot-1.1.14.tar.gz) = 2372939
>-MD5 (dovecot-1.1.14-managesieve-0.10.6.diff.gz) = 09f9dea802678cb0fbd6f66cea0b0e2d
>-SHA256 (dovecot-1.1.14-managesieve-0.10.6.diff.gz) = c6d0329ab99eb73e0d464fb38b0806b93e444af2ae9603996fadf2ee58788f4f
>-SIZE (dovecot-1.1.14-managesieve-0.10.6.diff.gz) = 6488
>+MD5 (dovecot-1.1.15.tar.gz) = 90562401bbf6bd052b23b89f7f5a700f
>+SHA256 (dovecot-1.1.15.tar.gz) = d65828787c97919fca3e607369d87a3a29940fde3e5162ebb4444dfda47f7fca
>+SIZE (dovecot-1.1.15.tar.gz) = 2383354
>+MD5 (dovecot-1.1.15-managesieve-0.10.6.diff.gz) = a4e6d2a4c9d4111d8a53173a25c914e3
>+SHA256 (dovecot-1.1.15-managesieve-0.10.6.diff.gz) = eb31a517eabaa1577b80332688383846a8108ff4ed863f29d666189ef241d3c3
>+SIZE (dovecot-1.1.15-managesieve-0.10.6.diff.gz) = 6180
>diff -u -r -N dovecot-1.1.14/files/patch-configure dovecot/files/patch-configure
>--- dovecot-1.1.14/files/patch-configure	2009-01-31 05:03:26.000000000 -0500
>+++ dovecot/files/patch-configure	2009-05-17 21:39:51.000000000 -0400
>@@ -1,6 +1,6 @@
>---- configure.orig	2009-01-26 19:26:05.000000000 -0500
>-+++ configure	2009-01-26 19:26:05.000000000 -0500
>-@@ -1001,6 +1001,7 @@
>+--- configure.orig	2009-05-17 21:39:51.000000000 -0400
>++++ configure	2009-05-17 21:39:51.000000000 -0400
>+@@ -1082,6 +1082,7 @@
>  includedir='${prefix}/include'
>  oldincludedir='/usr/include'
>  docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
>diff -u -r -N dovecot-1.1.14/files/patch-dovecot-example.conf dovecot/files/patch-dovecot-example.conf
>--- dovecot-1.1.14/files/patch-dovecot-example.conf	2009-05-14 13:17:41.000000000 -0400
>+++ dovecot/files/patch-dovecot-example.conf	2009-05-13 12:41:46.000000000 -0400
>@@ -1,15 +1,15 @@
>---- dovecot-example.conf.orig	2009-05-09 18:13:35.000000000 -0700
>-+++ dovecot-example.conf	2009-05-09 18:14:44.000000000 -0700
>-@@ -20,7 +20,7 @@
>+--- dovecot-example.conf.orig	2009-05-13 12:41:46.000000000 -0400
>++++ dovecot-example.conf	2009-05-13 12:41:46.000000000 -0400
>+@@ -21,7 +21,7 @@
>  
>- # Protocols we want to be serving: imap imaps pop3 pop3s managesieve
>+ # 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 = %%PROTOCOLS%%
>  
>  # A space separated list of IP or host addresses where to listen in for
>  # connections. "*" listens in all IPv4 interfaces. "[::]" listens in all IPv6
>-@@ -48,7 +48,7 @@
>+@@ -45,7 +45,7 @@
>  # SSL/TLS is used (LOGINDISABLED capability). Note that if the remote IP
>  # matches the local IP (ie. you're connecting from the same computer), the
>  # connection is considered secure and plaintext authentication is allowed.
>@@ -18,7 +18,7 @@
>  
>  # Should all IMAP and POP3 processes be killed when Dovecot master process
>  # shuts down. Setting this to "no" means that Dovecot can be upgraded without
>-@@ -218,7 +218,7 @@
>+@@ -215,7 +215,7 @@
>  #
>  # <doc/wiki/MailLocation.txt>
>  #
>@@ -27,7 +27,7 @@
>  
>  # If you need to set multiple mailbox locations or want to change default
>  # namespace settings, you can do it by defining namespace sections.
>-@@ -276,7 +276,7 @@
>+@@ -273,7 +273,7 @@
>  # Group to enable temporarily for privileged operations. Currently this is
>  # used only with INBOX when either its initial creation or dotlocking fails.
>  # Typically this is set to "mail" to give access to /var/mail.
>@@ -36,7 +36,7 @@
>  
>  # Grant access to these supplementary groups for mail processes. Typically
>  # these are used to set up access to shared mailboxes. Note that it may be
>-@@ -315,7 +315,7 @@
>+@@ -312,7 +312,7 @@
>  
>  # Rely on O_EXCL to work when creating dotlock files. NFS supports O_EXCL
>  # since version 3, so this should be safe to use nowadays by default.
>@@ -45,7 +45,7 @@
>  
>  # Don't use fsync() or fdatasync() calls. This makes the performance better
>  # at the cost of potential data loss if the server (or the file server)
>-@@ -343,20 +343,20 @@
>+@@ -340,20 +340,20 @@
>  # Show more verbose process titles (in ps). Currently shows user name and
>  # IP address. Useful for seeing who are actually using the IMAP processes
>  # (eg. shared mailboxes or if same uid is used for multiple accounts).
>@@ -69,7 +69,7 @@
>  #last_valid_gid = 0
>  
>  # Maximum number of running mail processes. When this limit is reached,
>-@@ -423,7 +423,7 @@
>+@@ -420,7 +420,7 @@
>  
>  # When copying a message, do it with hard links whenever possible. This makes
>  # the performance much better, and it's unlikely to have any side effects.
>@@ -78,7 +78,7 @@
>  
>  # When copying a message, try to preserve the base filename. Only if the
>  # destination mailbox already contains the same name (ie. the mail is being
>-@@ -538,7 +538,7 @@
>+@@ -535,7 +535,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.
>    # Many clients however don't understand it and ask the CAPABILITY anyway.
>@@ -87,7 +87,7 @@
>  
>    # IMAP logout format string:
>    #  %i - total number of bytes read from client
>-@@ -567,7 +567,7 @@
>+@@ -564,7 +564,7 @@
>    #     but not both. Thunderbird separates these two by forcing server to
>    #     accept '/' suffix in mailbox names in subscriptions list.
>    # The list is space-separated.
>@@ -96,7 +96,7 @@
>  }
>    
>  ##
>-@@ -619,7 +619,7 @@
>+@@ -616,7 +616,7 @@
>    # Dovecot's default, so if you're building a new server it would be a good
>    # idea to change this. %08Xu%08Xv should be pretty fail-safe.
>    #
>@@ -105,7 +105,7 @@
>  
>    # POP3 logout format string:
>    #  %i - total number of bytes read from client
>-@@ -650,7 +650,7 @@
>+@@ -647,7 +647,7 @@
>    #     Outlook Express and Netscape Mail breaks if end of headers-line is
>    #     missing. This option simply sends it if it's missing.
>    # The list is space-separated.
>@@ -114,7 +114,7 @@
>  }
>  
>  ##
>-@@ -787,7 +787,7 @@
>+@@ -742,7 +742,7 @@
>  # the standard variables here, eg. %Lu would lowercase the username, %n would
>  # drop away the domain if it was given, or "%n-AT-%d" would change the '@' into
>  # "-AT-". This translation is done after auth_username_translation changes.
>@@ -123,7 +123,7 @@
>  
>  # If you want to allow master users to log in by specifying the master
>  # username within the normal username string (ie. not using SASL mechanism's
>-@@ -843,7 +843,7 @@
>+@@ -798,7 +798,7 @@
>    #   plain login digest-md5 cram-md5 ntlm rpa apop anonymous gssapi otp skey
>    #   gss-spnego
>    # NOTE: See also disable_plaintext_auth setting.
>@@ -132,7 +132,7 @@
>  
>    #
>    # Password database is used to verify user's password (and nothing more).
>-@@ -905,6 +905,7 @@
>+@@ -860,6 +860,7 @@
>      #   args = session=yes %Ls
>      #   args = cache_key=%u dovecot
>      #args = dovecot
>@@ -140,7 +140,7 @@
>    }
>  
>    # System users (NSS, /etc/passwd, or similiar)
>-@@ -948,14 +949,16 @@
>+@@ -903,14 +904,16 @@
>  
>    # SQL database <doc/wiki/AuthDatabase.SQL.txt>
>    #passdb sql {
>@@ -161,7 +161,7 @@
>    #}
>  
>    # vpopmail authentication <doc/wiki/AuthDatabase.VPopMail.txt>
>-@@ -990,7 +993,7 @@
>+@@ -945,7 +948,7 @@
>      # proceses. Useful with remote NSS lookups that may block.
>      # NOTE: Be sure to use this setting with nss_ldap or users might get
>      # logged in as each others!
>@@ -170,7 +170,7 @@
>    }
>  
>    # passwd-like file with specified location
>-@@ -1019,14 +1022,16 @@
>+@@ -974,14 +977,16 @@
>  
>    # SQL database <doc/wiki/AuthDatabase.SQL.txt>
>    #userdb sql {
>@@ -191,7 +191,7 @@
>    #}
>  
>    # vpopmail <doc/wiki/AuthDatabase.VPopMail.txt>
>-@@ -1058,25 +1063,25 @@
>+@@ -1013,25 +1018,25 @@
>    #ssl_username_from_cert = no
>  
>    # It's possible to export the authentication interface to other programs:
>@@ -227,7 +227,7 @@
>  }
>  
>  # If you wish to use another authentication server than dovecot-auth, you can
>-@@ -1104,11 +1109,12 @@
>+@@ -1059,11 +1064,12 @@
>  
>  dict {
>    #quota = mysql:/etc/dovecot-dict-quota.conf 
>@@ -243,7 +243,7 @@
>  
>  ##
>  ## Plugin settings
>-@@ -1145,8 +1151,8 @@
>+@@ -1100,8 +1106,8 @@
>    # Each quota root has separate limits. Only the command for the first
>    # exceeded limit is excecuted, so put the highest limit first.
>    # Note that % needs to be escaped as %%, otherwise "% " expands to empty.

Actions: View | Diff

Attachments on bug 134852: 96268