[pkgsrc/trunk]: pkgsrc Don't hardcode the use of "99" as a file descriptor be...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/53ba35c116d3
branches:  trunk
changeset: 533660:53ba35c116d3
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun Sep 23 11:42:43 2007 +0000

description:
Don't hardcode the use of "99" as a file descriptor because it may
not be available.  Instead, use (OPEN_MAX - 1) which uses the same
"pick a high number" strategy as choosing "99", but is more likely to
be available.  This allows users with a soft limit of 64 open files
to run courierfilter and courierldapaliasd.

Bump the following PKGREVISIONs:

        mail/courier-mta        --> 11
        meta-pkgs/courier       --> 7
        net/couriertcpd         --> 3

diffstat:

 mail/courier-mta/Makefile         |   6 +++---
 mail/courier-mta/distinfo         |   3 ++-
 mail/courier-mta/patches/patch-aw |  33 +++++++++++++++++++++++++++++++++
 meta-pkgs/courier/Makefile        |   8 ++++----
 net/couriertcpd/Makefile          |   4 ++--
 net/couriertcpd/distinfo          |   3 ++-
 net/couriertcpd/patches/patch-ab  |  33 +++++++++++++++++++++++++++++++++
 7 files changed, 79 insertions(+), 11 deletions(-)

diffs (162 lines):

diff -r 31c92876fbe0 -r 53ba35c116d3 mail/courier-mta/Makefile
--- a/mail/courier-mta/Makefile Sun Sep 23 11:20:48 2007 +0000
+++ b/mail/courier-mta/Makefile Sun Sep 23 11:42:43 2007 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2007/09/23 01:24:55 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2007/09/23 11:42:44 jlam Exp $
 
 DISTNAME=      courier-${COURIER_VERSION}
 PKGNAME=       ${DISTNAME:S/-/-mta-/}
-PKGREVISION=   10
+PKGREVISION=   11
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=  .tar.bz2
@@ -14,7 +14,7 @@
 HOMEPAGE=      http://www.courier-mta.org/
 
 DEPENDS+=      courier-maildir>=${COURIER_VERSION}:../../mail/courier-maildir
-DEPENDS+=      couriertcpd>=${COURIER_VERSION}nb2:../../net/couriertcpd
+DEPENDS+=      couriertcpd>=${COURIER_VERSION}nb3:../../net/couriertcpd
 DEPENDS+=      maildrop>=2.0.4:../../mail/maildrop
 
 USE_TOOLS+=            gmake openssl:run perl:run
diff -r 31c92876fbe0 -r 53ba35c116d3 mail/courier-mta/distinfo
--- a/mail/courier-mta/distinfo Sun Sep 23 11:20:48 2007 +0000
+++ b/mail/courier-mta/distinfo Sun Sep 23 11:42:43 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2007/09/17 15:28:04 jlam Exp $
+$NetBSD: distinfo,v 1.8 2007/09/23 11:42:44 jlam Exp $
 
 SHA1 (courier-0.56.0.tar.bz2) = 536f24db9f33f8d93445c03dd4edb50c7ec2f6b2
 RMD160 (courier-0.56.0.tar.bz2) = ce8e2d99f5b7baf500d748c18fbd126df8331398
@@ -23,3 +23,4 @@
 SHA1 (patch-at) = 7c93cabfe5b1164c6699111cd74e612af887881c
 SHA1 (patch-au) = 794fdd49f7994689e4e4ee809293d2e67d9bc4c2
 SHA1 (patch-av) = df4847bcf1127766f35cfecd65a293fa2bf7d6c9
+SHA1 (patch-aw) = a777a767893642b8425c70e8a7a791d6e2c77eb7
diff -r 31c92876fbe0 -r 53ba35c116d3 mail/courier-mta/patches/patch-aw
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/courier-mta/patches/patch-aw Sun Sep 23 11:42:43 2007 +0000
@@ -0,0 +1,33 @@
+$NetBSD: patch-aw,v 1.1 2007/09/23 11:42:44 jlam Exp $
+
+--- liblock/lockdaemon.c.orig  2007-05-04 23:04:41.000000000 -0400
++++ liblock/lockdaemon.c
+@@ -8,4 +8,5 @@
+ #include      <stdio.h>
+ #include      <signal.h>
++#include      <limits.h>
+ #include      <stdlib.h>
+ #include      <string.h>
+@@ -31,4 +32,8 @@
+ #endif
+ 
++#ifndef OPEN_MAX
++#define OPEN_MAX      64
++#endif
++
+ #define exit(_a_) _exit(_a_)
+ 
+@@ -146,5 +151,5 @@ int        lockfd;
+       }
+ 
+-      if (lockfd < 0 || dup2(lockfd, 99) != 99)
++      if (lockfd < 0 || dup2(lockfd, OPEN_MAX-1) != OPEN_MAX-1)
+       {
+               perror(lockfile);
+@@ -153,5 +158,5 @@ int        lockfd;
+ 
+       close(lockfd);
+-      lockfd=99;
++      lockfd=OPEN_MAX-1;
+ 
+ #ifdef        FD_CLOEXEC
diff -r 31c92876fbe0 -r 53ba35c116d3 meta-pkgs/courier/Makefile
--- a/meta-pkgs/courier/Makefile        Sun Sep 23 11:20:48 2007 +0000
+++ b/meta-pkgs/courier/Makefile        Sun Sep 23 11:42:43 2007 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2007/09/23 01:24:55 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2007/09/23 11:42:44 jlam Exp $
 
 DISTNAME=      courier-${COURIER_VERSION}
-PKGREVISION=   6
+PKGREVISION=   7
 CATEGORIES=    meta-pkgs mail
 MASTER_SITES=  # empty
 DISTFILES=     # empty
@@ -20,9 +20,9 @@
 #
 #      net/couriertcpd, mail/courier-maildir, mail/courier-mta
 #
-DEPENDS+=      couriertcpd>=${COURIER_VERSION}nb2:../../net/couriertcpd
+DEPENDS+=      couriertcpd>=${COURIER_VERSION}nb3:../../net/couriertcpd
 DEPENDS+=      courier-maildir>=${COURIER_VERSION}:../../mail/courier-maildir
-DEPENDS+=      courier-mta>=${COURIER_VERSION}nb9:../../mail/courier-mta
+DEPENDS+=      courier-mta>=${COURIER_VERSION}nb11:../../mail/courier-mta
 
 # The following packages must be from the same lineage as the version
 # of Courier:
diff -r 31c92876fbe0 -r 53ba35c116d3 net/couriertcpd/Makefile
--- a/net/couriertcpd/Makefile  Sun Sep 23 11:20:48 2007 +0000
+++ b/net/couriertcpd/Makefile  Sun Sep 23 11:42:43 2007 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2007/09/21 14:12:19 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2007/09/23 11:42:43 jlam Exp $
 
 DISTNAME=      courier-${COURIER_VERSION}
 PKGNAME=       ${DISTNAME:S/-/tcpd-/}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=  .tar.bz2
diff -r 31c92876fbe0 -r 53ba35c116d3 net/couriertcpd/distinfo
--- a/net/couriertcpd/distinfo  Sun Sep 23 11:20:48 2007 +0000
+++ b/net/couriertcpd/distinfo  Sun Sep 23 11:42:43 2007 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2007/09/17 15:28:03 jlam Exp $
+$NetBSD: distinfo,v 1.6 2007/09/23 11:42:43 jlam Exp $
 
 SHA1 (courier-0.56.0.tar.bz2) = 536f24db9f33f8d93445c03dd4edb50c7ec2f6b2
 RMD160 (courier-0.56.0.tar.bz2) = ce8e2d99f5b7baf500d748c18fbd126df8331398
 Size (courier-0.56.0.tar.bz2) = 7022057 bytes
 SHA1 (patch-aa) = df4847bcf1127766f35cfecd65a293fa2bf7d6c9
+SHA1 (patch-ab) = a777a767893642b8425c70e8a7a791d6e2c77eb7
diff -r 31c92876fbe0 -r 53ba35c116d3 net/couriertcpd/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/couriertcpd/patches/patch-ab  Sun Sep 23 11:42:43 2007 +0000
@@ -0,0 +1,33 @@
+$NetBSD: patch-ab,v 1.3 2007/09/23 11:42:43 jlam Exp $
+
+--- liblock/lockdaemon.c.orig  2007-05-04 23:04:41.000000000 -0400
++++ liblock/lockdaemon.c
+@@ -8,4 +8,5 @@
+ #include      <stdio.h>
+ #include      <signal.h>
++#include      <limits.h>
+ #include      <stdlib.h>
+ #include      <string.h>
+@@ -31,4 +32,8 @@
+ #endif
+ 
++#ifndef OPEN_MAX
++#define OPEN_MAX      64
++#endif
++
+ #define exit(_a_) _exit(_a_)
+ 
+@@ -146,5 +151,5 @@ int        lockfd;
+       }
+ 
+-      if (lockfd < 0 || dup2(lockfd, 99) != 99)
++      if (lockfd < 0 || dup2(lockfd, OPEN_MAX-1) != OPEN_MAX-1)
+       {
+               perror(lockfile);
+@@ -153,5 +158,5 @@ int        lockfd;
+ 
+       close(lockfd);
+-      lockfd=99;
++      lockfd=OPEN_MAX-1;
+ 
+ #ifdef        FD_CLOEXEC