diff options
| author | hubertf <hubertf@pkgsrc.org> | 2001-11-09 00:39:38 +0000 |
|---|---|---|
| committer | hubertf <hubertf@pkgsrc.org> | 2001-11-09 00:39:38 +0000 |
| commit | d564911ef141b616c981fad1ccb75efccfff7fd8 (patch) | |
| tree | 15d61947109ab0604e57d2d391aa905b664d7575 | |
| parent | f3698e49fbd56f7c46394cf0f10a1e83588f51bf (diff) | |
| download | pkgsrc-d564911ef141b616c981fad1ccb75efccfff7fd8.tar.gz | |
Update to ElectricFence 2.1nb1:
Fix this pkg to run on sparc64 (and probably some others), by changing the
2ns argument of mmap(2) from (int)size to size.
Patches contributed by Volker Stolz <stolz@hyperion.informatik.rwth-aachen.de>
in PR pkg/14493.
| -rw-r--r-- | devel/electricfence/Makefile | 4 | ||||
| -rw-r--r-- | devel/electricfence/distinfo | 5 | ||||
| -rw-r--r-- | devel/electricfence/patches/patch-ab | 24 | ||||
| -rw-r--r-- | devel/electricfence/patches/patch-ac | 13 |
4 files changed, 39 insertions, 7 deletions
diff --git a/devel/electricfence/Makefile b/devel/electricfence/Makefile index e8eb3e2ddbf..af7953f02e2 100644 --- a/devel/electricfence/Makefile +++ b/devel/electricfence/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.4 2001/10/21 11:53:05 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2001/11/09 00:39:38 hubertf Exp $ -DISTNAME= ElectricFence-2.1 +DISTNAME= ElectricFence-2.1nb1 CATEGORIES= devel MASTER_SITES= ftp://ftp.perens.com/pub/ElectricFence/ diff --git a/devel/electricfence/distinfo b/devel/electricfence/distinfo index 3e7dd0881ce..7b8cb05a5b6 100644 --- a/devel/electricfence/distinfo +++ b/devel/electricfence/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.3 2001/10/21 11:53:05 wiz Exp $ +$NetBSD: distinfo,v 1.4 2001/11/09 00:39:39 hubertf Exp $ SHA1 (ElectricFence-2.1.tar.gz) = 1794db6d446f31045ebf845543cf6759cbab1e4f Size (ElectricFence-2.1.tar.gz) = 47917 bytes SHA1 (patch-aa) = 4bf399ac54af53bd564158d3a55925ab1b38f551 -SHA1 (patch-ab) = 9adc0ebf72815829edc2e197a7ed73870c833cd4 +SHA1 (patch-ab) = 85d3ae4197e520c6718367d60836c1378e71f33c +SHA1 (patch-ac) = 4c56eeea0b8e53cdf260b61aa8fdef16f601b186 diff --git a/devel/electricfence/patches/patch-ab b/devel/electricfence/patches/patch-ab index 21e0088576b..5b6cb7966e7 100644 --- a/devel/electricfence/patches/patch-ab +++ b/devel/electricfence/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.2 1998/10/27 11:03:09 agc Exp $ +$NetBSD: patch-ab,v 1.3 2001/11/09 00:39:39 hubertf Exp $ ---- page.c.orig Fri Jan 20 05:01:06 1995 -+++ page.c Tue Oct 27 10:47:30 1998 +--- page.c.orig Sat Apr 27 00:57:38 1996 ++++ page.c @@ -3,6 +3,7 @@ #include <unistd.h> #include <fcntl.h> @@ -19,3 +19,21 @@ $NetBSD: patch-ab,v 1.2 1998/10/27 11:03:09 agc Exp $ extern int sys_nerr; extern char * sys_errlist[]; #endif +@@ -70,7 +71,7 @@ + */ + allocation = (caddr_t) mmap( + startAddr +- ,(int)size ++ ,size + ,PROT_READ|PROT_WRITE + ,MAP_PRIVATE|MAP_ANONYMOUS + ,-1 +@@ -122,7 +123,7 @@ + */ + allocation = (caddr_t) mmap( + startAddr +- ,(int)size ++ ,size + ,PROT_READ|PROT_WRITE + ,MAP_PRIVATE + ,devZeroFd diff --git a/devel/electricfence/patches/patch-ac b/devel/electricfence/patches/patch-ac new file mode 100644 index 00000000000..296c8e855d7 --- /dev/null +++ b/devel/electricfence/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1 2001/11/09 00:39:39 hubertf Exp $ + +--- tstheap.c.orig Fri Jan 20 05:54:32 1995 ++++ tstheap.c +@@ -47,7 +47,7 @@ + + for ( ; count < duration; count++ ) { + void * * element = &pool[(int)(drand48() * POOL_SIZE)]; +- size_t size = (size_t)(drand48() * (LARGEST_BUFFER + 1)); ++ size_t size = (size_t)(lrand48() % (LARGEST_BUFFER + 1)); + + if ( *element ) { + free( *element ); |