Subject: Re: pkg/25481 - sendmail on current
To: Louis Guillaume <lguillaume@berklee.edu>
From: Julian C. Dunn <julian@dreaming.org>
List: tech-pkg
Date: 06/29/2004 16:13:44
On Tue, 29 Jun 2004, Louis  Guillaume wrote:

> I have the problem that's described in pr 25481 but I don't know how to
> apply the patch that is attached to that pr (which should fix it). It
> seems to be a uuencoded file, but I haven't had any luck decoding it.
>
> How do I apply that patch?

/me puts on pointy hat

Here's the contents of the patch, not mangled by my MUA:

Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/mail/sendmail/distinfo,v
retrieving revision 1.16
diff -u -r1.16 distinfo
--- distinfo	27 Mar 2004 22:07:32 -0000	1.16
+++ distinfo	7 May 2004 03:29:38 -0000
@@ -8,4 +8,4 @@
  SHA1 (patch-ad) = 7232cc7ceb46a2dbf631d61185e4c6ca4af18a13
  SHA1 (patch-ae) = ae06caa125fe4d4fc85123dc0a5d0016cd099ebd
  SHA1 (patch-af) = d26481845328adad6d46fdf797785ec2ad003e28
-SHA1 (patch-ag) = 68bdd03affc2d4c81f65fc32bef7c5c958d5c1a7
+SHA1 (patch-ag) = 4b4391eaf4989033522aae9306b5f9ba46da94f8
Index: patches/patch-ag
===================================================================
RCS file: /cvsroot/pkgsrc/mail/sendmail/patches/patch-ag,v
retrieving revision 1.6
diff -u -r1.6 patch-ag
--- patches/patch-ag	15 Sep 2003 11:47:28 -0000	1.6
+++ patches/patch-ag	7 May 2004 03:29:38 -0000
@@ -1,8 +1,32 @@
  $NetBSD: patch-ag,v 1.6 2003/09/15 11:47:28 markd Exp $

---- include/sm/conf.h.orig	2003-09-15 22:16:32.000000000 +1200
-+++ include/sm/conf.h
-@@ -890,6 +890,9 @@ extern unsigned int sleepX __P((unsigned
+--- include/sm/conf.h.old	2004-01-06 19:52:16.000000000 -0500
++++ include/sm/conf.h	2004-05-06 23:06:57.000000000 -0400
+@@ -780,7 +780,11 @@
+ #  ifndef LA_TYPE
+ #   define LA_TYPE	LA_SUBR
+ #  endif /* ! LA_TYPE */
++#if __NetBSD_Version__ > 200030000
++#  define SFS_TYPE	SFS_STATVFS	/* use <sys/statvfs.h> statfs() impl */
++#else
+ #  define SFS_TYPE	SFS_MOUNT	/* use <sys/mount.h> statfs() impl */
++#endif
+ #  define SPT_TYPE	SPT_PSSTRINGS	/* use PS_STRINGS pointer */
+ # endif /* defined(BSD4_4) && !defined(__bsdi__) && !defined(__GNU__) */
+ 
+@@ -894,7 +898,11 @@
+ #  ifndef LA_TYPE
+ #   define LA_TYPE	LA_SUBR
+ #  endif /* ! LA_TYPE */
++#if __NetBSD_Version__ > 200030000
++#  define SFS_TYPE	SFS_STATVFS	/* use <sys/statvfs.h> statfs() impl */
++#else
+ #  define SFS_TYPE	SFS_MOUNT	/* use <sys/mount.h> statfs() impl */
++#endif
+ #  if defined(__NetBSD__) && (NetBSD > 199307 || NetBSD0_9 > 1)
+ #   undef SPT_TYPE
+ #   define SPT_TYPE	SPT_BUILTIN	/* setproctitle is in libc */
+@@ -902,6 +910,9 @@
   #  if defined(__NetBSD__) && ((__NetBSD_Version__ > 102070000) || (NetBSD1_2 > 8) || defined(NetBSD1_4) || defined(NetBSD1_3))
   #   define HASURANDOMDEV	1	/* has /dev/urandom(4) */
   #  endif /* defined(__NetBSD__) && ((__NetBSD_Version__ > 102070000) || (NetBSD1_2 > 8) || defined(NetBSD1_4) || defined(NetBSD1_3)) */