Fix rc script mode/group, and adjust an #ifdef in a patch to use a specific

OpenBSD version. From Brad (maintainer).
This commit is contained in:
sthen 2011-07-22 20:15:47 +00:00
parent 76d000dcb2
commit cd74aaa9b7
3 changed files with 12 additions and 11 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.170 2011/06/18 22:41:27 sthen Exp $
# $OpenBSD: Makefile,v 1.171 2011/07/22 20:15:47 sthen Exp $
SHARED_ONLY= Yes
@ -15,7 +15,7 @@ V_DOVECOT= 2.0.13
DISTNAME= dovecot-${V_DOVECOT}
PKGNAME= dovecot-${V_DOVECOT}
PKGNAME-server= dovecot-${V_DOVECOT}
REVISION-server= 4
REVISION-server= 5
PKGNAME-ldap= dovecot-ldap-${V_DOVECOT}
PKGNAME-mysql= dovecot-mysql-${V_DOVECOT}
PKGNAME-postgresql= dovecot-postgresql-${V_DOVECOT}

View File

@ -1,16 +1,15 @@
$OpenBSD: patch-src_lib_ipwd_c,v 1.1 2011/05/23 22:54:38 sthen Exp $
--- src/lib/ipwd.c.orig Wed May 11 20:27:44 2011
+++ src/lib/ipwd.c Wed May 11 20:28:24 2011
@@ -31,12 +31,8 @@ static void gr_init(void)
$OpenBSD: patch-src_lib_ipwd_c,v 1.2 2011/07/22 20:15:47 sthen Exp $
--- src/lib/ipwd.c.orig Thu Apr 28 10:14:24 2011
+++ src/lib/ipwd.c Mon Jul 18 18:33:53 2011
@@ -31,9 +31,8 @@ static void gr_init(void)
long size;
if (grbuf == NULL) {
- /* OpenBSD (up to 4.8 at least) reports too low value in
- sysconf() */
-#ifndef __OpenBSD__
+ /* OpenBSD up to 4.9 reports too low value in sysconf() */
+#if !defined(__OpenBSD__) || OpenBSD >= 201111
size = sysconf(_SC_GETGR_R_SIZE_MAX);
if (size < 0)
-#endif
size = DEFAULT_GRBUF_SIZE;
grbuf_size = size;
#endif

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-server,v 1.20 2011/06/04 11:38:43 sthen Exp $
@comment $OpenBSD: PLIST-server,v 1.21 2011/07/22 20:15:47 sthen Exp $
@pkgpath mail/dovecot
@pkgpath mail/dovecot,-server,bdb
@pkgpath mail/dovecot,-server,bdb,ldap,mysql,postgresql,sqlite
@ -695,4 +695,6 @@ share/examples/dovecot/example-config/dovecot.conf
@sample /var/dovecot/login/
@extra /etc/ssl/dovecotcert.pem
@extra /etc/ssl/private/dovecot.pem
@mode
@group
@rcscript ${RCDIR}/dovecot