unregen patch-ab, since the patch context was manually reduced so that

the managesieve patch applies cleanly together with this.

Noted by Edgar Fuß in PR 49599.

2 files changed, 12 insertions, 15 deletions

diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo
index c0eba808260..42ead41fa63 100644
--- a/mail/dovecot/distinfo
+++ b/mail/dovecot/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.119 2015/01/23 12:17:47 wiz Exp $
+$NetBSD: distinfo,v 1.120 2015/01/26 23:26:48 wiz Exp $
 
 SHA1 (dovecot-1.2-managesieve-0.11.13.tar.gz) = cd5d2149250072aa8079f9db967cfeffc1b57c53
 RMD160 (dovecot-1.2-managesieve-0.11.13.tar.gz) = 9deed0637f1b5942a1b4996a343fed1b23301023
@@ -13,7 +13,7 @@ SHA1 (dovecot-1.2.17.tar.gz) = 457b16791a15e739c6bc8b02bc9c78f9ad794e39
 RMD160 (dovecot-1.2.17.tar.gz) = 59f619dba2aadef3cccd6ceb045a2e75a11700a2
 Size (dovecot-1.2.17.tar.gz) = 2983431 bytes
 SHA1 (patch-aa) = 447e46268a93201b3ef22491ff0968752978d020
-SHA1 (patch-ab) = c4b94708ba99d8ae51898a1a46ef0c0faef92f14
+SHA1 (patch-ab) = e5b5d72f0553da42d14ee05a9ed0faff8a6c7075
 SHA1 (patch-ac) = 5912392abb79df8e78de6f710c2a83264ee58fe7
 SHA1 (patch-ag) = 7e733d41c0607df64c2c3195b78683689f2143d6
 SHA1 (patch-ah) = a7d02fa3ab1d1a760e05510ebd3cfb07a6652863
diff --git a/mail/dovecot/patches/patch-ab b/mail/dovecot/patches/patch-ab
index f1648c3fd0a..49dddff4ede 100644
--- a/mail/dovecot/patches/patch-ab
+++ b/mail/dovecot/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.30 2015/01/23 12:17:47 wiz Exp $
+$NetBSD: patch-ab,v 1.31 2015/01/26 23:26:48 wiz Exp $
 
---- dovecot-example.conf.orig	2010-01-24 23:30:41.000000000 +0000
+--- dovecot-example.conf.orig	2009-06-01 05:21:42.000000000 +0200
 +++ dovecot-example.conf
-@@ -12,16 +12,13 @@
+@@ -12,9 +12,6 @@
  # Default values are shown for each setting, it's not required to uncomment
  # those. These are exceptions to this though: No sections (e.g. namespace {})
  # or plugin settings are added by default, they're listed only as examples.
@@ -12,14 +12,11 @@ $NetBSD: patch-ab,v 1.30 2015/01/23 12:17:47 wiz Exp $
  
  # Base directory where to store runtime data.
  #base_dir = /var/run/dovecot/
- 
- # Protocols we want to be serving: imap imaps pop3 pop3s
+@@ -23,3 +20,3 @@
  # If you only want to use dovecot-auth, you can set this to "none".
 -#protocols = imap imaps
 +protocols = imap pop3
  
- # A space separated list of IP or host addresses where to listen in for
- # connections. "*" listens in all IPv4 interfaces. "[::]" listens in all IPv6
 @@ -86,7 +83,7 @@
  #ssl_listen =
  
@@ -77,7 +74,7 @@ $NetBSD: patch-ab,v 1.30 2015/01/23 12:17:47 wiz Exp $
  
    # 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
-@@ -682,7 +679,7 @@ protocol pop3 {
+@@ -678,7 +675,7 @@ protocol pop3 {
    # Support for dynamically loadable plugins. mail_plugins is a space separated
    # list of plugins to load.
    #mail_plugins = 
@@ -86,7 +83,7 @@ $NetBSD: patch-ab,v 1.30 2015/01/23 12:17:47 wiz Exp $
  
    # Workarounds for various client bugs:
    #   outlook-no-nuls:
-@@ -710,7 +707,7 @@ protocol lda {
+@@ -706,7 +703,7 @@ protocol lda {
    # Support for dynamically loadable plugins. mail_plugins is a space separated
    # list of plugins to load.
    #mail_plugins = 
@@ -95,7 +92,7 @@ $NetBSD: patch-ab,v 1.30 2015/01/23 12:17:47 wiz Exp $
  
    # If user is over quota, return with temporary failure instead of
    # bouncing the mail.
-@@ -724,7 +721,7 @@ protocol lda {
+@@ -720,7 +717,7 @@ protocol lda {
    #deliver_log_format = msgid=%m: %$
  
    # Binary to use for sending mails.
@@ -104,7 +101,7 @@ $NetBSD: patch-ab,v 1.30 2015/01/23 12:17:47 wiz Exp $
  
    # Subject: header to use for rejection mails. You can use the same variables
    # as for rejection_reason below.
-@@ -743,7 +740,7 @@ protocol lda {
+@@ -739,7 +736,7 @@ protocol lda {
  ##
  
  # Executable location
@@ -113,7 +110,7 @@ $NetBSD: patch-ab,v 1.30 2015/01/23 12:17:47 wiz Exp $
  
  # Set max. process size in megabytes.
  #auth_process_size = 256
-@@ -872,7 +869,7 @@ auth default {
+@@ -869,7 +866,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>
@@ -122,7 +119,7 @@ $NetBSD: patch-ab,v 1.30 2015/01/23 12:17:47 wiz Exp $
      # [session=yes] [setcred=yes] [failure_show_msg=yes] [max_requests=<n>]
      # [cache_key=<key>] [<service name>]
      #
-@@ -905,15 +902,15 @@ auth default {
+@@ -902,15 +899,15 @@ auth default {
      #   args = session=yes %Ls
      #   args = cache_key=%u dovecot
      #args = dovecot