summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authormartti <martti@pkgsrc.org>2005-09-30 06:04:32 +0000
committermartti <martti@pkgsrc.org>2005-09-30 06:04:32 +0000
commitd69e00ac5e7a3106fb07202a1cc01b254c1093c8 (patch)
tree14c03672284594351ee56f32e46a7ec79d536873 /mail
parented3705164f598c7b0b8f41dc73eaf3effcb78298 (diff)
downloadpkgsrc-d69e00ac5e7a3106fb07202a1cc01b254c1093c8.tar.gz
Updated postfix-current to 2.3-20050922
* lots of bug fixes and new features (see RELEASE_NOTES for details) * sync PLIST.*, MESSAGE.*, Makefile and options.mk with pkgsrc/mail/postfix
Diffstat (limited to 'mail')
-rw-r--r--mail/postfix-current/MESSAGE.sasl22
-rw-r--r--mail/postfix-current/MESSAGE.tls20
-rw-r--r--mail/postfix-current/Makefile16
-rw-r--r--mail/postfix-current/PLIST3
-rw-r--r--mail/postfix-current/PLIST.inet62
-rw-r--r--mail/postfix-current/PLIST.sasl2
-rw-r--r--mail/postfix-current/distinfo16
-rw-r--r--mail/postfix-current/options.mk87
-rw-r--r--mail/postfix-current/patches/patch-aa10
-rw-r--r--mail/postfix-current/patches/patch-ab14
-rw-r--r--mail/postfix-current/patches/patch-ac27
-rw-r--r--mail/postfix-current/patches/patch-ag41
-rw-r--r--mail/postfix-current/patches/patch-ai74
13 files changed, 170 insertions, 164 deletions
diff --git a/mail/postfix-current/MESSAGE.sasl b/mail/postfix-current/MESSAGE.sasl
index c824cc80384..efc0cd65bbc 100644
--- a/mail/postfix-current/MESSAGE.sasl
+++ b/mail/postfix-current/MESSAGE.sasl
@@ -1,16 +1,30 @@
===========================================================================
-$NetBSD: MESSAGE.sasl,v 1.2 2004/07/31 05:53:44 jlam Exp $
+$NetBSD: MESSAGE.sasl,v 1.3 2005/09/30 06:04:32 martti Exp $
-To enable SASL authentication, you may want to edit
+To enable SASL authentication in the SMTP server, you may want to edit
${SASLLIBDIR}/smtpd.conf
and change the method used to check plaintext passwords. To use
-security/cyrus-saslauthd, you should change the contents of smtpd.conf to:
+security/cyrus-saslauthd, you should change the contents of smtpd.conf
+to:
pwcheck_method: saslauthd
-Please consult:
+You may also want to edit
+
+ ${PKG_SYSCONFDIR}/main.cf
+
+and set the smtpd_sasl_* variables to appropriate values.
+
+To enable SASL authentication in the SMTP client, you may want to edit
+
+ ${PKG_SYSCONFDIR}/main.cf
+
+and set the smtp_sasl_* variables to appropriate values.
+
+The corresponding SASL authentication plugins will also need to be
+installed. Please consult:
${DOCDIR}/SASL_README
diff --git a/mail/postfix-current/MESSAGE.tls b/mail/postfix-current/MESSAGE.tls
deleted file mode 100644
index 8602a9a1ec9..00000000000
--- a/mail/postfix-current/MESSAGE.tls
+++ /dev/null
@@ -1,20 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.tls,v 1.2 2004/07/31 05:53:44 jlam Exp $
-
-To enable TLS, you might need to reconfigure the following files:
-
- ${PKG_SYSCONFDIR}/main.cf
- ${PKG_SYSCONFDIR}/master.cf
-
-master.cf:
-----------
-# ==========================================================================
-# service type private unpriv chroot wakeup maxproc command + args
-# ==========================================================================
-tlsmgr fifo - - y 300 1 tlsmgr
-smtps inet n - y - - smtpd
- -o smtpd_tls_wrappermode=yes -o smtpd_sasl_auth_enable=yes
-submission inet n - y - - smtpd
- -o smtpd_enforce_tls=yes -o smtpd_sasl_auth_enable=yes
-
-===========================================================================
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 6631e41dd95..e3d291a9c82 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.44 2005/08/23 11:48:49 rillig Exp $
+# $NetBSD: Makefile,v 1.45 2005/09/30 06:04:32 martti Exp $
-DISTNAME= postfix-2.3-20050726
+DISTNAME= postfix-2.3-20050922
CATEGORIES= mail
MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \
http://public.planetmirror.com.au/pub/postfix/experimental/
-DIST_SUBDIR= postfix
MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.postfix.org/
COMMENT= Postfix SMTP server and tools
+DIST_SUBDIR= postfix
+
CONFLICTS+= sendmail-[0-9]* fastforward>=0.51nb2
PKG_INSTALLATION_TYPES= overwrite pkgviews
@@ -105,6 +106,8 @@ MAKE_DIRS+= ${SASLLIBDIR}
CONF_FILES+= ${EXAMPLEDIR}/smtpd.conf ${SASLLIBDIR}/smtpd.conf
.endif
+MAKE_ENV+= DEBUG= # empty
+
do-configure:
cd ${WRKSRC} && \
${SETENV} ${MAKE_ENV} ${MAKE} -f Makefile.init makefiles \
@@ -117,10 +120,6 @@ post-build:
${ECHO} "pwcheck_method: ${PWCHECK_METHOD}" > ${WRKDIR}/smtpd.conf
.endif
-POSTFIX_EXAMPLE_FILES= LICENSE access aliases canonical header_checks \
- main.cf main.cf.default makedefs.out master.cf \
- postfix-files relocated transport virtual
-
do-install:
${INSTALL_DATA_DIR} ${LIBEXECDIR}
${INSTALL_DATA_DIR} ${EXAMPLEDIR}
@@ -129,9 +128,6 @@ do-install:
.if !empty(PKG_OPTIONS:Msasl)
${INSTALL_DATA} ${WRKDIR}/smtpd.conf ${EXAMPLEDIR}
.endif
- @for i in ${POSTFIX_EXAMPLE_FILES}; do \
- ${INSTALL_DATA} ${WRKSRC}/conf/$$i ${EXAMPLEDIR}/$$i; \
- done
${INSTALL_SCRIPT} ${WRKSRC}/conf/post-install ${EXAMPLEDIR}
${INSTALL_SCRIPT} ${WRKSRC}/conf/postfix-script ${EXAMPLEDIR}
${INSTALL_DATA} ${WRKDIR}/mailer.conf ${EXAMPLEDIR}/mailer.conf
diff --git a/mail/postfix-current/PLIST b/mail/postfix-current/PLIST
index 668118c872e..de6c099412b 100644
--- a/mail/postfix-current/PLIST
+++ b/mail/postfix-current/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2005/09/30 05:42:38 martti Exp $
+@comment $NetBSD: PLIST,v 1.8 2005/09/30 06:04:32 martti Exp $
bin/mailq
bin/newaliases
libexec/postfix/anvil
@@ -160,6 +160,7 @@ share/examples/postfix/post-install
share/examples/postfix/postfix-files
share/examples/postfix/postfix-script
share/examples/postfix/relocated
+${SASL}share/examples/postfix/smtpd.conf
share/examples/postfix/transport
share/examples/postfix/virtual
share/examples/rc.d/postfix
diff --git a/mail/postfix-current/PLIST.inet6 b/mail/postfix-current/PLIST.inet6
deleted file mode 100644
index b2285b97ed7..00000000000
--- a/mail/postfix-current/PLIST.inet6
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.inet6,v 1.1 2004/08/07 17:08:26 jlam Exp $
-share/doc/postfix/IPV6_README
diff --git a/mail/postfix-current/PLIST.sasl b/mail/postfix-current/PLIST.sasl
deleted file mode 100644
index 11fb50bc238..00000000000
--- a/mail/postfix-current/PLIST.sasl
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.sasl,v 1.1.1.1 2004/03/06 15:04:12 grant Exp $
-share/examples/postfix/smtpd.conf
diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo
index 00a5a44e429..649a8b021f0 100644
--- a/mail/postfix-current/distinfo
+++ b/mail/postfix-current/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.13 2005/09/06 08:10:58 abs Exp $
+$NetBSD: distinfo,v 1.14 2005/09/30 06:04:32 martti Exp $
-SHA1 (postfix/postfix-2.3-20050726.tar.gz) = 7b5c10f01a003b4764c6e4a672ae866ca53e793c
-RMD160 (postfix/postfix-2.3-20050726.tar.gz) = 4eecae72057e23c97f05280485ad2ce9d1df7973
-Size (postfix/postfix-2.2-20040628.tar.gz) = 2504873 bytes
-SHA1 (patch-aa) = 279b54f19289b56a423214716386c5aab79a57d5
-SHA1 (patch-ag) = 806a75127cb596059ca68664ad7ba070e96cc589
-SHA1 (patch-ai) = 14fdae53a54422c9714442df2bc7c308393e0dfa
+SHA1 (postfix/postfix-2.3-20050922.tar.gz) = 392548fef18c860bc6d75155f0e6b259fd4489a5
+RMD160 (postfix/postfix-2.3-20050922.tar.gz) = 848bcfcc5e044fdae3f42ed384bbc7bea98a1ae5
+Size (postfix/postfix-2.3-20050922.tar.gz) = 2508873 bytes
+SHA1 (patch-aa) = 3f45ca9b05bf080bd0f9ef3c9f8c24a1ef992edd
+SHA1 (patch-ab) = aa08339399411b8c1e12856f6b5f8406b7775840
+SHA1 (patch-ac) = 1b0fb6da368b65ccd6e47c94ff867f0169aaa839
+SHA1 (patch-ag) = 9285c62239419876ee3351250dcc29984c39d958
+SHA1 (patch-ai) = adc9996118adc6162efbec21d6aa491e6962706b
diff --git a/mail/postfix-current/options.mk b/mail/postfix-current/options.mk
index 9d609b2113d..ed44fe2213d 100644
--- a/mail/postfix-current/options.mk
+++ b/mail/postfix-current/options.mk
@@ -1,46 +1,33 @@
-# $NetBSD: options.mk,v 1.10 2005/07/15 18:27:51 jlam Exp $
+# $NetBSD: options.mk,v 1.11 2005/09/30 06:04:32 martti Exp $
+
+# Global and legacy options
PKG_OPTIONS_VAR= PKG_OPTIONS.postfix
-#PKG_SUPPORTED_OPTIONS= inet6 ldap mysql mysql4 pcre pgsql sasl tls
-PKG_SUPPORTED_OPTIONS= ldap mysql mysql4 pcre pgsql sasl
+PKG_SUPPORTED_OPTIONS= bdb ldap mysql mysql4 pcre pgsql sasl tls
.include "../../mk/bsd.options.mk"
-# ###
-# ### IPv6 and STARTTLS support (http://www.ipnet6.org/postfix/)
-# ###
-# .if !empty(PKG_OPTIONS:Minet6)
-# . if empty(PKG_OPTIONS:Mtls)
-# PKG_OPTIONS+= tls
-# . endif
-# IPV6TLS_PATCH= tls+ipv6-1.25-pf-2.2-20040616.patch.gz
-# PATCHFILES+= ${IPV6TLS_PATCH}
-# SITES_${IPV6TLS_PATCH}= ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.25/
-# PATCH_DIST_STRIP.${IPV6TLS_PATCH}= -p1
-# PLIST_SRC+= ${PKGDIR}/PLIST.inet6
-# .endif
-#
-# ###
-# ### STARTTLS support (http://mirrors.loonybin.net/postfix_tls/)
-# ###
-# .if !empty(PKG_OPTIONS:Mtls)
-# . include "../../security/openssl/buildlink3.mk"
-# . if empty(PKG_OPTIONS:Minet6)
-# TLS_PATCH= pfixtls-0.8.18-2.1.3-0.9.7d.tar.gz
-# PATCHFILES+= ${TLS_PATCH}
-# SITES_${TLS_PATCH}= http://mirrors.loonybin.net/postfix_tls/ \
-# ftp://mirrors.loonybin.net/pub/postfix_tls/ \
-# ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/
-# USE_TOOLS+= tar
-# PATCH_DIST_CAT.${TLS_PATCH}= ${TAR} -zxOf ${TLS_PATCH} "*/pfixtls.diff"
-# PATCH_DIST_STRIP.${TLS_PATCH}= -p1
-# . endif
-# CCARGS+= -DHAS_SSL
-# AUXLIBS+= -L${BUILDLINK_PREFIX.openssl}/lib \
-# ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib \
-# -lssl -lcrypto
-# PLIST_SRC+= ${PKGDIR}/PLIST.tls
-# MESSAGE_SRC+= ${PKGDIR}/MESSAGE.tls
-# .endif
+###
+### Support "hash" (Berkeley DB) map type.
+###
+.if empty(PKG_OPTIONS:Mbdb)
+PKG_OPTIONS+= bdb # "hash" map type is mandatory
+.endif
+.if !empty(PKG_OPTIONS:Mbdb)
+. include "../../mk/bdb.buildlink3.mk"
+CCARGS+= -DHAS_DB
+AUXLIBS+= ${BDB_LIBS}
+.endif
+
+###
+### STARTTLS support
+###
+.if !empty(PKG_OPTIONS:Mtls)
+. include "../../security/openssl/buildlink3.mk"
+CCARGS+= -DUSE_TLS
+AUXLIBS+= -L${BUILDLINK_PREFIX.openssl}/lib \
+ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib \
+ -lssl -lcrypto
+.endif
###
### Support "pcre" map type for regular expressions.
@@ -64,13 +51,6 @@ CCARGS+= -DHAS_LDAP
AUXLIBS+= -L${BUILDLINK_PREFIX.openldap}/lib \
${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openldap}/lib \
-lldap -llber
-. if ${OPSYS} != "Linux"
-. include "../../databases/db4/buildlink3.mk"
-CCARGS+= -I${BUILDLINK_PREFIX.db4}/include/db4
-AUXLIBS+= -L${BUILDLINK_PREFIX.db4}/lib \
- ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.db4}/lib \
- -ldb4
-. endif
.endif
###
@@ -101,8 +81,7 @@ AUXLIBS+= -L${PGSQL_PREFIX}/lib -lpq \
.endif
###
-### SASL support for SMTP authentication. If neither SASLv1 or SASLv2 is
-### explicitly specified, then build with SASLv2.
+### SASL support for SMTP authentication.
###
.if !empty(PKG_OPTIONS:Msasl)
. include "../../security/cyrus-sasl2/buildlink3.mk"
@@ -113,16 +92,10 @@ CCARGS+= -DUSE_SASL_AUTH
AUXLIBS+= -L${BUILDLINK_PREFIX.cyrus-sasl}/lib \
${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \
-lsasl2
-PLIST_SRC+= ${PKGDIR}/PLIST.sasl
+PLIST_SUBST+= SASL=
MESSAGE_SRC+= ${PKGDIR}/MESSAGE.sasl
MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
MESSAGE_SUBST+= SASLLIBDIR=${SASLLIBDIR}
-.endif
-
-.if ${OPSYS} == "Linux"
-. include "../../databases/db/buildlink3.mk"
-CCARGS+= -I${BUILDLINK_PREFIX.db2}/include/db2
-AUXLIBS+= -L${BUILDLINK_PREFIX.db2}/lib \
- ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.db2}/lib \
- -ldb2
+.else
+PLIST_SUBST+= SASL="@comment "
.endif
diff --git a/mail/postfix-current/patches/patch-aa b/mail/postfix-current/patches/patch-aa
index 060f2d35d8c..dd6a159b4dc 100644
--- a/mail/postfix-current/patches/patch-aa
+++ b/mail/postfix-current/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.14 2004/07/31 05:53:44 jlam Exp $
+$NetBSD: patch-aa,v 1.15 2005/09/30 06:04:32 martti Exp $
---- postfix-install.orig Wed Apr 14 11:45:23 2004
-+++ postfix-install
-@@ -354,26 +354,6 @@ HTML files. Specify \"no\" if you do not
+--- postfix-install.orig 2005-08-14 04:51:38.000000000 +0300
++++ postfix-install 2005-09-30 05:48:14.000000000 +0300
+@@ -359,26 +359,6 @@
: ${tempdir=`pwd`}
: ${config_directory=`bin/postconf -h -d config_directory`}
@@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.14 2004/07/31 05:53:44 jlam Exp $
# In case some systems special-case pathnames beginning with //.
case $install_root in
-@@ -715,10 +695,3 @@ bin/postconf -c $CONFIG_DIRECTORY -e \
+@@ -725,10 +705,3 @@
"sample_directory = $sample_directory" \
"readme_directory = $readme_directory" \
|| exit 1
diff --git a/mail/postfix-current/patches/patch-ab b/mail/postfix-current/patches/patch-ab
new file mode 100644
index 00000000000..05a46569eef
--- /dev/null
+++ b/mail/postfix-current/patches/patch-ab
@@ -0,0 +1,14 @@
+$NetBSD: patch-ab,v 1.8 2005/09/30 06:04:32 martti Exp $
+
+--- src/dns/dns.h.orig 2005-07-27 03:31:35.000000000 +0300
++++ src/dns/dns.h 2005-09-30 05:49:31.000000000 +0300
+@@ -19,6 +19,9 @@
+ #ifdef RESOLVE_H_NEEDS_STDIO_H
+ #include <stdio.h>
+ #endif
++#ifdef RESOLVE_H_NEEDS_NAMESER8_COMPAT_H
++#include <nameser8_compat.h>
++#endif
+ #include <resolv.h>
+
+ /*
diff --git a/mail/postfix-current/patches/patch-ac b/mail/postfix-current/patches/patch-ac
new file mode 100644
index 00000000000..0f2b3047cfd
--- /dev/null
+++ b/mail/postfix-current/patches/patch-ac
@@ -0,0 +1,27 @@
+$NetBSD: patch-ac,v 1.6 2005/09/30 06:04:32 martti Exp $
+
+See http://archives.neohapsis.com/archives/postfix/2004-08/1114.html
+and the preceding thread. Fixes "smtp killed by signal 11" problems.
+
+--- src/util/vstream.c.orig 2005-08-29 21:24:44.000000000 +0300
++++ src/util/vstream.c 2005-09-30 05:50:46.000000000 +0300
+@@ -983,6 +983,10 @@
+ * policies. Either this, or the vstream*open() routines would have to
+ * have a really ugly interface with lots of mostly-unused arguments (can
+ * you say VMS?).
++ *
++ * Initialize the I/O time (as documented) so that a time sensitive, "write
++ * before read" application does not force flush the first data written
++ * to a stream, potentially triggering NAGLE delays or other trouble.
+ */
+ stream = (VSTREAM *) mymalloc(sizeof(*stream));
+ stream->fd = fd;
+@@ -996,7 +1000,7 @@
+ stream->timeout = 0;
+ stream->context = 0;
+ stream->jbuf = 0;
+- stream->iotime = 0;
++ stream->iotime = time((time_t *) 0); /* as documented */;
+ return (stream);
+ }
+
diff --git a/mail/postfix-current/patches/patch-ag b/mail/postfix-current/patches/patch-ag
index da64dc75032..abccb3022ed 100644
--- a/mail/postfix-current/patches/patch-ag
+++ b/mail/postfix-current/patches/patch-ag
@@ -1,41 +1,12 @@
-$NetBSD: patch-ag,v 1.8 2005/09/06 08:10:58 abs Exp $
+$NetBSD: patch-ag,v 1.9 2005/09/30 06:04:32 martti Exp $
---- src/util/sys_defs.h.orig 2005-07-14 14:28:33.000000000 -0700
-+++ src/util/sys_defs.h 2005-08-22 19:05:24.000000000 -0700
-@@ -24,11 +24,12 @@
- * 4.4BSD and close derivatives.
- */
- #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
-- || defined(FREEBSD5) \
-+ || defined(FREEBSD5) || defined(FREEBSD6) \
- || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
- || defined(OPENBSD2) || defined(OPENBSD3) \
-- || defined(NETBSD1) || defined(NETBSD2) \
-- || defined(EKKOBSD1)
-+ || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \
-+ || defined(EKKOBSD1) \
-+ || defined(DRAGONFLY1)
- #define SUPPORTED
- #include <sys/types.h>
- #include <sys/param.h>
-@@ -89,6 +90,14 @@
- #define SOCKOPT_SIZE socklen_t
- #endif
-
-+#ifdef DRAGONFLY1
-+#define HAS_DUPLEX_PIPE
-+#define HAS_DEV_URANDOM
-+#define HAS_ISSETUGID
-+#define SOCKADDR_SIZE socklen_t
-+#define SOCKOPT_SIZE socklen_t
-+#endif
-+
- /* OpenBSD version is year+month */
-
- #if OpenBSD >= 200000 /* XXX */
-@@ -156,8 +165,13 @@
+--- src/util/sys_defs.h.orig 2005-07-15 00:28:33.000000000 +0300
++++ src/util/sys_defs.h 2005-09-30 05:52:00.000000000 +0300
+@@ -155,9 +155,15 @@
+ #define DEF_DB_TYPE "hash"
#define ALIAS_DB_MAP "hash:/etc/aliases"
#define GETTIMEOFDAY(t) gettimeofday(t,(struct timezone *) 0)
++#define RESOLVE_H_NEEDS_NAMESER8_COMPAT_H
#define ROOT_PATH "/bin:/usr/bin:/sbin:/usr/sbin"
+#if (defined(__NetBSD__) && __NetBSD_Version__ >= 299000900) /* NetBSD 2.99.9 */
+#define USE_STATVFS
diff --git a/mail/postfix-current/patches/patch-ai b/mail/postfix-current/patches/patch-ai
index e497f526ad1..b601239b842 100644
--- a/mail/postfix-current/patches/patch-ai
+++ b/mail/postfix-current/patches/patch-ai
@@ -1,29 +1,35 @@
-$NetBSD: patch-ai,v 1.9 2005/08/23 02:31:44 reed Exp $
+$NetBSD: patch-ai,v 1.10 2005/09/30 06:04:32 martti Exp $
---- makedefs.orig 2005-07-16 16:51:31.000000000 -0700
-+++ makedefs 2005-08-22 19:04:19.000000000 -0700
-@@ -116,6 +116,10 @@
+--- makedefs.orig 2005-07-17 02:51:31.000000000 +0300
++++ makedefs 2005-09-30 05:52:25.000000000 +0300
+@@ -124,7 +124,7 @@
;;
- FreeBSD.5*) SYSTYPE=FREEBSD5
+ NetBSD.1*) SYSTYPE=NETBSD1
;;
-+ FreeBSD.6*) SYSTYPE=FREEBSD6
-+ ;;
-+ DragonFly.1*) SYSTYPE=DRAGONFLY1
-+ ;;
- OpenBSD.2*) SYSTYPE=OPENBSD2
+- NetBSD.2*) SYSTYPE=NETBSD2
++ NetBSD.[23]*)SYSTYPE=NETBSD2
;;
- OpenBSD.3*) SYSTYPE=OPENBSD3
-@@ -126,6 +130,8 @@
- ;;
- NetBSD.2*) SYSTYPE=NETBSD2
- ;;
-+ NetBSD.3*) SYSTYPE=NETBSD3
-+ ;;
BSD/OS.2*) SYSTYPE=BSDI2
;;
- BSD/OS.3*) SYSTYPE=BSDI3
-@@ -217,22 +223,6 @@
- SYSLIBS="-ldb"
+@@ -176,13 +176,6 @@
+ esac
+ ;;
+ ULTRIX.4*) SYSTYPE=ULTRIX4
+- if [ -f /usr/local/lib/libdb.a ]; then
+- SYSLIBS="$SYSLIBS -ldb"
+- CCARGS="$CCARGS -DHAS_DB"
+- if [ -d /usr/local/include/db ]; then
+- CCARGS="$CCARGS -I/usr/local/include/db"
+- fi
+- fi
+ for l in syslog resolv; do
+ if [ -f /usr/local/lib/lib$l.a ]; then
+ SYSLIBS="$SYSLIBS -l$l"
+@@ -214,25 +207,8 @@
+ esac;;
+ # Tested with RedHat 3.03 on 20020729.
+ Linux.1*) SYSTYPE=LINUX1
+- SYSLIBS="-ldb"
;;
Linux.2*) SYSTYPE=LINUX2
- # Postfix no longer needs DB 1.85 compatibility
@@ -45,7 +51,7 @@ $NetBSD: patch-ai,v 1.9 2005/08/23 02:31:44 reed Exp $
# GDBM locks the DBM .pag file after open. This breaks postmap.
# if [ -f /usr/include/gdbm-ndbm.h ]
# then
-@@ -243,7 +233,6 @@
+@@ -243,7 +219,6 @@
# CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H='<gdbm/ndbm.h>'"
# GDBM_LIBS=gdbm
# fi
@@ -53,3 +59,29 @@ $NetBSD: patch-ai,v 1.9 2005/08/23 02:31:44 reed Exp $
for name in nsl resolv $GDBM_LIBS
do
for lib in /usr/lib64 /lib64 /usr/lib /lib
+@@ -271,25 +246,13 @@
+ HP-UX.A.09.*) SYSTYPE=HPUX9
+ SYSLIBS=-ldbm
+ CCARGS="$CCARGS -DMISSING_USLEEP"
+- if [ -f /usr/lib/libdb.a ]; then
+- CCARGS="$CCARGS -DHAS_DB"
+- SYSLIBS="$SYSLIBS -ldb"
+- fi
+ ;;
+ HP-UX.B.10.*) SYSTYPE=HPUX10
+ CCARGS="$CCARGS `nm /usr/lib/libc.a 2>/dev/null |
+ (grep usleep >/dev/null || echo '-DMISSING_USLEEP')`"
+- if [ -f /usr/lib/libdb.a ]; then
+- CCARGS="$CCARGS -DHAS_DB"
+- SYSLIBS=-ldb
+- fi
+ ;;
+ HP-UX.B.11.*) SYSTYPE=HPUX11
+ SYSLIBS=-lnsl
+- if [ -f /usr/lib/libdb.a ]; then
+- CCARGS="$CCARGS -DHAS_DB"
+- SYSLIBS="$SYSLIBS -ldb"
+- fi
+ ;;
+ ReliantUNIX-?.5.43) SYSTYPE=ReliantUnix543
+ RANLIB=echo