04f01c205f
pkgsrc changes:
- consolidate several patches into site.config.m4
- pkgsrc LDFLAGS should always be used
- don't bother specifying file owner/group anywhere except in Makefile
- create include/sm/os/sm_os_netbsd.h to fix warnings and OS specific stuff
- install mail.local and rmail
- convert to use res_n* functions
- allows for linking against threaded libraries
- add a TODO file
- PR/35249 - Loren M. Lang
- can't find libraries on Linux, this should be fixed by using pkgsrc LDFLAGS
- PR/46694 - Makoto Fujiwara
- bring back netbsd-proto.mc from when sendmail was part of the base system
- PR/47207 - Richard Palo
- let pkgsrc infrastructure handle file ownership and group
- PR/48566 - Emmanuel Dreyfus
- always set _FFR_USE_GETPWNAM_ERRNO on NetBSD
- roll ffr_tls_1 and the suggested ffr_tls_ec into one new ffr_tls option
- not enabled by default because it changes behaviour
8.14.9/8.14.9 2014/05/21
SECURITY: Properly set the close-on-exec flag for file descriptors
(except stdin, stdout, and stderr) before executing mailers.
Fix a misformed comment in conf.c: "/*" within comment
which may cause a compilation error on some systems.
Problem reported by John Beck of Oracle.
DEVTOOLS: Fix regression in auto-detection of libraries when only
shared libraries are available. Problem reported by
Bryan Costales.
33 lines
1 KiB
Text
33 lines
1 KiB
Text
$NetBSD: patch-av,v 1.1 2014/06/15 20:48:50 jnemeth Exp $
|
|
|
|
--- sendmail/queue.c.orig 2014-05-16 20:40:15.000000000 +0000
|
|
+++ sendmail/queue.c
|
|
@@ -34,6 +34,10 @@ SM_RCSID("@(#)$Id: queue.c,v 8.1000 2013
|
|
# define SM_OPEN_EXLOCK 0
|
|
#endif /* ! SM_OPEN_EXLOCK */
|
|
|
|
+#if NAMED_BIND
|
|
+extern struct __res_state sm_res;
|
|
+#endif
|
|
+
|
|
/*
|
|
** Historical notes:
|
|
** QF_VERSION == 4 was sendmail 8.10/8.11 without _FFR_QUEUEDELAY
|
|
@@ -4360,13 +4364,13 @@ readqf(e, openonly)
|
|
/* adjust BIND parameters immediately */
|
|
if (e->e_ntries == 0)
|
|
{
|
|
- _res.retry = TimeOuts.res_retry[RES_TO_FIRST];
|
|
- _res.retrans = TimeOuts.res_retrans[RES_TO_FIRST];
|
|
+ sm_res.retry = TimeOuts.res_retry[RES_TO_FIRST];
|
|
+ sm_res.retrans = TimeOuts.res_retrans[RES_TO_FIRST];
|
|
}
|
|
else
|
|
{
|
|
- _res.retry = TimeOuts.res_retry[RES_TO_NORMAL];
|
|
- _res.retrans = TimeOuts.res_retrans[RES_TO_NORMAL];
|
|
+ sm_res.retry = TimeOuts.res_retry[RES_TO_NORMAL];
|
|
+ sm_res.retrans = TimeOuts.res_retrans[RES_TO_NORMAL];
|
|
}
|
|
#endif /* NAMED_BIND */
|
|
break;
|