diff options
| author | joerg <joerg@pkgsrc.org> | 2006-01-25 17:22:54 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-01-25 17:22:54 +0000 |
| commit | 0526124ef19fc092a42311fe78b4ad594da9a04d (patch) | |
| tree | e1da7047757f43b38bc9204590d5aff688a64bf8 /net | |
| parent | fc61b4f948bfb8ad7d5c1a0d0bac590d8500613e (diff) | |
| download | pkgsrc-0526124ef19fc092a42311fe78b4ad594da9a04d.tar.gz | |
Rename bpf_dump, it conflicts with a function in libpcap.
Diffstat (limited to 'net')
| -rw-r--r-- | net/tcpdpriv/distinfo | 5 | ||||
| -rw-r--r-- | net/tcpdpriv/patches/patch-aa | 24 | ||||
| -rw-r--r-- | net/tcpdpriv/patches/patch-ab | 13 |
3 files changed, 37 insertions, 5 deletions
diff --git a/net/tcpdpriv/distinfo b/net/tcpdpriv/distinfo index f8b1a0dd5a2..7a289e7b53a 100644 --- a/net/tcpdpriv/distinfo +++ b/net/tcpdpriv/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.3 2005/02/24 12:14:05 agc Exp $ +$NetBSD: distinfo,v 1.4 2006/01/25 17:22:54 joerg Exp $ SHA1 (tcpd-tools-0.8.tar.gz) = fe2abe15bbf9062833af9bec3745c751a8aa06df RMD160 (tcpd-tools-0.8.tar.gz) = 876842cbb37ca65d4b955718abd5ef5c14810dee Size (tcpd-tools-0.8.tar.gz) = 468856 bytes -SHA1 (patch-aa) = 646ef4c578b5ede84f80e27b4226806c9f02c861 +SHA1 (patch-aa) = be90f2b82ef4512eb85be99b8055843964cba24a +SHA1 (patch-ab) = 6ca6c40f9f1e6c8c1ac00a41e49f2d5df59953f0 diff --git a/net/tcpdpriv/patches/patch-aa b/net/tcpdpriv/patches/patch-aa index feb7c4a211e..967a1487486 100644 --- a/net/tcpdpriv/patches/patch-aa +++ b/net/tcpdpriv/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/03/06 03:43:16 itojun Exp $ +$NetBSD: patch-aa,v 1.2 2006/01/25 17:22:54 joerg Exp $ ---- tcpdpriv.c- Tue Mar 6 12:39:07 2001 -+++ tcpdpriv.c Tue Mar 6 12:39:12 2001 +--- tcpdpriv.c.orig 2000-04-18 07:59:19.000000000 +0000 ++++ tcpdpriv.c @@ -90,7 +90,7 @@ #include <arpa/nameser.h> #endif @@ -11,3 +11,21 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/03/06 03:43:16 itojun Exp $ #include <net/slcompress.h> #if !defined(osf1) #include <net/slip.h> +@@ -2759,7 +2759,7 @@ usage(char *cmd) + int + main(int argc, char *argv[], char *envp[]) + { +- void bpf_dump(FILE *output, struct bpf_program *, int); ++ void my_bpf_dump(FILE *output, struct bpf_program *, int); + char *copy_argv(register char **argv); + char *read_infile(char *fname); + char *rfile, *wfile; +@@ -2903,7 +2903,7 @@ main(int argc, char *argv[], char *envp[ + + /* dump? */ + if (dflag) { +- bpf_dump(stderr, &fcode, dflag); ++ my_bpf_dump(stderr, &fcode, dflag); + exit(0); + } + diff --git a/net/tcpdpriv/patches/patch-ab b/net/tcpdpriv/patches/patch-ab new file mode 100644 index 00000000000..e8702410a38 --- /dev/null +++ b/net/tcpdpriv/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1 2006/01/25 17:22:54 joerg Exp $ + +--- tcpdutil.c.orig 2006-01-25 17:16:26.000000000 +0000 ++++ tcpdutil.c +@@ -141,7 +141,7 @@ read_infile(char *fname) + + + void +-bpf_dump(FILE *output, struct bpf_program *p, int option) ++my_bpf_dump(FILE *output, struct bpf_program *p, int option) + { + struct bpf_insn *insn; + int i; |