summaryrefslogtreecommitdiff
path: root/mail/sendmail/patches/patch-aj
diff options
context:
space:
mode:
Diffstat (limited to 'mail/sendmail/patches/patch-aj')
-rw-r--r--mail/sendmail/patches/patch-aj34
1 files changed, 15 insertions, 19 deletions
diff --git a/mail/sendmail/patches/patch-aj b/mail/sendmail/patches/patch-aj
index 74389d9c065..cda1a0591ac 100644
--- a/mail/sendmail/patches/patch-aj
+++ b/mail/sendmail/patches/patch-aj
@@ -1,22 +1,18 @@
-$NetBSD: patch-aj,v 1.3 2006/06/14 18:53:53 adrianp Exp $
+$NetBSD: patch-aj,v 1.4 2006/07/07 18:06:28 tv Exp $
---- sendmail/deliver.c.orig 2006-03-02 01:37:39.000000000 +0000
-+++ sendmail/deliver.c
-@@ -4623,7 +4623,7 @@ putbody(mci, e, separator)
- /* now do the hard work */
- boundaries[0] = NULL;
- mci->mci_flags |= MCIF_INHEADER;
-- if (mime8to7(mci, e->e_header, e, boundaries, M87F_OUTER) ==
-+ if (mime8to7(mci, e->e_header, e, boundaries, M87F_OUTER, 0) ==
- SM_IO_EOF)
- goto writeerr;
- }
-@@ -4654,7 +4654,7 @@ putbody(mci, e, separator)
- SuprErrs = true;
+--- cf/cf/Makefile.orig 2005-06-13 22:16:34.000000000 -0400
++++ cf/cf/Makefile
+@@ -25,10 +25,10 @@ CHMOD= chmod
+ ROMODE= 444
+ RM= rm -f
+ # use our own install program; should be really confINSTALL
+-INSTALL=../../devtools/bin/install.sh
++INSTALL=@@INSTALL@@
+ # CF file ownership/permissions
+-CFOWN=root
+-CFGRP=bin
++CFOWN=@@BINOWN@@
++CFGRP=@@BINGRP@@
+ CFMODE=0444
- if (mime8to7(mci, e->e_header, e, boundaries,
-- M87F_OUTER|M87F_NO8TO7) == SM_IO_EOF)
-+ M87F_OUTER|M87F_NO8TO7, 0) == SM_IO_EOF)
- goto writeerr;
- /* restore SuprErrs */