summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorghen <ghen@pkgsrc.org>2006-05-21 13:48:51 +0000
committerghen <ghen@pkgsrc.org>2006-05-21 13:48:51 +0000
commit6be99ae82900143c63971742ae7e05c408464351 (patch)
tree0afdb0f19598da27133afac9925785295b349166 /mail
parented490863b7dd27fd88bb45ef2254a02e9f963a1c (diff)
downloadpkgsrc-6be99ae82900143c63971742ae7e05c408464351.tar.gz
Fix a problem with non-C99 compilers (reported on NetBSD 1.6 and
Solaris). The patch is from dovecot CVS (see the thread following http://www.dovecot.org/list/dovecot/2006-May/013389.html), via PR pkg/33489. Bump PKGREVISION.
Diffstat (limited to 'mail')
-rw-r--r--mail/dovecot/Makefile3
-rw-r--r--mail/dovecot/distinfo3
-rw-r--r--mail/dovecot/patches/patch-af35
3 files changed, 39 insertions, 2 deletions
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 8db2b4c98d9..2ac62f7b2be 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.51 2006/05/12 11:02:48 grant Exp $
+# $NetBSD: Makefile,v 1.52 2006/05/21 13:48:51 ghen Exp $
DISTNAME= dovecot-1.0.beta8
PKGNAME= ${DISTNAME:S/.beta/beta/}
+PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.dovecot.org/releases/
diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo
index 0fb4ca53df4..b4108bc843e 100644
--- a/mail/dovecot/distinfo
+++ b/mail/dovecot/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.29 2006/05/12 11:02:48 grant Exp $
+$NetBSD: distinfo,v 1.30 2006/05/21 13:48:51 ghen Exp $
SHA1 (dovecot-1.0.beta8.tar.gz) = fedd38c29a2bc396df386636ed5d8b65ecab0ff6
RMD160 (dovecot-1.0.beta8.tar.gz) = 101a7011467691ba5f4a6f48e21d6d1dc5626c16
Size (dovecot-1.0.beta8.tar.gz) = 1392106 bytes
SHA1 (patch-aa) = b2d48d991cb57f1ae99617d26a5d9f30fcdc4700
SHA1 (patch-ab) = a674cc1cb195e31f7c8cd1cd2735c69e3562fca7
+SHA1 (patch-af) = 8a8a219feba0bc575c1319ff7743f1ae5281413a
diff --git a/mail/dovecot/patches/patch-af b/mail/dovecot/patches/patch-af
new file mode 100644
index 00000000000..89c4ff5c98b
--- /dev/null
+++ b/mail/dovecot/patches/patch-af
@@ -0,0 +1,35 @@
+$NetBSD: patch-af,v 1.1 2006/05/21 13:48:51 ghen Exp $
+
+From dovecot CVS: fix problem with non-C99 compilers.
+
+--- src/master/master-settings.c.orig 2006-04-25 11:00:07.000000000 +0900
++++ src/master/master-settings.c
+@@ -366,7 +366,6 @@ struct settings default_settings = {
+ MEMBER(pop3_logout_format) "top=%t/%p, retr=%r/%b, del=%d/%m, size=%s",
+
+ /* .. */
+- MEMBER(login_uid) 0,
+ MEMBER(listen_fd) -1,
+ MEMBER(ssl_listen_fd) -1
+ };
+--- src/master/master-settings.h.orig 2006-04-15 11:00:07.000000000 +0900
++++ src/master/master-settings.h
+@@ -116,14 +116,15 @@ struct settings {
+ const char *pop3_logout_format;
+
+ /* .. */
+- uid_t login_uid;
++ int listen_fd, ssl_listen_fd;
+
+- const char *imap_generated_capability;
++ uid_t login_uid;
+
+- int listen_fd, ssl_listen_fd;
+ struct ip_addr listen_ip, ssl_listen_ip;
+ unsigned int listen_port, ssl_listen_port;
+
++ const char *imap_generated_capability;
++
+ array_t ARRAY_DEFINE(plugin_envs, const char *);
+ };
+