cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to Dovecot 2.2.21, from Brad

Browse Source
This commit is contained in:
sthen 2015-12-12 16:43:09 +00:00
parent d58c9f5441
commit 21554d6765
8 changed files with 23 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mail/dovecot/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.233 2015/11/10 10:30:04 sthen Exp $
# $OpenBSD: Makefile,v 1.234 2015/12/12 16:43:09 sthen Exp $
SHARED_ONLY= Yes
@ -8,12 +8,11 @@ COMMENT-mysql= MySQL authentication / dictionary support for Dovecot
COMMENT-postgresql= PostgreSQL authentication / dictionary support for Dovecot
V_MAJOR= 2.2
V_DOVECOT= 2.2.19
V_DOVECOT= 2.2.21
DISTNAME= dovecot-${V_DOVECOT}
PKGNAME= dovecot-${V_DOVECOT}
PKGNAME-server= dovecot-${V_DOVECOT}
REVISION-server= 0
PKGSPEC-server= dovecot-=${V_DOVECOT}
PKGNAME-ldap= dovecot-ldap-${V_DOVECOT}
PKGNAME-mysql= dovecot-mysql-${V_DOVECOT}

4
mail/dovecot/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (dovecot-2.2.19.tar.gz) = dZ4eP52QfNqrrR9fusx5PKGR0jTAhL7Du6QpZpUqTp8=
SIZE (dovecot-2.2.19.tar.gz) = 5256627
SHA256 (dovecot-2.2.21.tar.gz) = ercTnlnh8DU7+cJCUfE8iTzxpu9LzEfi1E3kNxCNCyA=
SIZE (dovecot-2.2.21.tar.gz) = 4985686

8
mail/dovecot/patches/patch-configure
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-configure,v 1.12 2015/10/05 10:20:29 sthen Exp $
$OpenBSD: patch-configure,v 1.13 2015/12/12 16:43:09 sthen Exp $
Workaround libpthread bug.
--- configure.orig Fri Oct 2 06:37:49 2015
+++ configure Fri Oct 2 14:05:54 2015
@@ -25585,7 +25585,7 @@ _ACEOF
--- configure.orig Fri Dec 11 11:37:20 2015
+++ configure Fri Dec 11 22:11:34 2015
@@ -25590,7 +25590,7 @@ _ACEOF
CFLAGS="$CFLAGS $EXTRA_CFLAGS"

8
mail/dovecot/patches/patch-doc_example-config_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-doc_example-config_Makefile_in,v 1.10 2015/10/05 10:20:29 sthen Exp $
--- doc/example-config/Makefile.in.orig Fri Oct 2 06:37:50 2015
+++ doc/example-config/Makefile.in Fri Oct 2 14:05:54 2015
@@ -401,7 +401,7 @@ top_srcdir = @top_srcdir@
$OpenBSD: patch-doc_example-config_Makefile_in,v 1.11 2015/12/12 16:43:09 sthen Exp $
--- doc/example-config/Makefile.in.orig Fri Dec 11 11:37:20 2015
+++ doc/example-config/Makefile.in Fri Dec 11 22:11:34 2015
@@ -403,7 +403,7 @@ top_srcdir = @top_srcdir@
SUBDIRS = conf.d
pkgsysconfdir = $(sysconfdir)/dovecot
nodist_pkgsysconf_DATA = README

8
mail/dovecot/patches/patch-doc_example-config_conf_d_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-doc_example-config_conf_d_Makefile_in,v 1.10 2015/10/05 10:20:29 sthen Exp $
--- doc/example-config/conf.d/Makefile.in.orig Fri Oct 2 06:37:50 2015
+++ doc/example-config/conf.d/Makefile.in Fri Oct 2 14:05:54 2015
@@ -338,7 +338,7 @@ top_build_prefix = @top_build_prefix@
$OpenBSD: patch-doc_example-config_conf_d_Makefile_in,v 1.11 2015/12/12 16:43:09 sthen Exp $
--- doc/example-config/conf.d/Makefile.in.orig Fri Dec 11 11:37:20 2015
+++ doc/example-config/conf.d/Makefile.in Fri Dec 11 22:11:34 2015
@@ -340,7 +340,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
pkgsysconfdir = $(sysconfdir)/dovecot

43
mail/dovecot/patches/patch-src_auth_password-scheme-crypt_c
View File

@ -1,43 +0,0 @@
$OpenBSD: patch-src_auth_password-scheme-crypt_c,v 1.1 2015/11/10 10:30:04 sthen Exp $
auth: Don't crash when trying to use CRYPT scheme when crypt() doesn't support DES
--- src/auth/password-scheme-crypt.c.orig Tue Nov 10 01:21:24 2015
+++ src/auth/password-scheme-crypt.c Tue Nov 10 01:23:34 2015
@@ -24,6 +24,19 @@ void password_set_encryption_rounds(unsigned int round
}
static void
+crypt_generate_des(const char *plaintext, const char *user ATTR_UNUSED,
+ const unsigned char **raw_password_r, size_t *size_r)
+{
+#define CRYPT_SALT_LEN 2
+ const char *password, *salt;
+
+ salt = password_generate_salt(CRYPT_SALT_LEN);
+ password = t_strdup(mycrypt(plaintext, salt));
+ *raw_password_r = (const unsigned char *)password;
+ *size_r = strlen(password);
+}
+
+static void
crypt_generate_blowfisch(const char *plaintext, const char *user ATTR_UNUSED,
const unsigned char **raw_password_r, size_t *size_r)
{
@@ -98,6 +111,7 @@ static const struct {
const char *salt;
const char *expected;
} sample[] = {
+ { "08/15!test~4711", "JB", "JBOZ0DgmtucwE" },
{ "08/15!test~4711", "$2a$04$0123456789abcdefABCDEF",
"$2a$04$0123456789abcdefABCDE.N.drYX5yIAL1LkTaaZotW3yI0hQhZru" },
{ "08/15!test~4711", "$5$rounds=1000$0123456789abcdef",
@@ -110,6 +124,8 @@ static const struct {
/* keep in sync with the sample struct above */
static const struct password_scheme crypt_schemes[] = {
+ { "CRYPT", PW_ENCODING_NONE, 0, crypt_verify,
+ crypt_generate_des },
{ "BLF-CRYPT", PW_ENCODING_NONE, 0, crypt_verify,
crypt_generate_blowfisch },
{ "SHA256-CRYPT", PW_ENCODING_NONE, 0, crypt_verify,

34
mail/dovecot/patches/patch-src_auth_password-scheme_c
View File

@ -1,34 +0,0 @@
$OpenBSD: patch-src_auth_password-scheme_c,v 1.1 2015/11/10 10:30:04 sthen Exp $
auth: Don't crash when trying to use CRYPT scheme when crypt() doesn't support DES
--- src/auth/password-scheme.c.orig Tue Nov 10 01:23:44 2015
+++ src/auth/password-scheme.c Tue Nov 10 01:24:30 2015
@@ -341,19 +341,6 @@ int crypt_verify(const char *plaintext, const char *us
return strcmp(crypted, password) == 0 ? 1 : 0;
}
-static void
-crypt_generate(const char *plaintext, const char *user ATTR_UNUSED,
- const unsigned char **raw_password_r, size_t *size_r)
-{
-#define CRYPT_SALT_LEN 2
- const char *password, *salt;
-
- salt = password_generate_salt(CRYPT_SALT_LEN);
- password = t_strdup(mycrypt(plaintext, salt));
- *raw_password_r = (const unsigned char *)password;
- *size_r = strlen(password);
-}
-
static int
md5_verify(const char *plaintext, const char *user,
const unsigned char *raw_password, size_t size, const char **error_r)
@@ -803,7 +790,6 @@ rpa_generate(const char *plaintext, const char *user A
}
static const struct password_scheme builtin_schemes[] = {
- { "CRYPT", PW_ENCODING_NONE, 0, crypt_verify, crypt_generate },
{ "MD5", PW_ENCODING_NONE, 0, md5_verify, md5_crypt_generate },
{ "MD5-CRYPT", PW_ENCODING_NONE, 0,
md5_crypt_verify, md5_crypt_generate },

8
mail/dovecot/pkg/PLIST-server
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-server,v 1.49 2015/10/05 10:20:29 sthen Exp $
@comment $OpenBSD: PLIST-server,v 1.50 2015/12/12 16:43:09 sthen Exp $
@conflict dovecot-sqlite-*
@pkgpath mail/dovecot
@pkgpath mail/dovecot,-server,bdb
@ -141,7 +141,9 @@ include/dovecot/fts-filter.h
include/dovecot/fts-icu.h
include/dovecot/fts-indexer.h
include/dovecot/fts-language.h
include/dovecot/fts-library.h
include/dovecot/fts-parser.h
include/dovecot/fts-storage.h
include/dovecot/fts-tokenizer-generic-private.h
include/dovecot/fts-tokenizer-private.h
include/dovecot/fts-tokenizer.h
@ -294,6 +296,7 @@ include/dovecot/login-proxy-state.h
include/dovecot/login-proxy.h
include/dovecot/login-settings.h
include/dovecot/macros.h
include/dovecot/mail-autoexpunge.h
include/dovecot/mail-cache-private.h
include/dovecot/mail-cache.h
include/dovecot/mail-copy.h
@ -862,6 +865,7 @@ share/doc/dovecot/wiki/PostLoginScripting.txt
share/doc/dovecot/wiki/PreAuth.txt
share/doc/dovecot/wiki/QuickConfiguration.txt
share/doc/dovecot/wiki/Quota.Configuration.txt
share/doc/dovecot/wiki/Quota.Count.txt
share/doc/dovecot/wiki/Quota.Dict.txt
share/doc/dovecot/wiki/Quota.Dirsize.txt
share/doc/dovecot/wiki/Quota.FS.txt
@ -916,6 +920,8 @@ share/dovecot/stopwords/
share/dovecot/stopwords/stopwords_en.txt
share/dovecot/stopwords/stopwords_fi.txt
share/dovecot/stopwords/stopwords_fr.txt
share/dovecot/stopwords/stopwords_no.txt
share/dovecot/stopwords/stopwords_sv.txt
share/examples/dovecot/
share/examples/dovecot/dovecot-openssl.cnf
@sample /etc/ssl/dovecot-openssl.cnf