summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorabs <abs@pkgsrc.org>2004-11-01 17:25:25 +0000
committerabs <abs@pkgsrc.org>2004-11-01 17:25:25 +0000
commit982bd253df6c662562a6fe08a15d5d7f5630c083 (patch)
tree5da43423aac657600bb94f3f732ea6e523f835ea /mail
parent40ad5f21d0aee97bcd41b45ab7d9fb35df2b3ee9 (diff)
downloadpkgsrc-982bd253df6c662562a6fe08a15d5d7f5630c083.tar.gz
Update exim to 4.43nb1
Update exim-exiscan to 4.43_28nb1 Add back patch to ensure fork() is not called with closed fd 0, 1, or 2
Diffstat (limited to 'mail')
-rw-r--r--mail/exim/Makefile.common3
-rw-r--r--mail/exim/distinfo3
-rw-r--r--mail/exim/patches/patch-ag31
3 files changed, 35 insertions, 2 deletions
diff --git a/mail/exim/Makefile.common b/mail/exim/Makefile.common
index 0a8c816e8d0..cbf835388fe 100644
--- a/mail/exim/Makefile.common
+++ b/mail/exim/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2004/10/11 21:52:12 reed Exp $
+# $NetBSD: Makefile.common,v 1.19 2004/11/01 17:25:25 abs Exp $
MASTER_SITES= ftp://ftp.exim.org/pub/exim/exim4/ \
ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \
@@ -11,6 +11,7 @@ USE_PKGINSTALL= yes
MAKE_ENV+= SSLBASE=${SSLBASE:Q}
EXIM_VERSION= 4.43
+PKGREVISION= 1
EXTRACT_SUFX= .tar.bz2
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index 073d80adff6..3519ef7c271 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2004/10/07 17:29:16 abs Exp $
+$NetBSD: distinfo,v 1.23 2004/11/01 17:25:25 abs Exp $
SHA1 (exim-4.43.tar.bz2) = 675f2c5453c93e01dbbb61d15a264a23f9e61b8f
Size (exim-4.43.tar.bz2) = 1388183 bytes
@@ -10,3 +10,4 @@ SHA1 (patch-ac) = e6bb70132b655862cf4af4e344dfe9509d7b8106
SHA1 (patch-ad) = ab2df5e42b993937d124f50510f70d594bafff4a
SHA1 (patch-ae) = d65205adf8c2ae8a874825e68c163014c13d1628
SHA1 (patch-af) = 0f4fdaf82bcaa44620b8a235a86d4a638d6d8f66
+SHA1 (patch-ag) = 483fe63aa9c6b524ab61a53a20968e5a7fa3d095
diff --git a/mail/exim/patches/patch-ag b/mail/exim/patches/patch-ag
new file mode 100644
index 00000000000..c561c6f8c97
--- /dev/null
+++ b/mail/exim/patches/patch-ag
@@ -0,0 +1,31 @@
+$NetBSD: patch-ag,v 1.3 2004/11/01 17:25:25 abs Exp $
+
+--- src/daemon.c.orig Wed May 5 11:08:35 2004
++++ src/daemon.c
+@@ -756,6 +756,7 @@ daemon_go(void)
+ {
+ int *listen_sockets = NULL;
+ int listen_socket_count = 0;
++int fd;
+ ip_address_item *addresses = NULL;
+
+ /* If any debugging options are set, turn on the D_pid bit so that all
+@@ -1082,9 +1083,17 @@ if (background_daemon)
+ {
+ log_close_all(); /* Just in case anything was logged earlier */
+ search_tidyup(); /* Just in case any were used in reading the config. */
+- close(0); /* Get rid of stdin/stdout/stderr */
++ /* Get rid of stdin/stdout/stderr
++ close(0);
+ close(1);
+ close(2);
++ */
++ /* Instead of closing, dup them to /dev/null */
++ fd= open( "/dev/null", O_RDWR );
++ dup2( fd, 0 );
++ dup2( fd, 1 );
++ dup2( fd, 2 );
++ if( fd > 2 ) close( fd );
+ log_stderr = NULL; /* So no attempt to copy paniclog output */
+
+ /* If the parent process of this one has pid == 1, we are re-initializing the