[pkgsrc/trunk]: pkgsrc/mail/sendmail As owner of the package, I have not appr...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0ea82134037d
branches:  trunk
changeset: 556431:0ea82134037d
user:      jnemeth <jnemeth%pkgsrc.org@localhost>
date:      Sat Mar 21 21:20:28 2009 +0000

description:
As owner of the package, I have not approved this patch.  Having
had a chance to closely examine it, I would prefer it be done
slightly differently.  Also, the patch patches multiple files in
direct contravention of pkgsrc guidelines.  One of the files is
also patched by a different patch.  Having multiple patches applied
to a single file makes maitenance much more difficult.

diffstat:

 mail/sendmail/Makefile         |   4 +-
 mail/sendmail/distinfo         |   3 +-
 mail/sendmail/patches/patch-ba |  60 ------------------------------------------
 3 files changed, 3 insertions(+), 64 deletions(-)

diffs (91 lines):

diff -r 21e8bc0aec54 -r 0ea82134037d mail/sendmail/Makefile
--- a/mail/sendmail/Makefile    Sat Mar 21 20:55:58 2009 +0000
+++ b/mail/sendmail/Makefile    Sat Mar 21 21:20:28 2009 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.105 2009/03/09 21:24:00 manu Exp $
+# $NetBSD: Makefile,v 1.106 2009/03/21 21:20:28 jnemeth Exp $
 
 PKGNAME=       sendmail-${DIST_VERS}
-PKGREVISION=   2
+PKGREVISION=   3
 COMMENT=       The well known Mail Transport Agent
 
 CONFLICTS+=    courier-mta-[0-9]* fastforward>=0.51nb2 postfix-[0-9]*
diff -r 21e8bc0aec54 -r 0ea82134037d mail/sendmail/distinfo
--- a/mail/sendmail/distinfo    Sat Mar 21 20:55:58 2009 +0000
+++ b/mail/sendmail/distinfo    Sat Mar 21 21:20:28 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.39 2009/03/10 12:41:14 manu Exp $
+$NetBSD: distinfo,v 1.40 2009/03/21 21:20:28 jnemeth Exp $
 
 SHA1 (sendmail.8.14.3.tar.gz) = 814c54c3917aa6b0981b5ea99fb34e0c02f31489
 RMD160 (sendmail.8.14.3.tar.gz) = 5423360ce908c985827cf6524a6de87e3451c27a
@@ -15,4 +15,3 @@
 SHA1 (patch-aj) = e65e6fe44380de2f9c397c1a97677eb4ad285433
 SHA1 (patch-al) = f5d8cef8c4abba5d5ae813b754c16037190a7ef1
 SHA1 (patch-am) = d84eedbff0f037c1db341255dc9e1877866f12c7
-SHA1 (patch-ba) = 4c1eb53d0124ccdf516d3d8690990ec64e610434
diff -r 21e8bc0aec54 -r 0ea82134037d mail/sendmail/patches/patch-ba
--- a/mail/sendmail/patches/patch-ba    Sat Mar 21 20:55:58 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2009/03/09 21:24:00 manu Exp $
---- devtools/OS/NetBSD.orig    2008-11-09 16:26:18.000000000 +0100
-+++ devtools/OS/NetBSD 2008-11-09 16:28:06.000000000 +0100
-@@ -7,3 +7,3 @@
- define(`confLIBS', `-lutil')
--define(`confENVDEF', ` -DNETISO')
-+define(`confENVDEF', ` -DNETISO -D_FFR_GETPWNAM_R')
- define(`confDEPEND_TYPE', `CC-M')
---- libsm/mbdb.c.orig  2003-12-10 04:19:07.000000000 +0100
-+++ libsm/mbdb.c       2008-11-09 17:02:31.000000000 +0100
-@@ -313,8 +313,12 @@
-       char *name;
-       SM_MBDB_T *user;
- {
-       struct passwd *pw;
-+#ifdef _FFR_GETPWNAM_R
-+      struct passwd pwres;
-+      char pwbuf[1024];
-+#endif
- 
- #ifdef HESIOD
-       /* DEC Hesiod getpwnam accepts numeric strings -- short circuit it */
-       {
-@@ -327,31 +331,16 @@
-                       return EX_NOUSER;
-       }
- #endif /* HESIOD */
- 
--      errno = 0;
-+#ifdef _FFR_GETPWNAM_R
-+      if (getpwnam_r(name, &pwres, pwbuf, sizeof(pwbuf), &pw) != 0)
-+              return EX_TEMPFAIL;
-+#else
-       pw = getpwnam(name);
-+#endif
-       if (pw == NULL)
--      {
--#if 0
--              /*
--              **  getpwnam() isn't advertised as setting errno.
--              **  In fact, under FreeBSD, non-root getpwnam() on
--              **  non-existant users returns NULL with errno = EPERM.
--              **  This test won't work.
--              */
--              switch (errno)
--              {
--                case 0:
--                      return EX_NOUSER;
--                case EIO:
--                      return EX_OSERR;
--                default:
--                      return EX_TEMPFAIL;
--              }
--#endif /* 0 */
-               return EX_NOUSER;
--      }
- 
-       sm_mbdb_frompw(user, pw);
-       return EX_OK;
- }