[pkgsrc/trunk]: pkgsrc/devel/electricfence DragonFly uses SIGBUS for access v...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8b5d6f28bbc7
branches:  trunk
changeset: 505882:8b5d6f28bbc7
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Jan 08 20:25:34 2006 +0000

description:
DragonFly uses SIGBUS for access violations. Fix the vprint
implementation, va_arg of a char violates C promotion rules.
The builtin of newer GCC versions would call abort() in that case.

diffstat:

 devel/electricfence/Makefile         |   4 ++--
 devel/electricfence/distinfo         |   3 ++-
 devel/electricfence/patches/patch-ad |  13 +++++++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diffs (49 lines):

diff -r c1fd0e72df25 -r 8b5d6f28bbc7 devel/electricfence/Makefile
--- a/devel/electricfence/Makefile      Sun Jan 08 20:16:27 2006 +0000
+++ b/devel/electricfence/Makefile      Sun Jan 08 20:25:34 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/06/16 06:57:46 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/01/08 20:25:34 joerg Exp $
 
 DISTNAME=              ElectricFence-2.1
 PKGREVISION=           1
@@ -11,7 +11,7 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${MACHINE_ARCH} == "mipsel"
+.if ${MACHINE_ARCH} == "mipsel" || ${OPSYS} == "DragonFly"
 CFLAGS+=               -g -DPAGE_PROTECTION_VIOLATED_SIGNAL=SIGBUS
 .else
 CFLAGS+=               -g
diff -r c1fd0e72df25 -r 8b5d6f28bbc7 devel/electricfence/distinfo
--- a/devel/electricfence/distinfo      Sun Jan 08 20:16:27 2006 +0000
+++ b/devel/electricfence/distinfo      Sun Jan 08 20:25:34 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2005/11/08 03:27:32 tv Exp $
+$NetBSD: distinfo,v 1.9 2006/01/08 20:25:34 joerg Exp $
 
 SHA1 (ElectricFence-2.1.tar.gz) = 1794db6d446f31045ebf845543cf6759cbab1e4f
 RMD160 (ElectricFence-2.1.tar.gz) = 4513b43b2c9b4212822c2b2d749b6485909d8f67
@@ -6,3 +6,4 @@
 SHA1 (patch-aa) = 53c7c23d6d0a5b4f9814125bce8d6280f474fd56
 SHA1 (patch-ab) = 54c2dca3c58f430fd2ffe3a59ddfd6d89fc4bbda
 SHA1 (patch-ac) = 4c56eeea0b8e53cdf260b61aa8fdef16f601b186
+SHA1 (patch-ad) = 28cb084b2cbf6ecb6ec38c9ba11237fd2204aa92
diff -r c1fd0e72df25 -r 8b5d6f28bbc7 devel/electricfence/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/electricfence/patches/patch-ad      Sun Jan 08 20:25:34 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2006/01/08 20:25:34 joerg Exp $
+
+--- print.c.orig       2006-01-08 20:17:34.000000000 +0000
++++ print.c
+@@ -99,7 +99,7 @@ vprint(const char * pattern, va_list arg
+                               break;
+                       case 'c':
+                               {
+-                                      char    c = va_arg(args, char);
++                                      char    c = va_arg(args, int);
+                                       
+                                       (void) write(2, &c, 1);
+                               }