diff options
| author | obache <obache@pkgsrc.org> | 2011-06-10 11:45:01 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2011-06-10 11:45:01 +0000 |
| commit | 09b42da0acc9f37dbdc667bee0ee112a91993c13 (patch) | |
| tree | af305d38693d8054cba55a4fbb095f63f8252861 | |
| parent | 9b2975d49edee1480c46cfda7e715cef43f77b04 (diff) | |
| download | pkgsrc-09b42da0acc9f37dbdc667bee0ee112a91993c13.tar.gz | |
remove bpf_dump() definition from sf-gencode.h.
Its signature is changed at libpcap-1.0, not DragonFly specific,
and it should be defined by include of pcap.h, no need to define here.
fixes PR#45035.
| -rw-r--r-- | sysutils/pftop/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/pftop/patches/patch-aj | 16 |
2 files changed, 8 insertions, 12 deletions
diff --git a/sysutils/pftop/distinfo b/sysutils/pftop/distinfo index 8ce19e0fd5d..b772550f560 100644 --- a/sysutils/pftop/distinfo +++ b/sysutils/pftop/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2011/02/09 22:51:38 rumko Exp $ +$NetBSD: distinfo,v 1.9 2011/06/10 11:45:01 obache Exp $ SHA1 (pftop-0.7.tar.gz) = 651afa532cfc8cf59c3598704deb9bf3788ac9e9 RMD160 (pftop-0.7.tar.gz) = 0e0c09e5feeb07deba8b540233dcb946ba0b4508 @@ -12,6 +12,6 @@ SHA1 (patch-af) = 59b907b20fa215b3f0a1e690c9c71d2f7077e322 SHA1 (patch-ag) = 2e749dc45b2b91a1563bc1467b69775f595e4d03 SHA1 (patch-ah) = 7adca5a484de91bf89e66d10ab645912068cd1c2 SHA1 (patch-ai) = 629c1668eab0d819e590fb62b7afa6c85709fd15 -SHA1 (patch-aj) = 287b09d61d5e761c4f6842c37ed0b668b84beae9 +SHA1 (patch-aj) = ad0ddcbadbcd342c4973f932a3b7042a1c97e66b SHA1 (patch-ak) = 78622d902016fa559ae3090d9c8407337d7cd0ed SHA1 (patch-al) = 94f87c9655fd772e05e193da90617d12200a6ae5 diff --git a/sysutils/pftop/patches/patch-aj b/sysutils/pftop/patches/patch-aj index a2c6bbd9842..263f8a9ddbb 100644 --- a/sysutils/pftop/patches/patch-aj +++ b/sysutils/pftop/patches/patch-aj @@ -1,8 +1,8 @@ -$NetBSD: patch-aj,v 1.1 2010/09/18 20:48:23 wiz Exp $ +$NetBSD: patch-aj,v 1.2 2011/06/10 11:45:01 obache Exp $ ---- sf-gencode.h.orig 2009-11-16 23:47:42 +0100 -+++ sf-gencode.h 2009-11-16 23:47:54 +0100 -@@ -169,8 +169,13 @@ +--- sf-gencode.h.orig 2007-11-07 06:34:18.000000000 +0000 ++++ sf-gencode.h +@@ -169,8 +169,13 @@ struct arth *gen_loadage(void); struct arth *gen_loadexpire(void); void bpf_optimize(struct block **); @@ -16,7 +16,7 @@ $NetBSD: patch-aj,v 1.1 2010/09/18 20:48:23 wiz Exp $ void finish_parse(struct block *); char *sdup(const char *); -@@ -184,11 +189,19 @@ +@@ -184,11 +189,14 @@ void sappend(struct slist *, struct slis #define JT(b) ((b)->et.succ) #define JF(b) ((b)->ef.succ) @@ -28,11 +28,7 @@ $NetBSD: patch-aj,v 1.1 2010/09/18 20:48:23 wiz Exp $ const char *sf_get_error(void); int sf_compile(struct bpf_program *, char *, int, bpf_u_int32); void sf_freecode(struct bpf_program *); -+#ifdef __DragonFly__ -+void bpf_dump(const struct bpf_program *, int); -+#else - void bpf_dump(struct bpf_program *, int); -+#endif +-void bpf_dump(struct bpf_program *, int); extern int no_optimize; |